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

Changed 16->32 window procedure thunks to use winebuild-generated 

entry code directly.
This commit is contained in:
Alexandre Julliard 2001-12-14 23:15:44 +00:00
parent 7662ea1004
commit 70b7619ad6
2 changed files with 57 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/user/user.spec
View File

@ -298,13 +298,13 @@ rsrc resources/version16.res
286 pascal16 GetDesktopWindow() GetDesktopWindow16 286 pascal16 GetDesktopWindow() GetDesktopWindow16
287 pascal16 GetLastActivePopup(word) GetLastActivePopup16 287 pascal16 GetLastActivePopup(word) GetLastActivePopup16
288 pascal GetMessageExtraInfo() GetMessageExtraInfo 288 pascal GetMessageExtraInfo() GetMessageExtraInfo
289 register keybd_event() keybd_event16 289 pascal -register keybd_event() keybd_event16
290 pascal16 RedrawWindow(word ptr word word) RedrawWindow16 290 pascal16 RedrawWindow(word ptr word word) RedrawWindow16
291 pascal SetWindowsHookEx(s_word segptr word word) SetWindowsHookEx16 291 pascal SetWindowsHookEx(s_word segptr word word) SetWindowsHookEx16
292 pascal16 UnhookWindowsHookEx(segptr) UnhookWindowsHookEx16 292 pascal16 UnhookWindowsHookEx(segptr) UnhookWindowsHookEx16
293 pascal CallNextHookEx(segptr s_word word long) CallNextHookEx16 293 pascal CallNextHookEx(segptr s_word word long) CallNextHookEx16
294 pascal16 LockWindowUpdate(word) LockWindowUpdate16 294 pascal16 LockWindowUpdate(word) LockWindowUpdate16
299 register mouse_event() mouse_event16 299 pascal -register mouse_event() mouse_event16
300 stub UnloadInstalledDrivers # W1.1: USER_FARFRAME 300 stub UnloadInstalledDrivers # W1.1: USER_FARFRAME
301 stub EDITWNDPROC # BOZOSLIVEHERE :-)) 301 stub EDITWNDPROC # BOZOSLIVEHERE :-))
302 stub STATICWNDPROC 302 stub STATICWNDPROC
@ -575,3 +575,7 @@ rsrc resources/version16.res
930 pascal16 MessageBoxEx(word str str word word) MessageBoxEx16 930 pascal16 MessageBoxEx(word str str word word) MessageBoxEx16
1000 pascal16 SetProcessDefaultLayout(long) SetProcessDefaultLayout16 1000 pascal16 SetProcessDefaultLayout(long) SetProcessDefaultLayout16
1001 pascal16 GetProcessDefaultLayout(ptr) GetProcessDefaultLayout16 1001 pascal16 GetProcessDefaultLayout(ptr) GetProcessDefaultLayout16
# Wine internal functions
1010 pascal __wine_call_wndproc_32A(word word word long long) __wine_call_wndproc_32A
1011 pascal __wine_call_wndproc_32W(word word word long long) __wine_call_wndproc_32W

135
windows/winproc.c
View File

