mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
ntdll-DllOverrides_WOW64: Remove patchset.
This was always a no-op; HKCU/Software does not reflect.
This commit is contained in:
Zebediah Figura
parent
ab89820aa5
commit
f605d79997
@ -1,34 +0,0 @@
|
||||
From 625a74b841194e5895198cd1cdc2991cb42bdead Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 18 Oct 2015 15:50:04 +0200
|
||||
Subject: ntdll: Always use 64-bit registry view on WOW64 setups.
|
||||
|
||||
---
|
||||
dlls/ntdll/loadorder.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
|
||||
index 401d256..8a0b139 100644
|
||||
--- a/dlls/ntdll/loadorder.c
|
||||
+++ b/dlls/ntdll/loadorder.c
|
||||
@@ -316,7 +316,7 @@ static HANDLE get_standard_key(void)
|
||||
RtlInitUnicodeString( &nameW, DllOverridesW );
|
||||
|
||||
/* @@ Wine registry key: HKCU\Software\Wine\DllOverrides */
|
||||
- if (NtOpenKey( &std_key, KEY_ALL_ACCESS, &attr )) std_key = 0;
|
||||
+ if (NtOpenKey( &std_key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr )) std_key = 0;
|
||||
NtClose( root );
|
||||
}
|
||||
return std_key;
|
||||
@@ -359,7 +359,7 @@ static HANDLE get_app_key( const WCHAR *app_name )
|
||||
RtlInitUnicodeString( &nameW, str );
|
||||
|
||||
/* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DllOverrides */
|
||||
- if (NtOpenKey( &app_key, KEY_ALL_ACCESS, &attr )) app_key = 0;
|
||||
+ if (NtOpenKey( &app_key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr )) app_key = 0;
|
||||
NtClose( root );
|
||||
RtlFreeHeap( GetProcessHeap(), 0, str );
|
||||
return app_key;
|
||||
--
|
||||
2.6.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Always use 64-bit registry view on WOW64 setups
|
||||
@ -1,21 +1,22 @@
|
||||
From 13b6ccee7fb76c5eb81b7e02afe25b58553cfebf Mon Sep 17 00:00:00 2001
|
||||
From af18765a883e4eb6acb37ef63dd38f1782d24717 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 13 Dec 2014 02:14:30 +0100
|
||||
Subject: ntdll: Move logic to determine loadorder HKCU/app key into separate
|
||||
functions.
|
||||
|
||||
---
|
||||
dlls/ntdll/loadorder.c | 104 +++++++++++++++++++++++++++----------------------
|
||||
dlls/ntdll/loadorder.c | 104 +++++++++++++++++++++++------------------
|
||||
1 file changed, 58 insertions(+), 46 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
|
||||
index 401d256..d45a85f 100644
|
||||
index c6c02459..0102c560 100644
|
||||
--- a/dlls/ntdll/loadorder.c
|
||||
+++ b/dlls/ntdll/loadorder.c
|
||||
@@ -290,6 +290,60 @@ static inline enum loadorder get_env_load_order( const WCHAR *module )
|
||||
@@ -289,6 +289,60 @@ static inline enum loadorder get_env_load_order( const WCHAR *module )
|
||||
}
|
||||
|
||||
|
||||
/***************************************************************************
|
||||
+/***************************************************************************
|
||||
+ * open_user_reg_key
|
||||
+ *
|
||||
+ * Return a handle to a registry key under HKCU.
|
||||
@ -35,7 +36,7 @@ index 401d256..d45a85f 100644
|
||||
+ attr.SecurityQualityOfService = NULL;
|
||||
+ RtlInitUnicodeString( &nameW, key_name );
|
||||
+
|
||||
+ if (NtOpenKey( &hkey, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr )) hkey = 0;
|
||||
+ if (NtOpenKey( &hkey, KEY_ALL_ACCESS, &attr )) hkey = 0;
|
||||
+ NtClose( root );
|
||||
+
|
||||
+ return hkey;
|
||||
@ -69,10 +70,9 @@ index 401d256..d45a85f 100644
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/***************************************************************************
|
||||
/***************************************************************************
|
||||
* get_standard_key
|
||||
*
|
||||
* Return a handle to the standard DllOverrides registry section.
|
||||
@@ -301,24 +355,8 @@ static HANDLE get_standard_key(void)
|
||||
static HANDLE std_key = (HANDLE)-1;
|
||||
|
||||
@ -92,7 +92,7 @@ index 401d256..d45a85f 100644
|
||||
- RtlInitUnicodeString( &nameW, DllOverridesW );
|
||||
-
|
||||
- /* @@ Wine registry key: HKCU\Software\Wine\DllOverrides */
|
||||
- if (NtOpenKey( &std_key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr )) std_key = 0;
|
||||
- if (NtOpenKey( &std_key, KEY_ALL_ACCESS, &attr )) std_key = 0;
|
||||
- NtClose( root );
|
||||
- }
|
||||
+ std_key = open_user_reg_key( DllOverridesW );
|
||||
@ -135,12 +135,12 @@ index 401d256..d45a85f 100644
|
||||
- RtlInitUnicodeString( &nameW, str );
|
||||
-
|
||||
- /* @@ Wine registry key: HKCU\Software\Wine\AppDefaults\app.exe\DllOverrides */
|
||||
- if (NtOpenKey( &app_key, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr )) app_key = 0;
|
||||
- if (NtOpenKey( &app_key, KEY_ALL_ACCESS, &attr )) app_key = 0;
|
||||
- NtClose( root );
|
||||
- RtlFreeHeap( GetProcessHeap(), 0, str );
|
||||
return app_key;
|
||||
}
|
||||
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,4 +1,3 @@
|
||||
Fixes: Support for loader dll redirections
|
||||
#Depends: ntdll-Loader_Machine_Type
|
||||
Depends: ntdll-DllOverrides_WOW64
|
||||
Depends: wow64cpu-Wow64Transition
|
||||
@ -195,7 +195,6 @@ patch_enable_all ()
|
||||
enable_ntdll_DOS_Attributes="$1"
|
||||
enable_ntdll_Dealloc_Thread_Stack="$1"
|
||||
enable_ntdll_DeviceType_Systemroot="$1"
|
||||
enable_ntdll_DllOverrides_WOW64="$1"
|
||||
enable_ntdll_DllRedirects="$1"
|
||||
enable_ntdll_Exception="$1"
|
||||
enable_ntdll_FileDispositionInformation="$1"
|
||||
@ -749,9 +748,6 @@ patch_enable ()
|
||||
ntdll-DeviceType_Systemroot)
|
||||
enable_ntdll_DeviceType_Systemroot="$2"
|
||||
;;
|
||||
ntdll-DllOverrides_WOW64)
|
||||
enable_ntdll_DllOverrides_WOW64="$2"
|
||||
;;
|
||||
ntdll-DllRedirects)
|
||||
enable_ntdll_DllRedirects="$2"
|
||||
;;
|
||||
@ -2060,13 +2056,9 @@ if test "$enable_ntdll_HashLinks" -eq 1; then
|
||||
fi
|
||||
|
||||
if test "$enable_ntdll_DllRedirects" -eq 1; then
|
||||
if test "$enable_ntdll_DllOverrides_WOW64" -gt 1; then
|
||||
abort "Patchset ntdll-DllOverrides_WOW64 disabled, but ntdll-DllRedirects depends on that."
|
||||
fi
|
||||
if test "$enable_wow64cpu_Wow64Transition" -gt 1; then
|
||||
abort "Patchset wow64cpu-Wow64Transition disabled, but ntdll-DllRedirects depends on that."
|
||||
fi
|
||||
enable_ntdll_DllOverrides_WOW64=1
|
||||
enable_wow64cpu_Wow64Transition=1
|
||||
fi
|
||||
|
||||
@ -4532,18 +4524,6 @@ if test "$enable_ntdll_DeviceType_Systemroot" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DllOverrides_WOW64
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/loadorder.c
|
||||
# |
|
||||
if test "$enable_ntdll_DllOverrides_WOW64" -eq 1; then
|
||||
patch_apply ntdll-DllOverrides_WOW64/0001-ntdll-Always-use-64-bit-registry-view-on-WOW64-setup.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "ntdll: Always use 64-bit registry view on WOW64 setups.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wow64cpu-Wow64Transition
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -4565,7 +4545,7 @@ fi
|
||||
# Patchset ntdll-DllRedirects
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntdll-DllOverrides_WOW64, wow64cpu-Wow64Transition
|
||||
# | * wow64cpu-Wow64Transition
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/loader.c, dlls/ntdll/loadorder.c, dlls/ntdll/ntdll_misc.h
|
||||
@ -4998,7 +4978,7 @@ fi
|
||||
# Patchset ntdll-Purist_Mode
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntdll-DllOverrides_WOW64, wow64cpu-Wow64Transition, ntdll-DllRedirects
|
||||
# | * wow64cpu-Wow64Transition, ntdll-DllRedirects
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/loadorder.c
|
||||
@ -6716,7 +6696,7 @@ fi
|
||||
# Patchset uxtheme-GTK_Theming
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * ntdll-DllOverrides_WOW64, wow64cpu-Wow64Transition, ntdll-DllRedirects
|
||||
# | * wow64cpu-Wow64Transition, ntdll-DllRedirects
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * aclocal.m4, configure.ac, dlls/uxtheme-gtk/Makefile.in, dlls/uxtheme-gtk/buffer.c, dlls/uxtheme-gtk/button.c, dlls
|
||||
|
||||
Loading…
Reference in New Issue
Block a user