ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build tsx11 layer as a separate shared library.

This commit is contained in:
Alexandre Julliard 2000-12-06 00:04:10 +00:00
parent 886604c715
commit b018239fef
30 changed files with 630 additions and 1044 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Make.rules.in
View File

@ -60,8 +60,12 @@ WINEBUILD = $(TOPOBJDIR)/tools/winebuild/winebuild
MAKEDEP = $(TOPOBJDIR)/tools/makedep MAKEDEP = $(TOPOBJDIR)/tools/makedep
WRC = $(TOPOBJDIR)/tools/wrc/wrc WRC = $(TOPOBJDIR)/tools/wrc/wrc
WMC = $(TOPOBJDIR)/tools/wmc/wmc WMC = $(TOPOBJDIR)/tools/wmc/wmc
LDPATH = LD_LIBRARY_PATH="$(TOPOBJDIR):$$LD_LIBRARY_PATH" LDPATH = LD_LIBRARY_PATH="$(TOPOBJDIR)/unicode:$$LD_LIBRARY_PATH"
DLLDIR = $(TOPOBJDIR)/dlls DLLDIR = $(TOPOBJDIR)/dlls
LIBWINE = -L$(TOPOBJDIR)/library -lwine
LIBTSX11 = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11
LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode
@SET_MAKE@ @SET_MAKE@
# Installation infos # Installation infos
@ -175,7 +179,7 @@ DLLS = \
$(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $< $(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
.spec.spec.c: .spec.spec.c:
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -o $@ -spec $< $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) -o $@ -spec $<
.c.glue.c: .c.glue.c:
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $< $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
@ -198,7 +202,7 @@ $(MODULE).tmp.o: $(OBJS) Makefile.in
# Rule for main module spec file # Rule for main module spec file
$(MODULE).spec.c: $(MODULE).spec $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD) $(MODULE).spec.c: $(MODULE).spec $(RC_SRCS:.rc=.res) $(SYMBOLFILE) $(WINEBUILD)
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MODULE).spec $(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) $(SYMBOLFILE:%=-sym %) -o $@ -spec $(SRCDIR)/$(MODULE).spec
# Rule to rebuild the resource compiler # Rule to rebuild the resource compiler

26
Makefile.in
View File

@ -33,8 +33,15 @@ LIBPROGRAMS = \
# Libraries (not dlls) to build # Libraries (not dlls) to build
LIBRARIES = \ LIBRARIES = \
library/libwine.$(LIBEXT) \ library/libwine.$(LIBEXT) \
tsx11/libwine_tsx11.$(LIBEXT) \
unicode/libwine_unicode.$(LIBEXT) unicode/libwine_unicode.$(LIBEXT)
# Libraries symlinks to create at the top level
LIBSYMLINKS = \
libwine.$(LIBEXT) \
libwine_tsx11.$(LIBEXT) \
libwine_unicode.$(LIBEXT)
# Sub-directories to run make depend/clean into # Sub-directories to run make depend/clean into
SUBDIRS = \ SUBDIRS = \
debugger \ debugger \
@ -47,6 +54,7 @@ SUBDIRS = \
programs \ programs \
server \ server \
tools \ tools \
tsx11 \
unicode unicode
# Sub-directories to run make install into # Sub-directories to run make install into
@ -58,6 +66,7 @@ INSTALLSUBDIRS = \
library \ library \
server \ server \
tools \ tools \
tsx11 \
unicode unicode
EMUOBJS = \ EMUOBJS = \
@ -65,7 +74,7 @@ EMUOBJS = \
DLLOBJS = $(DLLS:%=dlls/lib%.@LIBEXT@) DLLOBJS = $(DLLS:%=dlls/lib%.@LIBEXT@)
all: Make.rules $(PROGRAMS) $(LIBPROGRAMS) wine all: Make.rules $(PROGRAMS) $(LIBPROGRAMS) $(LIBSYMLINKS) wine
@echo "Wine build complete." @echo "Wine build complete."
WINAPI_CHECK_EXTRA_FLAGS = --global WINAPI_CHECK_EXTRA_FLAGS = --global
@ -76,7 +85,7 @@ Make.rules: Make.rules.in configure
@echo $? is newer than 'Make.rules', please rerun ./configure! @echo $? is newer than 'Make.rules', please rerun ./configure!
@exit 1 @exit 1
wine: libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) dlls $(EMUOBJS) wine: dlls $(EMUOBJS)
$(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) $(LDFLAGS) $(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) $(LDFLAGS)
install:: all $(INSTALLSUBDIRS:%=%/__install__) install:: all $(INSTALLSUBDIRS:%=%/__install__)
@ -94,6 +103,9 @@ $(EMUOBJS) $(DLLOBJS) $(PROGRAMS) $(LIBPROGRAMS) $(LIBRARIES): dummy
libwine.$(LIBEXT): library/libwine.$(LIBEXT) libwine.$(LIBEXT): library/libwine.$(LIBEXT)
$(RM) $@ && $(LN_S) library/libwine.$(LIBEXT) $@ $(RM) $@ && $(LN_S) library/libwine.$(LIBEXT) $@
libwine_tsx11.$(LIBEXT): tsx11/libwine_tsx11.$(LIBEXT)
$(RM) $@ && $(LN_S) tsx11/libwine_tsx11.$(LIBEXT) $@
libwine_unicode.$(LIBEXT): unicode/libwine_unicode.$(LIBEXT) libwine_unicode.$(LIBEXT): unicode/libwine_unicode.$(LIBEXT)
$(RM) $@ && $(LN_S) unicode/libwine_unicode.$(LIBEXT) $@ $(RM) $@ && $(LN_S) unicode/libwine_unicode.$(LIBEXT) $@
@ -103,14 +115,14 @@ $(DLLOBJS) $(PROGRAMS): tools
$(EMUOBJS): tools dlls $(EMUOBJS): tools dlls
$(LIBPROGRAMS): tools dlls libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) $(LIBPROGRAMS): tools dlls
server tools: libwine_unicode.$(LIBEXT) server tools: unicode/libwine_unicode.$(LIBEXT)
dlls: tools libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) dlls: tools $(LIBRARIES)
checklink:: checklink::
$(CC) -o checklink $(TOPSRCDIR)/library/checklink.c -L. -lwine -lwine_unicode $(LIBS) && $(RM) checklink $(CC) -o checklink $(TOPSRCDIR)/library/checklink.c $(LIBWINE) $(LIBUNICODE) $(LIBS) && $(RM) checklink
install_programs: dummy install_programs: dummy
@cd programs && $(MAKE) install @cd programs && $(MAKE) install
@ -136,7 +148,7 @@ clean::
$(RM) wine $(RM) wine
distclean: clean distclean: clean
$(RM) config.* TAGS Make.rules dlls/Makedll.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher $(RM) config.* TAGS Make.rules dlls/Makedll.rules programs/Makeprog.rules include/config.h documentation/wine.man documentation/wine.conf.man tools/winelauncher
$(RM) `find . \( -name Makefile -o -size 0 \) -print` $(RM) `find . \( -name Makefile -o -size 0 \) -print`
# We depend on configure above for checks, so we better don't use this rule. # We depend on configure above for checks, so we better don't use this rule.

4
configure vendored
View File

@ -4825,9 +4825,9 @@ DLLFLAGS=""
if test "$LIBEXT" = "so"; then if test "$LIBEXT" = "so"; then
DLLFLAGS="-fPIC" DLLFLAGS="-fPIC"
DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode" DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) \$(LIBWINE) \$(LIBUNICODE)"
else else
DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode \$(X_LIBS) \$(XLIB)" DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) \$(LIBWINE) \$(LIBUNICODE) \$(X_LIBS) \$(XLIB)"
echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6 echo $ac_n "checking whether the linker supports --[no]-whole-archive (Linux)""... $ac_c" 1>&6
echo "configure:4833: checking whether the linker supports --[no]-whole-archive (Linux)" >&5 echo "configure:4833: checking whether the linker supports --[no]-whole-archive (Linux)" >&5
if eval "test \"`echo '$''{'ac_cv_c_whole_archive'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_c_whole_archive'+set}'`\" = set"; then

