Skip to content

W
wine-cw
Commit b018239f authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Build tsx11 layer as a separate shared library.

parent 886604c7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 304 additions and 386 deletions
Make.rules.in
View file @ b018239f
......@@ -60,8 +60,12 @@ WINEBUILD = $(TOPOBJDIR)/tools/winebuild/winebuild
MAKEDEP = $(TOPOBJDIR)/tools/makedep
WRC = $(TOPOBJDIR)/tools/wrc/wrc
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
LIBWINE = -L$(TOPOBJDIR)/library -lwine
LIBTSX11 = -L$(TOPOBJDIR)/tsx11 -lwine_tsx11
LIBUNICODE= -L$(TOPOBJDIR)/unicode -lwine_unicode
@SET_MAKE@
# Installation infos
......@@ -175,7 +179,7 @@ DLLS = \
$(LDPATH) $(WRC) $(WRCFLAGS) $(DIVINCL) -o $@ -r $<
.spec.spec.c:
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L $(DLLDIR) -o $@ -spec $<
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -L$(DLLDIR) -o $@ -spec $<
.c.glue.c:
$(LDPATH) $(WINEBUILD) @DLLFLAGS@ -o $@ -glue $<
......@@ -198,7 +202,7 @@ $(MODULE).tmp.o: $(OBJS) Makefile.in
# Rule for main module spec file
$(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
......
Makefile.in
View file @ b018239f
......@@ -33,8 +33,15 @@ LIBPROGRAMS = \
# Libraries (not dlls) to build
LIBRARIES = \
library/libwine.$(LIBEXT) \
tsx11/libwine_tsx11.$(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
SUBDIRS = \
debugger \
......@@ -47,6 +54,7 @@ SUBDIRS = \
programs \
server \
tools \
tsx11 \
unicode
# Sub-directories to run make install into
......@@ -58,6 +66,7 @@ INSTALLSUBDIRS = \
library \
server \
tools \
tsx11 \
unicode
EMUOBJS = \
......@@ -65,7 +74,7 @@ EMUOBJS = \
DLLOBJS = $(DLLS:%=dlls/lib%.@LIBEXT@)
all: Make.rules $(PROGRAMS) $(LIBPROGRAMS) wine
all: Make.rules $(PROGRAMS) $(LIBPROGRAMS) $(LIBSYMLINKS) wine
@echo "Wine build complete."
WINAPI_CHECK_EXTRA_FLAGS = --global
......@@ -76,7 +85,7 @@ Make.rules: Make.rules.in configure
@echo $? is newer than 'Make.rules', please rerun ./configure!
@exit 1
wine: libwine.$(LIBEXT) libwine_unicode.$(LIBEXT) dlls $(EMUOBJS)
wine: dlls $(EMUOBJS)
$(CC) -o wine $(EMUOBJS) $(DLL_LINK) $(LIBS) $(LDFLAGS)
install:: all $(INSTALLSUBDIRS:%=%/__install__)
......@@ -94,6 +103,9 @@ $(EMUOBJS) $(DLLOBJS) $(PROGRAMS) $(LIBPROGRAMS) $(LIBRARIES): dummy
libwine.$(LIBEXT): 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)
$(RM) $@ && $(LN_S) unicode/libwine_unicode.$(LIBEXT) $@
......@@ -103,14 +115,14 @@ $(DLLOBJS) $(PROGRAMS): tools
$(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::
$(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
@cd programs && $(MAKE) install
......@@ -136,7 +148,7 @@ clean::
$(RM) wine
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`
# We depend on configure above for checks, so we better don't use this rule.
......
configure
View file @ b018239f
......@@ -4825,9 +4825,9 @@ DLLFLAGS=""
if test "$LIBEXT" = "so"; then
DLLFLAGS="-fPIC"
DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode"
DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) \$(LIBWINE) \$(LIBUNICODE)"
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 "configure:4833: checking whether the linker supports --[no]-whole-archive (Linux)" >&5
if eval "test \"`echo '$''{'ac_cv_c_whole_archive'+set}'`\" = set"; then
......
configure.in
View file @ b018239f
......@@ -575,9 +575,9 @@ DLLFLAGS=""
if test "$LIBEXT" = "so"; then
DLLFLAGS="-fPIC"
DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) -L\$(TOPOBJDIR) -lwine -lwine_unicode"
DLL_LINK="-L\$(DLLDIR) \$(IMPORTS:%=-l%) \$(LIBWINE) \$(LIBUNICODE)"
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_cv_c_whole_archive,
[saved_cflags=$CFLAGS
......
dlls/x11drv/Makefile.in
View file @ b018239f
......@@ -3,8 +3,7 @@ TOPOBJDIR = ../..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = x11drv
SOVERSION = 1.0
EXTRALIBS = $(X_LIBS) $(XLIB)
EXTRALIBS = $(LIBTSX11) $(X_LIBS) $(XLIB)
IMPORTS = user32 gdi32 kernel32
C_SRCS = \
......@@ -15,12 +14,10 @@ PROGRAMS = \
EXTRA_OBJS = \
$(TOPOBJDIR)/graphics/x11drv/x11drv.o \
$(TOPOBJDIR)/tsx11/tsx11.o \
$(TOPOBJDIR)/windows/x11drv/x11drv.o
SUBDIRS = \
$(TOPOBJDIR)/graphics/x11drv \
$(TOPOBJDIR)/tsx11 \
$(TOPOBJDIR)/windows/x11drv
@MAKE_DLL_RULES@
......
dlls/x11drv/x11drv_main.c
View file @ b018239f
......@@ -34,6 +34,8 @@
DEFAULT_DEBUG_CHANNEL(x11drv);
static XKeyboardState keyboard_state;
static void (*old_tsx11_lock)(void);
static void (*old_tsx11_unlock)(void);
Display *display;
Screen *screen;
......@@ -54,6 +56,21 @@ static int error_handler(Display *display, XErrorEvent *error_evt)
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
......@@ -256,6 +273,12 @@ 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 = lock_tsx11;
wine_tsx11_unlock = unlock_tsx11;
/* Open display */
if (!(display = TSXOpenDisplay( Options.display )))
......@@ -339,8 +362,11 @@ static void process_detach(void)
/* cleanup GDI */
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 */
XCloseDisplay( display );
display = NULL;
......
include/ts_shape.h
View file @ b018239f
......@@ -16,6 +16,9 @@
#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 TSXShapeCombineMask(Display*, Window, int, int, int, Pixmap, int);
......
include/ts_xf86dga.h
View file @ b018239f
......@@ -16,6 +16,9 @@
#include <X11/Xlib.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 TSXF86DGAQueryExtension(Display*,int*,int*);
extern Status TSXF86DGAGetVideo(Display*,int,char**,int*,int*,int*);
......
include/ts_xf86dga2.h
View file @ b018239f
......@@ -16,6 +16,9 @@
#include <X11/Xlib.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 TSXDGAQueryExtension(Display*, int*, int*);
extern XDGAMode* TSXDGAQueryModes(Display*, int, int*);
......
include/ts_xf86vmode.h
View file @ b018239f
......@@ -19,6 +19,9 @@
#include <X11/Xlib.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 TSXF86VidModeQueryExtension(Display*,int*,int*);
extern Bool TSXF86VidModeGetModeLine(Display*,int,int*,XF86VidModeModeLine*);
......
include/ts_xlib.h
View file @ b018239f
......@@ -14,6 +14,9 @@
#include <X11/Xlib.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XFontStruct * TSXLoadQueryFont(Display*, const char*);
extern XModifierKeymap * TSXGetModifierMapping(Display*);
extern XImage * TSXCreateImage(Display*, Visual*, unsigned int, int, int, char*, unsigned int, unsigned int, int, int);
......
include/ts_xpm.h
View file @ b018239f
......@@ -15,6 +15,9 @@
#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 TSXpmAttributesSize(void);
......
include/ts_xresource.h
View file @ b018239f
......@@ -15,6 +15,9 @@
#include <X11/Xlib.h>
#include <X11/Xresource.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XrmQuark TSXrmUniqueQuark(void);
extern int TSXrmGetResource(XrmDatabase, const char*, const char*, char**, XrmValue*);
extern XrmDatabase TSXrmGetFileDatabase(const char*);
......
include/ts_xshm.h
View file @ b018239f
......@@ -16,6 +16,9 @@
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern Bool TSXShmQueryExtension(Display *);
extern Bool TSXShmQueryVersion(Display *, int *, int *, Bool *);
extern int TSXShmPixmapFormat(Display *);
......
include/ts_xutil.h
View file @ b018239f
......@@ -16,6 +16,9 @@
#include <X11/Xresource.h>
#include <X11/Xutil.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XClassHint * TSXAllocClassHint(void);
extern XSizeHints * TSXAllocSizeHints(void);
extern XWMHints * TSXAllocWMHints(void);
......
include/ts_xvideo.h
View file @ b018239f
......@@ -18,6 +18,9 @@
#include <X11/extensions/XShm.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 TSXvQueryAdaptors(Display*, Window, unsigned int*, XvAdaptorInfo**);
extern int TSXvQueryEncodings(Display*, XvPortID, unsigned int*, XvEncodingInfo**);
......
tools/make_X11wrappers
View file @ b018239f
......@@ -112,6 +112,9 @@ foreach $name (@dolist) {
$pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h>
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
END
print OUTC <<END;
......@@ -126,11 +129,8 @@ END
$pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h>
#include "debugtools.h"
#include "ts_$lcname.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
END
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 OUTC "{\n";
print OUTC " $resultdecl;\n" if $resultdecl;
print OUTC " TRACE(\"Call $fn_name\\n\");\n";
print OUTC " EnterCriticalSection( &X11DRV_CritSection );\n";
print OUTC " wine_tsx11_lock();\n";
print OUTC " ";
print OUTC "r = " if $resultdecl;
print OUTC "$fn_name($actuals);\n";
print OUTC " LeaveCriticalSection( &X11DRV_CritSection );\n";
print OUTC " TRACE(\"Ret $fn_name\\n\");\n";
print OUTC " wine_tsx11_unlock();\n";
print OUTC " return r;\n" if $resultdecl;
print OUTC "}\n";
$want{$fn_name} = 2;
......
tsx11/.cvsignore
View file @ b018239f
Makefile
libwine_tsx11.so.1.0
tsx11/Makefile.in
View file @ b018239f
......@@ -3,9 +3,14 @@ TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ..
SRCDIR = @srcdir@
VPATH = @srcdir@
MODULE = tsx11
LIBEXT = @LIBEXT@
MODULE = none
SOVERSION = 1.0
SONAME = libwine_tsx11.so
EXTRALIBS = $(X_LIBS) $(XLIB)
C_SRCS = \
locking.c \
ts_xf86dga.c \
ts_xf86dga2.c \
ts_xf86vmode.c \
......@@ -17,11 +22,36 @@ C_SRCS = \
ts_shape.c \
ts_xpm.c
all: $(MODULE).o
all: libwine_tsx11.$(LIBEXT)
@MAKE_RULES@
$(MODULE).o: $(OBJS) Makefile.in $(TOPSRCDIR)/Make.rules.in
$(LDCOMBINE) $(OBJS) -o $@
libwine_tsx11.so.$(SOVERSION): $(OBJS)
$(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:
tsx11/locking.c 0 → 100644
View file @ b018239f
/*
* Thread-safe X11 locking stubs
*/
static void nop(void)
{
}
void (*wine_tsx11_lock)(void) = nop;
void (*wine_tsx11_unlock)(void) = nop;
tsx11/ts_shape.c
View file @ b018239f
......@@ -11,28 +11,21 @@
#include <X11/extensions/shape.h>
#include "debugtools.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)
{
TRACE("Call XShapeCombineRectangles\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XShapeCombineRectangles(a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShapeCombineRectangles\n");
wine_tsx11_unlock();
}
void TSXShapeCombineMask(Display* a0, Window a1, int a2, int a3, int a4, Pixmap a5, int a6)
{
TRACE("Call XShapeCombineMask\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XShapeCombineMask(a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShapeCombineMask\n");
wine_tsx11_unlock();
}
#endif /* defined(HAVE_LIBXSHAPE) */
......
tsx11/ts_xf86dga.c
View file @ b018239f
......@@ -11,108 +11,87 @@
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
#include "debugtools.h"
#include "ts_xf86dga.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2)
{
Bool r;
TRACE("Call XF86DGAQueryVersion\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAQueryVersion(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAQueryVersion\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86DGAQueryExtension(Display*a0,int*a1,int*a2)
{
Bool r;
TRACE("Call XF86DGAQueryExtension\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAQueryExtension(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAQueryExtension\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAGetVideo(Display*a0,int a1,char**a2,int*a3,int*a4,int*a5)
{
Status r;
TRACE("Call XF86DGAGetVideo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAGetVideo(a0,a1,a2,a3,a4,a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAGetVideo\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGADirectVideo(Display*a0,int a1,int a2)
{
Status r;
TRACE("Call XF86DGADirectVideo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGADirectVideo(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGADirectVideo\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAGetViewPortSize(Display*a0,int a1,int *a2,int *a3)
{
Status r;
TRACE("Call XF86DGAGetViewPortSize\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAGetViewPortSize(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAGetViewPortSize\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGASetViewPort(Display*a0,int a1,int a2,int a3)
{
Status r;
TRACE("Call XF86DGASetViewPort\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGASetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGASetViewPort\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAInstallColormap(Display*a0,int a1,Colormap a2)
{
Status r;
TRACE("Call XF86DGAInstallColormap\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAInstallColormap(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAInstallColormap\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAQueryDirectVideo(Display*a0,int a1,int *a2)
{
Status r;
TRACE("Call XF86DGAQueryDirectVideo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAQueryDirectVideo(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAQueryDirectVideo\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
{
Status r;
TRACE("Call XF86DGAViewPortChanged\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86DGAViewPortChanged(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86DGAViewPortChanged\n");
wine_tsx11_unlock();
return r;
}
......
tsx11/ts_xf86dga2.c
View file @ b018239f
......@@ -11,188 +11,149 @@
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
#include "debugtools.h"
#include "ts_xf86dga2.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXDGAQueryVersion(Display* a0, int* a1, int* a2)
{
Bool r;
TRACE("Call XDGAQueryVersion\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGAQueryVersion( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAQueryVersion\n");
wine_tsx11_unlock();
return r;
}
Bool TSXDGAQueryExtension(Display* a0, int* a1, int* a2)
{
Bool r;
TRACE("Call XDGAQueryExtension\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGAQueryExtension( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAQueryExtension\n");
wine_tsx11_unlock();
return r;
}
XDGAMode* TSXDGAQueryModes(Display* a0, int a1, int* a2)
{
XDGAMode* r;
TRACE("Call XDGAQueryModes\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGAQueryModes( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAQueryModes\n");
wine_tsx11_unlock();
return r;
}
XDGADevice* TSXDGASetMode(Display* a0, int a1, int a2)
{
XDGADevice* r;
TRACE("Call XDGASetMode\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGASetMode( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGASetMode\n");
wine_tsx11_unlock();
return r;
}
Bool TSXDGAOpenFramebuffer(Display* a0, int a1)
{
Bool r;
TRACE("Call XDGAOpenFramebuffer\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGAOpenFramebuffer( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAOpenFramebuffer\n");
wine_tsx11_unlock();
return r;
}
void TSXDGACloseFramebuffer(Display* a0, int a1)
{
TRACE("Call XDGACloseFramebuffer\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGACloseFramebuffer( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGACloseFramebuffer\n");
wine_tsx11_unlock();
}
void TSXDGASetViewport(Display* a0, int a1, int a2, int a3, int a4)
{
TRACE("Call XDGASetViewport\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGASetViewport( a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGASetViewport\n");
wine_tsx11_unlock();
}
void TSXDGAInstallColormap(Display* a0, int a1, Colormap a2)
{
TRACE("Call XDGAInstallColormap\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGAInstallColormap( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAInstallColormap\n");
wine_tsx11_unlock();
}
Colormap TSXDGACreateColormap(Display* a0, int a1, XDGADevice* a2, int a3)
{
Colormap r;
TRACE("Call XDGACreateColormap\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGACreateColormap( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGACreateColormap\n");
wine_tsx11_unlock();
return r;
}
void TSXDGASelectInput(Display* a0, int a1, long a2)
{
TRACE("Call XDGASelectInput\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGASelectInput( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGASelectInput\n");
wine_tsx11_unlock();
}
void TSXDGAFillRectangle(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6)
{
TRACE("Call XDGAFillRectangle\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGAFillRectangle( a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAFillRectangle\n");
wine_tsx11_unlock();
}
void TSXDGACopyArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7)
{
TRACE("Call XDGACopyArea\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGACopyArea( a0, a1, a2, a3, a4, a5, a6, a7);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGACopyArea\n");
wine_tsx11_unlock();
}
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");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGACopyTransparentArea( a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGACopyTransparentArea\n");
wine_tsx11_unlock();
}
int TSXDGAGetViewportStatus(Display* a0, int a1)
{
int r;
TRACE("Call XDGAGetViewportStatus\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGAGetViewportStatus( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAGetViewportStatus\n");
wine_tsx11_unlock();
return r;
}
void TSXDGASync(Display* a0, int a1)
{
TRACE("Call XDGASync\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGASync( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGASync\n");
wine_tsx11_unlock();
}
Bool TSXDGASetClientVersion(Display* a0)
{
Bool r;
TRACE("Call XDGASetClientVersion\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XDGASetClientVersion( a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGASetClientVersion\n");
wine_tsx11_unlock();
return r;
}
void TSXDGAChangePixmapMode(Display* a0, int a1, int* a2, int* a3, int a4)
{
TRACE("Call XDGAChangePixmapMode\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGAChangePixmapMode( a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAChangePixmapMode\n");
wine_tsx11_unlock();
}
void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1)
{
TRACE("Call XDGAKeyEventToXKeyEvent\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XDGAKeyEventToXKeyEvent( a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XDGAKeyEventToXKeyEvent\n");
wine_tsx11_unlock();
}
#endif /* defined(HAVE_LIBXXF86DGA2) */
......
tsx11/ts_xf86vmode.c
View file @ b018239f
......@@ -14,163 +14,132 @@
#include <X11/Xlib.h>
#include <X11/extensions/xf86vmode.h>
#include "debugtools.h"
#include "ts_xf86vmode.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXF86VidModeQueryVersion(Display*a0,int*a1,int*a2)
{
Bool r;
TRACE("Call XF86VidModeQueryVersion\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeQueryVersion(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeQueryVersion\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeQueryExtension(Display*a0,int*a1,int*a2)
{
Bool r;
TRACE("Call XF86VidModeQueryExtension\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeQueryExtension(a0,a2,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeQueryExtension\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeGetModeLine(Display*a0,int a1,int*a2,XF86VidModeModeLine*a3)
{
Bool r;
TRACE("Call XF86VidModeGetModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeGetModeLine(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeGetModeLine\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo***a3)
{
Bool r;
TRACE("Call XF86VidModeGetAllModeLines\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeGetAllModeLines(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeGetAllModeLines\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3)
{
Bool r;
TRACE("Call XF86VidModeAddModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeAddModeLine(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeAddModeLine\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Bool r;
TRACE("Call XF86VidModeDeleteModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeDeleteModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeDeleteModeLine\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2)
{
Bool r;
TRACE("Call XF86VidModeModModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeModModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeModModeLine\n");
wine_tsx11_unlock();
return r;
}
Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Status r;
TRACE("Call XF86VidModeValidateModeLine\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeValidateModeLine(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeValidateModeLine\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2)
{
Bool r;
TRACE("Call XF86VidModeSwitchMode\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeSwitchMode(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeSwitchMode\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Bool r;
TRACE("Call XF86VidModeSwitchToMode\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeSwitchToMode(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeSwitchToMode\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2)
{
Bool r;
TRACE("Call XF86VidModeLockModeSwitch\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeLockModeSwitch(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeLockModeSwitch\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2)
{
Bool r;
TRACE("Call XF86VidModeGetMonitor\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeGetMonitor(a0,a1,a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeGetMonitor\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3)
{
Bool r;
TRACE("Call XF86VidModeGetViewPort\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeGetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeGetViewPort\n");
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
{
Bool r;
TRACE("Call XF86VidModeSetViewPort\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XF86VidModeSetViewPort(a0,a1,a2,a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XF86VidModeSetViewPort\n");
wine_tsx11_unlock();
return r;
}
......
tsx11/ts_xpm.c
View file @ b018239f
......@@ -10,31 +10,24 @@
#include <X11/xpm.h>
#include "debugtools.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 r;
TRACE("Call XpmCreatePixmapFromData\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XpmCreatePixmapFromData(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XpmCreatePixmapFromData\n");
wine_tsx11_unlock();
return r;
}
int TSXpmAttributesSize(void)
{
int r;
TRACE("Call XpmAttributesSize\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XpmAttributesSize();
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XpmAttributesSize\n");
wine_tsx11_unlock();
return r;
}
......
tsx11/ts_xresource.c
View file @ b018239f
......@@ -10,72 +10,57 @@
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include "debugtools.h"
#include "ts_xresource.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
XrmQuark TSXrmUniqueQuark(void)
{
XrmQuark r;
TRACE("Call XrmUniqueQuark\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XrmUniqueQuark();
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XrmUniqueQuark\n");
wine_tsx11_unlock();
return r;
}
int TSXrmGetResource(XrmDatabase a0, const char* a1, const char* a2, char** a3, XrmValue* a4)
{
int r;
TRACE("Call XrmGetResource\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XrmGetResource(a0, a1, a2, a3, a4);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XrmGetResource\n");
wine_tsx11_unlock();
return r;
}
XrmDatabase TSXrmGetFileDatabase(const char* a0)
{
XrmDatabase r;
TRACE("Call XrmGetFileDatabase\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XrmGetFileDatabase(a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XrmGetFileDatabase\n");
wine_tsx11_unlock();
return r;
}
XrmDatabase TSXrmGetStringDatabase(const char* a0)
{
XrmDatabase r;
TRACE("Call XrmGetStringDatabase\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XrmGetStringDatabase(a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XrmGetStringDatabase\n");
wine_tsx11_unlock();
return r;
}
void TSXrmMergeDatabases(XrmDatabase a0, XrmDatabase* a1)
{
TRACE("Call XrmMergeDatabases\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XrmMergeDatabases(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XrmMergeDatabases\n");
wine_tsx11_unlock();
}
void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const char* a3, int* a4, char** a5)
{
TRACE("Call XrmParseCommand\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XrmParseCommand(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XrmParseCommand\n");
wine_tsx11_unlock();
}
tsx11/ts_xshm.c
View file @ b018239f
......@@ -11,108 +11,87 @@
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
#include "debugtools.h"
#include "ts_xshm.h"
#include "x11drv.h"
DEFAULT_DEBUG_CHANNEL(x11);
Bool TSXShmQueryExtension(Display *a0)
{
Bool r;
TRACE("Call XShmQueryExtension\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmQueryExtension(a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmQueryExtension\n");
wine_tsx11_unlock();
return r;
}
Bool TSXShmQueryVersion(Display *a0, int *a1, int *a2, Bool *a3)
{
Bool r;
TRACE("Call XShmQueryVersion\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmQueryVersion(a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmQueryVersion\n");
wine_tsx11_unlock();
return r;
}
int TSXShmPixmapFormat(Display *a0)
{
int r;
TRACE("Call XShmPixmapFormat\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmPixmapFormat(a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmPixmapFormat\n");
wine_tsx11_unlock();
return r;
}
Status TSXShmAttach(Display *a0, XShmSegmentInfo *a1)
{
Status r;
TRACE("Call XShmAttach\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmAttach(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmAttach\n");
wine_tsx11_unlock();
return r;
}
Status TSXShmDetach(Display *a0, XShmSegmentInfo *a1)
{
Status r;
TRACE("Call XShmDetach\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmDetach(a0, a1);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmDetach\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XShmPutImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmPutImage\n");
wine_tsx11_unlock();
return r;
}
Status TSXShmGetImage(Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5)
{
Status r;
TRACE("Call XShmGetImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmGetImage(a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmGetImage\n");
wine_tsx11_unlock();
return r;
}
XImage * TSXShmCreateImage(Display *a0, Visual *a1, unsigned int a2, int a3, char *a4, XShmSegmentInfo *a5, unsigned int a6, unsigned int a7)
{
XImage * r;
TRACE("Call XShmCreateImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmCreateImage(a0, a1, a2, a3, a4, a5, a6, a7);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmCreateImage\n");
wine_tsx11_unlock();
return r;
}
Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a3, unsigned int a4, unsigned int a5, unsigned int a6)
{
Pixmap r;
TRACE("Call XShmCreatePixmap\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XShmCreatePixmap(a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XShmCreatePixmap\n");
wine_tsx11_unlock();
return r;
}
......
tsx11/ts_xvideo.c
View file @ b018239f
......@@ -13,258 +13,209 @@
#include <X11/extensions/XShm.h>
#include <X11/extensions/Xvlib.h>
#include "debugtools.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 r;
TRACE("Call XvQueryExtension\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvQueryExtension( a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvQueryExtension\n");
wine_tsx11_unlock();
return r;
}
int TSXvQueryAdaptors(Display* a0, Window a1, unsigned int* a2, XvAdaptorInfo** a3)
{
int r;
TRACE("Call XvQueryAdaptors\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvQueryAdaptors( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvQueryAdaptors\n");
wine_tsx11_unlock();
return r;
}
int TSXvQueryEncodings(Display* a0, XvPortID a1, unsigned int* a2, XvEncodingInfo** a3)
{
int r;
TRACE("Call XvQueryEncodings\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvQueryEncodings( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvQueryEncodings\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvPutVideo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvPutVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvPutVideo\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvPutStill\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvPutStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvPutStill\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvGetVideo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvGetVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvGetVideo\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvGetStill\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvGetStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvGetStill\n");
wine_tsx11_unlock();
return r;
}
int TSXvStopVideo(Display* a0, XvPortID a1, Drawable a2)
{
int r;
TRACE("Call XvStopVideo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvStopVideo( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvStopVideo\n");
wine_tsx11_unlock();
return r;
}
int TSXvGrabPort(Display* a0, XvPortID a1, Time a2)
{
int r;
TRACE("Call XvGrabPort\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvGrabPort( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvGrabPort\n");
wine_tsx11_unlock();
return r;
}
int TSXvUngrabPort(Display* a0, XvPortID a1, Time a2)
{
int r;
TRACE("Call XvUngrabPort\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvUngrabPort( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvUngrabPort\n");
wine_tsx11_unlock();
return r;
}
int TSXvSelectVideoNotify(Display* a0, Drawable a1, Bool a2)
{
int r;
TRACE("Call XvSelectVideoNotify\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvSelectVideoNotify( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvSelectVideoNotify\n");
wine_tsx11_unlock();
return r;
}
int TSXvSelectPortNotify(Display* a0, XvPortID a1, Bool a2)
{
int r;
TRACE("Call XvSelectPortNotify\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvSelectPortNotify( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvSelectPortNotify\n");
wine_tsx11_unlock();
return r;
}
int TSXvSetPortAttribute(Display* a0, XvPortID a1, Atom a2, int a3)
{
int r;
TRACE("Call XvSetPortAttribute\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvSetPortAttribute( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvSetPortAttribute\n");
wine_tsx11_unlock();
return r;
}
int TSXvGetPortAttribute(Display* a0, XvPortID a1, Atom a2, int* a3)
{
int r;
TRACE("Call XvGetPortAttribute\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvGetPortAttribute( a0, a1, a2, a3);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvGetPortAttribute\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvQueryBestSize\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvQueryBestSize( a0, a1, a2, a3, a4, a5, a6, a7, a8);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvQueryBestSize\n");
wine_tsx11_unlock();
return r;
}
XvAttribute* TSXvQueryPortAttributes(Display* a0, XvPortID a1, int* a2)
{
XvAttribute* r;
TRACE("Call XvQueryPortAttributes\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvQueryPortAttributes( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvQueryPortAttributes\n");
wine_tsx11_unlock();
return r;
}
void TSXvFreeAdaptorInfo(XvAdaptorInfo* a0)
{
TRACE("Call XvFreeAdaptorInfo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XvFreeAdaptorInfo( a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvFreeAdaptorInfo\n");
wine_tsx11_unlock();
}
void TSXvFreeEncodingInfo(XvEncodingInfo* a0)
{
TRACE("Call XvFreeEncodingInfo\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
XvFreeEncodingInfo( a0);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvFreeEncodingInfo\n");
wine_tsx11_unlock();
}
XvImageFormatValues * TSXvListImageFormats(Display* a0, XvPortID a1, int* a2)
{
XvImageFormatValues * r;
TRACE("Call XvListImageFormats\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvListImageFormats( a0, a1, a2);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvListImageFormats\n");
wine_tsx11_unlock();
return r;
}
XvImage * TSXvCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5)
{
XvImage * r;
TRACE("Call XvCreateImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvCreateImage( a0, a1, a2, a3, a4, a5);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvCreateImage\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvPutImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvPutImage\n");
wine_tsx11_unlock();
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 r;
TRACE("Call XvShmPutImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvShmPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvShmPutImage\n");
wine_tsx11_unlock();
return r;
}
XvImage * TSXvShmCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5, XShmSegmentInfo* a6)
{
XvImage * r;
TRACE("Call XvShmCreateImage\n");
EnterCriticalSection( &X11DRV_CritSection );
wine_tsx11_lock();
r = XvShmCreateImage( a0, a1, a2, a3, a4, a5, a6);
LeaveCriticalSection( &X11DRV_CritSection );
TRACE("Ret XvShmCreateImage\n");
wine_tsx11_unlock();
return r;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment