wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added shell32-registry-lookup-app patchset

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-11-04 21:06:02 +11:00
parent fa3a80f5af
commit df26057ddf
3 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
patches/patchinstall.sh
View File

@ -194,6 +194,7 @@ patch_enable_all ()
enable_shell32_SHFileOperation_Move="$1"
enable_shell32_SHGetStockIconInfo="$1"
enable_shell32_Toolbar_Bitmaps="$1"
enable_shell32_registry_lookup_app="$1"
enable_shlwapi_AssocGetPerceivedType="$1"
enable_shlwapi_UrlCanonicalize="$1"
enable_shlwapi_UrlCombine="$1"
@ -610,6 +611,9 @@ patch_enable ()
shell32-Toolbar_Bitmaps)
enable_shell32_Toolbar_Bitmaps="$2"
;;
shell32-registry-lookup-app)
enable_shell32_registry_lookup_app="$2"
;;
shlwapi-AssocGetPerceivedType)
enable_shlwapi_AssocGetPerceivedType="$2"
;;
@ -3041,6 +3045,18 @@ if test "$enable_shell32_Toolbar_Bitmaps" -eq 1; then
patch_apply shell32-Toolbar_Bitmaps/0002-shell32-Add-more-Tango-icons-to-the-IE-toolbar.patch
fi
# Patchset shell32-registry-lookup-app
# |
# | This patchset fixes the following Wine bugs:
# | * [#51957] Append .exe, if registry lookup fails first.
# |
# | Modified files:
# | * dlls/shell32/shlexec.c
# |
if test "$enable_shell32_registry_lookup_app" -eq 1; then
patch_apply shell32-registry-lookup-app/0001-shell32-Append-.exe-when-registry-lookup-fails-first.patch
fi
# Patchset shlwapi-AssocGetPerceivedType
# |
# | Modified files:

28
patches/shell32-registry-lookup-app/0001-shell32-Append-.exe-when-registry-lookup-fails-first.patch Normal file
View File

@ -0,0 +1,28 @@
From 70e0b924b2c89bae3f5723c6397fb00df6283586 Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox.xerox2000x@gmail.com>
Date: Thu, 4 Nov 2021 21:01:24 +1100
Subject: [PATCH] shell32: Append .exe when registry lookup fails first time
---
dlls/shell32/shlexec.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/shlexec.c b/dlls/shell32/shlexec.c
index d24b597181f..674e1e3b0c4 100644
--- a/dlls/shell32/shlexec.c
+++ b/dlls/shell32/shlexec.c
@@ -457,7 +457,10 @@ static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env)
lstrcpyW(buffer, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\");
lstrcatW(buffer, szName);
res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, buffer, 0, KEY_READ, &hkApp);
- if (res) goto end;
+ if (res)
+ res = RegOpenKeyExW(HKEY_LOCAL_MACHINE, lstrcatW(buffer, L".exe"), 0, KEY_READ, &hkApp);
+ if (res)
+ goto end;
len = MAX_PATH*sizeof(WCHAR);
res = RegQueryValueW(hkApp, NULL, lpResult, &len);
--
2.33.0

1
patches/shell32-registry-lookup-app/definition Normal file
View File

@ -0,0 +1 @@
Fixes: [51957] Append .exe, if registry lookup fails first.