marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed X_DISPLAY_MISSING.

oldstable
Patrik Stridvall 2000-04-25 19:55:35 +00:00 committed by Alexandre Julliard
parent 164bac9292
commit 3d511617f4
37 changed files with 24 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/x11drv/bitblt.c
View File

@ -6,9 +6,8 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Intrinsic.h>
#include "ts_xlib.h"
#include <assert.h>
@ -1542,4 +1541,3 @@ BOOL X11DRV_StretchBlt( DC *dcDst, INT xDst, INT yDst,
return result;
}
#endif /* !defined(X_DISPLAY_MISSING) */

3
graphics/x11drv/bitmap.c
View File

@ -7,8 +7,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include "ts_xutil.h"
@ -618,4 +616,3 @@ Pixmap X11DRV_BITMAP_Pixmap(HBITMAP hbitmap)
return (Pixmap)bmp->physBitmap;
}
#endif /* !defined(X_DISPLAY_MISSING) */

5
graphics/x11drv/brush.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include <stdlib.h>
@ -285,6 +283,3 @@ HBRUSH X11DRV_BRUSH_SelectObject( DC * dc, HBRUSH hbrush, BRUSHOBJ * brush )
return prevHandle;
}
#endif /* !defined(X_DISPLAY_MISSING) */

5
graphics/x11drv/clipping.c
View File

@ -6,11 +6,10 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include <stdio.h>
#include "dc.h"
#include "x11drv.h"
#include "region.h"
@ -74,5 +73,3 @@ void X11DRV_SetDeviceClipping( DC * dc )
GDI_HEAP_UNLOCK( dc->w.hGCClipRgn );
}
#endif /* !defined(X_DISPLAY_MISSING) */

8
graphics/x11drv/dib.c
View File

@ -6,11 +6,8 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include "ts_xutil.h"
#ifdef HAVE_LIBXXSHM
# include "ts_xshm.h"
# ifdef HAVE_SYS_SHM_H
@ -3553,8 +3550,3 @@ Pixmap X11DRV_DIB_CreatePixmapFromDIB( HGLOBAL hPackedDIB, HDC hdc )
TRACE("\tReturning Pixmap %ld\n", pixmap);
return pixmap;
}
#endif /* !defined(X_DISPLAY_MISSING) */

4
graphics/x11drv/graphics.c
View File

@ -11,9 +11,8 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Intrinsic.h>
#include "ts_xlib.h"
#include "ts_xutil.h"
@ -1352,4 +1351,3 @@ BOOL X11DRV_GetDCOrgEx( DC *dc, LPPOINT lpp )
return TRUE;
}
#endif /* !defined(X_DISPLAY_MISSING) */

3
graphics/x11drv/init.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include <string.h>
@ -312,4 +310,3 @@ static INT X11DRV_Escape( DC *dc, INT nEscape, INT cbInput,
return 0;
}
#endif /* !defined(X_DISPLAY_MISSING) */

4
graphics/x11drv/objects.c
View File

@ -6,10 +6,9 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <stdlib.h>
#include <stdio.h>
#include "bitmap.h"
#include "brush.h"
#include "font.h"
@ -88,4 +87,3 @@ BOOL X11DRV_DeleteObject( HGDIOBJ handle )
return ret;
}
#endif /* !defined(X_DISPLAY_MISSING) */

3
graphics/x11drv/oembitmap.c
View File

@ -7,8 +7,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include "ts_xutil.h"
@ -625,4 +623,3 @@ BOOL X11DRV_OBM_Init(void)
return 1;
}
#endif /* !defined(X_DISPLAY_MISSING) */

3
graphics/x11drv/palette.c
View File

@ -7,8 +7,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include <stdlib.h>
@ -992,4 +990,3 @@ BOOL X11DRV_PALETTE_IsDark(int pixel)
return (GetRValue(col) + GetGValue(col) + GetBValue(col)) <= 0x180;
}
#endif /* !defined(X_DISPLAY_MISSING) */

4
graphics/x11drv/pen.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "pen.h"
#include "color.h"
#include "x11drv.h"
@ -68,5 +66,3 @@ HPEN X11DRV_PEN_SelectObject( DC * dc, HPEN hpen, PENOBJ * pen )
return prevHandle;
}
#endif /* !defined(X_DISPLAY_MISSING) */

7
graphics/x11drv/text.c
View File

@ -6,14 +6,14 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xatom.h>
#include "ts_xlib.h"
#include <stdlib.h>
#include "windef.h"
#include <math.h>
#include "windef.h"
#include "dc.h"
#include "gdi.h"
#include "heap.h"
@ -371,4 +371,3 @@ END:
return TRUE;
}
#endif /* !defined(X_DISPLAY_MISSING) */

