Bug 777: Merge from CYGWIN branch

1 files changed, 81 insertions, 17 deletions

diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c
index b2ac9f14e..dbee9d285 100644
--- a/hw/xwin/winnativegdi.c
+++ b/hw/xwin/winnativegdi.c
@@ -31,7 +31,65 @@
 
 #include "win.h"
 
-Bool
+
+/*
+ * External symbols
+ */
+
+extern HWND			g_hDlgExit;
+
+
+/*
+ * Local function prototypes
+ */
+
+static Bool
+winAllocateFBNativeGDI (ScreenPtr pScreen);
+
+static void
+winShadowUpdateNativeGDI (ScreenPtr pScreen, 
+			  shadowBufPtr pBuf);
+
+static Bool
+winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen);
+
+static Bool
+winInitVisualsNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winAdjustVideoModeNativeGDI (ScreenPtr pScreen);
+
+#if 0
+static Bool
+winBltExposedRegionsNativeGDI (ScreenPtr pScreen);
+#endif
+
+static Bool
+winActivateAppNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winRedrawScreenNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen);
+
+static Bool
+winInstallColormapNativeGDI (ColormapPtr pColormap);
+
+static Bool
+winStoreColorsNativeGDI (ColormapPtr pmap, 
+			 int ndef,
+			 xColorItem *pdefs);
+
+static Bool
+winCreateColormapNativeGDI (ColormapPtr pColormap);
+
+static Bool
+winDestroyColormapNativeGDI (ColormapPtr pColormap);
+
+
+
+static Bool
 winAllocateFBNativeGDI (ScreenPtr pScreen)
 {
   FatalError ("winAllocateFBNativeGDI\n");
@@ -39,11 +97,13 @@ winAllocateFBNativeGDI (ScreenPtr pScreen)
   return TRUE;
 }
 
+
 /*
  * We wrap whatever CloseScreen procedure was specified by fb;
  * a pointer to said procedure is stored in our privates.
  */
-Bool
+
+static Bool
 winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
 {
   winScreenPriv(pScreen);
@@ -95,7 +155,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
 }
 
 
-void
+static void
 winShadowUpdateNativeGDI (ScreenPtr pScreen, 
 			  shadowBufPtr pBuf)
 {
@@ -104,7 +164,7 @@ winShadowUpdateNativeGDI (ScreenPtr pScreen,
 }
 
 
-Bool
+static Bool
 winInitVisualsNativeGDI (ScreenPtr pScreen)
 {
   winScreenPriv(pScreen);
@@ -149,7 +209,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
 
   /* Tell the user how many bits per RGB we are using */
   ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
-	  pScreenPriv->dwBitsPerRGB);
+	  (int) pScreenPriv->dwBitsPerRGB);
 
   /* Create a single visual according to the Windows screen depth */
   switch (pScreenInfo->dwDepth)
@@ -199,7 +259,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
 
 
 /* Adjust the video mode */
-Bool
+static Bool
 winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
 {
   winScreenPriv(pScreen);
@@ -239,7 +299,8 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
     {
       /* No -depth parameter passed, let the user know the depth being used */
       ErrorF ("winAdjustVideoModeNativeGDI - Using Windows display "
-	      "depth of %d bits per pixel, %d depth\n", dwBPP, pScreenInfo->dwDepth);
+	      "depth of %d bits per pixel, %d depth\n",
+	      (int) dwBPP, (int) pScreenInfo->dwDepth);
 
       /* Use GDI's depth */
       pScreenInfo->dwBPP = dwBPP;
@@ -248,7 +309,8 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
     {
       /* Warn user if GDI depth is different than -depth parameter */
       ErrorF ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\
-	      "using bpp: %d\n", pScreenInfo->dwBPP, dwBPP);
+	      "using bpp: %d\n",
+	      (int) pScreenInfo->dwBPP, (int) dwBPP);
 
       /* We'll use GDI's depth */
       pScreenInfo->dwBPP = dwBPP;
@@ -261,7 +323,7 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
 }
 
 
-Bool
+static Bool
 winActivateAppNativeGDI (ScreenPtr pScreen)
 {
   winScreenPriv(pScreen);
@@ -380,15 +442,17 @@ winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,
 }
 
 
-Bool
+#if 0
+static Bool
 winBltExposedRegionsNativeGDI (ScreenPtr pScreen)
 {
   
   return TRUE;
 }
+#endif
 
 
-Bool
+static Bool
 winRedrawScreenNativeGDI (ScreenPtr pScreen)
 {
   FatalError ("winRedrawScreenNativeGDI\n");
@@ -396,7 +460,7 @@ winRedrawScreenNativeGDI (ScreenPtr pScreen)
 }
 
 
-Bool
+static Bool
 winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen)
 {
   FatalError ("winRealizeInstalledPaletteNativeGDI\n");
@@ -404,7 +468,7 @@ winRealizeInstalledPaletteNativeGDI (ScreenPtr pScreen)
 }
 
 
-Bool
+static Bool
 winInstallColormapNativeGDI (ColormapPtr pColormap)
 {
   FatalError ("winInstallColormapNativeGDI\n");
@@ -412,7 +476,7 @@ winInstallColormapNativeGDI (ColormapPtr pColormap)
 }
 
 
-Bool
+static Bool
 winStoreColorsNativeGDI (ColormapPtr pmap, 
 			 int ndef,
 			 xColorItem *pdefs)
@@ -422,7 +486,7 @@ winStoreColorsNativeGDI (ColormapPtr pmap,
 }
 
 
-Bool
+static Bool
 winCreateColormapNativeGDI (ColormapPtr pColormap)
 {
   FatalError ("winCreateColormapNativeGDI\n");
@@ -430,7 +494,7 @@ winCreateColormapNativeGDI (ColormapPtr pColormap)
 }
 
 
-Bool
+static Bool
 winDestroyColormapNativeGDI (ColormapPtr pColormap)
 {
   FatalError ("winDestroyColormapNativeGDI\n");
@@ -474,7 +538,7 @@ winSetEngineFunctionsNativeGDI (ScreenPtr pScreen)
   pScreenPriv->pwinStoreColors = winStoreColorsNativeGDI;
   pScreenPriv->pwinCreateColormap = winCreateColormapNativeGDI;
   pScreenPriv->pwinDestroyColormap = winDestroyColormapNativeGDI;
-  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)())NoopDDA;
+  pScreenPriv->pwinHotKeyAltTab = (winHotKeyAltTabProcPtr) (void (*)(void))NoopDDA;
 
   return TRUE;
 }