[PATCH] krnl386: Remove unused support for WCB16_REGS_LONG.

Zebediah Figura zfigura at codeweavers.com
Wed Aug 4 10:21:20 CDT 2021


This was introduced in 3a5b7cf105f52c3a2936be09e318c4177454bcc9 as way to expose
wine_call_to_16_regs_long(); however, the same commit changed the only user to
use WCB16_REGS instead.

Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
 dlls/krnl386.exe16/wowthunk.c | 19 ++++---------------
 include/wownt32.h             |  1 -
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c
index 73d1565c573..5bd9d7aecd4 100644
--- a/dlls/krnl386.exe16/wowthunk.c
+++ b/dlls/krnl386.exe16/wowthunk.c
@@ -400,7 +400,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
 
     memcpy( stack, pArgs, cbArgs );
 
-    if (dwFlags & (WCB16_REGS|WCB16_REGS_LONG))
+    if (dwFlags & WCB16_REGS)
     {
         CONTEXT *context = (CONTEXT *)pdwRetCode;
 
@@ -420,20 +420,9 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
         }
 
         /* push return address */
-        if (dwFlags & WCB16_REGS_LONG)
-        {
-            stack -= sizeof(DWORD);
-            *((DWORD *)stack) = HIWORD(call16_ret_addr);
-            stack -= sizeof(DWORD);
-            *((DWORD *)stack) = LOWORD(call16_ret_addr);
-            cbArgs += 2 * sizeof(DWORD);
-        }
-        else
-        {
-            stack -= sizeof(SEGPTR);
-            *((SEGPTR *)stack) = call16_ret_addr;
-            cbArgs += sizeof(SEGPTR);
-        }
+        stack -= sizeof(SEGPTR);
+        *((SEGPTR *)stack) = call16_ret_addr;
+        cbArgs += sizeof(SEGPTR);
 
         _EnterWin16Lock();
         wine_call_to_16_regs( context, cbArgs, call16_handler );
diff --git a/include/wownt32.h b/include/wownt32.h
index 51b1108d1c9..ddfa9b562b7 100644
--- a/include/wownt32.h
+++ b/include/wownt32.h
@@ -150,7 +150,6 @@ WORD   WINAPI WOWHandle16(HANDLE,WOW_HANDLE_TYPE);
 
 /* Wine extensions: call register function, context ptr is passed in the return value LPDWORD */
 #define WCB16_REGS       2
-#define WCB16_REGS_LONG  4  /* function uses 32-bit lret */
 
 DWORD WINAPI WOWCallback16(DWORD,DWORD);
 BOOL  WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD);
-- 
2.32.0




More information about the wine-devel mailing list