diff --git a/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch b/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch index e423dc07..bbde4376 100644 --- a/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch +++ b/patches/ntdll-Hide_Wine_Exports/0001-ntdll-Add-support-for-hiding-wine-version-informatio.patch @@ -1,33 +1,32 @@ -From ab7508f34fd0f428392e8e0811709f6436e00c93 Mon Sep 17 00:00:00 2001 +From ced18580fb543c16bd1c3a203ac4da2bbd5aba83 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 30 May 2015 02:23:15 +0200 -Subject: ntdll: Add support for hiding wine version information from +Subject: [PATCH] ntdll: Add support for hiding wine version information from applications. --- - dlls/ntdll/loader.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++- + dlls/ntdll/loader.c | 95 ++++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/ntdll_misc.h | 5 +++ - 2 files changed, 100 insertions(+), 1 deletion(-) + 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c -index 94668e8ba4..f4e002a060 100644 +index a90814290b..498d95b2b7 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c -@@ -63,10 +63,13 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); +@@ -63,9 +63,12 @@ WINE_DECLARE_DEBUG_CHANNEL(imports); typedef DWORD (CALLBACK *DLLENTRYPROC)(HMODULE,DWORD,LPVOID); typedef void (CALLBACK *LDRENUMPROC)(LDR_MODULE *, void *, BOOLEAN *); +#define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') + static BOOL imports_fixup_done = FALSE; /* set once the imports have been fixed up, before attaching them */ - static BOOL process_attaching = TRUE; /* set on process attach to avoid calling callbacks too early */ static BOOL process_detaching = FALSE; /* set on process detach to avoid deadlocks with thread detach */ static int free_lib_count; /* recursion depth of LdrUnloadDll calls */ +static BOOL hide_wine_exports = FALSE; /* try to hide ntdll wine exports from applications */ static const char * const reason_names[] = { -@@ -1449,6 +1452,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULO +@@ -1435,6 +1438,96 @@ NTSTATUS WINAPI LdrUnlockLoaderLock( ULONG flags, ULONG_PTR magic ) } @@ -124,7 +123,7 @@ index 94668e8ba4..f4e002a060 100644 /****************************************************************** * LdrGetProcedureAddress (NTDLL.@) */ -@@ -1469,7 +1562,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(H +@@ -1455,7 +1548,7 @@ NTSTATUS WINAPI LdrGetProcedureAddress(HMODULE module, const ANSI_STRING *name, LPCWSTR load_path = NtCurrentTeb()->Peb->ProcessParameters->DllPath.Buffer; void *proc = name ? find_named_export( module, exports, exp_size, name->Buffer, -1, load_path ) : find_ordinal_export( module, exports, exp_size, ord - exports->Base, load_path ); @@ -134,10 +133,10 @@ index 94668e8ba4..f4e002a060 100644 *address = proc; ret = STATUS_SUCCESS; diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 6549a71fc0..6e51612380 100644 +index d126fae6c8..475fec1bdd 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -266,6 +266,11 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; +@@ -254,6 +254,11 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; NTSTATUS WINAPI RtlHashUnicodeString(PCUNICODE_STRING,BOOLEAN,ULONG,ULONG*); @@ -150,4 +149,5 @@ index 6549a71fc0..6e51612380 100644 extern BOOL read_process_time(int unix_pid, int unix_tid, unsigned long clk_tck, LARGE_INTEGER *kernel, LARGE_INTEGER *user) DECLSPEC_HIDDEN; -- -2.12.2 +2.16.1 + diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index df6ffa8e..7261d05f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -58,7 +58,7 @@ upstream_commit() # Show version information version() { - echo "Wine Staging 3.1 (Unreleased)" + echo "Wine Staging 3.2 (Unreleased)" echo "Copyright (C) 2014-2018 the Wine Staging project authors." echo "Copyright (C) 2018 Alistair Leslie-Hughes" echo "" @@ -2920,12 +2920,12 @@ if test "$enable_Pipelight" -eq 1; then patch_apply Pipelight/0001-winex11-Implement-X11DRV_FLUSH_GDI_DISPLAY-ExtEscape-c.patch patch_apply Pipelight/0002-user32-Decrease-minimum-SetTimer-interval-to-5-ms.patch patch_apply Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch - patch_apply Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch + #patch_apply Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch ( printf '%s\n' '+ { "Sebastian Lackner", "winex11: Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command.", 1 },'; printf '%s\n' '+ { "Michael Müller", "user32: Decrease minimum SetTimer interval to 5 ms.", 2 },'; printf '%s\n' '+ { "Michael Müller", "wined3d: Allow changing strict drawing through an exported function.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "winex11.drv: Indicate direct rendering through OpenGL extension.", 1 },'; + # printf '%s\n' '+ { "Michael Müller", "winex11.drv: Indicate direct rendering through OpenGL extension.", 1 },'; ) >> "$patchlist" fi @@ -3771,16 +3771,16 @@ fi # | if test "$enable_d3d11_Depth_Bias" -eq 1; then patch_apply d3d11-Depth_Bias/0002-d3d11-tests-Add-some-basic-depth-tests.patch - patch_apply d3d11-Depth_Bias/0003-d3d11-Implement-depth-bias-and-slope.patch - patch_apply d3d11-Depth_Bias/0004-d3d11-Add-support-for-SlopeScaledDepthBias-in-RSSetS.patch - patch_apply d3d11-Depth_Bias/0005-d3d11-tests-Add-basic-test-for-depth-bias-clamping.patch - patch_apply d3d11-Depth_Bias/0006-wined3d-Add-support-for-depth-bias-clamping.patch +# patch_apply d3d11-Depth_Bias/0003-d3d11-Implement-depth-bias-and-slope.patch +# patch_apply d3d11-Depth_Bias/0004-d3d11-Add-support-for-SlopeScaledDepthBias-in-RSSetS.patch +# patch_apply d3d11-Depth_Bias/0005-d3d11-tests-Add-basic-test-for-depth-bias-clamping.patch +# patch_apply d3d11-Depth_Bias/0006-wined3d-Add-support-for-depth-bias-clamping.patch ( printf '%s\n' '+ { "Michael Müller", "d3d11/tests: Add some basic depth tests.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "d3d11: Implement depth bias and slope.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "d3d11: Add support for SlopeScaledDepthBias in RSSetState.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "d3d11/tests: Add basic test for depth bias clamping.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "wined3d: Add support for depth bias clamping.", 1 },'; +# printf '%s\n' '+ { "Michael Müller", "d3d11: Implement depth bias and slope.", 1 },'; +# printf '%s\n' '+ { "Michael Müller", "d3d11: Add support for SlopeScaledDepthBias in RSSetState.", 1 },'; +# printf '%s\n' '+ { "Michael Müller", "d3d11/tests: Add basic test for depth bias clamping.", 1 },'; +# printf '%s\n' '+ { "Michael Müller", "wined3d: Add support for depth bias clamping.", 1 },'; ) >> "$patchlist" fi @@ -3877,12 +3877,12 @@ fi # | Modified files: # | * dlls/d3d10_1/tests/d3d10_1.c, dlls/d3d11/tests/d3d11.c, dlls/d3d9/tests/device.c, dlls/winex11.drv/opengl.c # | -if test "$enable_d3d9_DesktopWindow" -eq 1; then - patch_apply d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch - ( - printf '%s\n' '+ { "Michael Müller", "winex11.drv: Allow changing the opengl pixel format on the desktop window.", 1 },'; - ) >> "$patchlist" -fi +#if test "$enable_d3d9_DesktopWindow" -eq 1; then +# patch_apply d3d9-DesktopWindow/0001-winex11.drv-Allow-changing-the-opengl-pixel-format-o.patch +# ( +# printf '%s\n' '+ { "Michael Müller", "winex11.drv: Allow changing the opengl pixel format on the desktop window.", 1 },'; +# ) >> "$patchlist" +#fi # Patchset d3d9-Tests # |