4
configure.in
View File

@ -575,9 +575,9 @@ DLLFLAGS=""
if test "$LIBEXT" = "so"; then if test "$LIBEXT" = "so"; then
DLLFLAGS="-fPIC" DLLFLAGS="-fPIC"
DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode" DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) \$(LIBWINE) \$(LIBUNICODE)"
else else
DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode \$(X_LIBS) \$(XLIB)" DLL_LINK="-L\$(DLLDIR) \$(DLLS:%=-l%) \$(LIBWINE) \$(LIBUNICODE) \$(X_LIBS) \$(XLIB)"
AC_CACHE_CHECK([whether the linker supports --[[no]]-whole-archive (Linux)], AC_CACHE_CHECK([whether the linker supports --[[no]]-whole-archive (Linux)],
ac_cv_c_whole_archive, ac_cv_c_whole_archive,
[saved_cflags=$CFLAGS [saved_cflags=$CFLAGS

5
dlls/x11drv/Makefile.in
View File

@ -3,8 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = x11drv MODULE = x11drv
SOVERSION = 1.0 EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)
EXTRALIBS = $(X_LIBS) $(XLIB)
IMPORTS = user32 gdi32 kernel32 IMPORTS = user32 gdi32 kernel32
C_SRCS = \ C_SRCS = \
@ -15,12 +14,10 @@ PROGRAMS = \
EXTRA_OBJS = \ EXTRA_OBJS = \
$(TOPOBJDIR)/graphics/x11drv/x11drv.o \ $(TOPOBJDIR)/graphics/x11drv/x11drv.o \
$(TOPOBJDIR)/tsx11/tsx11.o \
$(TOPOBJDIR)/windows/x11drv/x11drv.o $(TOPOBJDIR)/windows/x11drv/x11drv.o
SUBDIRS = \ SUBDIRS = \
$(TOPOBJDIR)/graphics/x11drv \ $(TOPOBJDIR)/graphics/x11drv \
$(TOPOBJDIR)/tsx11 \
$(TOPOBJDIR)/windows/x11drv $(TOPOBJDIR)/windows/x11drv
@MAKE_DLL_RULES@ @MAKE_DLL_RULES@

28
dlls/x11drv/x11drv_main.c
View File

@ -34,6 +34,8 @@
DEFAULT_DEBUG_CHANNEL(x11drv); DEFAULT_DEBUG_CHANNEL(x11drv);
static XKeyboardState keyboard_state; static XKeyboardState keyboard_state;
static void (*old_tsx11_lock)(void);
static void (*old_tsx11_unlock)(void);
Display *display; Display *display;
Screen *screen; Screen *screen;
@ -54,6 +56,21 @@ static int error_handler(Display *display, XErrorEvent *error_evt)
return 0; return 0;
} }
/***********************************************************************
* lock_tsx11
*/
static void lock_tsx11(void)
{
RtlEnterCriticalSection( &X11DRV_CritSection );
}
/***********************************************************************
* unlock_tsx11
*/
static void unlock_tsx11(void)
{
RtlLeaveCriticalSection( &X11DRV_CritSection );
}
/*********************************************************************** /***********************************************************************
* get_server_startup * get_server_startup
@ -256,6 +273,12 @@ static void process_attach(void)
get_server_startup(); get_server_startup();
setup_options(); setup_options();
/* setup TSX11 locking */
old_tsx11_lock = wine_tsx11_lock;
old_tsx11_unlock = wine_tsx11_unlock;
wine_tsx11_lock = lock_tsx11;
wine_tsx11_unlock = unlock_tsx11;
/* Open display */ /* Open display */
if (!(display = TSXOpenDisplay( Options.display ))) if (!(display = TSXOpenDisplay( Options.display )))
@ -339,8 +362,11 @@ static void process_detach(void)
/* cleanup GDI */ /* cleanup GDI */
X11DRV_GDI_Finalize(); X11DRV_GDI_Finalize();
#if 0 /* FIXME */ /* restore TSX11 locking */
wine_tsx11_lock = old_tsx11_lock;
wine_tsx11_unlock = old_tsx11_unlock;
#if 0 /* FIXME */
/* close the display */ /* close the display */
XCloseDisplay( display ); XCloseDisplay( display );
display = NULL; display = NULL;

3
include/ts_shape.h
View File

@ -16,6 +16,9 @@
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern void TSXShapeCombineRectangles(Display*, Window, int, int, int, XRectangle*, int, int, int); extern void TSXShapeCombineRectangles(Display*, Window, int, int, int, XRectangle*, int, int, int);
extern void TSXShapeCombineMask(Display*, Window, int, int, int, Pixmap, int); extern void TSXShapeCombineMask(Display*, Window, int, int, int, Pixmap, int);

3
include/ts_xf86dga.h
View File

@ -16,6 +16,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h> #include <X11/extensions/xf86dga.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern Bool TSXF86DGAQueryVersion(Display*,int*,int*); extern Bool TSXF86DGAQueryVersion(Display*,int*,int*);
extern Bool TSXF86DGAQueryExtension(Display*,int*,int*); extern Bool TSXF86DGAQueryExtension(Display*,int*,int*);
extern Status TSXF86DGAGetVideo(Display*,int,char**,int*,int*,int*); extern Status TSXF86DGAGetVideo(Display*,int,char**,int*,int*,int*);

3
include/ts_xf86dga2.h
View File

@ -16,6 +16,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h> #include <X11/extensions/xf86dga.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern Bool TSXDGAQueryVersion(Display*, int*, int*); extern Bool TSXDGAQueryVersion(Display*, int*, int*);
extern Bool TSXDGAQueryExtension(Display*, int*, int*); extern Bool TSXDGAQueryExtension(Display*, int*, int*);
extern XDGAMode* TSXDGAQueryModes(Display*, int, int*); extern XDGAMode* TSXDGAQueryModes(Display*, int, int*);

3
include/ts_xf86vmode.h
View File

@ -19,6 +19,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern Bool TSXF86VidModeQueryVersion(Display*,int*,int*); extern Bool TSXF86VidModeQueryVersion(Display*,int*,int*);
extern Bool TSXF86VidModeQueryExtension(Display*,int*,int*); extern Bool TSXF86VidModeQueryExtension(Display*,int*,int*);
extern Bool TSXF86VidModeGetModeLine(Display*,int,int*,XF86VidModeModeLine*); extern Bool TSXF86VidModeGetModeLine(Display*,int,int*,XF86VidModeModeLine*);

3
include/ts_xlib.h
View File

@ -14,6 +14,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XFontStruct * TSXLoadQueryFont(Display*, const char*); extern XFontStruct * TSXLoadQueryFont(Display*, const char*);
extern XModifierKeymap * TSXGetModifierMapping(Display*); extern XModifierKeymap * TSXGetModifierMapping(Display*);
extern XImage * TSXCreateImage(Display*, Visual*, unsigned int, int, int, char*, unsigned int, unsigned int, int, int); extern XImage * TSXCreateImage(Display*, Visual*, unsigned int, int, int, char*, unsigned int, unsigned int, int, int);

3
include/ts_xpm.h
View File

@ -15,6 +15,9 @@
#include <X11/xpm.h> #include <X11/xpm.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern int TSXpmCreatePixmapFromData(Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *); extern int TSXpmCreatePixmapFromData(Display *, Drawable, char **, Pixmap *, Pixmap *, XpmAttributes *);
extern int TSXpmAttributesSize(void); extern int TSXpmAttributesSize(void);

3
include/ts_xresource.h
View File

@ -15,6 +15,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XrmQuark TSXrmUniqueQuark(void); extern XrmQuark TSXrmUniqueQuark(void);
extern int TSXrmGetResource(XrmDatabase, const char*, const char*, char**, XrmValue*); extern int TSXrmGetResource(XrmDatabase, const char*, const char*, char**, XrmValue*);
extern XrmDatabase TSXrmGetFileDatabase(const char*); extern XrmDatabase TSXrmGetFileDatabase(const char*);

3
include/ts_xshm.h
View File

@ -16,6 +16,9 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern Bool TSXShmQueryExtension(Display *); extern Bool TSXShmQueryExtension(Display *);
extern Bool TSXShmQueryVersion(Display *, int *, int *, Bool *); extern Bool TSXShmQueryVersion(Display *, int *, int *, Bool *);
extern int TSXShmPixmapFormat(Display *); extern int TSXShmPixmapFormat(Display *);

3
include/ts_xutil.h
View File

@ -16,6 +16,9 @@
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XClassHint * TSXAllocClassHint(void); extern XClassHint * TSXAllocClassHint(void);
extern XSizeHints * TSXAllocSizeHints(void); extern XSizeHints * TSXAllocSizeHints(void);
extern XWMHints * TSXAllocWMHints(void); extern XWMHints * TSXAllocWMHints(void);

3
include/ts_xvideo.h
View File

@ -18,6 +18,9 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include <X11/extensions/Xvlib.h> #include <X11/extensions/Xvlib.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern int TSXvQueryExtension(Display*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*); extern int TSXvQueryExtension(Display*, unsigned int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*);
extern int TSXvQueryAdaptors(Display*, Window, unsigned int*, XvAdaptorInfo**); extern int TSXvQueryAdaptors(Display*, Window, unsigned int*, XvAdaptorInfo**);
extern int TSXvQueryEncodings(Display*, XvPortID, unsigned int*, XvEncodingInfo**); extern int TSXvQueryEncodings(Display*, XvPortID, unsigned int*, XvEncodingInfo**);

12
tools/make_X11wrappers
View File

@ -112,6 +112,9 @@ foreach $name (@dolist) {
$pre_file $pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h> $x11_incl#include <X11/$extensions_dir$inc_name.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
END END
print OUTC <<END; print OUTC <<END;
@ -126,11 +129,8 @@ END
$pre_file $pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h> $x11_incl#include <X11/$extensions_dir$inc_name.h>
#include "debugtools.h"
#include "ts_$lcname.h" #include "ts_$lcname.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
END END
if($name eq "xpm") { # Handle as special case. if($name eq "xpm") { # Handle as special case.
@ -487,13 +487,11 @@ sub raw_output_fn {
# print OUTH "#define $fn_name TS$fn_name\n"; # print OUTH "#define $fn_name TS$fn_name\n";
print OUTC "{\n"; print OUTC "{\n";
print OUTC " $resultdecl;\n" if $resultdecl; print OUTC " $resultdecl;\n" if $resultdecl;
print OUTC " TRACE(\"Call $fn_name\\n\");\n"; print OUTC " wine_tsx11_lock();\n";
print OUTC " EnterCriticalSection( &X11DRV_CritSection );\n";
print OUTC " "; print OUTC " ";
print OUTC "r = " if $resultdecl; print OUTC "r = " if $resultdecl;
print OUTC "$fn_name($actuals);\n"; print OUTC "$fn_name($actuals);\n";
print OUTC " LeaveCriticalSection( &X11DRV_CritSection );\n"; print OUTC " wine_tsx11_unlock();\n";
print OUTC " TRACE(\"Ret $fn_name\\n\");\n";
print OUTC " return r;\n" if $resultdecl; print OUTC " return r;\n" if $resultdecl;
print OUTC "}\n"; print OUTC "}\n";
$want{$fn_name} = 2; $want{$fn_name} = 2;

1
tsx11/.cvsignore
View File

@ -1 +1,2 @@
Makefile Makefile
libwine_tsx11.so.1.0

38
tsx11/Makefile.in
View File

@ -3,9 +3,14 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = .. TOPOBJDIR = ..
SRCDIR = @srcdir@ SRCDIR = @srcdir@
VPATH = @srcdir@ VPATH = @srcdir@
MODULE = tsx11 LIBEXT = @LIBEXT@
MODULE = none
SOVERSION = 1.0
SONAME = libwine_tsx11.so
EXTRALIBS = $(X_LIBS) $(XLIB)
C_SRCS = \ C_SRCS = \
locking.c \
ts_xf86dga.c \ ts_xf86dga.c \
ts_xf86dga2.c \ ts_xf86dga2.c \
ts_xf86vmode.c \ ts_xf86vmode.c \
@ -17,11 +22,36 @@ C_SRCS = \
ts_shape.c \ ts_shape.c \
ts_xpm.c ts_xpm.c
all: $(MODULE).o all: libwine_tsx11.$(LIBEXT)
@MAKE_RULES@ @MAKE_RULES@
$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in libwine_tsx11.so.$(SOVERSION): $(OBJS)
$(LDCOMBINE) $(OBJS) -o $@ $(LDSHARED) $(OBJS) -o $@
libwine_tsx11.so: libwine_tsx11.so.$(SOVERSION)
$(RM) $@ && $(LN_S) libwine_tsx11.so.$(SOVERSION) $@
libwine_tsx11.a: $(OBJS)
$(RM) $@
$(AR) $@ $(OBJS)
$(RANLIB) $@
install_so: libwine_tsx11.so.$(SOVERSION)
[ -d $(libdir) ] || $(MKDIR) $(libdir)
$(INSTALL_PROGRAM) libwine_tsx11.so.$(SOVERSION) $(libdir)/libwine_tsx11.so.$(SOVERSION)
cd $(libdir) && $(RM) libwine_tsx11.so && $(LN_S) libwine_tsx11.so.$(SOVERSION) libwine_tsx11.so
install_a: libwine_tsx11.a
[ -d $(libdir) ] || $(MKDIR) $(libdir)
$(INSTALL_DATA) libwine_tsx11.a $(libdir)/libwine_tsx11.a
install:: all $(LIBEXT:%=install_%)
uninstall::
cd $(libdir) && $(RM) libwine_tsx11.a libwine_tsx11.so libwine_tsx11.so.$(SOVERSION)
clean::
$(RM) libwine_tsx11.so.$(SOVERSION)
### Dependencies: ### Dependencies:

10
tsx11/locking.c Normal file
View File

@ -0,0 +1,10 @@
/*
* Thread-safe X11 locking stubs
*/
static void nop(void)
{
}
void (*wine_tsx11_lock)(void) = nop;
void (*wine_tsx11_unlock)(void) = nop;

15
tsx11/ts_shape.c
View File

@ -11,28 +11,21 @@
#include <X11/extensions/shape.h> #include <X11/extensions/shape.h>
#include "debugtools.h"
#include "ts_shape.h" #include "ts_shape.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
void TSXShapeCombineRectangles(Display* a0, Window a1, int a2, int a3, int a4, XRectangle* a5, int a6, int a7, int a8) void TSXShapeCombineRectangles(Display* a0, Window a1, int a2, int a3, int a4, XRectangle* a5, int a6, int a7, int a8)
{ {
TRACE("Call XShapeCombineRectangles\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XShapeCombineRectangles(a0, a1, a2, a3, a4, a5, a6, a7, a8); XShapeCombineRectangles(a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShapeCombineRectangles\n");
} }
void TSXShapeCombineMask(Display* a0, Window a1, int a2, int a3, int a4, Pixmap a5, int a6) void TSXShapeCombineMask(Display* a0, Window a1, int a2, int a3, int a4, Pixmap a5, int a6)
{ {
TRACE("Call XShapeCombineMask\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XShapeCombineMask(a0, a1, a2, a3, a4, a5, a6); XShapeCombineMask(a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShapeCombineMask\n");
} }
#endif /* defined(HAVE_LIBXSHAPE) */ #endif /* defined(HAVE_LIBXSHAPE) */

57
tsx11/ts_xf86dga.c
View File

@ -11,108 +11,87 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h> #include <X11/extensions/xf86dga.h>
#include "debugtools.h"
#include "ts_xf86dga.h" #include "ts_xf86dga.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2) Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86DGAQueryVersion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAQueryVersion(a0,a1,a2); r = XF86DGAQueryVersion(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAQueryVersion\n");
return r; return r;
} }
Bool TSXF86DGAQueryExtension(Display*a0,int*a1,int*a2) Bool TSXF86DGAQueryExtension(Display*a0,int*a1,int*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86DGAQueryExtension\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAQueryExtension(a0,a1,a2); r = XF86DGAQueryExtension(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAQueryExtension\n");
return r; return r;
} }
Status TSXF86DGAGetVideo(Display*a0,int a1,char**a2,int*a3,int*a4,int*a5) Status TSXF86DGAGetVideo(Display*a0,int a1,char**a2,int*a3,int*a4,int*a5)
{ {
Status r; Status r;
TRACE("Call XF86DGAGetVideo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAGetVideo(a0,a1,a2,a3,a4,a5); r = XF86DGAGetVideo(a0,a1,a2,a3,a4,a5);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAGetVideo\n");
return r; return r;
} }
Status TSXF86DGADirectVideo(Display*a0,int a1,int a2) Status TSXF86DGADirectVideo(Display*a0,int a1,int a2)
{ {
Status r; Status r;
TRACE("Call XF86DGADirectVideo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGADirectVideo(a0,a1,a2); r = XF86DGADirectVideo(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGADirectVideo\n");
return r; return r;
} }
Status TSXF86DGAGetViewPortSize(Display*a0,int a1,int *a2,int *a3) Status TSXF86DGAGetViewPortSize(Display*a0,int a1,int *a2,int *a3)
{ {
Status r; Status r;
TRACE("Call XF86DGAGetViewPortSize\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAGetViewPortSize(a0,a1,a2,a3); r = XF86DGAGetViewPortSize(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAGetViewPortSize\n");
return r; return r;
} }
Status TSXF86DGASetViewPort(Display*a0,int a1,int a2,int a3) Status TSXF86DGASetViewPort(Display*a0,int a1,int a2,int a3)
{ {
Status r; Status r;
TRACE("Call XF86DGASetViewPort\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGASetViewPort(a0,a1,a2,a3); r = XF86DGASetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGASetViewPort\n");
return r; return r;
} }
Status TSXF86DGAInstallColormap(Display*a0,int a1,Colormap a2) Status TSXF86DGAInstallColormap(Display*a0,int a1,Colormap a2)
{ {
Status r; Status r;
TRACE("Call XF86DGAInstallColormap\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAInstallColormap(a0,a1,a2); r = XF86DGAInstallColormap(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAInstallColormap\n");
return r; return r;
} }
Status TSXF86DGAQueryDirectVideo(Display*a0,int a1,int *a2) Status TSXF86DGAQueryDirectVideo(Display*a0,int a1,int *a2)
{ {
Status r; Status r;
TRACE("Call XF86DGAQueryDirectVideo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAQueryDirectVideo(a0,a1,a2); r = XF86DGAQueryDirectVideo(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAQueryDirectVideo\n");
return r; return r;
} }
Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2) Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
{ {
Status r; Status r;
TRACE("Call XF86DGAViewPortChanged\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86DGAViewPortChanged(a0,a1,a2); r = XF86DGAViewPortChanged(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86DGAViewPortChanged\n");
return r; return r;
} }

111
tsx11/ts_xf86dga2.c
View File

@ -11,188 +11,149 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h> #include <X11/extensions/xf86dga.h>
#include "debugtools.h"
#include "ts_xf86dga2.h" #include "ts_xf86dga2.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXDGAQueryVersion(Display* a0, int* a1, int* a2) Bool TSXDGAQueryVersion(Display* a0, int* a1, int* a2)
{ {
Bool r; Bool r;
TRACE("Call XDGAQueryVersion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGAQueryVersion( a0, a1, a2); r = XDGAQueryVersion( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAQueryVersion\n");
return r; return r;
} }
Bool TSXDGAQueryExtension(Display* a0, int* a1, int* a2) Bool TSXDGAQueryExtension(Display* a0, int* a1, int* a2)
{ {
Bool r; Bool r;
TRACE("Call XDGAQueryExtension\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGAQueryExtension( a0, a1, a2); r = XDGAQueryExtension( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAQueryExtension\n");
return r; return r;
} }
XDGAMode* TSXDGAQueryModes(Display* a0, int a1, int* a2) XDGAMode* TSXDGAQueryModes(Display* a0, int a1, int* a2)
{ {
XDGAMode* r; XDGAMode* r;
TRACE("Call XDGAQueryModes\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGAQueryModes( a0, a1, a2); r = XDGAQueryModes( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAQueryModes\n");
return r; return r;
} }
XDGADevice* TSXDGASetMode(Display* a0, int a1, int a2) XDGADevice* TSXDGASetMode(Display* a0, int a1, int a2)
{ {
XDGADevice* r; XDGADevice* r;
TRACE("Call XDGASetMode\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGASetMode( a0, a1, a2); r = XDGASetMode( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGASetMode\n");
return r; return r;
} }
Bool TSXDGAOpenFramebuffer(Display* a0, int a1) Bool TSXDGAOpenFramebuffer(Display* a0, int a1)
{ {
Bool r; Bool r;
TRACE("Call XDGAOpenFramebuffer\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGAOpenFramebuffer( a0, a1); r = XDGAOpenFramebuffer( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAOpenFramebuffer\n");
return r; return r;
} }
void TSXDGACloseFramebuffer(Display* a0, int a1) void TSXDGACloseFramebuffer(Display* a0, int a1)
{ {
TRACE("Call XDGACloseFramebuffer\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGACloseFramebuffer( a0, a1); XDGACloseFramebuffer( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGACloseFramebuffer\n");
} }
void TSXDGASetViewport(Display* a0, int a1, int a2, int a3, int a4) void TSXDGASetViewport(Display* a0, int a1, int a2, int a3, int a4)
{ {
TRACE("Call XDGASetViewport\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGASetViewport( a0, a1, a2, a3, a4); XDGASetViewport( a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGASetViewport\n");
} }
void TSXDGAInstallColormap(Display* a0, int a1, Colormap a2) void TSXDGAInstallColormap(Display* a0, int a1, Colormap a2)
{ {
TRACE("Call XDGAInstallColormap\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGAInstallColormap( a0, a1, a2); XDGAInstallColormap( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAInstallColormap\n");
} }
Colormap TSXDGACreateColormap(Display* a0, int a1, XDGADevice* a2, int a3) Colormap TSXDGACreateColormap(Display* a0, int a1, XDGADevice* a2, int a3)
{ {
Colormap r; Colormap r;
TRACE("Call XDGACreateColormap\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGACreateColormap( a0, a1, a2, a3); r = XDGACreateColormap( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGACreateColormap\n");
return r; return r;
} }
void TSXDGASelectInput(Display* a0, int a1, long a2) void TSXDGASelectInput(Display* a0, int a1, long a2)
{ {
TRACE("Call XDGASelectInput\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGASelectInput( a0, a1, a2); XDGASelectInput( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGASelectInput\n");
} }
void TSXDGAFillRectangle(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6) void TSXDGAFillRectangle(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6)
{ {
TRACE("Call XDGAFillRectangle\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGAFillRectangle( a0, a1, a2, a3, a4, a5, a6); XDGAFillRectangle( a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAFillRectangle\n");
} }
void TSXDGACopyArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7) void TSXDGACopyArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7)
{ {
TRACE("Call XDGACopyArea\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGACopyArea( a0, a1, a2, a3, a4, a5, a6, a7); XDGACopyArea( a0, a1, a2, a3, a4, a5, a6, a7);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGACopyArea\n");
} }
void TSXDGACopyTransparentArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7, unsigned long a8) void TSXDGACopyTransparentArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7, unsigned long a8)
{ {
TRACE("Call XDGACopyTransparentArea\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGACopyTransparentArea( a0, a1, a2, a3, a4, a5, a6, a7, a8); XDGACopyTransparentArea( a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGACopyTransparentArea\n");
} }
int TSXDGAGetViewportStatus(Display* a0, int a1) int TSXDGAGetViewportStatus(Display* a0, int a1)
{ {
int r; int r;
TRACE("Call XDGAGetViewportStatus\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGAGetViewportStatus( a0, a1); r = XDGAGetViewportStatus( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAGetViewportStatus\n");
return r; return r;
} }
void TSXDGASync(Display* a0, int a1) void TSXDGASync(Display* a0, int a1)
{ {
TRACE("Call XDGASync\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGASync( a0, a1); XDGASync( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGASync\n");
} }
Bool TSXDGASetClientVersion(Display* a0) Bool TSXDGASetClientVersion(Display* a0)
{ {
Bool r; Bool r;
TRACE("Call XDGASetClientVersion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDGASetClientVersion( a0); r = XDGASetClientVersion( a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGASetClientVersion\n");
return r; return r;
} }
void TSXDGAChangePixmapMode(Display* a0, int a1, int* a2, int* a3, int a4) void TSXDGAChangePixmapMode(Display* a0, int a1, int* a2, int* a3, int a4)
{ {
TRACE("Call XDGAChangePixmapMode\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGAChangePixmapMode( a0, a1, a2, a3, a4); XDGAChangePixmapMode( a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAChangePixmapMode\n");
} }
void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1) void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1)
{ {
TRACE("Call XDGAKeyEventToXKeyEvent\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XDGAKeyEventToXKeyEvent( a0, a1); XDGAKeyEventToXKeyEvent( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDGAKeyEventToXKeyEvent\n");
} }
#endif /* defined(HAVE_LIBXXF86DGA2) */ #endif /* defined(HAVE_LIBXXF86DGA2) */

