From 569de388fa1297841b08648db660dd80d1d79b2c Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <m.b.lankhorst@gmail.com>
Date: Tue, 16 Dec 2008 14:30:37 +0100
Subject: [PATCH] wintab32/winex11.drv: Add CDECL to imported functions.

---
 dlls/winex11.drv/wintab.c       | 16 ++++++++--------
 dlls/wintab32/wintab32.c        |  8 ++++----
 dlls/wintab32/wintab_internal.h |  8 ++++----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dlls/winex11.drv/wintab.c b/dlls/winex11.drv/wintab.c
index c997c7c0c9..30f3e852ee 100644
--- a/dlls/winex11.drv/wintab.c
+++ b/dlls/winex11.drv/wintab.c
@@ -484,7 +484,7 @@ static void disable_system_cursors(void)
 /***********************************************************************
  *             X11DRV_LoadTabletInfo (X11DRV.@)
  */
-void X11DRV_LoadTabletInfo(HWND hwnddefault)
+void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault)
 {
     const WCHAR SZ_CONTEXT_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','C','o','n','t','e','x','t',0};
     const WCHAR SZ_DEVICE_NAME[] = {'W','i','n','e',' ','T','a','b','l','e','t',' ','D','e','v','i','c','e',0};
@@ -959,7 +959,7 @@ static void proximity_event( HWND hwnd, XEvent *event )
 /***********************************************************************
  *		X11DRV_AttachEventQueueToTablet (X11DRV.@)
  */
-int X11DRV_AttachEventQueueToTablet(HWND hOwner)
+int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner)
 {
     struct x11drv_thread_data *data = x11drv_init_thread_data();
     int             num_devices;
@@ -1041,7 +1041,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner)
 /***********************************************************************
  *		X11DRV_GetCurrentPacket (X11DRV.@)
  */
-int X11DRV_GetCurrentPacket(LPWTPACKET packet)
+int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet)
 {
     *packet = gMsgPacket;
     return 1;
@@ -1062,7 +1062,7 @@ static inline int CopyTabletData(LPVOID target, LPCVOID src, INT size)
 /***********************************************************************
  *		X11DRV_WTInfoW (X11DRV.@)
  */
-UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
+UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
 {
     /*
      * It is valid to call WTInfoA with lpOutput == NULL, as per standard.
@@ -1488,7 +1488,7 @@ UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
 /***********************************************************************
  *		AttachEventQueueToTablet (X11DRV.@)
  */
-int X11DRV_AttachEventQueueToTablet(HWND hOwner)
+int CDECL X11DRV_AttachEventQueueToTablet(HWND hOwner)
 {
     return 0;
 }
@@ -1496,7 +1496,7 @@ int X11DRV_AttachEventQueueToTablet(HWND hOwner)
 /***********************************************************************
  *		GetCurrentPacket (X11DRV.@)
  */
-int X11DRV_GetCurrentPacket(LPWTPACKET packet)
+int CDECL X11DRV_GetCurrentPacket(LPWTPACKET packet)
 {
     return 0;
 }
@@ -1504,14 +1504,14 @@ int X11DRV_GetCurrentPacket(LPWTPACKET packet)
 /***********************************************************************
  *		LoadTabletInfo (X11DRV.@)
  */
-void X11DRV_LoadTabletInfo(HWND hwnddefault)
+void CDECL X11DRV_LoadTabletInfo(HWND hwnddefault)
 {
 }
 
 /***********************************************************************
  *		WTInfoW (X11DRV.@)
  */
-UINT X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
+UINT CDECL X11DRV_WTInfoW(UINT wCategory, UINT nIndex, LPVOID lpOutput)
 {
     return 0;
 }
diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c
index 5f2afb18f8..b52b429d94 100644
--- a/dlls/wintab32/wintab32.c
+++ b/dlls/wintab32/wintab32.c
@@ -36,10 +36,10 @@ static const WCHAR
   WC_TABLETCLASSNAME[] = {'W','i','n','e','T','a','b','l','e','t','C','l','a','s','s',0};
 CRITICAL_SECTION csTablet;
 
-int (*pLoadTabletInfo)(HWND hwnddefault) = NULL;
-int (*pGetCurrentPacket)(LPWTPACKET packet) = NULL;
-int (*pAttachEventQueueToTablet)(HWND hOwner) = NULL;
-UINT (*pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL;
+int  (CDECL *pLoadTabletInfo)(HWND hwnddefault) = NULL;
+int  (CDECL *pGetCurrentPacket)(LPWTPACKET packet) = NULL;
+int  (CDECL *pAttachEventQueueToTablet)(HWND hOwner) = NULL;
+UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput) = NULL;
 
 static LRESULT WINAPI TABLET_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam,
                                           LPARAM lParam);
diff --git a/dlls/wintab32/wintab_internal.h b/dlls/wintab32/wintab_internal.h
index 4fa4bfd6fc..b0a2e8fd58 100644
--- a/dlls/wintab32/wintab_internal.h
+++ b/dlls/wintab32/wintab_internal.h
@@ -151,10 +151,10 @@ int TABLET_PostTabletMessage(LPOPENCONTEXT newcontext, UINT msg, WPARAM wParam,
 LPOPENCONTEXT AddPacketToContextQueue(LPWTPACKET packet, HWND hwnd);
 
 /* X11drv functions */
-extern int (*pLoadTabletInfo)(HWND hwnddefault);
-extern int (*pGetCurrentPacket)(LPWTPACKET packet);
-extern int (*pAttachEventQueueToTablet)(HWND hOwner);
-extern UINT (*pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput);
+extern int  (CDECL *pLoadTabletInfo)(HWND hwnddefault);
+extern int  (CDECL *pGetCurrentPacket)(LPWTPACKET packet);
+extern int  (CDECL *pAttachEventQueueToTablet)(HWND hOwner);
+extern UINT (CDECL *pWTInfoW)(UINT wCategory, UINT nIndex, LPVOID lpOutput);
 
 extern HWND hwndDefault;
 extern CRITICAL_SECTION csTablet;