10
graphics/x11drv/xfont.c
View File

@ -9,11 +9,9 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xatom.h>
#include "ts_xlib.h"
#include "x11font.h"
#endif /* !defined(X_DISPLAY_MISSING) */
#include <ctype.h>
#include <stdio.h>
@ -25,6 +23,7 @@
#include <fcntl.h>
#include <math.h>
#include <assert.h>
#include "windef.h"
#include "wingdi.h"
#include "winuser.h"
@ -34,11 +33,10 @@
#include "debugtools.h"
#include "ldt.h"
#include "tweak.h"
#include "x11font.h"
DEFAULT_DEBUG_CHANNEL(font)
#ifndef X_DISPLAY_MISSING
#define X_PFONT_MAGIC (0xFADE0000)
#define X_FMC_MAGIC (0x0000CAFE)
@ -3073,5 +3071,3 @@ BOOL X11DRV_GetCharWidth( DC *dc, UINT firstChar, UINT lastChar,
}
return FALSE;
}
#endif /* !defined(X_DISPLAY_MISSING) */

4
include/ts_xf86dga.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
@ -30,6 +28,4 @@ extern Status TSXF86DGAViewPortChanged(Display*,int,int);
#endif /* defined(HAVE_LIBXXF86DGA) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XF86DGA_H */

4
include/ts_xf86dga2.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXF86DGA2
#include <X11/Xlib.h>
@ -39,6 +37,4 @@ extern void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent*, XKeyEvent*);
#endif /* defined(HAVE_LIBXXF86DGA2) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XF86DGA2_H */

4
include/ts_xf86vmode.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "windef.h"
#ifdef HAVE_LIBXXF86VM
#define XMD_H
@ -38,6 +36,4 @@ extern Bool TSXF86VidModeSetViewPort(Display*,int,int,int);
#endif /* defined(HAVE_LIBXXF86VM) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XF86VMODE_H */

4
include/ts_xlib.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
@ -143,6 +141,4 @@ extern int (*TSXSynchronize(Display *, Bool))(Display *);
extern void TS_XInitImageFuncPtrs(XImage *);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XLIB_H */

4
include/ts_xpm.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
@ -22,6 +20,4 @@ extern int TSXpmAttributesSize(void);
#endif /* defined(HAVE_LIBXXPM) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XPM_H */

4
include/ts_xresource.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@ -25,6 +23,4 @@ extern void TSXrmMergeDatabases(XrmDatabase, XrmDatabase*);
extern void TSXrmParseCommand(XrmDatabase*, XrmOptionDescList, int, const char*, int*, char**);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XRESOURCE_H */

4
include/ts_xshm.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXSHM
#include <X11/Xlib.h>
@ -30,6 +28,4 @@ extern Pixmap TSXShmCreatePixmap(Display *, Drawable, char *, XShmSegmentInfo *,
#endif /* defined(HAVE_LIBXXSHM) */
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XSHM_H */

4
include/ts_xutil.h
View File

@ -11,8 +11,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@ -54,6 +52,4 @@ extern int TSXAddPixel(struct _XImage *, long);
extern XContext TSXUniqueContext(void);
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_XUTIL_H */

6
include/x11drv.h
View File

@ -7,18 +7,18 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#endif /* !defined(X_DISPLAY_MISSING) */
#ifdef HAVE_LIBXXSHM
# include <X11/extensions/XShm.h>
#endif /* defined(HAVE_LIBXXSHM) */
#include "gdi.h"
#include "winbase.h"
#include "windef.h"
#include <X11/extensions/XShm.h>
struct tagBITMAPOBJ;
struct tagCLASS;

7
tools/make_X11wrappers
View File

@ -95,8 +95,6 @@ foreach $name (@dolist) {
#include "config.h"
#ifndef X_DISPLAY_MISSING
$pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h>
@ -111,8 +109,6 @@ END
#include "config.h"
#ifndef X_DISPLAY_MISSING
$pre_file
$x11_incl#include <X11/$extensions_dir$inc_name.h>
@ -375,14 +371,11 @@ END
print OUTH <<END;
$post_file
#endif /* !defined(X_DISPLAY_MISSING) */
#endif /* __WINE_TS_$ucname\_H */
END
print OUTC <<END;
$post_file
#endif /* !defined(X_DISPLAY_MISSING) */
END

3
tsx11/ts_xf86dga.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXF86DGA
#include <X11/Xlib.h>
@ -120,4 +118,3 @@ Status TSXF86DGAViewPortChanged(Display*a0,int a1,int a2)
#endif /* defined(HAVE_LIBXXF86DGA) */
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xf86dga2.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXF86DGA2
#include <X11/Xlib.h>
@ -199,4 +197,3 @@ void TSXDGAKeyEventToXKeyEvent(XDGAKeyEvent* a0, XKeyEvent* a1)
#endif /* defined(HAVE_LIBXXF86DGA2) */
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xf86vmode.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "windef.h"
#ifdef HAVE_LIBXXF86VM
#define XMD_H
@ -178,4 +176,3 @@ Bool TSXF86VidModeSetViewPort(Display*a0,int a1,int a2,int a3)
#endif /* defined(HAVE_LIBXXF86VM) */
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xlib.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
@ -1391,4 +1389,3 @@ void TS_XInitImageFuncPtrs(XImage *a0)
}
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xpm.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXPM
#include <X11/xpm.h>
@ -42,4 +40,3 @@ int TSXpmAttributesSize(void)
#endif /* defined(HAVE_LIBXXPM) */
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xresource.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@ -81,4 +79,3 @@ void TSXrmParseCommand(XrmDatabase* a0, XrmOptionDescList a1, int a2, const ch
}
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xshm.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#ifdef HAVE_LIBXXSHM
#include <X11/Xlib.h>
@ -120,4 +118,3 @@ Pixmap TSXShmCreatePixmap(Display *a0, Drawable a1, char *a2, XShmSegmentInfo *a
#endif /* defined(HAVE_LIBXXSHM) */
#endif /* !defined(X_DISPLAY_MISSING) */

3
tsx11/ts_xutil.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xlib.h>
#include <X11/Xresource.h>
@ -390,4 +388,3 @@ XContext TSXUniqueContext(void)
}
#endif /* !defined(X_DISPLAY_MISSING) */

9
windows/x11drv/clipboard.c
View File

@ -47,17 +47,16 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xatom.h>
#include "ts_xlib.h"
#include <errno.h>
#include <X11/Xatom.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include "ts_xlib.h"
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
@ -1239,5 +1238,3 @@ void X11DRV_CLIPBOARD_FreeResources( Atom property )
else prop = &(*prop)->next;
}
}
#endif /* !defined(X_DISPLAY_MISSING) */

