Bugfix: Reverted CallTo16 routines to STDCALL convention.
diff --git a/if1632/thunk.c b/if1632/thunk.c
index 9fb0b13..d8c1009 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -26,84 +26,84 @@
DECLARE_DEBUG_CHANNEL(thunk)
-extern LONG CallTo16RegisterShort(const CONTEXT86 *context, INT offset);
-extern LONG CallTo16RegisterLong(const CONTEXT86 *context, INT offset);
+extern LONG CALLBACK CallTo16RegisterShort(const CONTEXT86 *context, INT offset);
+extern LONG CALLBACK CallTo16RegisterLong(const CONTEXT86 *context, INT offset);
/* List of the 16-bit callback functions. This list is used */
/* by the build program to generate the file if1632/callto16.S */
/* ### start build ### */
-extern WORD THUNK_CallTo16_word_ (FARPROC16);
-extern LONG THUNK_CallTo16_long_ (FARPROC16);
-extern WORD THUNK_CallTo16_word_w (FARPROC16,WORD);
-extern WORD THUNK_CallTo16_word_l (FARPROC16,LONG);
-extern LONG THUNK_CallTo16_long_l (FARPROC16,LONG);
-extern WORD THUNK_CallTo16_word_ww (FARPROC16,WORD,WORD);
-extern WORD THUNK_CallTo16_word_wl (FARPROC16,WORD,LONG);
-extern WORD THUNK_CallTo16_word_ll (FARPROC16,LONG,LONG);
-extern LONG THUNK_CallTo16_long_ll (FARPROC16,LONG,LONG);
-extern WORD THUNK_CallTo16_word_www (FARPROC16,WORD,WORD,WORD);
-extern WORD THUNK_CallTo16_word_wwl (FARPROC16,WORD,WORD,LONG);
-extern WORD THUNK_CallTo16_word_wlw (FARPROC16,WORD,LONG,WORD);
-extern LONG THUNK_CallTo16_long_wwl (FARPROC16,WORD,WORD,LONG);
-extern LONG THUNK_CallTo16_long_lll (FARPROC16,LONG,LONG,LONG);
-extern WORD THUNK_CallTo16_word_llwl (FARPROC16,LONG,LONG,WORD,LONG);
-extern WORD THUNK_CallTo16_word_lwll (FARPROC16,LONG,WORD,LONG,LONG);
-extern WORD THUNK_CallTo16_word_lwww (FARPROC16,LONG,WORD,WORD,WORD);
-extern WORD THUNK_CallTo16_word_wlww (FARPROC16,WORD,LONG,WORD,WORD);
-extern WORD THUNK_CallTo16_word_wwll (FARPROC16,WORD,WORD,LONG,LONG);
-extern WORD THUNK_CallTo16_word_wwwl (FARPROC16,WORD,WORD,WORD,LONG);
-extern LONG THUNK_CallTo16_long_wwwl (FARPROC16,WORD,WORD,WORD,LONG);
-extern WORD THUNK_CallTo16_word_llll (FARPROC16,LONG,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_llll (FARPROC16,LONG,LONG,LONG,LONG);
-extern WORD THUNK_CallTo16_word_wllwl(FARPROC16,WORD,LONG,LONG,WORD,LONG);
-extern WORD THUNK_CallTo16_word_lwwww(FARPROC16,LONG,WORD,WORD,WORD,WORD);
-extern LONG THUNK_CallTo16_long_lwwll(FARPROC16,LONG,WORD,WORD,LONG,LONG);
-extern WORD THUNK_CallTo16_word_wwlll(FARPROC16,WORD,WORD,LONG,LONG,LONG);
-extern WORD THUNK_CallTo16_word_wwwww(FARPROC16,WORD,WORD,WORD,WORD,WORD);
-extern WORD THUNK_CallTo16_word_lwlll(FARPROC16,LONG,WORD,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_lwlll(FARPROC16,LONG,WORD,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_lllll(FARPROC16,LONG,LONG,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_llllll(FARPROC16,LONG,LONG,LONG,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_lllllll(FARPROC16,LONG,LONG,LONG,LONG,LONG,LONG,LONG);
-extern WORD THUNK_CallTo16_word_llwwlll(FARPROC16,LONG,LONG,WORD,WORD,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_word_lwwlllll(FARPROC16,LONG,WORD,WORD,LONG,LONG,
- LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_llllllll(FARPROC16,LONG,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_lllllllll(FARPROC16,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_llllllllll(FARPROC16,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_lllllllllll(FARPROC16,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,LONG,
- LONG);
-extern LONG THUNK_CallTo16_long_llllllllllll(FARPROC16,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,LONG,
- LONG,LONG);
-extern LONG THUNK_CallTo16_long_lwwllwlllllw(FARPROC16,LONG,WORD,WORD,LONG,
- LONG,WORD,LONG,LONG,LONG,LONG,
- LONG,WORD);
-extern LONG THUNK_CallTo16_long_lllllllllllll(FARPROC16,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG);
-extern LONG THUNK_CallTo16_long_llllllllllllll(FARPROC16,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,
- LONG);
-extern LONG THUNK_CallTo16_word_lwwwwlwwwwllll(FARPROC16,LONG,WORD,WORD,
- WORD,WORD,LONG,WORD,WORD,
- WORD,WORD,LONG,LONG,LONG,
- LONG);
-extern LONG THUNK_CallTo16_long_lllllllllllllll(FARPROC16,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,
- LONG,LONG);
-extern LONG THUNK_CallTo16_long_llllllllllllllll(FARPROC16,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG,LONG,LONG,
- LONG,LONG,LONG);
-extern void THUNK_CallFrom16_p_long_wwwll();
+extern WORD CALLBACK THUNK_CallTo16_word_ (FARPROC16);
+extern LONG CALLBACK THUNK_CallTo16_long_ (FARPROC16);
+extern WORD CALLBACK THUNK_CallTo16_word_w (FARPROC16,WORD);
+extern WORD CALLBACK THUNK_CallTo16_word_l (FARPROC16,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_l (FARPROC16,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_ww (FARPROC16,WORD,WORD);
+extern WORD CALLBACK THUNK_CallTo16_word_wl (FARPROC16,WORD,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_ll (FARPROC16,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_ll (FARPROC16,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_www (FARPROC16,WORD,WORD,WORD);
+extern WORD CALLBACK THUNK_CallTo16_word_wwl (FARPROC16,WORD,WORD,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_wlw (FARPROC16,WORD,LONG,WORD);
+extern LONG CALLBACK THUNK_CallTo16_long_wwl (FARPROC16,WORD,WORD,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lll (FARPROC16,LONG,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_llwl (FARPROC16,LONG,LONG,WORD,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_lwll (FARPROC16,LONG,WORD,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_lwww (FARPROC16,LONG,WORD,WORD,WORD);
+extern WORD CALLBACK THUNK_CallTo16_word_wlww (FARPROC16,WORD,LONG,WORD,WORD);
+extern WORD CALLBACK THUNK_CallTo16_word_wwll (FARPROC16,WORD,WORD,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_wwwl (FARPROC16,WORD,WORD,WORD,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_wwwl (FARPROC16,WORD,WORD,WORD,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_llll (FARPROC16,LONG,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llll (FARPROC16,LONG,LONG,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_wllwl(FARPROC16,WORD,LONG,LONG,WORD,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_lwwww(FARPROC16,LONG,WORD,WORD,WORD,WORD);
+extern LONG CALLBACK THUNK_CallTo16_long_lwwll(FARPROC16,LONG,WORD,WORD,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_wwlll(FARPROC16,WORD,WORD,LONG,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_wwwww(FARPROC16,WORD,WORD,WORD,WORD,WORD);
+extern WORD CALLBACK THUNK_CallTo16_word_lwlll(FARPROC16,LONG,WORD,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lwlll(FARPROC16,LONG,WORD,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lllll(FARPROC16,LONG,LONG,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llllll(FARPROC16,LONG,LONG,LONG,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lllllll(FARPROC16,LONG,LONG,LONG,LONG,LONG,LONG,LONG);
+extern WORD CALLBACK THUNK_CallTo16_word_llwwlll(FARPROC16,LONG,LONG,WORD,WORD,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_word_lwwlllll(FARPROC16,LONG,WORD,WORD,LONG,LONG,
+ LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llllllll(FARPROC16,LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lllllllll(FARPROC16,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llllllllll(FARPROC16,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lllllllllll(FARPROC16,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,LONG,
+ LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llllllllllll(FARPROC16,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lwwllwlllllw(FARPROC16,LONG,WORD,WORD,LONG,
+ LONG,WORD,LONG,LONG,LONG,LONG,
+ LONG,WORD);
+extern LONG CALLBACK THUNK_CallTo16_long_lllllllllllll(FARPROC16,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llllllllllllll(FARPROC16,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,
+ LONG);
+extern LONG CALLBACK THUNK_CallTo16_word_lwwwwlwwwwllll(FARPROC16,LONG,WORD,WORD,
+ WORD,WORD,LONG,WORD,WORD,
+ WORD,WORD,LONG,LONG,LONG,
+ LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_lllllllllllllll(FARPROC16,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG);
+extern LONG CALLBACK THUNK_CallTo16_long_llllllllllllllll(FARPROC16,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG,LONG,LONG,
+ LONG,LONG,LONG);
+extern void CALLBACK THUNK_CallFrom16_p_long_wwwll();
/* ### stop build ### */
diff --git a/include/callback.h b/include/callback.h
index 34e03b8..bb3dae3 100644
--- a/include/callback.h
+++ b/include/callback.h
@@ -20,53 +20,53 @@
typedef struct
{
- LONG (*CallRegisterShortProc)( CONTEXT86 *, INT );
- LONG (*CallRegisterLongProc)( CONTEXT86 *, INT );
- VOID (*CallFrom16WndProc)(void);
- LRESULT (*CallWndProc)( WNDPROC16, HWND16, UINT16,
+ LONG (CALLBACK *CallRegisterShortProc)( CONTEXT86 *, INT );
+ LONG (CALLBACK *CallRegisterLongProc)( CONTEXT86 *, INT );
+ VOID (CALLBACK *CallFrom16WndProc)(void);
+ LRESULT (CALLBACK *CallWndProc)( WNDPROC16, HWND16, UINT16,
WPARAM16, LPARAM );
- LRESULT (*CallDriverProc)( DRIVERPROC16, DWORD, HDRVR16,
+ LRESULT (CALLBACK *CallDriverProc)( DRIVERPROC16, DWORD, HDRVR16,
UINT16, LPARAM, LPARAM );
- LRESULT (*CallDriverCallback)( FARPROC16, HANDLE16, UINT16,
+ LRESULT (CALLBACK *CallDriverCallback)( FARPROC16, HANDLE16, UINT16,
DWORD, LPARAM, LPARAM );
- LRESULT (*CallTimeFuncProc)( FARPROC16, WORD, UINT16,
+ LRESULT (CALLBACK *CallTimeFuncProc)( FARPROC16, WORD, UINT16,
DWORD, LPARAM, LPARAM );
- INT16 (*CallWindowsExitProc)( FARPROC16, INT16 );
- INT16 (*CallWordBreakProc)( EDITWORDBREAKPROC16, SEGPTR, INT16,
+ INT16 (CALLBACK *CallWindowsExitProc)( FARPROC16, INT16 );
+ INT16 (CALLBACK *CallWordBreakProc)( EDITWORDBREAKPROC16, SEGPTR, INT16,
INT16, INT16 );
- VOID (*CallBootAppProc)( FARPROC16, HANDLE16, HFILE16 );
- WORD (*CallLoadAppSegProc)( FARPROC16, HANDLE16, HFILE16, WORD );
- WORD (*CallLocalNotifyFunc)( FARPROC16, WORD, HLOCAL16, WORD );
- HGLOBAL16 (*CallResourceHandlerProc)( FARPROC16, HGLOBAL16, HMODULE16, HRSRC16 );
- DWORD (*CallWOWCallbackProc)( FARPROC16, DWORD );
- BOOL (*CallWOWCallback16Ex)( FARPROC16, DWORD, DWORD, LPVOID,
+ VOID (CALLBACK *CallBootAppProc)( FARPROC16, HANDLE16, HFILE16 );
+ WORD (CALLBACK *CallLoadAppSegProc)( FARPROC16, HANDLE16, HFILE16, WORD );
+ WORD (CALLBACK *CallLocalNotifyFunc)( FARPROC16, WORD, HLOCAL16, WORD );
+ HGLOBAL16 (CALLBACK *CallResourceHandlerProc)( FARPROC16, HGLOBAL16, HMODULE16, HRSRC16 );
+ DWORD (CALLBACK *CallWOWCallbackProc)( FARPROC16, DWORD );
+ BOOL (CALLBACK *CallWOWCallback16Ex)( FARPROC16, DWORD, DWORD, LPVOID,
LPDWORD );
- DWORD (*CallUTProc)( FARPROC16, DWORD, DWORD );
- LRESULT (*CallASPIPostProc)( FARPROC16, SEGPTR );
+ DWORD (CALLBACK *CallUTProc)( FARPROC16, DWORD, DWORD );
+ LRESULT (CALLBACK *CallASPIPostProc)( FARPROC16, SEGPTR );
/* Following are the graphics driver callbacks */
- WORD (*CallDrvControlProc)( FARPROC16, SEGPTR, WORD,
+ WORD (CALLBACK *CallDrvControlProc)( FARPROC16, SEGPTR, WORD,
SEGPTR, SEGPTR );
- WORD (*CallDrvEnableProc)( FARPROC16, SEGPTR, WORD, SEGPTR,
+ WORD (CALLBACK *CallDrvEnableProc)( FARPROC16, SEGPTR, WORD, SEGPTR,
SEGPTR, SEGPTR );
- WORD (*CallDrvEnumDFontsProc)( FARPROC16, SEGPTR, SEGPTR,
+ WORD (CALLBACK *CallDrvEnumDFontsProc)( FARPROC16, SEGPTR, SEGPTR,
FARPROC16, SEGPTR );
- WORD (*CallDrvEnumObjProc)( FARPROC16, SEGPTR, WORD, FARPROC16,
+ WORD (CALLBACK *CallDrvEnumObjProc)( FARPROC16, SEGPTR, WORD, FARPROC16,
SEGPTR );
- WORD (*CallDrvOutputProc)( FARPROC16, SEGPTR, WORD, WORD, SEGPTR,
+ WORD (CALLBACK *CallDrvOutputProc)( FARPROC16, SEGPTR, WORD, WORD, SEGPTR,
SEGPTR, SEGPTR, SEGPTR, SEGPTR );
- DWORD (*CallDrvRealizeProc)( FARPROC16, SEGPTR, WORD, SEGPTR,
+ DWORD (CALLBACK *CallDrvRealizeProc)( FARPROC16, SEGPTR, WORD, SEGPTR,
SEGPTR, SEGPTR );
- WORD (*CallDrvStretchBltProc)( FARPROC16, SEGPTR, WORD, WORD,
+ WORD (CALLBACK *CallDrvStretchBltProc)( FARPROC16, SEGPTR, WORD, WORD,
WORD, WORD, SEGPTR, WORD, WORD,
WORD, WORD, DWORD, SEGPTR, SEGPTR,
SEGPTR );
- DWORD (*CallDrvExtTextOutProc)( FARPROC16, SEGPTR, WORD, WORD,
+ DWORD (CALLBACK *CallDrvExtTextOutProc)( FARPROC16, SEGPTR, WORD, WORD,
SEGPTR, SEGPTR, INT16, SEGPTR,
SEGPTR, SEGPTR, SEGPTR, SEGPTR,
WORD );
- WORD (*CallDrvGetCharWidthProc)( FARPROC16, SEGPTR, SEGPTR, WORD,
+ WORD (CALLBACK *CallDrvGetCharWidthProc)( FARPROC16, SEGPTR, SEGPTR, WORD,
WORD, SEGPTR, SEGPTR, SEGPTR );
- BOOL16 (*CallDrvAbortProc)( FARPROC16, HDC16, INT16 );
+ BOOL16 (CALLBACK *CallDrvAbortProc)( FARPROC16, HDC16, INT16 );
} CALLBACKS_TABLE;
extern const CALLBACKS_TABLE *Callbacks;
diff --git a/include/stackframe.h b/include/stackframe.h
index a7b9f0b..5e6a821 100644
--- a/include/stackframe.h
+++ b/include/stackframe.h
@@ -24,8 +24,9 @@
DWORD ecx; /* 18 */
DWORD ebx; /* 1c */
DWORD ebp; /* 20 saved 32-bit frame pointer */
- DWORD retaddr; /* 24 actual return address */
- DWORD args[1]; /* 28 arguments to 16-bit function */
+ DWORD relay; /* 24 return address to relay stub */
+ DWORD retaddr; /* 28 actual return address */
+ DWORD args[1]; /* 2c arguments to 16-bit function */
} STACK32FRAME;
/* 16-bit stack layout after CallFrom16() */
diff --git a/misc/callback.c b/misc/callback.c
index bdccaaf..0bfbe9f 100644
--- a/misc/callback.c
+++ b/misc/callback.c
@@ -21,7 +21,7 @@
/**********************************************************************
* CALLBACK_CallWndProc
*/
-static LRESULT CALLBACK_CallWndProc( WNDPROC16 proc, HWND16 hwnd,
+static LRESULT WINAPI CALLBACK_CallWndProc( WNDPROC16 proc, HWND16 hwnd,
UINT16 msg, WPARAM16 wParam,
LPARAM lParam )
{
@@ -39,7 +39,7 @@
/**********************************************************************
* CALLBACK_CallRegisterProc
*/
-static LONG CALLBACK_CallRegisterProc( CONTEXT86 *context, INT offset)
+static LONG WINAPI CALLBACK_CallRegisterProc( CONTEXT86 *context, INT offset)
{
ERR("Cannot call a register proc in Winelib\n" );
assert( FALSE );
@@ -49,9 +49,9 @@
/**********************************************************************
* CALLBACK_CallDriverProc
*/
-static LRESULT CALLBACK_CallDriverProc( DRIVERPROC16 proc, DWORD dwId,
- HDRVR16 hdrvr, UINT16 msg,
- LPARAM lp1, LPARAM lp2 )
+static LRESULT WINAPI CALLBACK_CallDriverProc( DRIVERPROC16 proc, DWORD dwId,
+ HDRVR16 hdrvr, UINT16 msg,
+ LPARAM lp1, LPARAM lp2 )
{
ERR("Cannot call a 16-bit driver proc in Winelib\n" );
assert( FALSE );
@@ -61,10 +61,10 @@
/**********************************************************************
* CALLBACK_CallDriverCallback
*/
-static LRESULT CALLBACK_CallDriverCallback( FARPROC16 proc,
- HANDLE16 hDev, UINT16 msg,
- DWORD dwUser, LPARAM lp1,
- LPARAM lp2 )
+static LRESULT WINAPI CALLBACK_CallDriverCallback( FARPROC16 proc,
+ HANDLE16 hDev, UINT16 msg,
+ DWORD dwUser, LPARAM lp1,
+ LPARAM lp2 )
{
ERR("Cannot call a 16-bit driver proc in Winelib\n" );
assert( FALSE );
@@ -74,35 +74,41 @@
/**********************************************************************
* CALLBACK_CallTimeFuncProc
*/
-static LRESULT CALLBACK_CallTimeFuncProc( FARPROC16 proc, WORD id,
+static LRESULT WINAPI CALLBACK_CallTimeFuncProc( FARPROC16 proc, WORD id,
UINT16 msg, DWORD dwUser,
LPARAM lp1, LPARAM lp2 )
{
- return proc( id, msg, dwUser, lp1, lp2 );
+ ERR("Cannot call a 16-bit multimedia timer proc in Winelib\n" );
+ assert( FALSE );
+ return 0;
}
/**********************************************************************
* CALLBACK_CallWindowsExitProc
*/
-static INT16 CALLBACK_CallWindowsExitProc( FARPROC16 proc, INT16 type)
+static INT16 WINAPI CALLBACK_CallWindowsExitProc( FARPROC16 proc, INT16 type)
{
- return proc( type );
+ ERR("Cannot call a 16-bit WEP routine in Winelib\n" );
+ assert( FALSE );
+ return 0;
}
/**********************************************************************
* CALLBACK_CallWordBreakProc
*/
-static INT16 CALLBACK_CallWordBreakProc( EDITWORDBREAKPROC16 proc,
+static INT16 WINAPI CALLBACK_CallWordBreakProc( EDITWORDBREAKPROC16 proc,
SEGPTR text, INT16 word,
INT16 len, INT16 action )
{
- return proc( (LPSTR)text, word, len, action );
+ ERR("Cannot call a 16-bit word break proc in Winelib\n" );
+ assert( FALSE );
+ return 0;
}
/**********************************************************************
* CALLBACK_CallBootAppProc
*/
-static void CALLBACK_CallBootAppProc( FARPROC16 proc, HANDLE16 module,
+static void WINAPI CALLBACK_CallBootAppProc( FARPROC16 proc, HANDLE16 module,
HFILE16 file )
{
ERR("Cannot call a 16-bit self-load handler in Winelib\n" );
@@ -113,7 +119,7 @@
/**********************************************************************
* CALLBACK_CallLoadAppSegProc
*/
-static WORD CALLBACK_CallLoadAppSegProc( FARPROC16 proc,
+static WORD WINAPI CALLBACK_CallLoadAppSegProc( FARPROC16 proc,
HANDLE16 module, HFILE16 file,
WORD seg )
{
@@ -125,8 +131,8 @@
/**********************************************************************
* CALLBACK_CallLocalNotifyFunc
*/
-static WORD CALLBACK_CallLocalNotifyFunc( FARPROC16 proc,
- WORD wMsg, HLOCAL16 hMem, WORD wArg )
+static WORD WINAPI CALLBACK_CallLocalNotifyFunc( FARPROC16 proc,
+ WORD wMsg, HLOCAL16 hMem, WORD wArg )
{
ERR("Cannot call a 16-bit notification handler in Winelib\n" );
assert( FALSE );
@@ -136,10 +142,10 @@
/**********************************************************************
* CALLBACK_CallResourceHandlerProc
*/
-static HGLOBAL16 CALLBACK_CallResourceHandlerProc( FARPROC16 proc,
- HGLOBAL16 hMemObj,
- HMODULE16 hModule,
- HRSRC16 hRsrc )
+static HGLOBAL16 WINAPI CALLBACK_CallResourceHandlerProc( FARPROC16 proc,
+ HGLOBAL16 hMemObj,
+ HMODULE16 hModule,
+ HRSRC16 hRsrc )
{
ERR("Cannot call a 16-bit resource handler in Winelib\n" );
assert( FALSE );
@@ -149,15 +155,17 @@
/**********************************************************************
* CALLBACK_CallASPIPostProc
*/
-static LRESULT CALLBACK_CallASPIPostProc( FARPROC16 proc, SEGPTR ptr )
+static LRESULT WINAPI CALLBACK_CallASPIPostProc( FARPROC16 proc, SEGPTR ptr )
{
- return proc( ptr );
+ ERR("Cannot call a 16-bit ASPI proc in Winelib\n" );
+ assert( FALSE );
+ return 0;
}
/**********************************************************************
* CALLBACK_CallWOWCallbackProc
*/
-static DWORD CALLBACK_CallWOWCallbackProc( FARPROC16 proc, DWORD dw )
+static DWORD WINAPI CALLBACK_CallWOWCallbackProc( FARPROC16 proc, DWORD dw )
{
ERR("Cannot call a WOW thunk proc in Winelib\n" );
assert( FALSE );
@@ -167,8 +175,8 @@
/**********************************************************************
* CALLBACK_CallWOWCallback16Ex
*/
-static BOOL CALLBACK_CallWOWCallback16Ex( FARPROC16 proc, DWORD dwFlags,
- DWORD cbArgs, LPVOID xargs, LPDWORD pdwret )
+static BOOL WINAPI CALLBACK_CallWOWCallback16Ex( FARPROC16 proc, DWORD dwFlags,
+ DWORD cbArgs, LPVOID xargs, LPDWORD pdwret )
{
ERR("Cannot call a WOW thunk proc in Winelib\n" );
assert( FALSE );
@@ -178,7 +186,7 @@
/**********************************************************************
* CALLBACK_CallUTProc
*/
-static DWORD CALLBACK_CallUTProc( FARPROC16 proc, DWORD w1, DWORD w2 )
+static DWORD WINAPI CALLBACK_CallUTProc( FARPROC16 proc, DWORD w1, DWORD w2 )
{
ERR("Cannot call a UT thunk proc in Winelib\n" );
assert( FALSE );
diff --git a/tools/build.c b/tools/build.c
index b10a5b4..e2af4af 100644
--- a/tools/build.c
+++ b/tools/build.c
@@ -1741,6 +1741,19 @@
else
fprintf( outfile, "\tcall " PREFIX "CallTo16Long\n" );
+ /* Return to caller (using STDCALL calling convention) */
+ if ( strlen( args ) > 0 )
+ fprintf( outfile, "\tret $%d\n", strlen( args ) * 4 );
+ else
+ {
+ fprintf( outfile, "\tret\n" );
+
+ /* Note: the arg transfer routine must start exactly three bytes
+ after the return stub, hence the nop's */
+ fprintf( outfile, "\tnop\n" );
+ fprintf( outfile, "\tnop\n" );
+ }
+
/*
* The core routine will call here with registers set up as follows:
*
@@ -2146,8 +2159,8 @@
* CallTo16Word and CallTo16Long are used by the 32->16 glue code
* as described above. The register functions can be called directly:
*
- * extern void CallTo16RegisterShort( const CONTEXT86 *context, int nb_args );
- * extern void CallTo16RegisterLong ( const CONTEXT86 *context, int nb_args );
+ * extern void CALLBACK CallTo16RegisterShort( const CONTEXT86 *context, int nb_args );
+ * extern void CALLBACK CallTo16RegisterLong ( const CONTEXT86 *context, int nb_args );
*
* They call to 16-bit code with all registers except SS:SP set up as specified
* by the 'context' structure, and SS:SP set to point to the current 16-bit
@@ -2169,9 +2182,9 @@
fprintf( outfile, "\t.globl " PREFIX "CallTo16%s\n", name );
fprintf( outfile, PREFIX "CallTo16%s:\n", name );
- /* Retrieve relay target address */
- if ( !reg_func )
- fprintf( outfile, "\tpopl %%eax\n" );
+ /* No relay stub for 'register' functions */
+ if ( reg_func )
+ fprintf( outfile, "\tpushl $0\n" );
/* Function entry sequence */
fprintf( outfile, "\tpushl %%ebp\n" );
@@ -2195,7 +2208,10 @@
/* Move relay target address to %edi */
if ( !reg_func )
- fprintf( outfile, "\tmovl %%eax, %%edi\n" );
+ {
+ fprintf( outfile, "\tmovl 4(%%ebp), %%edi\n" );
+ fprintf( outfile, "\taddl $3, %%edi\n" );
+ }
/* Enter Win16 Mutex */
if ( UsePIC )
@@ -2210,10 +2226,10 @@
if ( reg_func )
fprintf( outfile, "\tpushl $-1\n" );
else
- fprintf( outfile, "\tpushl -9(%%edi)\n" );
+ fprintf( outfile, "\tpushl -12(%%edi)\n" );
/* Push the address of the first argument */
- fprintf( outfile, "\tleal 8(%%ebp),%%eax\n" );
+ fprintf( outfile, "\tleal 12(%%ebp),%%eax\n" );
fprintf( outfile, "\tpushl %%eax\n" );
if ( UsePIC )
@@ -2286,7 +2302,14 @@
/* Function exit sequence */
fprintf( outfile, "\tpopl %%ebp\n" );
- fprintf( outfile, "\tret\n" );
+
+ if ( !reg_func )
+ fprintf( outfile, "\tret\n" ); /* return to relay return stub */
+ else
+ {
+ fprintf( outfile, "\taddl $4, %%esp\n" );
+ fprintf( outfile, "\tret $8\n" );
+ }
/* Start of the actual CallTo16 routine */
