diff --git a/if1632/thunk.c b/if1632/thunk.c index 48ddfb94389..61ef072ee85 100644 --- a/if1632/thunk.c +++ b/if1632/thunk.c @@ -140,13 +140,8 @@ static THUNK *firstThunk = NULL; static LRESULT WINAPI THUNK_CallWndProc16( WNDPROC16 proc, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam ); -static BOOL WINAPI THUNK_CallTaskReschedule(void); static BOOL WINAPI THUNK_WOWCallback16Ex( FARPROC16,DWORD,DWORD, LPVOID,LPDWORD ); - -/* TASK_Reschedule() 16-bit entry point */ -static FARPROC16 TASK_RescheduleProc; - static BOOL THUNK_ThunkletInit( void ); extern void CallFrom16_p_long_wwwll(void); @@ -156,7 +151,6 @@ static const CALLBACKS_TABLE CALLBACK_EmulatorTable = { (void *)CallTo16_sreg_, /* CallRegisterShortProc */ (void *)CallTo16_lreg_, /* CallRegisterLongProc */ - THUNK_CallTaskReschedule, /* CallTaskRescheduleProc */ (void*)CallFrom16_p_long_wwwll, /* CallFrom16WndProc */ THUNK_CallWndProc16, /* CallWndProc */ (void *)CallTo16_long_lwwll, /* CallDriverProc */ @@ -192,8 +186,6 @@ BOOL THUNK_Init(void) { /* Set the window proc calling functions */ Callbacks = &CALLBACK_EmulatorTable; - /* Get the 16-bit reschedule function pointer */ - TASK_RescheduleProc = MODULE_GetWndProcEntry16( "TASK_Reschedule" ); /* Initialize Thunklets */ return THUNK_ThunkletInit(); } @@ -324,15 +316,6 @@ static LRESULT WINAPI THUNK_CallWndProc16( WNDPROC16 proc, HWND16 hwnd, } -/*********************************************************************** - * THUNK_CallTaskReschedule - */ -static BOOL WINAPI THUNK_CallTaskReschedule(void) -{ - return CallTo16_word_(TASK_RescheduleProc); -} - - /*********************************************************************** * THUNK_EnumObjects16 (GDI.71) */ diff --git a/include/callback.h b/include/callback.h index 7f70f43c3bb..059b5737fb9 100644 --- a/include/callback.h +++ b/include/callback.h @@ -22,7 +22,6 @@ typedef struct { LONG (CALLBACK *CallRegisterShortProc)( CONTEXT *, INT ); LONG (CALLBACK *CallRegisterLongProc)( CONTEXT *, INT ); - BOOL (CALLBACK *CallTaskRescheduleProc)(void); VOID (CALLBACK *CallFrom16WndProc)(void); LRESULT (CALLBACK *CallWndProc)( WNDPROC16, HWND16, UINT16, WPARAM16, LPARAM ); diff --git a/misc/callback.c b/misc/callback.c index 71b8b5313a2..567653a11c3 100644 --- a/misc/callback.c +++ b/misc/callback.c @@ -261,21 +261,6 @@ static DWORD WINAPI CALLBACK_CallUTProc( FARPROC16 proc, DWORD w1, DWORD w2 ) return 0; } -/********************************************************************** - * CALLBACK_CallTaskRescheduleProc - */ -static BOOL WINAPI CALLBACK_CallTaskRescheduleProc( void ) -{ - BOOL pending; - - SYSLEVEL_EnterWin16Lock(); - pending = TASK_Reschedule(); - SYSLEVEL_LeaveWin16Lock(); - - return pending; -} - - /********************************************************************** * CALLBACK_WinelibTable * @@ -285,7 +270,6 @@ static const CALLBACKS_TABLE CALLBACK_WinelibTable = { CALLBACK_CallRegisterProc, /* CallRegisterShortProc */ CALLBACK_CallRegisterProc, /* CallRegisterLongProc */ - CALLBACK_CallTaskRescheduleProc, /* CallTaskRescheduleProc */ NULL, /* CallFrom16WndProc */ CALLBACK_CallWndProc, /* CallWndProc */ CALLBACK_CallDriverProc, /* CallDriverProc */