diff --git a/if1632/thunk.c b/if1632/thunk.c index f598752688f..4636d9a4aa4 100644 --- a/if1632/thunk.c +++ b/if1632/thunk.c @@ -160,15 +160,12 @@ void THUNK_InitCallout(void) GETADDR( GetMessageA ); GETADDR( SendMessageA ); GETADDR( PostMessageA ); - GETADDR( PostThreadMessageA ); GETADDR( TranslateMessage ); GETADDR( DispatchMessageA ); GETADDR( RedrawWindow ); GETADDR( WaitForInputIdle ); GETADDR( MsgWaitForMultipleObjects ); GETADDR( WindowFromDC ); - GETADDR( GetForegroundWindow ); - GETADDR( IsChild ); GETADDR( MessageBoxA ); GETADDR( MessageBoxW ); #undef GETADDR diff --git a/include/callback.h b/include/callback.h index 9a17854e280..9ba70165da3 100644 --- a/include/callback.h +++ b/include/callback.h @@ -32,7 +32,6 @@ typedef struct LRESULT WINAPI (*SendMessageA)( HWND, UINT, WPARAM, LPARAM ); BOOL WINAPI (*PostMessageA)( HWND, UINT, WPARAM, LPARAM ); BOOL16 WINAPI (*PostAppMessage16)( HTASK16, UINT16, WPARAM16, LPARAM ); - BOOL WINAPI (*PostThreadMessageA)( DWORD, UINT, WPARAM, LPARAM ); BOOL WINAPI (*TranslateMessage)( const MSG *msg ); LONG WINAPI (*DispatchMessageA)( const MSG* msg ); BOOL WINAPI (*RedrawWindow)( HWND, const RECT *, HRGN, UINT ); @@ -44,8 +43,6 @@ typedef struct DWORD WINAPI (*WaitForInputIdle)( HANDLE, DWORD ); DWORD WINAPI (*MsgWaitForMultipleObjects)( DWORD, HANDLE *, BOOL, DWORD, DWORD ); HWND WINAPI (*WindowFromDC)( HDC ); - HWND WINAPI (*GetForegroundWindow)(void); - BOOL WINAPI (*IsChild)( HWND parent, HWND ); INT WINAPI (*MessageBoxA)( HWND, LPCSTR, LPCSTR, UINT ); INT WINAPI (*MessageBoxW)( HWND, LPCWSTR, LPCWSTR, UINT ); } CALLOUT_TABLE; diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c index bfd9cffad61..caec8a947c3 100644 --- a/windows/x11drv/event.c +++ b/windows/x11drv/event.c @@ -22,7 +22,8 @@ #include #include -#include "callback.h" +#include "wine/winuser16.h" + #include "clipboard.h" #include "dce.h" #include "debugtools.h" @@ -643,9 +644,8 @@ static void EVENT_Expose( HWND hWnd, XExposeEvent *event ) rect.bottom = rect.top + event->height; WIN_ReleaseWndPtr(pWnd); - - Callout.RedrawWindow( hWnd, &rect, 0, - RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN | RDW_ERASE ); + + RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | RDW_FRAME | RDW_ALLCHILDREN | RDW_ERASE ); /* FIXME: We should use SendNotifyMessage here, but this function is not implemented correctly, so for now we used SendMessage */ @@ -678,9 +678,8 @@ static void EVENT_GraphicsExpose( HWND hWnd, XGraphicsExposeEvent *event ) rect.bottom = rect.top + event->height; WIN_ReleaseWndPtr(pWnd); - - Callout.RedrawWindow( hWnd, &rect, 0, - RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE ); + + RedrawWindow( hWnd, &rect, 0, RDW_INVALIDATE | RDW_ALLCHILDREN | RDW_ERASE ); /* FIXME: We should use SendNotifyMessage here, but this function is not implemented correctly, so for now we used SendMessage */