https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1df87d7fe98ff0aab1e354a995aa4bd624084343
commit 1df87d7fe98ff0aab1e354a995aa4bd624084343 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Tue Jan 11 23:31:26 2022 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Tue Jan 11 23:31:26 2022 +0100 [SHELL32:WINE][PSDK] Addendum to 0bf768a1: Add missing FARPROC16 definition for CallCPLEntry16() prototype. --- dll/win32/shell32/wine/control.c | 2 +- sdk/include/psdk/shlobj.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/wine/control.c b/dll/win32/shell32/wine/control.c index 725f13dc3c0..272747dc3f0 100644 --- a/dll/win32/shell32/wine/control.c +++ b/dll/win32/shell32/wine/control.c @@ -25,7 +25,6 @@ #include <windef.h> #include <winbase.h> -#include <shlobj.h> #define NO_SHLWAPI_REG #include <shlwapi.h> #include <shellapi.h> @@ -945,6 +944,7 @@ void WINAPI RunDll_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, #ifndef __REACTOS__ DWORD WINAPI CallCPLEntry16(HMODULE hMod, FARPROC pFunc, DWORD dw3, DWORD dw4, DWORD dw5, DWORD dw6) #else +DECLARE_HANDLE(FARPROC16); LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6) #endif { diff --git a/sdk/include/psdk/shlobj.h b/sdk/include/psdk/shlobj.h index 193b84f7d26..9423e15c4b0 100644 --- a/sdk/include/psdk/shlobj.h +++ b/sdk/include/psdk/shlobj.h @@ -2660,11 +2660,13 @@ DECLARE_INTERFACE_(IShellFolderBand, IUnknown) }; #undef INTERFACE - +#if (NTDDI_VERSION >= NTDDI_WIN2K) && (NTDDI_VERSION <= NTDDI_WINXPSP2) /***************************************************************************** * Control Panel functions */ +DECLARE_HANDLE(FARPROC16); LRESULT WINAPI CallCPLEntry16(HINSTANCE hMod, FARPROC16 pFunc, HWND dw3, UINT dw4, LPARAM dw5, LPARAM dw6); +#endif #ifdef __cplusplus } /* extern "C" */
