1 files changed, 24 insertions, 46 deletions
diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 85104090e..3649fe830 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -42,11 +42,6 @@
 #define YES					1
 #endif
 
-/* Turn debug messages on or off */
-#ifndef CYGDEBUG
-#define CYGDEBUG				NO
-#endif
-
 /* WM_XBUTTON Messages. They should go into w32api. */
 #ifndef WM_XBUTTONDOWN
 # define WM_XBUTTONDOWN 523
@@ -142,6 +137,9 @@
 #include <errno.h>
 #if defined(XWIN_MULTIWINDOWEXTWM) || defined(XWIN_CLIPBOARD) || defined(XWIN_MULTIWINDOW)
 #define HANDLE void *
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
 #include <pthread.h>
 #undef HANDLE
 #endif
@@ -210,43 +208,6 @@
 #include "winwindow.h"
 #include "winmsg.h"
 
-
-/*
- * Debugging macros
- */
-
-#if CYGDEBUG
-#define DEBUG_MSG(str,...) \
-if (fDebugProcMsg) \
-{ \
-  char *pszTemp; \
-  int iLength; \
-  pszTemp = Xprintf (str, ##__VA_ARGS__); \
-  MessageBox (NULL, pszTemp, szFunctionName, MB_OK); \
-  free(pszTemp); \
-}
-#else
-#define DEBUG_MSG(str,...)
-#endif
-
-#if CYGDEBUG
-#define DEBUG_FN_NAME(str) PTSTR szFunctionName = str
-#else
-#define DEBUG_FN_NAME(str)
-#endif
-
-#if CYGDEBUG || YES
-#define DEBUGVARS BOOL fDebugProcMsg = FALSE
-#else
-#define DEBUGVARS
-#endif
-
-#if CYGDEBUG || YES
-#define DEBUGPROC_MSG fDebugProcMsg = TRUE
-#else
-#define DEBUGPROC_MSG
-#endif
-
 #define PROFILEPOINT(point,thresh)\
 {\
 static unsigned int PROFPT##point = 0;\
@@ -498,17 +459,19 @@ typedef struct _winPrivScreenRec
   
   /* Privates used by shadow fb and primary fb DirectDraw servers */
   LPDIRECTDRAW		pdd;
-  LPDIRECTDRAWSURFACE2	pddsPrimary;
+  LPDIRECTDRAWSURFACE	pddsPrimary;
   LPDIRECTDRAW2		pdd2;
 
   /* Privates used by shadow fb DirectDraw server */
-  LPDIRECTDRAWSURFACE2	pddsShadow;
+  LPDIRECTDRAWSURFACE	pddsShadow;
   LPDDSURFACEDESC	pddsdShadow;
 
+#ifdef XWIN_PRIMARYFB
   /* Privates used by primary fb DirectDraw server */
-  LPDIRECTDRAWSURFACE2	pddsOffscreen;
+  LPDIRECTDRAWSURFACE	pddsOffscreen;
   LPDDSURFACEDESC	pddsdOffscreen;
   LPDDSURFACEDESC	pddsdPrimary;
+#endif
 
   /* Privates used by shadow fb DirectDraw Nonlocking server */
   LPDIRECTDRAW4		pdd4;
@@ -589,6 +552,11 @@ typedef struct _winPrivScreenRec
   MoveWindowProcPtr			MoveWindow;
   SetShapeProcPtr			SetShape;
 
+#ifdef XWIN_NATIVEGDI
+  RealizeFontProcPtr                    RealizeFont;
+  UnrealizeFontProcPtr                  UnrealizeFont;
+#endif
+
   winCursorRec                          cursor;
 } winPrivScreenRec;
 
@@ -836,6 +804,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen);
  * windialogs.c
  */
 
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv);
+
 void
 winDisplayExitDialog (winPrivScreenPtr pScreenPriv);
 
@@ -1306,7 +1277,7 @@ winTopLevelWindowProc (HWND hwnd, UINT message,
  */
 
 void
-winInitNotifyIcon (winPrivScreenPtr pScreenPriv);
+winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);
 
 void
 winDeleteNotifyIcon (winPrivScreenPtr pScreenPriv);
@@ -1463,6 +1434,13 @@ void
 winInitializeScreens(int maxscreens);
 
 /*
+ * windisplay.c
+ */
+
+void
+winGetDisplayName(char *szDisplay, unsigned int screen);
+
+/*
  * END DDX and DIX Function Prototypes
  */