1 files changed, 26 insertions, 51 deletions

diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index b7d20ca73..c4847670e 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -47,11 +47,6 @@
 #define WM_MOUSEHWHEEL 0x020E
 #endif
 
-/* Turn debug messages on or off */
-#ifndef CYGDEBUG
-#define CYGDEBUG				NO
-#endif
-
 #define WIN_DEFAULT_BPP				0
 #define WIN_DEFAULT_WHITEPIXEL			255
 #define WIN_DEFAULT_BLACKPIXEL			0
@@ -130,6 +125,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
@@ -194,43 +192,6 @@
 #include "winwindow.h"
 #include "winmsg.h"
 
-/*
- * Debugging macros
- */
-
-#if CYGDEBUG
-#define DEBUG_MSG(str,...) \
-if (fDebugProcMsg) \
-{ \
-  char *pszTemp; \
-  int iLength; \
-  if (asprintf (&pszTemp, str, ##__VA_ARGS__) != -1) { \
-    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;\
@@ -405,9 +366,11 @@ typedef struct {
     Bool fDecoration;
 #ifdef XWIN_MULTIWINDOWEXTWM
     Bool fMWExtWM;
-    Bool fInternalWM;
     Bool fAnotherWMRunning;
 #endif
+#ifdef XWIN_MULTIWINDOWINTWM
+  Bool			fInternalWM;
+#endif
     Bool fRootless;
 #ifdef XWIN_MULTIWINDOW
     Bool fMultiWindow;
@@ -477,17 +440,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;
@@ -793,6 +758,9 @@ Bool
  * windialogs.c
  */
 
+int
+GetLiveClients (winPrivScreenPtr pScreenPriv);
+
 void
  winDisplayExitDialog(winPrivScreenPtr pScreenPriv);
 
@@ -1057,7 +1025,7 @@ winTopLevelWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam);
  */
 
 void
- winInitNotifyIcon(winPrivScreenPtr pScreenPriv);
+ winInitNotifyIcon (winPrivScreenPtr pScreenPriv, Bool Modify);
 
 void
  winDeleteNotifyIcon(winPrivScreenPtr pScreenPriv);
@@ -1160,13 +1128,13 @@ winMWExtWMUpdateWindowDecoration(win32RootlessWindowPtr pRLWinPriv,
 
 wBOOL CALLBACK winMWExtWMDecorateWindow(HWND hwnd, LPARAM lParam);
 
-Bool
- winIsInternalWMRunning(winScreenInfoPtr pScreenInfo);
-
 void
  winMWExtWMRestackWindows(ScreenPtr pScreen);
 #endif
-
+#ifdef XWIN_MULTIWINDOWINTWM
+Bool
+ winIsInternalWMRunning (winScreenInfoPtr pScreenInfo);
+#endif
 #ifdef XWIN_MULTIWINDOWEXTWM
 /*
  * winwin32rootlesswndproc.c
@@ -1202,6 +1170,13 @@ void
  winInitializeScreens(int maxscreens);
 
 /*
+ * windisplay.c
+ */
+
+void
+winGetDisplayName(char *szDisplay, unsigned int screen);
+
+/*
  * winrandr.c
  */
 Bool