Alexandre Julliard : winex11: Get rid of the X11 locking functions.
Alexandre Julliard
julliard at winehq.org
Thu Aug 16 15:26:13 CDT 2012
Module: wine
Branch: master
Commit: 9980868b81844528f3c3610d67e0be45b218f23f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9980868b81844528f3c3610d67e0be45b218f23f
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Aug 16 16:52:31 2012 +0200
winex11: Get rid of the X11 locking functions.
---
dlls/winex11.drv/winex11.drv.spec | 4 ----
dlls/winex11.drv/x11drv.h | 3 ---
dlls/winex11.drv/x11drv_main.c | 26 --------------------------
3 files changed, 0 insertions(+), 33 deletions(-)
diff --git a/dlls/winex11.drv/winex11.drv.spec b/dlls/winex11.drv/winex11.drv.spec
index 038c3e4..5b64dd7 100644
--- a/dlls/winex11.drv/winex11.drv.spec
+++ b/dlls/winex11.drv/winex11.drv.spec
@@ -61,10 +61,6 @@
@ cdecl LoadTabletInfo(long) X11DRV_LoadTabletInfo
@ cdecl WTInfoW(long long ptr) X11DRV_WTInfoW
-# X11 locks
-@ cdecl -norelay wine_tsx11_lock()
-@ cdecl -norelay wine_tsx11_unlock()
-
# Desktop
@ cdecl wine_create_desktop(long long) X11DRV_create_desktop
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 3aaedef..8566cd2 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -63,9 +63,6 @@ typedef int Status;
#define WINE_XDND_VERSION 4
-extern void CDECL wine_tsx11_lock(void);
-extern void CDECL wine_tsx11_unlock(void);
-
/* X physical pen */
typedef struct
{
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index f3c9d3f..0f94716 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -56,15 +56,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
WINE_DECLARE_DEBUG_CHANNEL(synchronous);
WINE_DECLARE_DEBUG_CHANNEL(winediag);
-static CRITICAL_SECTION X11DRV_CritSection;
-static CRITICAL_SECTION_DEBUG critsect_debug =
-{
- 0, 0, &X11DRV_CritSection,
- { &critsect_debug.ProcessLocksList, &critsect_debug.ProcessLocksList },
- 0, 0, { (DWORD_PTR)(__FILE__ ": X11DRV_CritSection") }
-};
-static CRITICAL_SECTION X11DRV_CritSection = { &critsect_debug, -1, 0, 0, 0, 0 };
-
static Screen *screen;
Visual *visual;
XPixmapFormatValues **pixmap_formats;
@@ -300,23 +291,6 @@ static int error_handler( Display *display, XErrorEvent *error_evt )
}
/***********************************************************************
- * wine_tsx11_lock (X11DRV.@)
- */
-void CDECL wine_tsx11_lock(void)
-{
- EnterCriticalSection( &X11DRV_CritSection );
-}
-
-/***********************************************************************
- * wine_tsx11_unlock (X11DRV.@)
- */
-void CDECL wine_tsx11_unlock(void)
-{
- LeaveCriticalSection( &X11DRV_CritSection );
-}
-
-
-/***********************************************************************
* init_pixmap_formats
*/
static void init_pixmap_formats( Display *display )
More information about the wine-cvs
mailing list