[ros-diffs] [reactos] 01/01: [SHELL32:WINE][PSDK] Fix the prototype of CallCPLEntry16().

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0bf768a14564ddc1b6b33…

commit 0bf768a14564ddc1b6b3397a099a92b8b3d8e3fa
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Mon Jan 10 20:07:49 2022 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Jan 11 23:03:25 2022 +0100

    [SHELL32:WINE][PSDK] Fix the prototype of CallCPLEntry16().
---
 dll/win32/shell32/wine/control.c | 5 +++++
 sdk/include/psdk/shlobj.h        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c
index 34c7b3bcf5b..725f13dc3c0 100644
--- a/dll/win32/shell32/wine/control.c
+++ b/dll/win32/shell32/wine/control.c
@@ -25,6 +25,7 @@
 
 #include <windef.h>
 #include <winbase.h>
+#include <shlobj.h>
 #define NO_SHLWAPI_REG
 #include <shlwapi.h>
 #include <shellapi.h>
@@ -941,7 +942,11 @@ void WINAPI RunDll_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE
inst,
  * hMod("DeskCp16.Dll"), pFunc("CplApplet"), 0, 1, 0xc, 0
  *
  */
+#ifndef __REACTOS__
 DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5,
DWORD dw6)
+#else
+LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM
dw5, LPARAM dw6)
+#endif
 {
     FIXME("(%p, %p, %08x, %08x, %08x, %08x): stub.\n", hMod, pFunc, dw3, dw4,
dw5, dw6);
     return 0x0deadbee;
diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h
index 9f7b215bff8..193b84f7d26 100644
--- a/sdk/include/psdk/shlobj.h
+++ b/sdk/include/psdk/shlobj.h
@@ -2664,7 +2664,7 @@ DECLARE_INTERFACE_(IShellFolderBand, IUnknown)
 /*****************************************************************************
  * Control Panel functions
  */
-LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC pFunc, HWND dw3, UINT dw4, LPARAM
dw5, LPARAM dw6);
+LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM
dw5, LPARAM dw6);
 
 #ifdef __cplusplus
 } /* extern "C" */