Scale custom button image according to current DPI

Fixes #2246

.github/workflows/build.yml

@@ -1,94 +0,0 @@
-name: Build
-
-permissions:
-  contents: read # Default to secure
-
-on:
-  pull_request:
-    branches:
-      - master
-    paths:
-      - 'Src/**'
-      - 'Localization/**'
-      - '.github/workflows/build.yml'
-
-  workflow_dispatch:  # allows manual trigger for main/master
-
-jobs:
-  build:
-    runs-on: windows-2022
-    outputs:
-      new_version: ${{ steps.versioning.outputs.NEW_VERSION }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-        with:
-          fetch-depth: 0 # Essential to see all tags
-
-      - name: Prepare version
-        id: versioning
-        shell: pwsh
-        run: |
-          # Fetch latest tag
-          $latestTag = git describe --tags --abbrev=0 2>$null
-
-          if ($latestTag -notmatch '^v\d+\.\d+\.\d+$') {
-            Write-Error "Error: Could not find a valid vX.Y.Z tag in history. Found: '$latestTag'"
-            exit 1
-          }
-          
-          # Parse and Increment
-          $version = [version]$latestTag.Substring(1)
-          $baseVersion = "$($version.Major).$($version.Minor).$($version.Build + 1)"
-
-          # Handle PR Suffix
-          if ("${{ github.event_name }}" -eq "pull_request") {
-            $shortSha = "${{ github.event.pull_request.head.sha }}".Substring(0, 7)
-            $finalVersion = "$baseVersion-pr-$shortSha"
-          } else {
-            $finalVersion = $baseVersion
-          }
-          
-          # Export
-          "NEW_VERSION=$finalVersion" | Out-File -FilePath $env:GITHUB_OUTPUT -Append
-          Write-Host "Building version: $finalVersion"
-
-      - name: Build
-        shell: cmd
-        env:
-          APPVEYOR_BUILD_VERSION: ${{ steps.versioning.outputs.NEW_VERSION }}
-        run: Src\Setup\__MakeFinal.bat
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: OpenShell
-          path: |
-            Src/Setup/Final/
-            !Src/Setup/Final/OpenShellLoc.zip
-
-  release:
-    if: github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/master' # Only manual master builds
-    needs: build
-    runs-on: ubuntu-latest # Cheaper/faster than windows for just uploading
-    permissions:
-      contents: write # Elevate permissions ONLY for this job
-    steps:
-      - name: Download artifacts
-        uses: actions/download-artifact@v8
-        with:
-          name: OpenShell
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v3
-        with:
-          tag_name: v${{ needs.build.outputs.new_version }}
-          name: ${{ needs.build.outputs.new_version }}
-          generate_release_notes: true
-          prerelease: true
-          files: |
-            OpenShellSetup*.exe
-            OpenShellSymbols_*.7z
-            Utility.exe
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -7,7 +7,7 @@ A collection of utilities bringing back classic features to Windows.
 
 *Originally* **[Classic Shell](http://www.classicshell.net)** *by [Ivo Beltchev](https://sourceforge.net/u/ibeltchev/profile/)*
 
-[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)  [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases)  [![Build](https://github.com/Open-Shell/Open-Shell-Menu/actions/workflows/build.yml/badge.svg)](https://github.com/Open-Shell/Open-Shell-Menu/actions/workflows/build.yml)  [![Build status](https://img.shields.io/appveyor/build/passionate-coder/Open-Shell-Menu?logo=appveyor&style=flat-square)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master)  [![GitQ](https://img.shields.io/badge/gitq-discussions-1577fa?style=flat-square)](https://gitq.com/passionate-coder/Classic-Start)  [![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen&logo=gitter&style=flat-square)](https://gitter.im/open-shell/Lobby)  [![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/7H6arr5)
+[![GitHub Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases/latest)  [![GitHub Pre-Release](https://img.shields.io/github/release/Open-Shell/Open-Shell-Menu/all.svg?style=flat-square)](https://github.com/Open-Shell/Open-Shell-Menu/releases)  [![Build status](https://img.shields.io/appveyor/build/passionate-coder/Open-Shell-Menu?logo=appveyor&style=flat-square)](https://ci.appveyor.com/project/passionate-coder/open-shell-menu/branch/master)  [![GitQ](https://img.shields.io/badge/gitq-discussions-1577fa?style=flat-square)](https://gitq.com/passionate-coder/Classic-Start)  [![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg?color=lightseagreen&logo=gitter&style=flat-square)](https://gitter.im/open-shell/Lobby)  [![Discord](https://img.shields.io/discord/757701054782636082?color=mediumslateblue&label=Discord&logo=discord&logoColor=white&style=flat-square)](https://discord.gg/7H6arr5)
 
 [Open-Shell Homepage](https://open-shell.github.io/Open-Shell-Menu)  
 

Src/Lib/Settings.cpp

@@ -1670,7 +1670,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		ofn.lpstrTitle=title;
 		ofn.lpstrDefExt=L".xml";
 		ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_PATHMUSTEXIST|OFN_OVERWRITEPROMPT|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-		if (GetSaveFileNameSafe(&ofn))
+		if (GetSaveFileName(&ofn))
 		{
 			CString err=g_SettingsManager.SaveSettingsXml(path);
 			if (!err.IsEmpty())
@@ -1699,7 +1699,7 @@ LRESULT CSettingsDlg::OnBackup( WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL&
 		CString title=LoadStringEx(IDS_XML_TITLE_LOAD);
 		ofn.lpstrTitle=title;
 		ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-		if (GetOpenFileNameSafe(&ofn))
+		if (GetOpenFileName(&ofn))
 		{
 			SetCurTab(m_Index,true); // reload tab once to force-close any active edit boxes
 			CString error=g_SettingsManager.LoadSettingsXml(path);

Src/Lib/SettingsUIHelper.cpp

@@ -15,7 +15,6 @@
 #include <uxtheme.h>
 #include <map>
 #include <algorithm>
-#include <thread>
 
 const KNOWNFOLDERID FOLDERID_DesktopRoot={'DESK', 'TO', 'P', {'D', 'E', 'S', 'K', 'T', 'O', 'P', 0x00}};
 
@@ -1194,7 +1193,7 @@ bool BrowseCommandHelper( HWND parent, wchar_t *text )
 	ofn.lpstrFile=text;
 	ofn.nMaxFile=_MAX_PATH;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR|OFN_NODEREFERENCELINKS;
-	if (GetOpenFileNameSafe(&ofn))
+	if (GetOpenFileName(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(text,buf,_countof(buf));
@@ -1217,8 +1216,7 @@ bool BrowseCommandHelper( HWND parent, wchar_t *text )
 	return false;
 }
 
-// Internal implementation that must be run on an STA thread with COM initialized.
-static bool BrowseLinkHelperImpl( HWND parent, wchar_t *text, bool bFoldersOnly )
+bool BrowseLinkHelper( HWND parent, wchar_t *text, bool bFoldersOnly )
 {
 	DoEnvironmentSubst(text,_MAX_PATH);
 
@@ -1278,41 +1276,6 @@ static bool BrowseLinkHelperImpl( HWND parent, wchar_t *text, bool bFoldersOnly
 	return pResult!=NULL;
 }
 
-// Run IFileOpenDialog on a separate STA thread and pump messages on the caller while waiting.
-bool BrowseLinkHelper( HWND parent, wchar_t *text, bool bFoldersOnly )
-{
-	bool result = false;
-
-	std::thread worker([&parent, &text, &bFoldersOnly, &result]() mutable {
-		CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-		result = BrowseLinkHelperImpl(parent, text, bFoldersOnly);
-		CoUninitialize();
-	});
-
-	// Pump messages while waiting for the worker (dialog) to finish
-	while (true)
-	{
-		HANDLE hWorker = worker.native_handle();
-		if (MsgWaitForMultipleObjects(1, &hWorker, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0)
-			break;
-
-		MSG msg;
-		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-		{
-			if (msg.message == WM_QUIT)
-			{
-				PostQuitMessage((int)msg.wParam);
-				break;
-			}
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-	}
-	worker.join();
-
-	return result;
-}
-
 bool BrowseIconHelper( HWND parent, wchar_t *text )
 {
 	int id=0;
@@ -2048,7 +2011,7 @@ LRESULT CBrowseForIconDlg::OnBrowse( WORD wNotifyCode, WORD wID, HWND hWndCtl, B
 	CString title=LoadStringEx(IDS_ICON_TITLE);
 	ofn.lpstrTitle=title;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-	if (GetOpenFileNameSafe(&ofn))
+	if (GetOpenFileName(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(path,buf,_countof(buf));
@@ -2247,7 +2210,7 @@ bool BrowseForBitmap( HWND hWndParent, wchar_t *path, bool bAllowJpeg )
 	CString title=LoadStringEx(IDS_BMP_TITLE);
 	ofn.lpstrTitle=title;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-	if (GetOpenFileNameSafe(&ofn))
+	if (GetOpenFileName(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(path,buf,_countof(buf));
@@ -2279,7 +2242,7 @@ bool BrowseForSound( HWND hWndParent, wchar_t *path )
 	CString title=LoadStringEx(IDS_WAV_TITLE);
 	ofn.lpstrTitle=title;
 	ofn.Flags=OFN_DONTADDTORECENT|OFN_ENABLESIZING|OFN_EXPLORER|OFN_FILEMUSTEXIST|OFN_HIDEREADONLY|OFN_NOCHANGEDIR;
-	if (GetOpenFileNameSafe(&ofn))
+	if (GetOpenFileName(&ofn))
 	{
 		wchar_t buf[_MAX_PATH];
 		UnExpandEnvStrings(path,buf,_countof(buf));
@@ -3667,49 +3630,3 @@ DWORD ParseColor(const wchar_t* str)
 	wchar_t* end;
 	return wcstoul(str, &end, 16) & 0xFFFFFF;
 }
-
-// Run GetOpenFileName/GetSaveFileName on a separate STA thread and pump messages on the caller
-template <typename auto Fnc>
-static BOOL GetFileNameSafe(OPENFILENAME* pOfn)
-{
-	BOOL result = FALSE;
-
-	std::thread worker([&pOfn, &result]() mutable {
-		CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
-		result = Fnc(pOfn);
-		CoUninitialize();
-		});
-
-	// Pump messages while waiting for the worker (dialog) to finish
-	while (true)
-	{
-		HANDLE hWorker = worker.native_handle();
-		if (MsgWaitForMultipleObjects(1, &hWorker, FALSE, INFINITE, QS_ALLINPUT) == WAIT_OBJECT_0)
-			break;
-
-		MSG msg;
-		while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
-		{
-			if (msg.message == WM_QUIT)
-			{
-				PostQuitMessage((int)msg.wParam);
-				break;
-			}
-			TranslateMessage(&msg);
-			DispatchMessage(&msg);
-		}
-	}
-	worker.join();
-
-	return result;
-}
-
-BOOL GetOpenFileNameSafe(OPENFILENAME* pOfn)
-{
-	return GetFileNameSafe<GetOpenFileNameW>(pOfn);
-}
-
-BOOL GetSaveFileNameSafe(OPENFILENAME* pOfn)
-{
-	return GetFileNameSafe<GetSaveFileNameW>(pOfn);
-}

Src/Lib/SettingsUIHelper.h

@@ -395,7 +395,3 @@ DWORD BgrToRgb(DWORD val);
 
 // parse color from hexadecimal string
 DWORD ParseColor(const wchar_t* str);
-
-// safe versions of GetOpenFileName/GetSaveFileName (run API on a separate STA thread and pump messages on the caller)
-BOOL GetOpenFileNameSafe(OPENFILENAME* pOfn);
-BOOL GetSaveFileNameSafe(OPENFILENAME* pOfn);

Src/Localization/WixUI/WixUI_ja-jp.wxl

@@ -31,7 +31,7 @@
     <String Id="Advanced_Font_Bigger_Size" Overridable="yes">12</String>
     <String Id="Advanced_Font_Title_Size" Overridable="yes">9</String>
     <String Id="Advanced_Font_Emphasized_Size" Overridable="yes">8</String>
-    <String Id="Advanced_Font_FaceName" Overridable="yes">"MS UI Gothic", "MS PGothic", "ＭＳ Ｐゴシック", "MS Gothic", "ＭＳ ゴシック", Yu Gothic UI, Tahoma</String>
+    <String Id="Advanced_Font_FaceName" Overridable="yes">"MS UI Gothic", "MS PGothic", "ＭＳ Ｐゴシック", "MS Gothic", "ＭＳ ゴシック", Osaka, Tahoma</String>
 
     <String Id="BrowseDlg_Title" Overridable="yes">[ProductName] セットアップ</String>
     <String Id="BrowseDlgComboLabel" Overridable="yes">場所(&amp;L):</String>

Src/Setup/BuildArchives.bat

@@ -20,8 +20,6 @@ cd ..
 
 cd Setup
 
-copy /B ..\..\build\bin\Release\Utility.exe .\Final > nul
-
 if defined APPVEYOR (
 	appveyor PushArtifact ..\..\build\bin\Release\Utility.exe
 )

Src/StartMenu/StartMenuDLL/ItemManager.h

@@ -383,7 +383,7 @@ private:
 	static DWORD CALLBACK StaticRefreshInfoThread( void *param );
 	static DWORD CALLBACK SaveCacheFileThread( void *param );
 
-	// all paths are in caps and end with backslash
+	// all paths are in caps and end with \ 
 	CString m_RootStartMenu1;
 	CString m_RootStartMenu2;
 	CString m_RootStartMenu3;

Src/StartMenu/StartMenuDLL/MenuContainer.cpp

@@ -6366,11 +6366,8 @@ LRESULT CMenuContainer::OnRefresh( UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL
 					}
 				}
 				else if (m_Items[m_OriginalCount].id==MENU_SEARCH_CATEGORY)
-				{
-					if (!bSearching || !s_SearchResults.programs.empty())
 					hotItem=m_OriginalCount+1;
 			}
-			}
 			else
 				hotItem=-1;
 		}

Src/StartMenu/StartMenuDLL/StartMenuDLL.cpp

@@ -1624,7 +1624,7 @@ static void ComputeTaskbarColors( int *data )
 {
 	bool bDefLook;
 	int look=GetSettingInt(L"TaskbarLook",bDefLook);
-	if (GetWinVersion()<WIN_VER_WIN10 || !IsAppThemed() || look==TASKBAR_AEROGLASS || (look==TASKBAR_TRANSPARENT && g_TaskbarTexture))
+	if (GetWinVersion()<WIN_VER_WIN10 || look==TASKBAR_AEROGLASS || (look==TASKBAR_TRANSPARENT && g_TaskbarTexture))
 	{
 		memset(data,0,16);
 	}
@@ -1872,7 +1872,6 @@ static LRESULT CALLBACK SubclassTaskBarProc( HWND hWnd, UINT uMsg, WPARAM wParam
 		ComputeTaskbarColors(data);
 		WINCOMPATTRDATA attrData={0x13,&data,sizeof(data)};
 		SetWindowCompositionAttribute(hWnd,&attrData);
-		UpdateTaskBars(TASKBAR_UPDATE_TEXTURE);
 		return res;
 	}
 	if ((uMsg==WM_DWMCOLORIZATIONCOLORCHANGED || uMsg==WM_SETTINGCHANGE) && taskBar && taskBar->bCustomLook && SetWindowCompositionAttribute && GetWinVersion()<WIN_VER_WIN10)
@@ -1933,7 +1932,7 @@ static LRESULT CALLBACK SubclassTaskBarProc( HWND hWnd, UINT uMsg, WPARAM wParam
 				WINCOMPATTRDATA attrData={0x13,&data,sizeof(data)};
 				SetWindowCompositionAttribute(hWnd,&attrData);
 			}
-			if (g_TaskbarTexture)
+			if (g_TaskbarTexture && IsAppThemed())
 			{
 				// draw taskbar background (behind start button and separators)
 				PAINTSTRUCT ps;
@@ -2384,20 +2383,13 @@ void UpdateTaskBars( TUpdateTaskbar update )
 					}
 				}
 			}
-			else if ((GetWinVersion()<WIN_VER_WIN10 && (!bDefColor || !bDefOpacity)) || !IsAppThemed())
+			else if (GetWinVersion()<WIN_VER_WIN10 && (!bDefColor || !bDefOpacity))
 			{
 				if (bDefColor && GetWinVersion()>WIN_VER_WIN7)
-				{
-					if (IsAppThemed()) 
 				{
 					color=GetSystemGlassColor8();
 					color=((color&0xFF)<<16)|(color&0xFF00)|((color>>16)&0xFF);
 				}
-					else
-					{
-						color=GetSysColor(COLOR_BTNFACE);
-					}
-				}
 				BITMAPINFO bi={0};
 				bi.bmiHeader.biSize=sizeof(BITMAPINFOHEADER);
 				bi.bmiHeader.biWidth=bi.bmiHeader.biHeight=32;
@@ -3020,10 +3012,7 @@ static void InitStartMenuDLL( void )
 		if (GetWinVersion()<=WIN_VER_WIN81)
 			g_DrawThemeBackgroundHook=SetIatHook(module,"uxtheme.dll","DrawThemeBackground",DrawThemeBackground2);
 		g_DrawThemeTextHook=SetIatHook(module,"uxtheme.dll","DrawThemeText",DrawThemeText2);
-		if (IsAppThemed())
-		{
 		g_DrawThemeTextExHook=SetIatHook(module,"uxtheme.dll","DrawThemeTextEx",DrawThemeTextEx2);
-		}
 		g_DrawThemeTextCtlHook=SetIatHook(GetModuleHandle(L"comctl32.dll"),"uxtheme.dll","DrawThemeText",DrawThemeText2);
 		if (GetWinVersion()>=WIN_VER_WIN10)
 			g_SetWindowCompositionAttributeHook=SetIatHook(module,"user32.dll","SetWindowCompositionAttribute",SetWindowCompositionAttribute2);

Src/StartMenu/StartMenuDLL/StartMenuDLL.rc

@@ -1081,9 +1081,9 @@ BEGIN
     IDS_RIGHT_SHIFT_TIP     "When this is checked, right-click on the start button will open the standard Windows context menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
     IDS_RIGHT_SHIFTX        "Right click opens Win+X menu"
     IDS_RIGHT_SHIFTX_TIP    "When this is checked, right-click on the start button will open the Win+X power menu instead of the Open-Shell menu. Otherwise Shift+right-click will open it"
-    IDS_STARTSCREEN_ITEM    "Show Start Menu/Screen shortcut"
+    IDS_STARTSCREEN_ITEM    "Show Start screen shortcut"
     IDS_STARTSCREEN_ITEM_TIP 
-                            "When this is checked, the main menu will contain a shortcut to open original Start menu/screen"
+                            "When this is checked, the main menu will contain a shortcut to open the Start screen"
     IDS_MIN_HEIGHT          "Minimum menu height"
     IDS_MIN_HEIGHT_TIP      "The main menu will be at least as tall as this many search results"
     IDS_GLASS_OVERRIDE      "Override glass color"

Src/StartMenu/StartMenuHelper/StartMenuExt.h

@@ -55,8 +55,8 @@ END_COM_MAP()
 	STDMETHODIMP InvokeCommand( CMINVOKECOMMANDINFO *pInfo );
 	STDMETHODIMP GetCommandString( UINT_PTR idCmd, UINT uFlags, UINT* pwReserved, LPSTR pszName, UINT cchMax );
 
-	wchar_t m_PinFolder1[_MAX_PATH]; // ending with backslash
-	wchar_t m_PinFolder2[_MAX_PATH]; // ending with backslash
+	wchar_t m_PinFolder1[_MAX_PATH]; // ending with \ 
+	wchar_t m_PinFolder2[_MAX_PATH]; // ending with \ 
 	wchar_t m_FileName[_MAX_PATH];
 	LPITEMIDLIST m_FilePidl;
 	bool m_bInPinFolder1, m_bInPinFolder2;

appveyor.yml

@@ -21,5 +21,5 @@ deploy:
   on:
     APPVEYOR_ACCOUNT_NAME: passionate-coder
   auth_token:
-    secure: SOu6Y71k0oIxXJR35x+7ZeU/+WRW8kaGnCWcbR3OVOd8HeCJwB1Tw3hUJa5EveLGKaGoMKGqAh01Pwc8tWX4xmphZsYYUr09IVjA0+rqgN5VT87CXD6OQxUxBJ7g+9IN
+    secure: SOu6Y71k0oIxXJR35x+7ZTrqDa3HqUM4kLNJc+DbohPz9zhVHh9O8QYwmI7LI0qslug5L11fo9pZVfVgZttw4eBgooHaX9TNBTTA6sJItkXqMX+M6mKAG7tbI/O3Eg0v
   prerelease: true