From: Jacek Caban jacek@codeweavers.com
--- dlls/winex11.drv/dllmain.c | 8 -------- dlls/winex11.drv/unixlib.h | 1 - dlls/winex11.drv/winex11.drv.spec | 1 - dlls/winex11.drv/wintab.c | 21 +++------------------ dlls/winex11.drv/x11drv.h | 1 - dlls/winex11.drv/x11drv_main.c | 2 -- dlls/wintab32/wintab32.c | 10 +++------- dlls/wintab32/wintab_internal.h | 1 - 8 files changed, 6 insertions(+), 39 deletions(-)
diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index b2c3b75065c..265d3d8368c 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -36,14 +36,6 @@ BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) return TRUE; }
-/*********************************************************************** - * GetCurrentPacket (winex11.@) - */ -int CDECL X11DRV_GetCurrentPacket( void *packet ) -{ - return X11DRV_CALL( tablet_get_packet, packet ); -} - /*********************************************************************** * LoadTabletInfo (winex11.@) */ diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 07da331d656..ca55ae25a0d 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -23,7 +23,6 @@ enum x11drv_funcs { unix_init, - unix_tablet_get_packet, unix_tablet_info, unix_tablet_load_info, unix_funcs_count, diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec index 3bd451597bf..3127508edd9 100644 --- a/dlls/winex11.drv/winex11.drv.spec +++ b/dlls/winex11.drv/winex11.drv.spec @@ -1,4 +1,3 @@ # WinTab32 -@ cdecl GetCurrentPacket(ptr) X11DRV_GetCurrentPacket @ cdecl LoadTabletInfo(long) X11DRV_LoadTabletInfo @ cdecl WTInfoW(long long ptr) X11DRV_WTInfoW diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c index 2905b37d2cc..7e3ce180854 100644 --- a/dlls/winex11.drv/wintab.c +++ b/dlls/winex11.drv/wintab.c @@ -1094,16 +1094,6 @@ static BOOL tablet_attach_queue( HWND owner ) return TRUE; }
-/*********************************************************************** - * x11drv_tablet_get_packet - */ -NTSTATUS x11drv_tablet_get_packet( void *packet ) -{ - *(WTPACKET *)packet = gMsgPacket; - return 1; -} - - static inline int CopyTabletData(LPVOID target, LPCVOID src, INT size) { /* @@ -1559,6 +1549,9 @@ LRESULT X11DRV_WintabProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, vo { case NtUserWintabAttach: return tablet_attach_queue( hwnd ); + case NtUserWintabPacket: + *(WTPACKET *)buffer = gMsgPacket; + return 1; } return 0; } @@ -1573,14 +1566,6 @@ LRESULT X11DRV_WintabProc( HWND hwmd, UINT msg, WPARAM wparam, LPARAM lparam, vo return 0; }
-/*********************************************************************** - * x11drv_tablet_get_packet - */ -NTSTATUS x11drv_tablet_get_packet( void *arg ) -{ - return 0; -} - /*********************************************************************** * x11drv_tablet_load_info */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 0d2823651a4..c5599a214c1 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -898,7 +898,6 @@ static inline BOOL is_window_rect_mapped( const RECT *rect )
/* unixlib interface */
-extern NTSTATUS x11drv_tablet_get_packet( void *arg ); extern NTSTATUS x11drv_tablet_load_info( void *arg ); extern NTSTATUS x11drv_tablet_info( void *arg );
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index bf9064970de..4e7439c7f20 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -806,7 +806,6 @@ BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, const unixlib_entry_t __wine_unix_call_funcs[] = { x11drv_init, - x11drv_tablet_get_packet, x11drv_tablet_info, x11drv_tablet_load_info, }; @@ -836,7 +835,6 @@ static NTSTATUS x11drv_wow64_tablet_info( void *arg ) const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { x11drv_init, - x11drv_tablet_get_packet, x11drv_wow64_tablet_info, x11drv_tablet_load_info, }; diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 415a4dbca0f..98a7e47a120 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -24,7 +24,7 @@ #include "winbase.h" #include "winreg.h" #include "wingdi.h" -#include "winuser.h" +#include "ntuser.h" #include "winerror.h" #define NOFIX32 #include "wintab.h" @@ -43,7 +43,6 @@ static CRITICAL_SECTION_DEBUG csTablet_debug = CRITICAL_SECTION csTablet = { &csTablet_debug, -1, 0, 0, 0, 0 };
int (CDECL *pLoadTabletInfo)(HWND hwnddefault) = NULL; -int (CDECL *pGetCurrentPacket)(LPWTPACKET packet) = NULL; UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL;
static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, @@ -107,7 +106,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) { HMODULE module = load_graphics_driver(); pLoadTabletInfo = (void *)GetProcAddress(module, "LoadTabletInfo"); - pGetCurrentPacket = (void *)GetProcAddress(module, "GetCurrentPacket"); pWTInfoW = (void *)GetProcAddress(module, "WTInfoW"); } else @@ -143,9 +141,8 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { WTPACKET packet; LPOPENCONTEXT handler; - if (pGetCurrentPacket) + if (NtUserMessageCall(hwnd, NtUserWintabPacket, 0, 0, &packet, NtUserWintabDriverCall, FALSE)) { - pGetCurrentPacket(&packet); handler = AddPacketToContextQueue(&packet,(HWND)lParam); if (handler && handler->context.lcOptions & CXO_MESSAGES) TABLET_PostTabletMessage(handler, _WT_PACKET(handler->context.lcMsgBase), @@ -158,9 +155,8 @@ static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, { WTPACKET packet; LPOPENCONTEXT handler; - if (pGetCurrentPacket) + if (NtUserMessageCall(hwnd, NtUserWintabPacket, 0, 0, &packet, NtUserWintabDriverCall, FALSE)) { - pGetCurrentPacket(&packet); handler = AddPacketToContextQueue(&packet,(HWND)wParam); if (handler) TABLET_PostTabletMessage(handler, WT_PROXIMITY, diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h index 049c54f8cdb..26a5c628473 100644 --- a/dlls/wintab32/wintab_internal.h +++ b/dlls/wintab32/wintab_internal.h @@ -152,7 +152,6 @@ LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd);
/* X11drv functions */ extern int (CDECL *pLoadTabletInfo)(HWND hwnddefault); -extern int (CDECL *pGetCurrentPacket)(LPWTPACKET packet); extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput);
extern HWND hwndDefault;