87
tsx11/ts_xf86vmode.c
View File

@ -14,163 +14,132 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#include "debugtools.h"
#include "ts_xf86vmode.h" #include "ts_xf86vmode.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXF86VidModeQueryVersion(Display*a0,int*a1,int*a2) Bool TSXF86VidModeQueryVersion(Display*a0,int*a1,int*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeQueryVersion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeQueryVersion(a0,a1,a2); r = XF86VidModeQueryVersion(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeQueryVersion\n");
return r; return r;
} }
Bool TSXF86VidModeQueryExtension(Display*a0,int*a1,int*a2) Bool TSXF86VidModeQueryExtension(Display*a0,int*a1,int*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeQueryExtension\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeQueryExtension(a0,a2,a2); r = XF86VidModeQueryExtension(a0,a2,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeQueryExtension\n");
return r; return r;
} }
Bool TSXF86VidModeGetModeLine(Display*a0,int a1,int*a2,XF86VidModeModeLine*a3) Bool TSXF86VidModeGetModeLine(Display*a0,int a1,int*a2,XF86VidModeModeLine*a3)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeGetModeLine\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetModeLine(a0,a1,a2,a3); r = XF86VidModeGetModeLine(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeGetModeLine\n");
return r; return r;
} }
Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo***a3) Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo***a3)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeGetAllModeLines\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetAllModeLines(a0,a1,a2,a3); r = XF86VidModeGetAllModeLines(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeGetAllModeLines\n");
return r; return r;
} }
Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3) Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeAddModeLine\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeAddModeLine(a0,a1,a2,a3); r = XF86VidModeAddModeLine(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeAddModeLine\n");
return r; return r;
} }
Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2) Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeDeleteModeLine\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeDeleteModeLine(a0,a1,a2); r = XF86VidModeDeleteModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeDeleteModeLine\n");
return r; return r;
} }
Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2) Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeModModeLine\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeModModeLine(a0,a1,a2); r = XF86VidModeModModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeModModeLine\n");
return r; return r;
} }
Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2) Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{ {
Status r; Status r;
TRACE("Call XF86VidModeValidateModeLine\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeValidateModeLine(a0,a1,a2); r = XF86VidModeValidateModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeValidateModeLine\n");
return r; return r;
} }
Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2) Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeSwitchMode\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeSwitchMode(a0,a1,a2); r = XF86VidModeSwitchMode(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeSwitchMode\n");
return r; return r;
} }
Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2) Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeSwitchToMode\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeSwitchToMode(a0,a1,a2); r = XF86VidModeSwitchToMode(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeSwitchToMode\n");
return r; return r;
} }
Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2) Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeLockModeSwitch\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeLockModeSwitch(a0,a1,a2); r = XF86VidModeLockModeSwitch(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeLockModeSwitch\n");
return r; return r;
} }
Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2) Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeGetMonitor\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetMonitor(a0,a1,a2); r = XF86VidModeGetMonitor(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeGetMonitor\n");
return r; return r;
} }
Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3) Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeGetViewPort\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeGetViewPort(a0,a1,a2,a3); r = XF86VidModeGetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeGetViewPort\n");
return r; return r;
} }
Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3) Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
{ {
Bool r; Bool r;
TRACE("Call XF86VidModeSetViewPort\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XF86VidModeSetViewPort(a0,a1,a2,a3); r = XF86VidModeSetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XF86VidModeSetViewPort\n");
return r; return r;
} }

