Module: wine Branch: master Commit: 4eca43e7024995da186f7cd21f92ff5f6fc0b04b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eca43e7024995da186f7cd21f...
Author: Maarten Lankhorst m.b.lankhorst@gmail.com Date: Thu Dec 18 21:12:36 2008 +0100
winex11.drv/wined3d: Fix tsx11 calling convention.
---
dlls/wined3d/wined3d_main.c | 6 +++--- dlls/wined3d/wined3d_private.h | 4 ++-- dlls/winex11.drv/x11drv_main.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index ee8f07f..b401f94 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -29,8 +29,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d);
int num_lock = 0; -void (*wine_tsx11_lock_ptr)(void) = NULL; -void (*wine_tsx11_unlock_ptr)(void) = NULL; +void (*CDECL wine_tsx11_lock_ptr)(void) = NULL; +void (*CDECL wine_tsx11_unlock_ptr)(void) = NULL;
/* When updating default value here, make sure to update winecfg as well, @@ -88,7 +88,7 @@ static inline DWORD get_config_key_dword(HKEY defkey, HKEY appkey, const char* n return ERROR_FILE_NOT_FOUND; }
-static void wined3d_do_nothing(void) +static void CDECL wined3d_do_nothing(void) { }
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7e422fb..60414ee 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -483,8 +483,8 @@ extern const shader_backend_t none_shader_backend;
/* X11 locking */
-extern void (*wine_tsx11_lock_ptr)(void); -extern void (*wine_tsx11_unlock_ptr)(void); +extern void (* CDECL wine_tsx11_lock_ptr)(void); +extern void (* CDECL wine_tsx11_unlock_ptr)(void);
/* As GLX relies on X, this is needed */ extern int num_lock; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6b0e95c..b4e4bca 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -271,7 +271,7 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) /*********************************************************************** * wine_tsx11_lock (X11DRV.@) */ -void wine_tsx11_lock(void) +void CDECL wine_tsx11_lock(void) { EnterCriticalSection( &X11DRV_CritSection ); } @@ -279,7 +279,7 @@ void wine_tsx11_lock(void) /*********************************************************************** * wine_tsx11_unlock (X11DRV.@) */ -void wine_tsx11_unlock(void) +void CDECL wine_tsx11_unlock(void) { LeaveCriticalSection( &X11DRV_CritSection ); }