Skip to content

W
wine-winehq
Commit df8e6eeb authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Removed a bunch of no longer used TSX wrappers.

parent 3d5b4676
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 1353 deletions
dlls/x11drv/event.c
View file @ df8e6eeb
......@@ -25,7 +25,6 @@
#include <X11/keysym.h>
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
#ifdef HAVE_LIBXXF86DGA2
#include "ts_xf86dga2.h"
......
dlls/x11drv/keyboard.c
View file @ df8e6eeb
......@@ -29,7 +29,6 @@
#include <X11/keysym.h>
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
#ifdef HAVE_XKB
#include <X11/XKBlib.h>
......
dlls/x11drv/winpos.c
View file @ df8e6eeb
......@@ -23,7 +23,10 @@
#include "ts_xlib.h"
#include "ts_xutil.h"
#include "ts_shape.h"
#ifdef HAVE_LIBXSHAPE
#include <X11/IntrinsicP.h>
#include <X11/extensions/shape.h>
#endif HAVE_LIBXSHAPE
#include "winbase.h"
#include "wingdi.h"
......@@ -1649,8 +1652,10 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
{
if (!hrgn)
{
TSXShapeCombineMask( display, data->whole_window,
ShapeBounding, 0, 0, None, ShapeSet );
wine_tsx11_lock();
XShapeCombineMask( display, data->whole_window,
ShapeBounding, 0, 0, None, ShapeSet );
wine_tsx11_unlock();
}
else
{
......@@ -1691,9 +1696,11 @@ int X11DRV_SetWindowRgn( HWND hwnd, HRGN hrgn, BOOL redraw )
}
/* shape = non-rectangular windows (X11/extensions) */
TSXShapeCombineRectangles( display, data->whole_window, ShapeBounding,
0, 0, aXRect,
pCurrRect - aXRect, ShapeSet, YXBanded );
wine_tsx11_lock();
XShapeCombineRectangles( display, data->whole_window, ShapeBounding,
0, 0, aXRect,
pCurrRect - aXRect, ShapeSet, YXBanded );
wine_tsx11_unlock();
HeapFree(GetProcessHeap(), 0, aXRect );
}
HeapFree(GetProcessHeap(), 0, pRegionData);
......
dlls/x11drv/x11drv_main.c
View file @ df8e6eeb
......@@ -34,7 +34,6 @@
#include <X11/cursorfont.h>
#include "ts_xlib.h"
#include "ts_xutil.h"
#include "ts_shape.h"
#include "winbase.h"
#include "wine/winbase16.h"
......
graphics/x11drv/dib.c
View file @ df8e6eeb
......@@ -23,7 +23,7 @@
#include "ts_xlib.h"
#include "ts_xutil.h"
#ifdef HAVE_LIBXXSHM
# include "ts_xshm.h"
#include <X11/extensions/XShm.h>
# ifdef HAVE_SYS_SHM_H
# include <sys/shm.h>
# endif
......@@ -5654,7 +5654,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
{
XImage *image;
wine_tsx11_lock();
image = XShmCreateImage(gdi_display, visual, bpp, ZPixmap, NULL, shminfo, width, height);
if (image)
{
......@@ -5674,7 +5673,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
if (ok)
{
shmctl(shminfo->shmid, IPC_RMID, 0);
wine_tsx11_unlock();
return image; /* Success! */
}
/* An error occured */
......@@ -5686,7 +5684,6 @@ static XImage *X11DRV_XShmCreateImage( int width, int height, int bpp,
XDestroyImage(image);
image = NULL;
}
wine_tsx11_unlock();
return image;
}
#endif /* HAVE_LIBXXSHM */
......@@ -5812,8 +5809,9 @@ HBITMAP X11DRV_DIB_CreateDIBSection(
/* Create XImage */
if (dib && bmp)
{
wine_tsx11_lock();
#ifdef HAVE_LIBXXSHM
if (TSXShmQueryExtension(gdi_display) &&
if (XShmQueryExtension(gdi_display) &&
(dib->image = X11DRV_XShmCreateImage( bm.bmWidth, effHeight,
bmp->bitmap.bmBitsPixel, &dib->shminfo )) )
{
......@@ -5825,6 +5823,7 @@ HBITMAP X11DRV_DIB_CreateDIBSection(
#else
dib->image = X11DRV_DIB_CreateXImage( bm.bmWidth, effHeight, bmp->bitmap.bmBitsPixel );
#endif
wine_tsx11_unlock();
}
/* Clean up in case of errors */
......@@ -5872,10 +5871,11 @@ void X11DRV_DIB_DeleteDIBSection(BITMAPOBJ *bmp)
if (dib->image)
{
wine_tsx11_lock();
#ifdef HAVE_LIBXXSHM
if (dib->shminfo.shmid != -1)
{
TSXShmDetach (gdi_display, &(dib->shminfo));
XShmDetach (gdi_display, &(dib->shminfo));
XDestroyImage (dib->image);
shmdt (dib->shminfo.shmaddr);
dib->shminfo.shmid = -1;
......@@ -5883,6 +5883,7 @@ void X11DRV_DIB_DeleteDIBSection(BITMAPOBJ *bmp)
else
#endif
XDestroyImage( dib->image );
wine_tsx11_unlock();
}
if (dib->colorMap)
......
include/ts_shape.h deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around shape calls.
* Always include this file instead of <X11/shape.h>.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#ifndef __WINE_TS_SHAPE_H
#define __WINE_TS_SHAPE_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_LIBXSHAPE
#include <X11/IntrinsicP.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 TSXShapeCombineMask(Display*, Window, int, int, int, Pixmap, int);
#endif /* defined(HAVE_LIBXSHAPE) */
#endif /* __WINE_TS_SHAPE_H */
include/ts_xf86dga.h deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around xf86dga calls.
* Always include this file instead of <X11/xf86dga.h>.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#ifndef __WINE_TS_XF86DGA_H
#define __WINE_TS_XF86DGA_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_LIBXXF86DGA
#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*);
extern Status TSXF86DGADirectVideo(Display*,int,int);
extern Status TSXF86DGAGetViewPortSize(Display*,int,int*,int*);
extern Status TSXF86DGASetViewPort(Display*,int,int,int);
extern Status TSXF86DGAInstallColormap(Display*,int,Colormap);
extern Status TSXF86DGAQueryDirectVideo(Display*,int,int*);
extern Status TSXF86DGAViewPortChanged(Display*,int,int);
#endif /* defined(HAVE_LIBXXF86DGA) */
#endif /* __WINE_TS_XF86DGA_H */
include/ts_xf86dga2.h
View file @ df8e6eeb
......@@ -30,14 +30,6 @@ extern void TSXDGASetViewport(Display*, int, int, int, int);
extern void TSXDGAInstallColormap(Display*, int, Colormap);
extern Colormap TSXDGACreateColormap(Display*, int, XDGADevice*, int);
extern void TSXDGASelectInput(Display*, int, long);
extern void TSXDGAFillRectangle(Display*, int, int, int, unsigned int, unsigned int, unsigned long);
extern void TSXDGACopyArea(Display*, int, int, int, unsigned int, unsigned int, int, int);
extern void TSXDGACopyTransparentArea(Display*, int, int, int, unsigned int, unsigned int, int, int, unsigned long);
extern int TSXDGAGetViewportStatus(Display*, int);
extern void TSXDGASync(Display*, int);
extern Bool TSXDGASetClientVersion(Display*);
extern void TSXDGAChangePixmapMode(Display*, int, int*, int*, int);
extern void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent*, XKeyEvent*);
#endif /* defined(HAVE_LIBXXF86DGA2) */
......
include/ts_xf86vmode.h
View file @ df8e6eeb
......@@ -27,15 +27,8 @@ extern Bool TSXF86VidModeQueryVersion(Display*,int*,int*);
extern Bool TSXF86VidModeQueryExtension(Display*,int*,int*);
extern Bool TSXF86VidModeGetModeLine(Display*,int,int*,XF86VidModeModeLine*);
extern Bool TSXF86VidModeGetAllModeLines(Display*,int,int*,XF86VidModeModeInfo***);
extern Bool TSXF86VidModeAddModeLine(Display*,int,XF86VidModeModeInfo*,XF86VidModeModeInfo*);
extern Bool TSXF86VidModeDeleteModeLine(Display*,int,XF86VidModeModeInfo*);
extern Bool TSXF86VidModeModModeLine(Display*,int,XF86VidModeModeLine*);
extern Status TSXF86VidModeValidateModeLine(Display*,int,XF86VidModeModeInfo*);
extern Bool TSXF86VidModeSwitchMode(Display*,int,int);
extern Bool TSXF86VidModeSwitchToMode(Display*,int,XF86VidModeModeInfo*);
extern Bool TSXF86VidModeLockModeSwitch(Display*,int,int);
extern Bool TSXF86VidModeGetMonitor(Display*,int,XF86VidModeMonitor*);
extern Bool TSXF86VidModeGetViewPort(Display*,int,int*,int*);
extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int);
#endif /* defined(HAVE_LIBXXF86VM) */
......
include/ts_xlib.h
View file @ df8e6eeb
......@@ -21,60 +21,36 @@ 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);
extern XImage * TSXGetImage(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int);
extern XImage * TSXGetSubImage(Display*, Drawable, int, int, unsigned int, unsigned int, unsigned long, int, XImage*, int, int);
extern Display * TSXOpenDisplay(const char*);
extern void TSXrmInitialize(void);
extern char * TSXGetAtomName(Display*, Atom);
extern char * TSXKeysymToString(KeySym);
extern Atom TSXInternAtom(Display*, const char*, int);
extern Colormap TSXCopyColormapAndFree(Display*, Colormap);
extern Colormap TSXCreateColormap(Display*, Window, Visual*, int);
extern Cursor TSXCreatePixmapCursor(Display*, Pixmap, Pixmap, XColor*, XColor*, unsigned int, unsigned int);
extern Cursor TSXCreateFontCursor(Display*, unsigned int);
extern GC TSXCreateGC(Display*, Drawable, unsigned long, XGCValues*);
extern Pixmap TSXCreatePixmap(Display*, Drawable, unsigned int, unsigned int, unsigned int);
extern Pixmap TSXCreateBitmapFromData(Display*, Drawable, const char*, unsigned int, unsigned int);
extern Window TSXGetSelectionOwner(Display*, Atom);
extern Window TSXCreateWindow(Display*, Window, int, int, unsigned int, unsigned int, unsigned int, int, unsigned int, Visual*, unsigned long, XSetWindowAttributes*);
extern char ** TSXListFonts(Display*, const char*, int, int*);
extern KeySym TSXKeycodeToKeysym(Display*, unsigned int, int);
extern KeySym TSXLookupKeysym(XKeyEvent*, int);
extern KeySym * TSXGetKeyboardMapping(Display*, unsigned int, int, int*);
extern char * TSXResourceManagerString(Display*);
extern VisualID TSXVisualIDFromVisual(Visual*);
extern int TSXInitThreads(void);
extern XPixmapFormatValues * TSXListPixmapFormats(Display*, int*);
extern int * TSXListDepths(Display*, int, int*);
extern int TSXReconfigureWMWindow(Display*, Window, int, unsigned int, XWindowChanges*);
extern int TSXSetWMProtocols(Display*, Window, Atom*, int);
extern int TSXIconifyWindow(Display*, Window, int);
extern int TSXSetTransientForHint(Display*, Window, Window);
extern int TSXActivateScreenSaver(Display*);
extern int TSXAllocColor(Display*, Colormap, XColor*);
extern int TSXAllocColorCells(Display*, Colormap, int, unsigned long*, unsigned int, unsigned long*, unsigned int);
extern int TSXBell(Display*, int);
extern int TSXChangeGC(Display*, GC, unsigned long, XGCValues*);
extern int TSXChangeKeyboardControl(Display*, unsigned long, XKeyboardControl*);
extern int TSXChangeProperty(Display*, Window, Atom, Atom, int, int, const unsigned char*, int);
extern int TSXChangeWindowAttributes(Display*, Window, unsigned long, XSetWindowAttributes*);
extern int TSXCheckTypedEvent(Display*, int, XEvent*);
extern int TSXCheckTypedWindowEvent(Display*, Window, int, XEvent*);
extern int TSXCheckWindowEvent(Display*, Window, long, XEvent*);
extern int TSXConvertSelection(Display*, Atom, Atom, Atom, Window, Time);
extern int TSXCopyArea(Display*, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int);
extern int TSXCopyPlane(Display*, Drawable, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned long);
extern int TSXDefineCursor(Display*, Window, Cursor);
extern int TSXDeleteProperty(Display*, Window, Atom);
extern int TSXDestroyWindow(Display*, Window);
extern int TSXDisplayKeycodes(Display*, int*, int*);
extern int TSXDrawArc(Display*, Drawable, GC, int, int, unsigned int, unsigned int, int, int);
extern int TSXDrawLine(Display*, Drawable, GC, int, int, int, int);
extern int TSXDrawLines(Display*, Drawable, GC, XPoint*, int, int);
extern int TSXDrawPoint(Display*, Drawable, GC, int, int);
extern int TSXDrawRectangle(Display*, Drawable, GC, int, int, unsigned int, unsigned int);
extern int TSXDrawSegments(Display*, Drawable, GC, XSegment*, int);
extern int TSXDrawString16(Display*, Drawable, GC, int, int, const XChar2b*, int);
extern int TSXDrawText16(Display*, Drawable, GC, int, int, XTextItem16*, int);
extern int TSXFillArc(Display*, Drawable, GC, int, int, unsigned int, unsigned int, int, int);
......@@ -84,70 +60,46 @@ extern int TSXFlush(Display*);
extern int TSXFree(void*);
extern int TSXFreeColormap(Display*, Colormap);
extern int TSXFreeColors(Display*, Colormap, unsigned long*, int, unsigned long);
extern int TSXFreeCursor(Display*, Cursor);
extern int TSXFreeFont(Display*, XFontStruct*);
extern int TSXFreeFontNames(char**);
extern int TSXFreeGC(Display*, GC);
extern int TSXFreeModifiermap(XModifierKeymap*);
extern int TSXFreePixmap(Display*, Pixmap);
extern int TSXGetFontProperty(XFontStruct*, Atom, unsigned long*);
extern int TSXGetGeometry(Display*, Drawable, Window*, int*, int*, unsigned int*, unsigned int*, unsigned int*, unsigned int*);
extern int TSXGetInputFocus(Display*, Window*, int*);
extern int TSXGetKeyboardControl(Display*, XKeyboardState*);
extern int TSXGetScreenSaver(Display*, int*, int*, int*, int*);
extern int TSXGetWindowProperty(Display*, Window, Atom, long, long, int, Atom, Atom*, int*, unsigned long*, unsigned long*, unsigned char**);
extern int TSXGetWindowAttributes(Display*, Window, XWindowAttributes*);
extern int TSXGrabKeyboard(Display*, Window, int, int, int, Time);
extern int TSXGrabPointer(Display*, Window, int, unsigned int, int, int, Window, Cursor, Time);
extern int TSXGrabServer(Display*);
extern int TSXInstallColormap(Display*, Colormap);
extern KeyCode TSXKeysymToKeycode(Display*, KeySym);
extern int TSXMapWindow(Display*, Window);
extern int TSXNextEvent(Display*, XEvent*);
extern int TSXParseGeometry(const char*, int*, int*, unsigned int*, unsigned int*);
extern int TSXPending(Display*);
extern int TSXPutBackEvent(Display*, XEvent*);
extern int TSXPutImage(Display*, Drawable, GC, XImage*, int, int, int, int, unsigned int, unsigned int);
extern int TSXQueryColor(Display*, Colormap, XColor*);
extern int TSXQueryColors(Display*, Colormap, XColor*, int);
extern int TSXQueryKeymap(Display*, char*);
extern int TSXQueryPointer(Display*, Window, Window*, Window*, int*, int*, int*, int*, unsigned int*);
extern int TSXQueryTree(Display*, Window, Window*, Window*, Window**, unsigned int*);
extern int TSXRefreshKeyboardMapping(XMappingEvent*);
extern int TSXResetScreenSaver(Display*);
extern int TSXRestackWindows(Display*, Window*, int);
extern int TSXSendEvent(Display*, Window, int, long, XEvent*);
extern int TSXSetArcMode(Display*, GC, int);
extern int TSXSetBackground(Display*, GC, unsigned long);
extern int TSXSetClipMask(Display*, GC, Pixmap);
extern int TSXSetClipOrigin(Display*, GC, int, int);
extern int TSXSetClipRectangles(Display*, GC, int, int, XRectangle*, int, int);
extern int TSXSetDashes(Display*, GC, int, const char*, int);
extern int TSXSetFillStyle(Display*, GC, int);
extern int TSXSetFont(Display*, GC, Font);
extern int TSXSetForeground(Display*, GC, unsigned long);
extern int TSXSetFunction(Display*, GC, int);
extern int TSXSetGraphicsExposures(Display*, GC, int);
extern int TSXSetIconName(Display*, Window, const char*);
extern int TSXSetInputFocus(Display*, Window, int, Time);
extern int TSXSetLineAttributes(Display*, GC, unsigned int, int, int, int);
extern int TSXSetScreenSaver(Display*, int, int, int, int);
extern int TSXSetSelectionOwner(Display*, Atom, Window, Time);
extern int TSXSetSubwindowMode(Display*, GC, int);
extern int TSXSetWindowColormap(Display*, Window, Colormap);
extern int TSXStoreColor(Display*, Colormap, XColor*);
extern int TSXStoreName(Display*, Window, const char*);
extern int TSXSync(Display*, int);
extern int TSXTextExtents16(XFontStruct*, const XChar2b*, int, int*, int*, int*, XCharStruct*);
extern int TSXTextWidth16(XFontStruct*, const XChar2b*, int);
extern int TSXUngrabKeyboard(Display*, Time);
extern int TSXUngrabPointer(Display*, Time);
extern int TSXUngrabServer(Display*);
extern int TSXUninstallColormap(Display*, Colormap);
extern int TSXUnmapWindow(Display*, Window);
extern int TSXWarpPointer(Display*, Window, Window, int, int, unsigned int, unsigned int, int, int);
extern XIM TSXOpenIM(Display*, struct _XrmHashBucketRec*, char*, char*);
extern int (*TSXSynchronize(Display *, Bool))(Display *);
#endif /* defined(HAVE_X11_XLIB_H) */
......
include/ts_xresource.h deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around Xresource calls.
* Always include this file instead of <X11/Xresource.h>.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#ifndef __WINE_TS_XRESOURCE_H
#define __WINE_TS_XRESOURCE_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_X11_XLIB_H
#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*);
extern XrmDatabase TSXrmGetStringDatabase(const char*);
extern void TSXrmMergeDatabases(XrmDatabase, XrmDatabase*);
extern void TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const char*, int*, char**);
#endif /* defined(HAVE_X11_XLIB_H) */
#endif /* __WINE_TS_XRESOURCE_H */
include/ts_xshm.h deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around XShm calls.
* Always include this file instead of <X11/XShm.h>.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#ifndef __WINE_TS_XSHM_H
#define __WINE_TS_XSHM_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_LIBXXSHM
#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 *);
extern Status TSXShmAttach(Display *, XShmSegmentInfo *);
extern Status TSXShmDetach(Display *, XShmSegmentInfo *);
extern Status TSXShmPutImage(Display *, Drawable, GC, XImage *, int, int, int, int, unsigned int, unsigned int, Bool);
extern Status TSXShmGetImage(Display *, Drawable, XImage *, int, int, unsigned long);
extern XImage * TSXShmCreateImage(Display *, Visual *, unsigned int, int, char *, XShmSegmentInfo *, unsigned int, unsigned int);
extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *, unsigned int, unsigned int, unsigned int);
#endif /* defined(HAVE_LIBXXSHM) */
#endif /* __WINE_TS_XSHM_H */
include/ts_xutil.h
View file @ df8e6eeb
......@@ -21,41 +21,12 @@
extern void (*wine_tsx11_lock)(void);
extern void (*wine_tsx11_unlock)(void);
extern XClassHint * TSXAllocClassHint(void);
extern XSizeHints * TSXAllocSizeHints(void);
extern XWMHints * TSXAllocWMHints(void);
extern int TSXClipBox(Region, XRectangle*);
extern Region TSXCreateRegion(void);
extern int TSXDestroyRegion(Region);
extern int TSXEmptyRegion(Region);
extern int TSXEqualRegion(Region, Region);
extern int TSXFindContext(Display*, XID, XContext, XPointer*);
extern XVisualInfo * TSXGetVisualInfo(Display*, long, XVisualInfo*, int*);
extern XWMHints * TSXGetWMHints(Display*, Window);
extern int TSXGetWMSizeHints(Display*, Window, XSizeHints*, long*, Atom);
extern int TSXIntersectRegion(Region, Region, Region);
extern int TSXLookupString(XKeyEvent*, char*, int, KeySym*, XComposeStatus*);
extern int TSXOffsetRegion(Region, int, int);
extern int TSXPointInRegion(Region, int, int);
extern Region TSXPolygonRegion(XPoint*, int, int);
extern int TSXRectInRegion(Region, int, int, unsigned int, unsigned int);
extern int TSXSaveContext(Display*, XID, XContext, const char*);
extern int TSXSetClassHint(Display*, Window, XClassHint*);
extern int TSXSetWMHints(Display*, Window, XWMHints*);
extern void TSXSetWMProperties(Display*, Window, XTextProperty*, XTextProperty*, char**, int, XSizeHints*, XWMHints*, XClassHint*);
extern void TSXSetWMSizeHints(Display*, Window, XSizeHints*, Atom);
extern int TSXSetRegion(Display*, GC, Region);
extern int TSXShrinkRegion(Region, int, int);
extern int TSXStringListToTextProperty(char**, int, XTextProperty*);
extern int TSXSubtractRegion(Region, Region, Region);
extern int TSXUnionRectWithRegion(XRectangle*, Region, Region);
extern int TSXUnionRegion(Region, Region, Region);
extern int TSXXorRegion(Region, Region, Region);
extern int TSXDestroyImage(struct _XImage *);
extern struct _XImage * TSXSubImage(struct _XImage *, int, int, unsigned int, unsigned int);
extern int TSXAddPixel(struct _XImage *, long);
extern XContext TSXUniqueContext(void);
extern int TSXDeleteContext(Display*,XID,XContext);
#endif /* defined(HAVE_X11_XLIB_H) */
......
include/ts_xvideo.h deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around xvideo calls.
* Always include this file instead of <X11/xvideo.h>.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#ifndef __WINE_TS_XVIDEO_H
#define __WINE_TS_XVIDEO_H
#ifndef __WINE_CONFIG_H
# error You must include config.h to use this header
#endif
#ifdef HAVE_XVIDEO
#include <X11/Xlib.h>
#include <X11/extensions/Xv.h>
#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**);
extern int TSXvPutVideo(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
extern int TSXvPutStill(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
extern int TSXvGetVideo(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
extern int TSXvGetStill(Display*, XvPortID, Drawable, GC, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
extern int TSXvStopVideo(Display*, XvPortID, Drawable);
extern int TSXvGrabPort(Display*, XvPortID, Time);
extern int TSXvUngrabPort(Display*, XvPortID, Time);
extern int TSXvSelectVideoNotify(Display*, Drawable, Bool);
extern int TSXvSelectPortNotify(Display*, XvPortID, Bool);
extern int TSXvSetPortAttribute(Display*, XvPortID, Atom, int);
extern int TSXvGetPortAttribute(Display*, XvPortID, Atom, int*);
extern int TSXvQueryBestSize(Display*, XvPortID, Bool, unsigned int, unsigned int, unsigned int, unsigned int, unsigned int*, unsigned int*);
extern XvAttribute* TSXvQueryPortAttributes(Display*, XvPortID, int*);
extern void TSXvFreeAdaptorInfo(XvAdaptorInfo*);
extern void TSXvFreeEncodingInfo(XvEncodingInfo*);
extern XvImageFormatValues * TSXvListImageFormats(Display*, XvPortID, int*);
extern XvImage * TSXvCreateImage(Display*, XvPortID, int, char*, int, int);
extern int TSXvPutImage(Display*, XvPortID, Drawable, GC, XvImage*, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int);
extern int TSXvShmPutImage(Display*, XvPortID, Drawable, GC, XvImage*, int, int, unsigned int, unsigned int, int, int, unsigned int, unsigned int, Bool);
extern XvImage * TSXvShmCreateImage(Display*, XvPortID, int, char*, int, int, XShmSegmentInfo*);
#endif /* defined(HAVE_XVIDEO) */
#endif /* __WINE_TS_XVIDEO_H */
tsx11/Makefile.in
View file @ df8e6eeb
......@@ -11,15 +11,10 @@ EXTRALIBS = $(X_LIBS) $(XLIB)
C_SRCS = \
locking.c \
ts_xf86dga.c \
ts_xf86dga2.c \
ts_xf86vmode.c \
ts_xshm.c \
ts_xlib.c \
ts_xresource.c \
ts_xvideo.c \
ts_xutil.c \
ts_shape.c
ts_xutil.c
all: libwine_tsx11.$(LIBEXT)
......
tsx11/X11_calls
View file @ df8e6eeb
......@@ -4,52 +4,45 @@
# To add a new call, put it on this list and run tools/make_X11wrappers.
# Also read the comments at the top of tools/make_X11wrappers.
#
XActivateScreenSaver
XAddPixel
XAllocClassHint
XAllocColor
XAllocColorCells
XAllocSizeHints
XAllocWMHints
XBell
XChangeGC
XChangeKeyboardControl
XChangeProperty
XChangeWindowAttributes
XCheckTypedEvent
XCheckTypedWindowEvent
XCheckWindowEvent
XClipBox
XConvertSelection
XCopyArea
XCopyColormapAndFree
XCopyPlane
XCreateBitmapFromData
XCreateColormap
XCreateFontCursor
XCreateGC
XCreateImage
XCreatePixmap
XCreatePixmapCursor
XCreateRegion
XCreateWindow
XDGACloseFramebuffer
XDGACreateColormap
XDGAInstallColormap
XDGAOpenFramebuffer
XDGAQueryExtension
XDGAQueryModes
XDGAQueryVersion
XDGASelectInput
XDGASetMode
XDGASetViewport
XDefineCursor
XDeleteContext
XDeleteProperty
XDestroyImage
XDestroyRegion
XDestroyWindow
XDisplayKeycodes
XDrawArc
XDrawLine
XDrawLines
XDrawPoint
XDrawRectangle
XDrawSegments
XDrawString16
XDrawText16
XEmptyRegion
XEqualRegion
XF86VidModeGetAllModeLines
XF86VidModeGetModeLine
XF86VidModeLockModeSwitch
XF86VidModeQueryExtension
XF86VidModeQueryVersion
XF86VidModeSetViewPort
XF86VidModeSwitchToMode
XFillArc
XFillPolygon
XFillRectangle
......@@ -58,10 +51,8 @@ XFlush
XFree
XFreeColormap
XFreeColors
XFreeCursor
XFreeFont
XFreeFontNames
XFreeGC
XFreeModifiermap
XFreePixmap
XGetAtomName
......@@ -69,183 +60,51 @@ XGetFontProperty
XGetGeometry
XGetImage
XGetInputFocus
XGetKeyboardControl
XGetKeyboardMapping
XGetModifierMapping
XGetScreenSaver
XGetSelectionOwner
XGetSubImage
XGetVisualInfo
XGetWMHints
XGetWMSizeHints
XGetWindowAttributes
XGetWindowProperty
XGrabKeyboard
XGrabPointer
XGrabServer
XIconifyWindow
XInitThreads
XInstallColormap
XInternAtom
XIntersectRegion
XKeycodeToKeysym
XKeysymToKeycode
XKeysymToString
XListDepths
XListFonts
XListPixmapFormats
XLoadQueryFont
XLookupKeysym
XLookupString
XMapWindow
XNextEvent
XOffsetRegion
XOpenDisplay
XOpenIM
XParseGeometry
XPending
XPointInRegion
XPolygonRegion
XPutBackEvent
XPutImage
XQueryColor
XQueryColors
XQueryKeymap
XQueryPointer
XQueryTree
XReconfigureWMWindow
XRectInRegion
XRefreshKeyboardMapping
XResetScreenSaver
XResourceManagerString
XRestackWindows
XSaveContext
XSendEvent
XSetArcMode
XSetBackground
XSetClassHint
XSetClipMask
XSetClipOrigin
XSetClipRectangles
XSetDashes
XSetFillStyle
XSetFont
XSetForeground
XSetFunction
XSetGraphicsExposures
XSetIconName
XSetInputFocus
XSetLineAttributes
XSetRegion
XSetScreenSaver
XSetSelectionOwner
XSetSubwindowMode
XSetTransientForHint
XSetWindowColormap
XSetWMHints
XSetWMProperties
XSetWMProtocols
XSetWMSizeHints
XShapeCombineMask
XShapeCombineRectangles
XShmAttach
XShmCreateImage
XShmCreatePixmap
XShmDetach
XShmGetImage
XShmPixmapFormat
XShmPutImage
XShmQueryExtension
XShmQueryVersion
XShrinkRegion
XStoreColor
XStoreName
XStringListToTextProperty
XSubImage
XSubtractRegion
XSync
XSynchronize
XTextExtents16
XTextWidth16
XUngrabKeyboard
XUngrabPointer
XUngrabServer
XUninstallColormap
XUnionRectWithRegion
XUnionRegion
XUniqueContext
XUnmapWindow
XVisualIDFromVisual
XWarpPointer
XXorRegion
XrmGetFileDatabase
XrmGetResource
XrmGetStringDatabase
XrmInitialize
XrmMergeDatabases
XrmParseCommand
XrmUniqueQuark
XF86DGAQueryExtension
XF86DGASetViewPort
XF86DGAInstallColormap
XF86DGAViewPortChanged
XF86DGADirectVideo
XF86DGAQueryVersion
XF86DGAQueryDirectVideo
XF86DGAGetVideo
XF86DGAGetViewPortSize
XF86VidModeQueryVersion
XF86VidModeQueryExtension
XF86VidModeGetModeLine
XF86VidModeGetAllModeLines
XF86VidModeAddModeLine
XF86VidModeDeleteModeLine
XF86VidModeModModeLine
XF86VidModeValidateModeLine
XF86VidModeSwitchMode
XF86VidModeSwitchToMode
XF86VidModeLockModeSwitch
XF86VidModeGetMonitor
XF86VidModeGetViewPort
XF86VidModeSetViewPort
XDGAQueryExtension
XDGAQueryVersion
XDGAQueryModes
XDGASetMode
XDGAOpenFramebuffer
XDGACloseFramebuffer
XDGASetViewport
XDGAInstallColormap
XDGACreateColormap
XDGASelectInput
XDGAFillRectangle
XDGACopyArea
XDGACopyTransparentArea
XDGAGetViewportStatus
XDGASync
XDGASetClientVersion
XDGAChangePixmapMode
XDGAKeyEventToXKeyEvent
XvQueryExtension
XvQueryAdaptors
XvQueryEncodings
XvPutVideo
XvPutStill
XvGetVideo
XvGetStill
XvStopVideo
XvGrabPort
XvUngrabPort
XvSelectVideoNotify
XvSelectPortNotify
XvSetPortAttribute
XvGetPortAttribute
XvQueryBestSize
XvQueryPortAttributes
XvFreeAdaptorInfo
XvFreeEncodingInfo
XvListImageFormats
XvCreateImage
XvPutImage
XvShmPutImage
XvShmCreateImage
tsx11/ts_shape.c deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around shape calls.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifdef HAVE_LIBXSHAPE
#include <X11/IntrinsicP.h>
#include <X11/extensions/shape.h>
#include "ts_shape.h"
void TSXShapeCombineRectangles(Display* a0, Window a1, int a2, int a3, int a4, XRectangle* a5, int a6, int a7, int a8)
{
wine_tsx11_lock();
XShapeCombineRectangles(a0, a1, a2, a3, a4, a5, a6, a7, a8);
wine_tsx11_unlock();
}
void TSXShapeCombineMask(Display* a0, Window a1, int a2, int a3, int a4, Pixmap a5, int a6)
{
wine_tsx11_lock();
XShapeCombineMask(a0, a1, a2, a3, a4, a5, a6);
wine_tsx11_unlock();
}
#endif /* defined(HAVE_LIBXSHAPE) */
tsx11/ts_xf86dga.c deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around xf86dga calls.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
#include <X11/extensions/xf86dga.h>
#include "ts_xf86dga.h"
Bool TSXF86DGAQueryVersion(Display*a0,int*a1,int*a2)
{
Bool r;
wine_tsx11_lock();
r = XF86DGAQueryVersion(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Bool TSXF86DGAQueryExtension(Display*a0,int*a1,int*a2)
{
Bool r;
wine_tsx11_lock();
r = XF86DGAQueryExtension(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAGetVideo(Display*a0,int a1,char**a2,int*a3,int*a4,int*a5)
{
Status r;
wine_tsx11_lock();
r = XF86DGAGetVideo(a0,a1,a2,a3,a4,a5);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGADirectVideo(Display*a0,int a1,int a2)
{
Status r;
wine_tsx11_lock();
r = XF86DGADirectVideo(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAGetViewPortSize(Display*a0,int a1,int *a2,int *a3)
{
Status r;
wine_tsx11_lock();
r = XF86DGAGetViewPortSize(a0,a1,a2,a3);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGASetViewPort(Display*a0,int a1,int a2,int a3)
{
Status r;
wine_tsx11_lock();
r = XF86DGASetViewPort(a0,a1,a2,a3);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAInstallColormap(Display*a0,int a1,Colormap a2)
{
Status r;
wine_tsx11_lock();
r = XF86DGAInstallColormap(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAQueryDirectVideo(Display*a0,int a1,int *a2)
{
Status r;
wine_tsx11_lock();
r = XF86DGAQueryDirectVideo(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
{
Status r;
wine_tsx11_lock();
r = XF86DGAViewPortChanged(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
#endif /* defined(HAVE_LIBXXF86DGA) */
tsx11/ts_xf86dga2.c
View file @ df8e6eeb
......@@ -96,65 +96,5 @@ void TSXDGASelectInput(Display* a0, int a1, long a2)
wine_tsx11_unlock();
}
void TSXDGAFillRectangle(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, unsigned long a6)
{
wine_tsx11_lock();
XDGAFillRectangle( a0, a1, a2, a3, a4, a5, a6);
wine_tsx11_unlock();
}
void TSXDGACopyArea(Display* a0, int a1, int a2, int a3, unsigned int a4, unsigned int a5, int a6, int a7)
{
wine_tsx11_lock();
XDGACopyArea( a0, a1, a2, a3, a4, a5, a6, a7);
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)
{
wine_tsx11_lock();
XDGACopyTransparentArea( a0, a1, a2, a3, a4, a5, a6, a7, a8);
wine_tsx11_unlock();
}
int TSXDGAGetViewportStatus(Display* a0, int a1)
{
int r;
wine_tsx11_lock();
r = XDGAGetViewportStatus( a0, a1);
wine_tsx11_unlock();
return r;
}
void TSXDGASync(Display* a0, int a1)
{
wine_tsx11_lock();
XDGASync( a0, a1);
wine_tsx11_unlock();
}
Bool TSXDGASetClientVersion(Display* a0)
{
Bool r;
wine_tsx11_lock();
r = XDGASetClientVersion( a0);
wine_tsx11_unlock();
return r;
}
void TSXDGAChangePixmapMode(Display* a0, int a1, int* a2, int* a3, int a4)
{
wine_tsx11_lock();
XDGAChangePixmapMode( a0, a1, a2, a3, a4);
wine_tsx11_unlock();
}
void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1)
{
wine_tsx11_lock();
XDGAKeyEventToXKeyEvent( a0, a1);
wine_tsx11_unlock();
}
#endif /* defined(HAVE_LIBXXF86DGA2) */
tsx11/ts_xf86vmode.c
View file @ df8e6eeb
......@@ -53,51 +53,6 @@ Bool TSXF86VidModeGetAllModeLines(Display*a0,int a1,int*a2,XF86VidModeModeInfo**
return r;
}
Bool TSXF86VidModeAddModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2,XF86VidModeModeInfo*a3)
{
Bool r;
wine_tsx11_lock();
r = XF86VidModeAddModeLine(a0,a1,a2,a3);
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeDeleteModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Bool r;
wine_tsx11_lock();
r = XF86VidModeDeleteModeLine(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeModModeLine(Display*a0,int a1,XF86VidModeModeLine*a2)
{
Bool r;
wine_tsx11_lock();
r = XF86VidModeModModeLine(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Status TSXF86VidModeValidateModeLine(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Status r;
wine_tsx11_lock();
r = XF86VidModeValidateModeLine(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeSwitchMode(Display*a0,int a1,int a2)
{
Bool r;
wine_tsx11_lock();
r = XF86VidModeSwitchMode(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeSwitchToMode(Display*a0,int a1,XF86VidModeModeInfo*a2)
{
Bool r;
......@@ -116,24 +71,6 @@ Bool TSXF86VidModeLockModeSwitch(Display*a0,int a1,int a2)
return r;
}
Bool TSXF86VidModeGetMonitor(Display*a0,int a1,XF86VidModeMonitor*a2)
{
Bool r;
wine_tsx11_lock();
r = XF86VidModeGetMonitor(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeGetViewPort(Display*a0,int a1,int*a2,int*a3)
{
Bool r;
wine_tsx11_lock();
r = XF86VidModeGetViewPort(a0,a1,a2,a3);
wine_tsx11_unlock();
return r;
}
Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
{
Bool r;
......
tsx11/ts_xresource.c deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around Xresource calls.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifdef HAVE_X11_XLIB_H
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include "ts_xresource.h"
XrmQuark TSXrmUniqueQuark(void)
{
XrmQuark r;
wine_tsx11_lock();
r = XrmUniqueQuark();
wine_tsx11_unlock();
return r;
}
int TSXrmGetResource(XrmDatabase a0, const char* a1, const char* a2, char** a3, XrmValue* a4)
{
int r;
wine_tsx11_lock();
r = XrmGetResource(a0, a1, a2, a3, a4);
wine_tsx11_unlock();
return r;
}
XrmDatabase TSXrmGetFileDatabase(const char* a0)
{
XrmDatabase r;
wine_tsx11_lock();
r = XrmGetFileDatabase(a0);
wine_tsx11_unlock();
return r;
}
XrmDatabase TSXrmGetStringDatabase(const char* a0)
{
XrmDatabase r;
wine_tsx11_lock();
r = XrmGetStringDatabase(a0);
wine_tsx11_unlock();
return r;
}
void TSXrmMergeDatabases(XrmDatabase a0, XrmDatabase* a1)
{
wine_tsx11_lock();
XrmMergeDatabases(a0, a1);
wine_tsx11_unlock();
}
void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const char* a3, int* a4, char** a5)
{
wine_tsx11_lock();
XrmParseCommand(a0, a1, a2, a3, a4, a5);
wine_tsx11_unlock();
}
#endif /* defined(HAVE_X11_XLIB_H) */
tsx11/ts_xshm.c deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around XShm calls.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifdef HAVE_LIBXXSHM
#include <X11/Xlib.h>
#include <X11/extensions/XShm.h>
#include "ts_xshm.h"
Bool TSXShmQueryExtension(Display *a0)
{
Bool r;
wine_tsx11_lock();
r = XShmQueryExtension(a0);
wine_tsx11_unlock();
return r;
}
Bool TSXShmQueryVersion(Display *a0, int *a1, int *a2, Bool *a3)
{
Bool r;
wine_tsx11_lock();
r = XShmQueryVersion(a0, a1, a2, a3);
wine_tsx11_unlock();
return r;
}
int TSXShmPixmapFormat(Display *a0)
{
int r;
wine_tsx11_lock();
r = XShmPixmapFormat(a0);
wine_tsx11_unlock();
return r;
}
Status TSXShmAttach(Display *a0, XShmSegmentInfo *a1)
{
Status r;
wine_tsx11_lock();
r = XShmAttach(a0, a1);
wine_tsx11_unlock();
return r;
}
Status TSXShmDetach(Display *a0, XShmSegmentInfo *a1)
{
Status r;
wine_tsx11_lock();
r = XShmDetach(a0, a1);
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;
wine_tsx11_lock();
r = XShmPutImage(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10);
wine_tsx11_unlock();
return r;
}
Status TSXShmGetImage(Display *a0, Drawable a1, XImage *a2, int a3, int a4, unsigned long a5)
{
Status r;
wine_tsx11_lock();
r = XShmGetImage(a0, a1, a2, a3, a4, a5);
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;
wine_tsx11_lock();
r = XShmCreateImage(a0, a1, a2, a3, a4, a5, a6, a7);
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;
wine_tsx11_lock();
r = XShmCreatePixmap(a0, a1, a2, a3, a4, a5, a6);
wine_tsx11_unlock();
return r;
}
#endif /* defined(HAVE_LIBXXSHM) */
tsx11/ts_xutil.c
View file @ df8e6eeb
......@@ -15,24 +15,6 @@
#include "ts_xutil.h"
XClassHint * TSXAllocClassHint(void)
{
XClassHint * r;
wine_tsx11_lock();
r = XAllocClassHint();
wine_tsx11_unlock();
return r;
}
XSizeHints * TSXAllocSizeHints(void)
{
XSizeHints * r;
wine_tsx11_lock();
r = XAllocSizeHints();
wine_tsx11_unlock();
return r;
}
XWMHints * TSXAllocWMHints(void)
{
XWMHints * r;
......@@ -42,51 +24,6 @@ XWMHints * TSXAllocWMHints(void)
return r;
}
int TSXClipBox(Region a0, XRectangle* a1)
{
int r;
wine_tsx11_lock();
r = XClipBox(a0, a1);
wine_tsx11_unlock();
return r;
}
Region TSXCreateRegion(void)
{
Region r;
wine_tsx11_lock();
r = XCreateRegion();
wine_tsx11_unlock();
return r;
}
int TSXDestroyRegion(Region a0)
{
int r;
wine_tsx11_lock();
r = XDestroyRegion(a0);
wine_tsx11_unlock();
return r;
}
int TSXEmptyRegion(Region a0)
{
int r;
wine_tsx11_lock();
r = XEmptyRegion(a0);
wine_tsx11_unlock();
return r;
}
int TSXEqualRegion(Region a0, Region a1)
{
int r;
wine_tsx11_lock();
r = XEqualRegion(a0, a1);
wine_tsx11_unlock();
return r;
}
int TSXFindContext(Display* a0, XID a1, XContext a2, XPointer* a3)
{
int r;
......@@ -96,15 +33,6 @@ int TSXFindContext(Display* a0, XID a1, XContext a2, XPointer* a3)
return r;
}
XVisualInfo * TSXGetVisualInfo(Display* a0, long a1, XVisualInfo* a2, int* a3)
{
XVisualInfo * r;
wine_tsx11_lock();
r = XGetVisualInfo(a0, a1, a2, a3);
wine_tsx11_unlock();
return r;
}
XWMHints * TSXGetWMHints(Display* a0, Window a1)
{
XWMHints * r;
......@@ -114,24 +42,6 @@ XWMHints * TSXGetWMHints(Display* a0, Window a1)
return r;
}
int TSXGetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, long* a3, Atom a4)
{
int r;
wine_tsx11_lock();
r = XGetWMSizeHints(a0, a1, a2, a3, a4);
wine_tsx11_unlock();
return r;
}
int TSXIntersectRegion(Region a0, Region a1, Region a2)
{
int r;
wine_tsx11_lock();
r = XIntersectRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXLookupString(XKeyEvent* a0, char* a1, int a2, KeySym* a3, XComposeStatus* a4)
{
int r;
......@@ -141,60 +51,6 @@ int TSXLookupString(XKeyEvent* a0, char* a1, int a2, KeySym* a3, XComposeStatus
return r;
}
int TSXOffsetRegion(Region a0, int a1, int a2)
{
int r;
wine_tsx11_lock();
r = XOffsetRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXPointInRegion(Region a0, int a1, int a2)
{
int r;
wine_tsx11_lock();
r = XPointInRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
Region TSXPolygonRegion(XPoint* a0, int a1, int a2)
{
Region r;
wine_tsx11_lock();
r = XPolygonRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXRectInRegion(Region a0, int a1, int a2, unsigned int a3, unsigned int a4)
{
int r;
wine_tsx11_lock();
r = XRectInRegion(a0, a1, a2, a3, a4);
wine_tsx11_unlock();
return r;
}
int TSXSaveContext(Display* a0, XID a1, XContext a2, const char* a3)
{
int r;
wine_tsx11_lock();
r = XSaveContext(a0, a1, a2, a3);
wine_tsx11_unlock();
return r;
}
int TSXSetClassHint(Display* a0, Window a1, XClassHint* a2)
{
int r;
wine_tsx11_lock();
r = XSetClassHint(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXSetWMHints(Display* a0, Window a1, XWMHints* a2)
{
int r;
......@@ -204,83 +60,6 @@ int TSXSetWMHints(Display* a0, Window a1, XWMHints* a2)
return r;
}
void TSXSetWMProperties(Display* a0, Window a1, XTextProperty* a2, XTextProperty* a3, char** a4, int a5, XSizeHints* a6, XWMHints* a7, XClassHint* a8)
{
wine_tsx11_lock();
XSetWMProperties(a0, a1, a2, a3, a4, a5, a6, a7, a8);
wine_tsx11_unlock();
}
void TSXSetWMSizeHints(Display* a0, Window a1, XSizeHints* a2, Atom a3)
{
wine_tsx11_lock();
XSetWMSizeHints(a0, a1, a2, a3);
wine_tsx11_unlock();
}
int TSXSetRegion(Display* a0, GC a1, Region a2)
{
int r;
wine_tsx11_lock();
r = XSetRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXShrinkRegion(Region a0, int a1, int a2)
{
int r;
wine_tsx11_lock();
r = XShrinkRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXStringListToTextProperty(char** a0, int a1, XTextProperty* a2)
{
int r;
wine_tsx11_lock();
r = XStringListToTextProperty(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXSubtractRegion(Region a0, Region a1, Region a2)
{
int r;
wine_tsx11_lock();
r = XSubtractRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXUnionRectWithRegion(XRectangle* a0, Region a1, Region a2)
{
int r;
wine_tsx11_lock();
r = XUnionRectWithRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXUnionRegion(Region a0, Region a1, Region a2)
{
int r;
wine_tsx11_lock();
r = XUnionRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXXorRegion(Region a0, Region a1, Region a2)
{
int r;
wine_tsx11_lock();
r = XXorRegion(a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXDestroyImage(struct _XImage *a0)
{
int r;
......@@ -290,41 +69,5 @@ int TSXDestroyImage(struct _XImage *a0)
return r;
}
struct _XImage * TSXSubImage(struct _XImage *a0, int a1, int a2, unsigned int a3, unsigned int a4)
{
struct _XImage * r;
wine_tsx11_lock();
r = XSubImage(a0, a1, a2, a3, a4);
wine_tsx11_unlock();
return r;
}
int TSXAddPixel(struct _XImage *a0, long a1)
{
int r;
wine_tsx11_lock();
r = XAddPixel(a0, a1);
wine_tsx11_unlock();
return r;
}
XContext TSXUniqueContext(void)
{
XContext r;
wine_tsx11_lock();
r = XUniqueContext();
wine_tsx11_unlock();
return r;
}
int TSXDeleteContext(Display*a0,XID a1,XContext a2)
{
int r;
wine_tsx11_lock();
r = XDeleteContext(a0,a1,a2);
wine_tsx11_unlock();
return r;
}
#endif /* defined(HAVE_X11_XLIB_H) */
tsx11/ts_xvideo.c deleted 100644 → 0
View file @ 3d5b4676
/*
* Thread safe wrappers around xvideo calls.
* This file was generated automatically by tools/make_X11wrappers
* DO NOT EDIT!
*/
#include "config.h"
#ifdef HAVE_XVIDEO
#include <X11/Xlib.h>
#include <X11/extensions/Xv.h>
#include <X11/extensions/XShm.h>
#include <X11/extensions/Xvlib.h>
#include "ts_xvideo.h"
int TSXvQueryExtension(Display* a0, unsigned int* a1, unsigned int* a2, unsigned int* a3, unsigned int* a4, unsigned int* a5)
{
int r;
wine_tsx11_lock();
r = XvQueryExtension( a0, a1, a2, a3, a4, a5);
wine_tsx11_unlock();
return r;
}
int TSXvQueryAdaptors(Display* a0, Window a1, unsigned int* a2, XvAdaptorInfo** a3)
{
int r;
wine_tsx11_lock();
r = XvQueryAdaptors( a0, a1, a2, a3);
wine_tsx11_unlock();
return r;
}
int TSXvQueryEncodings(Display* a0, XvPortID a1, unsigned int* a2, XvEncodingInfo** a3)
{
int r;
wine_tsx11_lock();
r = XvQueryEncodings( a0, a1, a2, a3);
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;
wine_tsx11_lock();
r = XvPutVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
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;
wine_tsx11_lock();
r = XvPutStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
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;
wine_tsx11_lock();
r = XvGetVideo( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
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;
wine_tsx11_lock();
r = XvGetStill( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11);
wine_tsx11_unlock();
return r;
}
int TSXvStopVideo(Display* a0, XvPortID a1, Drawable a2)
{
int r;
wine_tsx11_lock();
r = XvStopVideo( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXvGrabPort(Display* a0, XvPortID a1, Time a2)
{
int r;
wine_tsx11_lock();
r = XvGrabPort( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXvUngrabPort(Display* a0, XvPortID a1, Time a2)
{
int r;
wine_tsx11_lock();
r = XvUngrabPort( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXvSelectVideoNotify(Display* a0, Drawable a1, Bool a2)
{
int r;
wine_tsx11_lock();
r = XvSelectVideoNotify( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXvSelectPortNotify(Display* a0, XvPortID a1, Bool a2)
{
int r;
wine_tsx11_lock();
r = XvSelectPortNotify( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
int TSXvSetPortAttribute(Display* a0, XvPortID a1, Atom a2, int a3)
{
int r;
wine_tsx11_lock();
r = XvSetPortAttribute( a0, a1, a2, a3);
wine_tsx11_unlock();
return r;
}
int TSXvGetPortAttribute(Display* a0, XvPortID a1, Atom a2, int* a3)
{
int r;
wine_tsx11_lock();
r = XvGetPortAttribute( a0, a1, a2, a3);
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;
wine_tsx11_lock();
r = XvQueryBestSize( a0, a1, a2, a3, a4, a5, a6, a7, a8);
wine_tsx11_unlock();
return r;
}
XvAttribute* TSXvQueryPortAttributes(Display* a0, XvPortID a1, int* a2)
{
XvAttribute* r;
wine_tsx11_lock();
r = XvQueryPortAttributes( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
void TSXvFreeAdaptorInfo(XvAdaptorInfo* a0)
{
wine_tsx11_lock();
XvFreeAdaptorInfo( a0);
wine_tsx11_unlock();
}
void TSXvFreeEncodingInfo(XvEncodingInfo* a0)
{
wine_tsx11_lock();
XvFreeEncodingInfo( a0);
wine_tsx11_unlock();
}
XvImageFormatValues * TSXvListImageFormats(Display* a0, XvPortID a1, int* a2)
{
XvImageFormatValues * r;
wine_tsx11_lock();
r = XvListImageFormats( a0, a1, a2);
wine_tsx11_unlock();
return r;
}
XvImage * TSXvCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5)
{
XvImage * r;
wine_tsx11_lock();
r = XvCreateImage( a0, a1, a2, a3, a4, a5);
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;
wine_tsx11_lock();
r = XvPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12);
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;
wine_tsx11_lock();
r = XvShmPutImage( a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13);
wine_tsx11_unlock();
return r;
}
XvImage * TSXvShmCreateImage(Display* a0, XvPortID a1, int a2, char* a3, int a4, int a5, XShmSegmentInfo* a6)
{
XvImage * r;
wine_tsx11_lock();
r = XvShmCreateImage( a0, a1, a2, a3, a4, a5, a6);
wine_tsx11_unlock();
return r;
}
#endif /* defined(HAVE_XVIDEO) */
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