1 files changed, 22 insertions, 46 deletions

diff --git a/xorg-server/hw/xwin/winprocarg.c b/xorg-server/hw/xwin/winprocarg.c
index 39f0ee3e5..cfe1a6f20 100644
--- a/xorg-server/hw/xwin/winprocarg.c
+++ b/xorg-server/hw/xwin/winprocarg.c
@@ -35,7 +35,8 @@ from The Open Group.
 #include "win.h"

 #include "winconfig.h"

 #include "winmsg.h"

-

+#define COMPILE_MULTIMON_STUBS

+#include <multimon.h>

 /*

  * References to external symbols

  */

@@ -56,30 +57,10 @@ struct GetMonitorInfoData {
     int  monitorWidth;

 };

 

-typedef wBOOL (*ENUMDISPLAYMONITORSPROC)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);

-ENUMDISPLAYMONITORSPROC _EnumDisplayMonitors;

-

 wBOOL CALLBACK getMonitorInfo(HMONITOR hMonitor, HDC hdc, LPRECT rect, LPARAM _data);

 

 static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)

 {

-    /* Load EnumDisplayMonitors from DLL */

-    HMODULE user32;

-    FARPROC func;

-    user32 = LoadLibrary("user32.dll");

-    if (user32 == NULL)

-    {

-        winW32Error(2, "Could not open user32.dll");

-        return FALSE;

-    }

-    func = GetProcAddress(user32, "EnumDisplayMonitors");

-    if (func == NULL)

-    {

-        winW32Error(2, "Could not resolve EnumDisplayMonitors: ");

-        return FALSE;

-    }

-    _EnumDisplayMonitors = (ENUMDISPLAYMONITORSPROC)func;

-    

     /* prepare data */

     if (data == NULL)

         return FALSE;

@@ -87,10 +68,8 @@ static Bool QueryMonitor(int index, struct GetMonitorInfoData *data)
     data->requestedMonitor = index;

 

     /* query information */

-    _EnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);

+    xEnumDisplayMonitors(NULL, NULL, getMonitorInfo, (LPARAM) data);

 

-    /* cleanup */

-    FreeLibrary(user32);

     return TRUE;

 }

 

@@ -136,7 +115,7 @@ winInitializeScreenDefaults(void)
   dwWidth = GetSystemMetrics (SM_CXSCREEN);

   dwHeight = GetSystemMetrics (SM_CYSCREEN);

 