771
tsx11/ts_xlib.c
View File

File diff suppressed because it is too large Load Diff

15
tsx11/ts_xpm.c
View File

@ -10,31 +10,24 @@
#include <X11/xpm.h> #include <X11/xpm.h>
#include "debugtools.h"
#include "ts_xpm.h" #include "ts_xpm.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
int TSXpmCreatePixmapFromData(Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5) int TSXpmCreatePixmapFromData(Display *a0, Drawable a1, char **a2, Pixmap *a3, Pixmap *a4, XpmAttributes *a5)
{ {
int r; int r;
TRACE("Call XpmCreatePixmapFromData\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XpmCreatePixmapFromData(a0, a1, a2, a3, a4, a5); r = XpmCreatePixmapFromData(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XpmCreatePixmapFromData\n");
return r; return r;
} }
int TSXpmAttributesSize(void) int TSXpmAttributesSize(void)
{ {
int r; int r;
TRACE("Call XpmAttributesSize\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XpmAttributesSize(); r = XpmAttributesSize();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XpmAttributesSize\n");
return r; return r;
} }

39
tsx11/ts_xresource.c
View File

@ -10,72 +10,57 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include "debugtools.h"
#include "ts_xresource.h" #include "ts_xresource.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
XrmQuark TSXrmUniqueQuark(void) XrmQuark TSXrmUniqueQuark(void)
{ {
XrmQuark r; XrmQuark r;
TRACE("Call XrmUniqueQuark\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XrmUniqueQuark(); r = XrmUniqueQuark();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XrmUniqueQuark\n");
return r; return r;
} }
int TSXrmGetResource(XrmDatabase a0, const char* a1, const char* a2, char** a3, XrmValue* a4) int TSXrmGetResource(XrmDatabase a0, const char* a1, const char* a2, char** a3, XrmValue* a4)
{ {
int r; int r;
TRACE("Call XrmGetResource\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XrmGetResource(a0, a1, a2, a3, a4); r = XrmGetResource(a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XrmGetResource\n");
return r; return r;
} }
XrmDatabase TSXrmGetFileDatabase(const char* a0) XrmDatabase TSXrmGetFileDatabase(const char* a0)
{ {
XrmDatabase r; XrmDatabase r;
TRACE("Call XrmGetFileDatabase\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XrmGetFileDatabase(a0); r = XrmGetFileDatabase(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XrmGetFileDatabase\n");
return r; return r;
} }
XrmDatabase TSXrmGetStringDatabase(const char* a0) XrmDatabase TSXrmGetStringDatabase(const char* a0)
{ {
XrmDatabase r; XrmDatabase r;
TRACE("Call XrmGetStringDatabase\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XrmGetStringDatabase(a0); r = XrmGetStringDatabase(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XrmGetStringDatabase\n");
return r; return r;
} }
void TSXrmMergeDatabases(XrmDatabase a0, XrmDatabase* a1) void TSXrmMergeDatabases(XrmDatabase a0, XrmDatabase* a1)
{ {
TRACE("Call XrmMergeDatabases\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XrmMergeDatabases(a0, a1); XrmMergeDatabases(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XrmMergeDatabases\n");
} }
void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const char* a3, int* a4, char** a5) void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const char* a3, int* a4, char** a5)
{ {
TRACE("Call XrmParseCommand\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XrmParseCommand(a0, a1, a2, a3, a4, a5); XrmParseCommand(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XrmParseCommand\n");
} }

