https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c7c36702d2a49a6242e6ec...
commit c7c36702d2a49a6242e6ec2ffe308f5956af55fc Author: Thomas Faber thomas.faber@reactos.org AuthorDate: Fri Mar 9 09:06:08 2018 +0100 Commit: Thomas Faber thomas.faber@reactos.org CommitDate: Fri Mar 9 09:06:12 2018 +0100
[USER32] ForceResetUserApiHook is WINAPI, not FASTCALL. CORE-14450
Fixes stack pointer corruption when using Windows's uxtheme.dll. --- sdk/include/reactos/undocuser.h | 2 +- win32ss/user/user32/misc/usrapihk.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sdk/include/reactos/undocuser.h b/sdk/include/reactos/undocuser.h index dbe93b2ac9..f130e6b1a9 100644 --- a/sdk/include/reactos/undocuser.h +++ b/sdk/include/reactos/undocuser.h @@ -229,7 +229,7 @@ typedef BOOL (WINAPI *ADJUSTWINDOWRECTEX)(LPRECT,DWORD,BOOL,DWORD); typedef int (WINAPI *GETSYSTEMMETRICS)(int); typedef BOOL (WINAPI *SYSTEMPARAMETERSINFOA)(UINT,UINT,PVOID,UINT); typedef BOOL (WINAPI *SYSTEMPARAMETERSINFOW)(UINT,UINT,PVOID,UINT); -typedef BOOL (__fastcall *FORCERESETUSERAPIHOOK)(HINSTANCE); +typedef BOOL (WINAPI *FORCERESETUSERAPIHOOK)(HINSTANCE); typedef BOOL (WINAPI *DRAWFRAMECONTROL)(HDC,LPRECT,UINT,UINT); typedef BOOL (WINAPI *DRAWCAPTION)(HWND,HDC,LPCRECT,UINT); typedef BOOL (WINAPI *MDIREDRAWFRAME)(HWND,DWORD); diff --git a/win32ss/user/user32/misc/usrapihk.c b/win32ss/user/user32/misc/usrapihk.c index 8b5d264ee8..c2e91d5f3d 100644 --- a/win32ss/user/user32/misc/usrapihk.c +++ b/win32ss/user/user32/misc/usrapihk.c @@ -113,7 +113,7 @@ BeginIfHookedUserApiHook(VOID) }
BOOL -FASTCALL +WINAPI ForceResetUserApiHook(HINSTANCE hInstance) { if ( ghmodUserApiHook == hInstance &&