6
windows/x11drv/event.c
View File

@ -7,17 +7,15 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xatom.h>
#include <X11/keysym.h>
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
#ifdef HAVE_LIBXXSHM
#include "ts_xshm.h"
#endif
#ifdef HAVE_LIBXXF86DGA2
#include "ts_xf86dga2.h"
#endif
@ -2183,5 +2181,3 @@ void X11DRV_EVENT_WaitShmCompletions( Drawable dw )
}
#endif /* defined(HAVE_LIBXXSHM) */
#endif /* !defined(X_DISPLAY_MISSING) */

6
windows/x11drv/init.c
View File

@ -4,10 +4,6 @@
* Copyright 1998 Patrik Stridvall
*/
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "clipboard.h"
#include "monitor.h"
#include "user.h"
@ -46,6 +42,4 @@ WND_DRIVER X11DRV_WND_Driver =
X11DRV_WND_IsSelfClipping
};
#endif /* !defined(X_DISPLAY_MISSING) */

11
windows/x11drv/keyboard.c
View File

@ -11,16 +11,16 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <ctype.h>
#include <string.h>
#include <X11/Xatom.h>
#include <X11/keysym.h>
#include "ts_xlib.h"
#include "ts_xresource.h"
#include "ts_xutil.h"
#include <ctype.h>
#include <string.h>
#include "windef.h"
#include "wingdi.h"
#include "wine/winuser16.h"
@ -1567,6 +1567,3 @@ extern void X11DRV_KEYBOARD_SetKeyboardConfig(KEYBOARD_CONFIG *cfg, DWORD mask)
TSXChangeKeyboardControl(display, X_mask, &xkc);
}
#endif /* !defined(X_DISPLAY_MISSING) */

5
windows/x11drv/mouse.c
View File

@ -6,8 +6,6 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include "ts_xlib.h"
#include "callback.h"
@ -272,6 +270,3 @@ void X11DRV_MOUSE_Init()
GetTickCount(),
0);
}
#endif /* !defined(X_DISPLAY_MISSING) */

6
windows/x11drv/wnd.c
View File

@ -8,14 +8,14 @@
#include "config.h"
#ifndef X_DISPLAY_MISSING
#include <X11/Xatom.h>
#include "ts_xlib.h"
#include "ts_xutil.h"
#include <stdlib.h>
#include <string.h>
#include "bitmap.h"
#include "color.h"
#include "debugtools.h"
@ -882,4 +882,4 @@ void X11DRV_WND_DockWindow(WND *wndPtr)
display,win,kwmDockWindow,kwmDockWindow,32,PropModeReplace,(char*)&data,1
);
}
#endif /* !defined(X_DISPLAY_MISSING) */