mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
ntdll-Purist_Mode: Remove patch set.
This is redundant and not especially useful.
This commit is contained in:
parent
f605d79997
commit
35f9449641
@ -1,35 +0,0 @@
|
||||
From a83bb75f363f799616d7b39cb4829c15638b0fff Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Mon, 9 Nov 2015 10:20:21 +0100
|
||||
Subject: ntdll: Add dll override default rule for purist mode.
|
||||
|
||||
---
|
||||
dlls/ntdll/loadorder.c | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c
|
||||
index eaeba37..5068812 100644
|
||||
--- a/dlls/ntdll/loadorder.c
|
||||
+++ b/dlls/ntdll/loadorder.c
|
||||
@@ -557,6 +557,7 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path )
|
||||
enum loadorder ret = LO_INVALID;
|
||||
HANDLE std_key, app_key = 0;
|
||||
WCHAR *module, *basename;
|
||||
+ WCHAR default_rule[] = {'*',0};
|
||||
|
||||
if (!init_done) init_load_order();
|
||||
std_key = get_override_standard_key();
|
||||
@@ -588,6 +589,10 @@ enum loadorder get_load_order( const WCHAR *app_name, const WCHAR *path )
|
||||
goto done;
|
||||
}
|
||||
|
||||
+ /* default rule '*' (used for purist mode) */
|
||||
+ if ((ret = get_load_order_value( std_key, app_key, default_rule )) != LO_INVALID)
|
||||
+ goto done;
|
||||
+
|
||||
/* and last the hard-coded default */
|
||||
ret = LO_DEFAULT;
|
||||
TRACE( "got hardcoded %s for %s\n", debugstr_loadorder(ret), debugstr_w(path) );
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1,2 +0,0 @@
|
||||
Fixes: Implement support for "Purist Mode" (override for all dlls)
|
||||
Depends: ntdll-DllRedirects
|
@ -220,7 +220,6 @@ patch_enable_all ()
|
||||
enable_ntdll_NtSuspendProcess="$1"
|
||||
enable_ntdll_Pipe_SpecialCharacters="$1"
|
||||
enable_ntdll_ProcessQuotaLimits="$1"
|
||||
enable_ntdll_Purist_Mode="$1"
|
||||
enable_ntdll_RtlCaptureStackBackTrace="$1"
|
||||
enable_ntdll_RtlCreateUserThread="$1"
|
||||
enable_ntdll_RtlQueryPackageIdentity="$1"
|
||||
@ -823,9 +822,6 @@ patch_enable ()
|
||||
ntdll-ProcessQuotaLimits)
|
||||
enable_ntdll_ProcessQuotaLimits="$2"
|
||||
;;
|
||||
ntdll-Purist_Mode)
|
||||
enable_ntdll_Purist_Mode="$2"
|
||||
;;
|
||||
ntdll-RtlCaptureStackBackTrace)
|
||||
enable_ntdll_RtlCaptureStackBackTrace="$2"
|
||||
;;
|
||||
@ -1992,13 +1988,6 @@ if test "$enable_ntdll_RtlCreateUserThread" -eq 1; then
|
||||
enable_ntdll_LdrInitializeThunk=1
|
||||
fi
|
||||
|
||||
if test "$enable_ntdll_Purist_Mode" -eq 1; then
|
||||
if test "$enable_ntdll_DllRedirects" -gt 1; then
|
||||
abort "Patchset ntdll-DllRedirects disabled, but ntdll-Purist_Mode depends on that."
|
||||
fi
|
||||
enable_ntdll_DllRedirects=1
|
||||
fi
|
||||
|
||||
if test "$enable_ntdll_NtSuspendProcess" -eq 1; then
|
||||
if test "$enable_kernel32_K32GetPerformanceInfo" -gt 1; then
|
||||
abort "Patchset kernel32-K32GetPerformanceInfo disabled, but ntdll-NtSuspendProcess depends on that."
|
||||
@ -4975,21 +4964,6 @@ if test "$enable_ntdll_ProcessQuotaLimits" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-Purist_Mode
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * wow64cpu-Wow64Transition, ntdll-DllRedirects
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/loadorder.c
|
||||
# |
|
||||
if test "$enable_ntdll_Purist_Mode" -eq 1; then
|
||||
patch_apply ntdll-Purist_Mode/0001-ntdll-Add-dll-override-default-rule-for-purist-mode.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Christian Costa", "ntdll: Add dll override default rule for purist mode.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-RtlCaptureStackBackTrace
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
Reference in New Issue
Block a user