ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

krnl386: Remove unused support for WCB16_REGS_LONG. 

This was introduced in 3a5b7cf105 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@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2021-08-04 10:21:20 -05:00 committed by Alexandre Julliard
parent a440e8aa8e
commit 3338972feb
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dlls/krnl386.exe16/wowthunk.c
View File

@ -400,7 +400,7 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
memcpy( stack, pArgs, cbArgs ); memcpy( stack, pArgs, cbArgs );
if (dwFlags & (WCB16_REGS|WCB16_REGS_LONG)) if (dwFlags & WCB16_REGS)
{ {
CONTEXT *context = (CONTEXT *)pdwRetCode; CONTEXT *context = (CONTEXT *)pdwRetCode;
@ -420,20 +420,9 @@ BOOL WINAPI K32WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags,
} }
/* push return address */ /* push return address */
if (dwFlags & WCB16_REGS_LONG) stack -= sizeof(SEGPTR);
{ *((SEGPTR *)stack) = call16_ret_addr;
stack -= sizeof(DWORD); cbArgs += sizeof(SEGPTR);
*((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);
}
_EnterWin16Lock(); _EnterWin16Lock();
wine_call_to_16_regs( context, cbArgs, call16_handler ); wine_call_to_16_regs( context, cbArgs, call16_handler );

1
include/wownt32.h
View File

@ -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 */ /* Wine extensions: call register function, context ptr is passed in the return value LPDWORD */
#define WCB16_REGS 2 #define WCB16_REGS 2
#define WCB16_REGS_LONG 4 /* function uses 32-bit lret */
DWORD WINAPI WOWCallback16(DWORD,DWORD); DWORD WINAPI WOWCallback16(DWORD,DWORD);
BOOL WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD); BOOL WINAPI WOWCallback16Ex(DWORD,DWORD,DWORD,LPVOID,LPDWORD);