wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add RunDLL_CallEntry16 patch.

Browse Source
This commit is contained in:
Michael Müller
2014-08-05 00:57:45 +02:00
parent 647f53b37e
commit cd729384de
4 changed files with 80 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
patches/shell32-RunDLL_CallEntry16/0001-shell32-Use-manual-redirection-for-RunDLL_CallEntry1.patch Normal file
View File

@@ -0,0 +1,56 @@
From f83364d68291cd94bc0e20fee08fd08ff1e8f35d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 4 Aug 2014 23:04:34 +0200
Subject: shell32: Use manual redirection for RunDLL_CallEntry16
---
dlls/shell32/control.c | 22 ++++++++++++++++++++++
dlls/shell32/shell32.spec | 2 +-
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c
index b393154..2ddf8b0 100644
--- a/dlls/shell32/control.c
+++ b/dlls/shell32/control.c
@@ -883,3 +883,25 @@ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, D
FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4, dw5, dw6);
return 0x0deadbee;
}
+
+/*************************************************************************
+ * RunDLL_CallEntry16 [SHELL32.122]
+ * Manually relay this function to make Tages Protection v5 happy
+ */
+void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst,
+ LPCSTR cmdline, INT cmdshow )
+{
+ static HMODULE shell16 = NULL;
+ static void (WINAPI *pRunDLL_CallEntry16)( DWORD proc, HWND hwnd, HINSTANCE inst,
+ LPCSTR cmdline, INT cmdshow ) = NULL;
+
+ if (!pRunDLL_CallEntry16)
+ {
+ if (!shell16 && !(shell16 = LoadLibraryA( "shell.dll16" )))
+ return;
+ if (!(pRunDLL_CallEntry16 = (void *)GetProcAddress( shell16, "RunDLL_CallEntry16" )))
+ return;
+ }
+
+ pRunDLL_CallEntry16( proc, hwnd, inst, cmdline, cmdshow );
+}
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index d73dcbb..e559587 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -114,7 +114,7 @@
119 stdcall -ordinal IsLFNDrive(ptr) IsLFNDriveAW
120 stdcall -noname FileMenu_AbortInitMenu()
121 stdcall -noname SHFlushClipboard()
- 122 stdcall -private @(long long ptr str long) shell.dll16.RunDLL_CallEntry16
+ 122 stdcall -noname RunDLL_CallEntry16(long long long str long)
123 stdcall -noname SHFreeUnusedLibraries()
124 stdcall -noname FileMenu_AppendFilesForPidl(long ptr long)
125 stdcall -noname FileMenu_AddFilesForPidl(long long long ptr long long ptr)
--
1.8.3.2

4
patches/shell32-RunDLL_CallEntry16/definition Normal file
View File

@@ -0,0 +1,4 @@
Author: Michael Müller
Subject: Manually relay RunDLL_CallEntry16 to make Tages Protection v5 happy.
Revision: 1
Fixes: [23033] Use manual relay for RunDLL_CallEntry16 in shell32