-  winErrorFVerb (2, "winInitializeScreenDefaults - w %d h %d\n",

+  winDebug ("winInitializeScreenDefaults - w %d h %d\n",

 	  (int) dwWidth, (int) dwHeight);

 

   /* Set a default DPI, if no parameter was passed */

@@ -188,7 +167,7 @@ winInitializeScreenDefaults(void)
 static void

 winInitializeScreen(int i)

 {

-  winErrorFVerb (2, "winInitializeScreen - %d\n",i);

+  winDebug ("winInitializeScreen - %d\n",i);

 

   /* Initialize default screen values, if needed */

   winInitializeScreenDefaults();

@@ -204,7 +183,7 @@ void
 winInitializeScreens(int maxscreens)

 {

   int i;

-  winErrorFVerb (2, "winInitializeScreens - %i\n", maxscreens);

+  winDebug ("winInitializeScreens - %i\n", maxscreens);

 

   if (maxscreens > g_iNumScreens)

     {

@@ -280,15 +259,13 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	   * OsVendorInit () gets called, otherwise we will overwrite

 	   * settings changed by parameters such as -fullscreen, etc.

 	   */

-	  winErrorFVerb (2, "ddxProcessArgument - Initializing default "

+	  winDebug ("ddxProcessArgument - Initializing default "

 			 "screens\n");

 	  winInitializeScreenDefaults();

 	}

     }

 

-#if CYGDEBUG

   winDebug ("ddxProcessArgument - arg: %s\n", argv[i]);

-#endif

 

   /*

    * Look for the '-help' and similar options

@@ -322,10 +299,8 @@ ddxProcessArgument (int argc, char *argv[], int i)
       int		iWidth, iHeight, iX, iY;

       int		iMonitor;

 

-#if CYGDEBUG

       winDebug ("ddxProcessArgument - screen - argc: %d i: %d\n",

 	      argc, i);

-#endif

 

       /* Display the usage message if the argument is malformed */

       if (i + 1 >= argc)

@@ -364,7 +339,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
                     "Querying monitors is not supported on NT4 and Win95\n");

         } else if (data.bMonitorSpecifiedExists == TRUE) 

         {

-		  winErrorFVerb(2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);

+		  winDebug("ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);

 		  iArgsProcessed = 3;

 		  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE;

 		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

@@ -392,7 +367,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 			  (int *) &iWidth,

 			  (int *) &iHeight))

 	{

-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``WxD'' arg\n");

+	  winDebug ("ddxProcessArgument - screen - Found ``WxD'' arg\n");

 	  iArgsProcessed = 3;

 	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;

 	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;

@@ -404,7 +379,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 			   (int *) &iX,

 			   (int *) &iY))

 	  {

-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X+Y'' arg\n");

+	    winDebug("ddxProcessArgument - screen - Found ``X+Y'' arg\n");

 	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

 	    g_ScreenInfo[nScreenNum].dwInitialX = iX;

 	    g_ScreenInfo[nScreenNum].dwInitialY = iY;

@@ -447,7 +422,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
                   "Querying monitors is not supported on NT4 and Win95\n");

         } else if (data.bMonitorSpecifiedExists == TRUE) 

         {

-		  winErrorFVerb (2, "ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);

+		  winDebug ("ddxProcessArgument - screen - Found Valid ``@Monitor'' = %d arg\n", iMonitor);

 		  g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

 		  g_ScreenInfo[nScreenNum].dwInitialX = data.monitorOffsetX;

 		  g_ScreenInfo[nScreenNum].dwInitialY = data.monitorOffsetY;

@@ -470,7 +445,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	       && 1 == sscanf (argv[i + 3], "%d",

 			       (int *) &iHeight))

 	{

-	  winErrorFVerb (2, "ddxProcessArgument - screen - Found ``W D'' arg\n");

+	  winDebug ("ddxProcessArgument - screen - Found ``W D'' arg\n");

 	  iArgsProcessed = 4;

 	  g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = TRUE;

 	  g_ScreenInfo[nScreenNum].dwWidth = iWidth;

@@ -483,7 +458,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	      && 1 == sscanf (argv[i + 5], "%d",

 			      (int *) &iY))

 	  {

-	    winErrorFVerb (2, "ddxProcessArgument - screen - Found ``X Y'' arg\n");

+	    winDebug ("ddxProcessArgument - screen - Found ``X Y'' arg\n");

 	    iArgsProcessed = 6;

 	    g_ScreenInfo[nScreenNum].fUserGavePosition = TRUE;

 	    g_ScreenInfo[nScreenNum].dwInitialX = iX;

@@ -492,7 +467,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
 	}

       else

 	{

-	  winErrorFVerb (2, "ddxProcessArgument - screen - Did not find size arg. "

+	  ErrorF ("ddxProcessArgument - screen - Did not find size arg. "

 		  "dwWidth: %d dwHeight: %d\n",

 		  (int) g_ScreenInfo[nScreenNum].dwWidth,

 		  (int) g_ScreenInfo[nScreenNum].dwHeight);

@@ -1209,7 +1184,7 @@ winLogCommandLine (int argc, char *argv[])
       iCurrLen += strlen (argv[i]);

     }

 

-  ErrorF ("XWin was started with the following command line:\n\n"

+  winDebug ("XWin was started with the following command line:\n\n"

 	  "%s\n\n", g_pszCommandLine);

 }

 

@@ -1221,19 +1196,20 @@ winLogCommandLine (int argc, char *argv[])
 void

 winLogVersionInfo (void)

 {

+#ifdef WINDBG

   static Bool		s_fBeenHere = FALSE;

 

   if (s_fBeenHere)

     return;

   s_fBeenHere = TRUE;

 

-  ErrorF ("Welcome to the XWin X Server\n");

-  ErrorF ("Vendor: %s\n", XVENDORNAME);

-  ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);

-  ErrorF ("%s\n\n", BUILDERSTRING);

-  ErrorF ("Contact: %s\n", BUILDERADDR);

+  winDebug ("Welcome to the VcXsrv X Server\n");

+  winDebug ("Vendor: %s\n", XVENDORNAME);

+  winDebug ("Release: %d.%d.%d.%d (%d)\n\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT);

+  winDebug ("%s\n\n", BUILDERSTRING);

+  winDebug ("Contact: %s\n\n", BUILDERADDR);

+#endif

 }

-

 /*

  * getMonitorInfo - callback function used to return information from the enumeration of monitors attached

  */