diff --git a/Make.rules.in b/Make.rules.in index 0b780a8b762..554b4fc38d8 100644 --- a/Make.rules.in +++ b/Make.rules.in @@ -77,7 +77,6 @@ WMC = $(TOOLSDIR)/tools/wmc/wmc LDPATH = @LDPATH@ DLLDIR = $(TOPOBJDIR)/dlls LIBWINE = -L$(TOPOBJDIR)/library -lwine -LIBTSX11 = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11 LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode LIBUUID = -L$(TOPOBJDIR)/ole -lwine_uuid diff --git a/Makefile.in b/Makefile.in index f3171e747f7..9605959fed5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,7 +36,6 @@ SUBDIRS = \ programs \ server \ tools \ - tsx11 \ unicode # Sub-directories to install for install-lib @@ -47,7 +46,6 @@ INSTALLLIBSUBDIRS = \ miscemu \ programs \ server \ - tsx11 \ unicode # Sub-directories to install for install-dev @@ -113,14 +111,14 @@ uninstall:: # Dependencies between directories all: $(SUBDIRS) -dlls: library ole tools tsx11 unicode +dlls: library ole tools unicode server: library tools unicode -miscemu programs: dlls library ole tools tsx11 unicode +miscemu programs: dlls library ole tools unicode tools: library unicode -dlls/__install__: library ole tools tsx11 unicode +dlls/__install__: library ole tools unicode server/__install__: library tools unicode -miscemu/__install__ programs/__install__: library ole tools tsx11 unicode dlls/__install__ +miscemu/__install__ programs/__install__: library ole tools unicode dlls/__install__ library/__install__: library ole/__install__: ole tools/__install__: tools diff --git a/configure b/configure index 32ac89373bf..a9fe8c5e362 100755 --- a/configure +++ b/configure @@ -14192,7 +14192,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules MAKE_PROG_RULES=programs/Makeprog.rules -ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile tsx11/Makefile unicode/Makefile" +ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/comcat/Makefile dlls/comctl32/Makefile dlls/commdlg/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/d3d8/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput8/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dsound/Makefile dlls/gdi/Makefile dlls/glu32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/kernel/Makefile dlls/kernel/tests/Makefile dlls/lzexpand/Makefile dlls/mapi32/Makefile dlls/mpr/Makefile dlls/msacm/Makefile dlls/msacm/imaadp32/Makefile dlls/msacm/msadp32/Makefile dlls/msacm/msg711/Makefile dlls/msacm/winemp3/Makefile dlls/msdmo/Makefile dlls/msimg32/Makefile dlls/msisys/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt20/Makefile dlls/msvideo/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/odbc32/Makefile dlls/ole32/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr/Makefile dlls/opengl32/Makefile dlls/psapi/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/rasapi32/Makefile dlls/richedit/Makefile dlls/rpcrt4/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/shdocvw/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/sti/Makefile dlls/tapi32/Makefile dlls/ttydrv/Makefile dlls/twain/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/version/Makefile dlls/win32s/Makefile dlls/winaspi/Makefile dlls/winedos/Makefile dlls/wineps/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/mcianim/Makefile dlls/winmm/mciavi/Makefile dlls/winmm/mcicda/Makefile dlls/winmm/mciseq/Makefile dlls/winmm/mciwave/Makefile dlls/winmm/midimap/Makefile dlls/winmm/wavemap/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls/Makefile dlls/winsock/Makefile dlls/winsock/tests/Makefile dlls/winspool/Makefile dlls/wintrust/Makefile dlls/wow32/Makefile dlls/wsock32/Makefile dlls/x11drv/Makefile documentation/Makefile include/Makefile library/Makefile miscemu/Makefile ole/Makefile programs/Makefile programs/avitools/Makefile programs/clock/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/expand/Makefile programs/notepad/Makefile programs/osversioncheck/Makefile programs/progman/Makefile programs/regapi/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/regtest/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wcmd/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winapi/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile unicode/Makefile" cat >confcache <<\_ACEOF @@ -14819,7 +14819,6 @@ do "tools/wmc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wmc/Makefile" ;; "tools/wpp/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wpp/Makefile" ;; "tools/wrc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/wrc/Makefile" ;; - "tsx11/Makefile" ) CONFIG_FILES="$CONFIG_FILES tsx11/Makefile" ;; "unicode/Makefile" ) CONFIG_FILES="$CONFIG_FILES unicode/Makefile" ;; "controls" ) CONFIG_COMMANDS="$CONFIG_COMMANDS controls" ;; "dlls/ddraw/d3ddevice" ) CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/ddraw/d3ddevice" ;; diff --git a/configure.ac b/configure.ac index 1d3b5f7739e..fff35d3ed80 100644 --- a/configure.ac +++ b/configure.ac @@ -1510,7 +1510,6 @@ tools/winedump/Makefile tools/wmc/Makefile tools/wpp/Makefile tools/wrc/Makefile -tsx11/Makefile unicode/Makefile]) AC_OUTPUT diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 971f0b1b577..6d75fc7488b 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in @@ -42,7 +42,7 @@ $(SPEC_DEF): $(WINEBUILD) # Rules for checking that no imports are missing -CHECKLINK_RPATH = dlls library tsx11 unicode +CHECKLINK_RPATH = dlls library unicode checklink:: $(MODULE)$(DLLEXT) $(SUBDIRS:%=%/__checklink__) $(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE)$(DLLEXT) && $(RM) checklink diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in index 79e0ac4e0c6..98ed3265079 100644 --- a/dlls/Maketest.rules.in +++ b/dlls/Maketest.rules.in @@ -52,7 +52,7 @@ $(TESTLIST): Makefile.in # Rules for checking that no imports are missing -CHECKLINK_RPATH = library tsx11 unicode +CHECKLINK_RPATH = library checklink:: $(MODULE).so $(SUBDIRS:%=%/__checklink__) $(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE).so && $(RM) checklink diff --git a/dlls/x11drv/Makefile.in b/dlls/x11drv/Makefile.in index 832b3e0b772..718735659ec 100644 --- a/dlls/x11drv/Makefile.in +++ b/dlls/x11drv/Makefile.in @@ -5,7 +5,7 @@ SRCDIR = @srcdir@ VPATH = @srcdir@ MODULE = x11drv.dll IMPORTS = user32 gdi32 advapi32 kernel32 ntdll -EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB) +EXTRALIBS = $(X_LIBS) $(XLIB) LDDLLFLAGS = @LDDLLFLAGS@ SYMBOLFILE = $(MODULE).tmp.o @@ -31,6 +31,7 @@ C_SRCS = \ keyboard.c \ mouse.c \ scroll.c \ + ts_xlib.c \ window.c \ winpos.c \ x11ddraw.c \ diff --git a/tsx11/X11_calls b/dlls/x11drv/X11_calls similarity index 100% rename from tsx11/X11_calls rename to dlls/x11drv/X11_calls diff --git a/tsx11/ts_xlib.c b/dlls/x11drv/ts_xlib.c similarity index 99% rename from tsx11/ts_xlib.c rename to dlls/x11drv/ts_xlib.c index 4c6158fa9df..b8caf3a4bd8 100644 --- a/tsx11/ts_xlib.c +++ b/dlls/x11drv/ts_xlib.c @@ -680,4 +680,3 @@ XIM TSXOpenIM(Display* a0, struct _XrmHashBucketRec* a1, char* a2, char* a3) } #endif /* defined(HAVE_X11_XLIB_H) */ - diff --git a/include/ts_xlib.h b/dlls/x11drv/ts_xlib.h similarity index 98% rename from include/ts_xlib.h rename to dlls/x11drv/ts_xlib.h index fd0f1ca9000..056fa56717d 100644 --- a/include/ts_xlib.h +++ b/dlls/x11drv/ts_xlib.h @@ -16,8 +16,8 @@ #include -extern void (*wine_tsx11_lock)(void); -extern void (*wine_tsx11_unlock)(void); +extern void wine_tsx11_lock(void); +extern void wine_tsx11_unlock(void); extern XFontStruct * TSXLoadQueryFont(Display*, const char*); extern XImage * TSXGetImage(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int); diff --git a/dlls/x11drv/x11drv.spec b/dlls/x11drv/x11drv.spec index 1a03265ca55..1454cdd96c8 100644 --- a/dlls/x11drv/x11drv.spec +++ b/dlls/x11drv/x11drv.spec @@ -101,5 +101,5 @@ init X11DRV_Init @ cdecl ResetSelectionOwner(ptr long) X11DRV_ResetSelectionOwner # X11 locks -@ cdecl -norelay wine_tsx11_lock() X11DRV_tsx11_lock -@ cdecl -norelay wine_tsx11_unlock() X11DRV_tsx11_unlock +@ cdecl -norelay wine_tsx11_lock() wine_tsx11_lock +@ cdecl -norelay wine_tsx11_unlock() wine_tsx11_unlock diff --git a/dlls/x11drv/x11drv_main.c b/dlls/x11drv/x11drv_main.c index f0852113295..8f4e5cc4de9 100644 --- a/dlls/x11drv/x11drv_main.c +++ b/dlls/x11drv/x11drv_main.c @@ -49,9 +49,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11drv); -static void (*old_tsx11_lock)(void); -static void (*old_tsx11_unlock)(void); - static CRITICAL_SECTION X11DRV_CritSection = CRITICAL_SECTION_INIT("X11DRV_CritSection"); Screen *screen; @@ -136,17 +133,17 @@ static int error_handler( Display *display, XErrorEvent *error_evt ) } /*********************************************************************** - * X11DRV_tsx11_lock (X11DRV.@) + * wine_tsx11_lock (X11DRV.@) */ -void X11DRV_tsx11_lock(void) +void wine_tsx11_lock(void) { EnterCriticalSection( &X11DRV_CritSection ); } /*********************************************************************** - * X11DRV_tsx11_unlock (X11DRV.@) + * wine_tsx11_unlock (X11DRV.@) */ -void X11DRV_tsx11_unlock(void) +void wine_tsx11_unlock(void) { LeaveCriticalSection( &X11DRV_CritSection ); } @@ -270,12 +267,6 @@ static void process_attach(void) get_server_startup(); setup_options(); - /* setup TSX11 locking */ - old_tsx11_lock = wine_tsx11_lock; - old_tsx11_unlock = wine_tsx11_unlock; - wine_tsx11_lock = X11DRV_tsx11_lock; - wine_tsx11_unlock = X11DRV_tsx11_unlock; - /* Open display */ if (!(display = TSXOpenDisplay( NULL ))) @@ -397,9 +388,6 @@ static void process_detach(void) /* cleanup GDI */ X11DRV_GDI_Finalize(); - /* restore TSX11 locking */ - wine_tsx11_lock = old_tsx11_lock; - wine_tsx11_unlock = old_tsx11_unlock; DeleteCriticalSection( &X11DRV_CritSection ); } diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in index 8867f54a5a6..1fe437a2fd5 100644 --- a/programs/Makeprog.rules.in +++ b/programs/Makeprog.rules.in @@ -41,7 +41,7 @@ $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in # Rules for checking that no imports are missing -CHECKLINK_RPATH = library tsx11 unicode +CHECKLINK_RPATH = library checklink:: $(MODULE).so $(SUBDIRS:%=%/__checklink__) $(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE).so && $(RM) checklink diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in index 97717672b21..284164cf3b4 100644 --- a/programs/avitools/Makefile.in +++ b/programs/avitools/Makefile.in @@ -78,7 +78,7 @@ clean:: # Rules for checking that no imports are missing -CHECKLINK_RPATH = library tsx11 unicode +CHECKLINK_RPATH = library checklink:: $(PROGRAMS:%=%.so) $(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c aviinfo.exe.so && $(RM) checklink diff --git a/tools/make_X11wrappers b/tools/make_X11wrappers index c757f291009..8c6691b88d6 100755 --- a/tools/make_X11wrappers +++ b/tools/make_X11wrappers @@ -28,7 +28,7 @@ # This program expects to be run from Wine's main directory. $X11_include_dir = "/usr/X11/include"; -$outdir = "tsx11"; +$outdir = "dlls/x11drv"; $wantfile = "$outdir/X11_calls"; @dolist = ("Xlib"); @@ -53,7 +53,7 @@ foreach $name (@dolist) { $outfile = "/ts_$lcname"; open(OUTC, ">$outdir/$outfile.c") || die "open"; - open(OUTH, ">include/$outfile.h") || die "open"; + open(OUTH, ">$outdir/$outfile.h") || die "open"; $x11_incl = ""; $extensions_dir = ""; @@ -79,8 +79,8 @@ foreach $name (@dolist) { $pre_file $x11_incl#include -extern void (*wine_tsx11_lock)(void); -extern void (*wine_tsx11_unlock)(void); +extern void wine_tsx11_lock(void); +extern void wine_tsx11_unlock(void); END @@ -153,13 +153,7 @@ END $post_file #endif /* __WINE_TS_$ucname\_H */ END - print OUTC <