57
tsx11/ts_xshm.c
View File

@ -11,108 +11,87 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include "debugtools.h"
#include "ts_xshm.h" #include "ts_xshm.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXShmQueryExtension(Display *a0) Bool TSXShmQueryExtension(Display *a0)
{ {
Bool r; Bool r;
TRACE("Call XShmQueryExtension\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmQueryExtension(a0); r = XShmQueryExtension(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmQueryExtension\n");
return r; return r;
} }
Bool TSXShmQueryVersion(Display *a0, int *a1, int *a2, Bool *a3) Bool TSXShmQueryVersion(Display *a0, int *a1, int *a2, Bool *a3)
{ {
Bool r; Bool r;
TRACE("Call XShmQueryVersion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmQueryVersion(a0, a1, a2, a3); r = XShmQueryVersion(a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmQueryVersion\n");
return r; return r;
} }
int TSXShmPixmapFormat(Display *a0) int TSXShmPixmapFormat(Display *a0)
{ {
int r; int r;
TRACE("Call XShmPixmapFormat\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmPixmapFormat(a0); r = XShmPixmapFormat(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmPixmapFormat\n");
return r; return r;
} }
Status TSXShmAttach(Display *a0, XShmSegmentInfo *a1) Status TSXShmAttach(Display *a0, XShmSegmentInfo *a1)
{ {
Status r; Status r;
TRACE("Call XShmAttach\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmAttach(a0, a1); r = XShmAttach(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmAttach\n");
return r; return r;
} }
Status TSXShmDetach(Display *a0, XShmSegmentInfo *a1) Status TSXShmDetach(Display *a0, XShmSegmentInfo *a1)
{ {
Status r; Status r;
TRACE("Call XShmDetach\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmDetach(a0, a1); r = XShmDetach(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmDetach\n");
return r; return r;
} }
Status TSXShmPutImage(Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10) Status TSXShmPutImage(Display *a0, Drawable a1, GC a2, XImage *a3, int a4, int a5, int a6, int a7, unsigned int a8, unsigned int a9, Bool a10)
{ {
Status r; Status r;
TRACE("Call XShmPutImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); r = XShmPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmPutImage\n");
return r; return r;
} }
Status TSXShmGetImage(Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5) Status TSXShmGetImage(Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5)
{ {
Status r; Status r;
TRACE("Call XShmGetImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmGetImage(a0, a1, a2, a3, a4, a5); r = XShmGetImage(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmGetImage\n");
return r; return r;
} }
XImage * TSXShmCreateImage(Display *a0, Visual *a1, unsigned int a2, int a3, char *a4, XShmSegmentInfo *a5, unsigned int a6, unsigned int a7) XImage * TSXShmCreateImage(Display *a0, Visual *a1, unsigned int a2, int a3, char *a4, XShmSegmentInfo *a5, unsigned int a6, unsigned int a7)
{ {
XImage * r; XImage * r;
TRACE("Call XShmCreateImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmCreateImage(a0, a1, a2, a3, a4, a5, a6, a7); r = XShmCreateImage(a0, a1, a2, a3, a4, a5, a6, a7);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmCreateImage\n");
return r; return r;
} }
Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a3, unsigned int a4, unsigned int a5, unsigned int a6) Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a3, unsigned int a4, unsigned int a5, unsigned int a6)
{ {
Pixmap r; Pixmap r;
TRACE("Call XShmCreatePixmap\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShmCreatePixmap(a0, a1, a2, a3, a4, a5, a6); r = XShmCreatePixmap(a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShmCreatePixmap\n");
return r; return r;
} }

