krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48480Signed-off-by: Dirk Niggemann <dirk.niggemann@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

krnl386.exe: Make CallProcEx32W16 clear CPEX_DEST_CDECL flag before looping over arguments.
c57483ba · Dirk Niggemann · Alexandre Julliard · b064d32c · c57483ba
Commit c57483ba authored Feb 04, 2020 by Dirk Niggemann Committed by Alexandre Julliard Feb 05, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

thunk.c dlls/krnl386.exe16/thunk.c +4 -3

No files found.
--- a/dlls/krnl386.exe16/thunk.c
+++ b/dlls/krnl386.exe16/thunk.c
@@ -2475,11 +2475,12 @@ DWORD WINAPIV CallProc32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32, 
 DWORD WINAPIV CallProcEx32W16( DWORD nrofargs, DWORD argconvmask, FARPROC proc32, VA_LIST16 valist )
 {
    DWORD args[32];
-    unsigned int i;
+    unsigned int i, count = min( 32, nrofargs & ~CPEX_DEST_CDECL );

-    TRACE("(%d,%d,%p args[",nrofargs,argconvmask,proc32);
+    TRACE("(%s,%d,%d,%p args[", nrofargs & CPEX_DEST_CDECL ? "cdecl": "stdcall",
+          nrofargs & ~CPEX_DEST_CDECL, argconvmask, proc32);

-    for (i=0;i<nrofargs;i++)
+    for (i = 0; i < count; i++)
    {
        if (argconvmask & (1<<i))
        {