marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11.drv/wined3d: Fix tsx11 calling convention.

oldstable
Maarten Lankhorst 2008-12-18 21:12:36 +01:00 committed by Alexandre Julliard
parent 1b802bd5ac
commit 4eca43e702
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/wined3d/wined3d_main.c
View File

@ -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)
{
}

4
dlls/wined3d/wined3d_private.h
View File

@ -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;

4
dlls/winex11.drv/x11drv_main.c
View File

@ -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 );
}