@ -16,7 +16,6 @@
#include "wine/winuser16.h" #include "wine/winuser16.h"
#include "stackframe.h" #include "stackframe.h"
#include "selectors.h" #include "selectors.h"
#include "builtin16.h"
#include "controls.h" #include "controls.h"
#include "heap.h" #include "heap.h"
#include "struct32.h" #include "struct32.h"
@ -31,45 +30,38 @@ DECLARE_DEBUG_CHANNEL(msg);
DECLARE_DEBUG_CHANNEL(relay); DECLARE_DEBUG_CHANNEL(relay);
DECLARE_DEBUG_CHANNEL(win); DECLARE_DEBUG_CHANNEL(win);
/* Window procedure 16-to-32-bit thunk,
* see BuildSpec16File() in tools/build.c */
#include "pshpack1.h" #include "pshpack1.h"
typedef struct
{
WORD pushw_bp; /* pushw %bp */
BYTE pushl_func; /* pushl $proc */
WNDPROC proc;
WORD pushw_ax; /* pushw %ax */
BYTE pushl_relay; /* pushl $relay */
void (*relay)(); /* WINPROC_Thunk16To32A/W() */
BYTE lcall; /* lcall cs:glue */
void (*glue)(); /* __wine_call_from_16_long */
WORD cs; /* __FLATCS */
WORD lret; /* lret $10 */
WORD nArgs;
} WINPROC_THUNK_FROM16;
#include "poppack.h"
/* Window procedure 32-to-16-bit thunk,
* see BuildSpec32File() in tools/build.c */
/* Window procedure 16-to-32-bit thunk */
typedef struct typedef struct
{ {
BYTE popl_eax; /* popl %eax (return address) */ BYTE popl_eax; /* popl %eax (return address) */
BYTE pushl_func; /* pushl $proc */ BYTE pushl_func; /* pushl $proc */
WNDPROC16 proc WINE_PACKED; WNDPROC proc;
BYTE pushl_eax; /* pushl %eax */
BYTE ljmp; /* ljmp relay*/
DWORD relay_offset; /* __wine_call_wndproc_32A/W */
WORD relay_sel;
} WINPROC_THUNK_FROM16;
/* Window procedure 32-to-16-bit thunk */
typedef struct
{
BYTE popl_eax; /* popl %eax (return address) */
BYTE pushl_func; /* pushl $proc */
WNDPROC16 proc;
BYTE pushl_eax; /* pushl %eax */ BYTE pushl_eax; /* pushl %eax */
BYTE jmp; /* jmp relay (relative jump)*/ BYTE jmp; /* jmp relay (relative jump)*/
void (*relay)() WINE_PACKED; /* WINPROC_CallProc32ATo16() */ void (*relay)(); /* WINPROC_CallProc32ATo16() */
} WINPROC_THUNK_FROM32; } WINPROC_THUNK_FROM32;
/* Simple jmp to call 32-bit procedure directly */ /* Simple jmp to call 32-bit procedure directly */
typedef struct typedef struct
{ {
BYTE jmp; /* jmp proc (relative jump) */ BYTE jmp; /* jmp proc (relative jump) */
WNDPROC proc WINE_PACKED; WNDPROC proc;
} WINPROC_JUMP; } WINPROC_JUMP;
#include "poppack.h"
typedef union typedef union
{ {
@ -100,8 +92,6 @@ static LRESULT WINAPI WINPROC_CallProc32ATo16( WNDPROC16 func, HWND hwnd,
static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd, static LRESULT WINAPI WINPROC_CallProc32WTo16( WNDPROC16 func, HWND hwnd,
UINT msg, WPARAM wParam, UINT msg, WPARAM wParam,
LPARAM lParam ); LPARAM lParam );
static LRESULT WINAPI WINPROC_Thunk16To32A( WNDPROC func, LPBYTE args );
static LRESULT WINAPI WINPROC_Thunk16To32W( WNDPROC func, LPBYTE args );
static HANDLE WinProcHeap; static HANDLE WinProcHeap;
static WORD WinProcSel; static WORD WinProcSel;
@ -302,6 +292,8 @@ static WINDOWPROC *WINPROC_GetPtr( WNDPROC16 handle )
static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type, static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type,
WINDOWPROCUSER user ) WINDOWPROCUSER user )
{ {
static FARPROC16 relay_32A, relay_32W;
WINDOWPROC *proc, *oldproc; WINDOWPROC *proc, *oldproc;
/* Allocate a window procedure */ /* Allocate a window procedure */
@ -329,24 +321,32 @@ static WINDOWPROC *WINPROC_AllocWinProc( WNDPROC16 func, WINDOWPROCTYPE type,
(DWORD)(&proc->thunk.t_from32.relay + 1)); (DWORD)(&proc->thunk.t_from32.relay + 1));
break; break;
case WIN_PROC_32A: case WIN_PROC_32A:
case WIN_PROC_32W: if (!relay_32A) relay_32A = GetProcAddress16( GetModuleHandle16("user"),
proc->thunk.t_from16.pushw_bp = 0x5566; /* pushw %bp */ "__wine_call_wndproc_32A" );
proc->thunk.t_from16.pushl_func = 0x68; /* pushl $proc */ proc->thunk.t_from16.popl_eax = 0x58; /* popl %eax */
proc->thunk.t_from16.proc = (WNDPROC)func; proc->thunk.t_from16.pushl_func = 0x68; /* pushl $proc */
proc->thunk.t_from16.pushw_ax = 0x5066; /* pushw %ax */ proc->thunk.t_from16.proc = (WNDPROC)func;
proc->thunk.t_from16.pushl_relay = 0x68; /* pushl $relay */ proc->thunk.t_from16.pushl_eax = 0x50; /* pushl %eax */
proc->thunk.t_from16.relay = (type == WIN_PROC_32A) ? proc->thunk.t_from16.ljmp = 0xea; /* ljmp relay*/
(void(*)())WINPROC_Thunk16To32A : proc->thunk.t_from16.relay_offset = OFFSETOF(relay_32A);
(void(*)())WINPROC_Thunk16To32W; proc->thunk.t_from16.relay_sel = SELECTOROF(relay_32A);
proc->thunk.t_from16.lcall = 0x9a; /* lcall cs:glue */
proc->thunk.t_from16.glue = (void*)__wine_call_from_16_long;
proc->thunk.t_from16.cs = __get_cs();
proc->thunk.t_from16.lret = 0xca66;
proc->thunk.t_from16.nArgs = 10;
proc->jmp.jmp = 0xe9; proc->jmp.jmp = 0xe9;
/* Fixup relative jump */ /* Fixup relative jump */
proc->jmp.proc = (WNDPROC)((DWORD)func - proc->jmp.proc = (WNDPROC)((DWORD)func - (DWORD)(&proc->jmp.proc + 1));
(DWORD)(&proc->jmp.proc + 1)); break;
case WIN_PROC_32W:
if (!relay_32W) relay_32W = GetProcAddress16( GetModuleHandle16("user"),
"__wine_call_wndproc_32W" );
proc->thunk.t_from16.popl_eax = 0x58; /* popl %eax */
proc->thunk.t_from16.pushl_func = 0x68; /* pushl $proc */
proc->thunk.t_from16.proc = (WNDPROC)func;
proc->thunk.t_from16.pushl_eax = 0x50; /* pushl %eax */
proc->thunk.t_from16.ljmp = 0xea; /* ljmp relay*/
proc->thunk.t_from16.relay_offset = OFFSETOF(relay_32W);
proc->thunk.t_from16.relay_sel = SELECTOROF(relay_32W);
proc->jmp.jmp = 0xe9;
/* Fixup relative jump */
proc->jmp.proc = (WNDPROC)((DWORD)func - (DWORD)(&proc->jmp.proc + 1));
break; break;
default: default:
/* Should not happen */ /* Should not happen */
@ -2443,13 +2443,10 @@ static LRESULT WINPROC_CallProc32WTo32A( WNDPROC func, HWND hwnd,
/********************************************************************** /**********************************************************************
* WINPROC_CallProc16To32A * __wine_call_wndproc_32A (USER.1010)
*
* Call a 32-bit window procedure, translating the 16-bit args.
*/ */
static LRESULT WINPROC_CallProc16To32A( WNDPROC func, HWND16 hwnd, LRESULT WINAPI __wine_call_wndproc_32A( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam,
UINT16 msg, WPARAM16 wParam, WNDPROC func )
LPARAM lParam )
{ {
LRESULT result; LRESULT result;
UINT msg32; UINT msg32;
@ -2462,28 +2459,12 @@ static LRESULT WINPROC_CallProc16To32A( WNDPROC func, HWND16 hwnd,
return WINPROC_UnmapMsg16To32A( hwnd32, msg32, wParam32, lParam, result ); return WINPROC_UnmapMsg16To32A( hwnd32, msg32, wParam32, lParam, result );
} }
/**********************************************************************
* WINPROC_Thunk16To32A
*/
static LRESULT WINAPI WINPROC_Thunk16To32A( WNDPROC func, LPBYTE args )
{
HWND16 hwnd = *(HWND16 *)( args+8 );
UINT16 msg = *(HWND16 *)( args+6 );
WPARAM16 wParam = *(HWND16 *)( args+4 );
LPARAM lParam = *(LPARAM *)( args+0 );
return WINPROC_CallProc16To32A( func, hwnd, msg, wParam, lParam );
}
/********************************************************************** /**********************************************************************
* WINPROC_CallProc16To32W * __wine_call_wndproc_32W (USER.1011)
*
* Call a 32-bit window procedure, translating the 16-bit args.
*/ */
static LRESULT WINPROC_CallProc16To32W( WNDPROC func, HWND16 hwnd, LRESULT WINAPI __wine_call_wndproc_32W( HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam,
UINT16 msg, WPARAM16 wParam, WNDPROC func )
LPARAM lParam )
{ {
LRESULT result; LRESULT result;
UINT msg32; UINT msg32;
@ -2496,18 +2477,6 @@ static LRESULT WINPROC_CallProc16To32W( WNDPROC func, HWND16 hwnd,
return WINPROC_UnmapMsg16To32W( hwnd32, msg32, wParam32, lParam, result ); return WINPROC_UnmapMsg16To32W( hwnd32, msg32, wParam32, lParam, result );
} }
/**********************************************************************
* WINPROC_Thunk16To32W
*/
static LRESULT WINAPI WINPROC_Thunk16To32W( WNDPROC func, LPBYTE args )
{
HWND16 hwnd = *(HWND16 *)( args+8 );
UINT16 msg = *(HWND16 *)( args+6 );
WPARAM16 wParam = *(HWND16 *)( args+4 );
LPARAM lParam = *(LPARAM *)( args+0 );
return WINPROC_CallProc16To32W( func, hwnd, msg, wParam, lParam );
}
/********************************************************************** /**********************************************************************
* WINPROC_CallProc32ATo16 * WINPROC_CallProc32ATo16
@ -2579,12 +2548,10 @@ LRESULT WINAPI CallWindowProc16( WNDPROC16 func, HWND16 hwnd, UINT16 msg,
hwnd, msg, wParam, lParam ); hwnd, msg, wParam, lParam );
case WIN_PROC_32A: case WIN_PROC_32A:
if (!proc->thunk.t_from16.proc) return 0; if (!proc->thunk.t_from16.proc) return 0;
return WINPROC_CallProc16To32A( proc->thunk.t_from16.proc, return __wine_call_wndproc_32A( hwnd, msg, wParam, lParam, proc->thunk.t_from16.proc );
hwnd, msg, wParam, lParam );
case WIN_PROC_32W: case WIN_PROC_32W:
if (!proc->thunk.t_from16.proc) return 0; if (!proc->thunk.t_from16.proc) return 0;
return WINPROC_CallProc16To32W( proc->thunk.t_from16.proc, return __wine_call_wndproc_32W( hwnd, msg, wParam, lParam, proc->thunk.t_from16.proc );
hwnd, msg, wParam, lParam );
default: default:
WARN_(relay)("Invalid proc %p\n", proc ); WARN_(relay)("Invalid proc %p\n", proc );
return 0; return 0;