213
tsx11/ts_xutil.c
View File

@ -11,390 +11,317 @@
#include <X11/Xresource.h> #include <X11/Xresource.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "debugtools.h"
#include "ts_xutil.h" #include "ts_xutil.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
XClassHint * TSXAllocClassHint(void) XClassHint * TSXAllocClassHint(void)
{ {
XClassHint * r; XClassHint * r;
TRACE("Call XAllocClassHint\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XAllocClassHint(); r = XAllocClassHint();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XAllocClassHint\n");
return r; return r;
} }
XSizeHints * TSXAllocSizeHints(void) XSizeHints * TSXAllocSizeHints(void)
{ {
XSizeHints * r; XSizeHints * r;
TRACE("Call XAllocSizeHints\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XAllocSizeHints(); r = XAllocSizeHints();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XAllocSizeHints\n");
return r; return r;
} }
XWMHints * TSXAllocWMHints(void) XWMHints * TSXAllocWMHints(void)
{ {
XWMHints * r; XWMHints * r;
TRACE("Call XAllocWMHints\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XAllocWMHints(); r = XAllocWMHints();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XAllocWMHints\n");
return r; return r;
} }
int TSXClipBox(Region a0, XRectangle* a1) int TSXClipBox(Region a0, XRectangle* a1)
{ {
int r; int r;
TRACE("Call XClipBox\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XClipBox(a0, a1); r = XClipBox(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XClipBox\n");
return r; return r;
} }
Region TSXCreateRegion(void) Region TSXCreateRegion(void)
{ {
Region r; Region r;
TRACE("Call XCreateRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XCreateRegion(); r = XCreateRegion();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XCreateRegion\n");
return r; return r;
} }
int TSXDeleteContext(Display* a0, XID a1, XContext a2) int TSXDeleteContext(Display* a0, XID a1, XContext a2)
{ {
int r; int r;
TRACE("Call XDeleteContext\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDeleteContext(a0, a1, a2); r = XDeleteContext(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDeleteContext\n");
return r; return r;
} }
int TSXDestroyRegion(Region a0) int TSXDestroyRegion(Region a0)
{ {
int r; int r;
TRACE("Call XDestroyRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDestroyRegion(a0); r = XDestroyRegion(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDestroyRegion\n");
return r; return r;
} }
int TSXEmptyRegion(Region a0) int TSXEmptyRegion(Region a0)
{ {
int r; int r;
TRACE("Call XEmptyRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XEmptyRegion(a0); r = XEmptyRegion(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XEmptyRegion\n");
return r; return r;
} }
int TSXEqualRegion(Region a0, Region a1) int TSXEqualRegion(Region a0, Region a1)
{ {
int r; int r;
TRACE("Call XEqualRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XEqualRegion(a0, a1); r = XEqualRegion(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XEqualRegion\n");
return r; return r;
} }
int TSXFindContext(Display* a0, XID a1, XContext a2, XPointer* a3) int TSXFindContext(Display* a0, XID a1, XContext a2, XPointer* a3)
{ {
int r; int r;
TRACE("Call XFindContext\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XFindContext(a0, a1, a2, a3); r = XFindContext(a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XFindContext\n");
return r; return r;
} }
XVisualInfo * TSXGetVisualInfo(Display* a0, long a1, XVisualInfo* a2, int* a3) XVisualInfo * TSXGetVisualInfo(Display* a0, long a1, XVisualInfo* a2, int* a3)
{ {
XVisualInfo * r; XVisualInfo * r;
TRACE("Call XGetVisualInfo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XGetVisualInfo(a0, a1, a2, a3); r = XGetVisualInfo(a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XGetVisualInfo\n");
return r; return r;
} }
XWMHints * TSXGetWMHints(Display* a0, Window a1) XWMHints * TSXGetWMHints(Display* a0, Window a1)
{ {
XWMHints * r; XWMHints * r;
TRACE("Call XGetWMHints\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XGetWMHints(a0, a1); r = XGetWMHints(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XGetWMHints\n");
return r; return r;
} }
int TSXGetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, long* a3, Atom a4) int TSXGetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, long* a3, Atom a4)
{ {
int r; int r;
TRACE("Call XGetWMSizeHints\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XGetWMSizeHints(a0, a1, a2, a3, a4); r = XGetWMSizeHints(a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XGetWMSizeHints\n");
return r; return r;
} }
int TSXIntersectRegion(Region a0, Region a1, Region a2) int TSXIntersectRegion(Region a0, Region a1, Region a2)
{ {
int r; int r;
TRACE("Call XIntersectRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XIntersectRegion(a0, a1, a2); r = XIntersectRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XIntersectRegion\n");
return r; return r;
} }
int TSXLookupString(XKeyEvent* a0, char* a1, int a2, KeySym* a3, XComposeStatus* a4) int TSXLookupString(XKeyEvent* a0, char* a1, int a2, KeySym* a3, XComposeStatus* a4)
{ {
int r; int r;
TRACE("Call XLookupString\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XLookupString(a0, a1, a2, a3, a4); r = XLookupString(a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XLookupString\n");
return r; return r;
} }
int TSXOffsetRegion(Region a0, int a1, int a2) int TSXOffsetRegion(Region a0, int a1, int a2)
{ {
int r; int r;
TRACE("Call XOffsetRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XOffsetRegion(a0, a1, a2); r = XOffsetRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XOffsetRegion\n");
return r; return r;
} }
int TSXPointInRegion(Region a0, int a1, int a2) int TSXPointInRegion(Region a0, int a1, int a2)
{ {
int r; int r;
TRACE("Call XPointInRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XPointInRegion(a0, a1, a2); r = XPointInRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XPointInRegion\n");
return r; return r;
} }
Region TSXPolygonRegion(XPoint* a0, int a1, int a2) Region TSXPolygonRegion(XPoint* a0, int a1, int a2)
{ {
Region r; Region r;
TRACE("Call XPolygonRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XPolygonRegion(a0, a1, a2); r = XPolygonRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XPolygonRegion\n");
return r; return r;
} }
int TSXRectInRegion(Region a0, int a1, int a2, unsigned int a3, unsigned int a4) int TSXRectInRegion(Region a0, int a1, int a2, unsigned int a3, unsigned int a4)
{ {
int r; int r;
TRACE("Call XRectInRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XRectInRegion(a0, a1, a2, a3, a4); r = XRectInRegion(a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XRectInRegion\n");
return r; return r;
} }
int TSXSaveContext(Display* a0, XID a1, XContext a2, const char* a3) int TSXSaveContext(Display* a0, XID a1, XContext a2, const char* a3)
{ {
int r; int r;
TRACE("Call XSaveContext\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XSaveContext(a0, a1, a2, a3); r = XSaveContext(a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSaveContext\n");
return r; return r;
} }
int TSXSetClassHint(Display* a0, Window a1, XClassHint* a2) int TSXSetClassHint(Display* a0, Window a1, XClassHint* a2)
{ {
int r; int r;
TRACE("Call XSetClassHint\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XSetClassHint(a0, a1, a2); r = XSetClassHint(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSetClassHint\n");
return r; return r;
} }
int TSXSetWMHints(Display* a0, Window a1, XWMHints* a2) int TSXSetWMHints(Display* a0, Window a1, XWMHints* a2)
{ {
int r; int r;
TRACE("Call XSetWMHints\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XSetWMHints(a0, a1, a2); r = XSetWMHints(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSetWMHints\n");
return r; return r;
} }
void TSXSetWMProperties(Display* a0, Window a1, XTextProperty* a2, XTextProperty* a3, char** a4, int a5, XSizeHints* a6, XWMHints* a7, XClassHint* a8) void TSXSetWMProperties(Display* a0, Window a1, XTextProperty* a2, XTextProperty* a3, char** a4, int a5, XSizeHints* a6, XWMHints* a7, XClassHint* a8)
{ {
TRACE("Call XSetWMProperties\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XSetWMProperties(a0, a1, a2, a3, a4, a5, a6, a7, a8); XSetWMProperties(a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSetWMProperties\n");
} }
void TSXSetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, Atom a3) void TSXSetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, Atom a3)
{ {
TRACE("Call XSetWMSizeHints\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XSetWMSizeHints(a0, a1, a2, a3); XSetWMSizeHints(a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSetWMSizeHints\n");
} }
int TSXSetRegion(Display* a0, GC a1, Region a2) int TSXSetRegion(Display* a0, GC a1, Region a2)
{ {
int r; int r;
TRACE("Call XSetRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XSetRegion(a0, a1, a2); r = XSetRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSetRegion\n");
return r; return r;
} }
int TSXShrinkRegion(Region a0, int a1, int a2) int TSXShrinkRegion(Region a0, int a1, int a2)
{ {
int r; int r;
TRACE("Call XShrinkRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XShrinkRegion(a0, a1, a2); r = XShrinkRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XShrinkRegion\n");
return r; return r;
} }
int TSXStringListToTextProperty(char** a0, int a1, XTextProperty* a2) int TSXStringListToTextProperty(char** a0, int a1, XTextProperty* a2)
{ {
int r; int r;
TRACE("Call XStringListToTextProperty\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XStringListToTextProperty(a0, a1, a2); r = XStringListToTextProperty(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XStringListToTextProperty\n");
return r; return r;
} }
int TSXSubtractRegion(Region a0, Region a1, Region a2) int TSXSubtractRegion(Region a0, Region a1, Region a2)
{ {
int r; int r;
TRACE("Call XSubtractRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XSubtractRegion(a0, a1, a2); r = XSubtractRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSubtractRegion\n");
return r; return r;
} }
int TSXUnionRectWithRegion(XRectangle* a0, Region a1, Region a2) int TSXUnionRectWithRegion(XRectangle* a0, Region a1, Region a2)
{ {
int r; int r;
TRACE("Call XUnionRectWithRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XUnionRectWithRegion(a0, a1, a2); r = XUnionRectWithRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XUnionRectWithRegion\n");
return r; return r;
} }
int TSXUnionRegion(Region a0, Region a1, Region a2) int TSXUnionRegion(Region a0, Region a1, Region a2)
{ {
int r; int r;
TRACE("Call XUnionRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XUnionRegion(a0, a1, a2); r = XUnionRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XUnionRegion\n");
return r; return r;
} }
int TSXXorRegion(Region a0, Region a1, Region a2) int TSXXorRegion(Region a0, Region a1, Region a2)
{ {
int r; int r;
TRACE("Call XXorRegion\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XXorRegion(a0, a1, a2); r = XXorRegion(a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XXorRegion\n");
return r; return r;
} }
int TSXDestroyImage(struct _XImage *a0) int TSXDestroyImage(struct _XImage *a0)
{ {
int r; int r;
TRACE("Call XDestroyImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XDestroyImage(a0); r = XDestroyImage(a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XDestroyImage\n");
return r; return r;
} }
struct _XImage * TSXSubImage(struct _XImage *a0, int a1, int a2, unsigned int a3, unsigned int a4) struct _XImage * TSXSubImage(struct _XImage *a0, int a1, int a2, unsigned int a3, unsigned int a4)
{ {
struct _XImage * r; struct _XImage * r;
TRACE("Call XSubImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XSubImage(a0, a1, a2, a3, a4); r = XSubImage(a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XSubImage\n");
return r; return r;
} }
int TSXAddPixel(struct _XImage *a0, long a1) int TSXAddPixel(struct _XImage *a0, long a1)
{ {
int r; int r;
TRACE("Call XAddPixel\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XAddPixel(a0, a1); r = XAddPixel(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XAddPixel\n");
return r; return r;
} }
XContext TSXUniqueContext(void) XContext TSXUniqueContext(void)
{ {
XContext r; XContext r;
TRACE("Call XUniqueContext\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XUniqueContext(); r = XUniqueContext();
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XUniqueContext\n");
return r; return r;
} }

141
tsx11/ts_xvideo.c
View File

@ -13,258 +13,209 @@
#include <X11/extensions/XShm.h> #include <X11/extensions/XShm.h>
#include <X11/extensions/Xvlib.h> #include <X11/extensions/Xvlib.h>
#include "debugtools.h"
#include "ts_xvideo.h" #include "ts_xvideo.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
int TSXvQueryExtension(Display* a0, unsigned int* a1, unsigned int* a2, unsigned int* a3, unsigned int* a4, unsigned int* a5) int TSXvQueryExtension(Display* a0, unsigned int* a1, unsigned int* a2, unsigned int* a3, unsigned int* a4, unsigned int* a5)
{ {
int r; int r;
TRACE("Call XvQueryExtension\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvQueryExtension( a0, a1, a2, a3, a4, a5); r = XvQueryExtension( a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvQueryExtension\n");
return r; return r;
} }
int TSXvQueryAdaptors(Display* a0, Window a1, unsigned int* a2, XvAdaptorInfo** a3) int TSXvQueryAdaptors(Display* a0, Window a1, unsigned int* a2, XvAdaptorInfo** a3)
{ {
int r; int r;
TRACE("Call XvQueryAdaptors\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvQueryAdaptors( a0, a1, a2, a3); r = XvQueryAdaptors( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvQueryAdaptors\n");
return r; return r;
} }
int TSXvQueryEncodings(Display* a0, XvPortID a1, unsigned int* a2, XvEncodingInfo** a3) int TSXvQueryEncodings(Display* a0, XvPortID a1, unsigned int* a2, XvEncodingInfo** a3)
{ {
int r; int r;
TRACE("Call XvQueryEncodings\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvQueryEncodings( a0, a1, a2, a3); r = XvQueryEncodings( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvQueryEncodings\n");
return r; return r;
} }
int TSXvPutVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) int TSXvPutVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
{ {
int r; int r;
TRACE("Call XvPutVideo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvPutVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); r = XvPutVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvPutVideo\n");
return r; return r;
} }
int TSXvPutStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) int TSXvPutStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
{ {
int r; int r;
TRACE("Call XvPutStill\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvPutStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); r = XvPutStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvPutStill\n");
return r; return r;
} }
int TSXvGetVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) int TSXvGetVideo(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
{ {
int r; int r;
TRACE("Call XvGetVideo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvGetVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); r = XvGetVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvGetVideo\n");
return r; return r;
} }
int TSXvGetStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11) int TSXvGetStill(Display* a0, XvPortID a1, Drawable a2, GC a3, int a4, int a5, unsigned int a6, unsigned int a7, int a8, int a9, unsigned int a10, unsigned int a11)
{ {
int r; int r;
TRACE("Call XvGetStill\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvGetStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11); r = XvGetStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvGetStill\n");
return r; return r;
} }
int TSXvStopVideo(Display* a0, XvPortID a1, Drawable a2) int TSXvStopVideo(Display* a0, XvPortID a1, Drawable a2)
{ {
int r; int r;
TRACE("Call XvStopVideo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvStopVideo( a0, a1, a2); r = XvStopVideo( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvStopVideo\n");
return r; return r;
} }
int TSXvGrabPort(Display* a0, XvPortID a1, Time a2) int TSXvGrabPort(Display* a0, XvPortID a1, Time a2)
{ {
int r; int r;
TRACE("Call XvGrabPort\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvGrabPort( a0, a1, a2); r = XvGrabPort( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvGrabPort\n");
return r; return r;
} }
int TSXvUngrabPort(Display* a0, XvPortID a1, Time a2) int TSXvUngrabPort(Display* a0, XvPortID a1, Time a2)
{ {
int r; int r;
TRACE("Call XvUngrabPort\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvUngrabPort( a0, a1, a2); r = XvUngrabPort( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvUngrabPort\n");
return r; return r;
} }
int TSXvSelectVideoNotify(Display* a0, Drawable a1, Bool a2) int TSXvSelectVideoNotify(Display* a0, Drawable a1, Bool a2)
{ {
int r; int r;
TRACE("Call XvSelectVideoNotify\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvSelectVideoNotify( a0, a1, a2); r = XvSelectVideoNotify( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvSelectVideoNotify\n");
return r; return r;
} }
int TSXvSelectPortNotify(Display* a0, XvPortID a1, Bool a2) int TSXvSelectPortNotify(Display* a0, XvPortID a1, Bool a2)
{ {
int r; int r;
TRACE("Call XvSelectPortNotify\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvSelectPortNotify( a0, a1, a2); r = XvSelectPortNotify( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvSelectPortNotify\n");
return r; return r;
} }
int TSXvSetPortAttribute(Display* a0, XvPortID a1, Atom a2, int a3) int TSXvSetPortAttribute(Display* a0, XvPortID a1, Atom a2, int a3)
{ {
int r; int r;
TRACE("Call XvSetPortAttribute\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvSetPortAttribute( a0, a1, a2, a3); r = XvSetPortAttribute( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvSetPortAttribute\n");
return r; return r;
} }
int TSXvGetPortAttribute(Display* a0, XvPortID a1, Atom a2, int* a3) int TSXvGetPortAttribute(Display* a0, XvPortID a1, Atom a2, int* a3)
{ {
int r; int r;
TRACE("Call XvGetPortAttribute\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvGetPortAttribute( a0, a1, a2, a3); r = XvGetPortAttribute( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvGetPortAttribute\n");
return r; return r;
} }
int TSXvQueryBestSize(Display* a0, XvPortID a1, Bool a2, unsigned int a3, unsigned int a4, unsigned int a5, unsigned int a6, unsigned int* a7, unsigned int* a8) int TSXvQueryBestSize(Display* a0, XvPortID a1, Bool a2, unsigned int a3, unsigned int a4, unsigned int a5, unsigned int a6, unsigned int* a7, unsigned int* a8)
{ {
int r; int r;
TRACE("Call XvQueryBestSize\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvQueryBestSize( a0, a1, a2, a3, a4, a5, a6, a7, a8); r = XvQueryBestSize( a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvQueryBestSize\n");
return r; return r;
} }
XvAttribute* TSXvQueryPortAttributes(Display* a0, XvPortID a1, int* a2) XvAttribute* TSXvQueryPortAttributes(Display* a0, XvPortID a1, int* a2)
{ {
XvAttribute* r; XvAttribute* r;
TRACE("Call XvQueryPortAttributes\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvQueryPortAttributes( a0, a1, a2); r = XvQueryPortAttributes( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvQueryPortAttributes\n");
return r; return r;
} }
void TSXvFreeAdaptorInfo(XvAdaptorInfo* a0) void TSXvFreeAdaptorInfo(XvAdaptorInfo* a0)
{ {
TRACE("Call XvFreeAdaptorInfo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XvFreeAdaptorInfo( a0); XvFreeAdaptorInfo( a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvFreeAdaptorInfo\n");
} }
void TSXvFreeEncodingInfo(XvEncodingInfo* a0) void TSXvFreeEncodingInfo(XvEncodingInfo* a0)
{ {
TRACE("Call XvFreeEncodingInfo\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
XvFreeEncodingInfo( a0); XvFreeEncodingInfo( a0);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvFreeEncodingInfo\n");
} }
XvImageFormatValues * TSXvListImageFormats(Display* a0, XvPortID a1, int* a2) XvImageFormatValues * TSXvListImageFormats(Display* a0, XvPortID a1, int* a2)
{ {
XvImageFormatValues * r; XvImageFormatValues * r;
TRACE("Call XvListImageFormats\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvListImageFormats( a0, a1, a2); r = XvListImageFormats( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvListImageFormats\n");
return r; return r;
} }
XvImage * TSXvCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5) XvImage * TSXvCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5)
{ {
XvImage * r; XvImage * r;
TRACE("Call XvCreateImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvCreateImage( a0, a1, a2, a3, a4, a5); r = XvCreateImage( a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvCreateImage\n");
return r; return r;
} }
int TSXvPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12) int TSXvPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12)
{ {
int r; int r;
TRACE("Call XvPutImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12); r = XvPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvPutImage\n");
return r; return r;
} }
int TSXvShmPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12, Bool a13) int TSXvShmPutImage(Display* a0, XvPortID a1, Drawable a2, GC a3, XvImage* a4, int a5, int a6, unsigned int a7, unsigned int a8, int a9, int a10, unsigned int a11, unsigned int a12, Bool a13)
{ {
int r; int r;
TRACE("Call XvShmPutImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvShmPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13); r = XvShmPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvShmPutImage\n");
return r; return r;
} }
XvImage * TSXvShmCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5, XShmSegmentInfo* a6) XvImage * TSXvShmCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5, XShmSegmentInfo* a6)
{ {
XvImage * r; XvImage * r;
TRACE("Call XvShmCreateImage\n"); wine_tsx11_lock();
EnterCriticalSection( &X11DRV_CritSection );
r = XvShmCreateImage( a0, a1, a2, a3, a4, a5, a6); r = XvShmCreateImage( a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection ); wine_tsx11_unlock();
TRACE("Ret XvShmCreateImage\n");
return r; return r;
} }