Landing mingw gfx-viewer changes.

Bug #134113 r=pavlov sr=blizzard

gfx/src/windows/nsRenderingContextWin.cpp

@@ -2979,7 +2979,11 @@ nsRenderingContextWin::InitBidiInfo()
     const PRUnichar one     = 0x0031;
 
     int distanceArray[2];
+#ifdef __MINGW32__
+    UINT glyphArray[2];
+#else
     PRUnichar glyphArray[2];
+#endif
     PRUnichar outStr[] = {0, 0};
 
     GCP_RESULTSW gcpResult;

gfx/src/windows/nsScreenManagerWin.cpp

@@ -61,7 +61,7 @@ typedef HMONITOR (WINAPI *MonitorFromRectProc)(LPCRECT inRect, DWORD inFlag);
 typedef BOOL (WINAPI *EnumDisplayMonitorsProc)(HDC, LPCRECT, MONITORENUMPROC, LPARAM);
 
 BOOL CALLBACK CountMonitors ( HMONITOR, HDC, LPRECT, LPARAM ioCount ) ;
-#else
+#elif !defined(__MINGW32__)
 typedef void* HMONITOR;
 #endif
 

webshell/tests/viewer/nsViewerApp.cpp

@@ -110,7 +110,7 @@
 #include "ngprefs.h"
 #endif
 #endif
-#ifdef XP_WIN
+#if defined(XP_WIN) && !defined(__MINGW32__)
 #include <crtdbg.h>
 #endif
 
@@ -460,7 +460,7 @@ nsViewerApp::ProcessArguments(int argc, char** argv)
       if (PL_strcmp(argv[i], "-x") == 0) {
         mJustShutdown = PR_TRUE;
       }
-#if defined(NS_DEBUG) && defined(XP_WIN)
+#if defined(NS_DEBUG) && defined(XP_WIN) && !defined(__MINGW32__)
       else if (PL_strcmp(argv[i], "-md") == 0) {
         int old = _CrtSetDbgFlag(0);
         old |= _CRTDBG_CHECK_ALWAYS_DF;

webshell/tests/viewer/viewer.rc

@@ -36,7 +36,7 @@
  * ***** END LICENSE BLOCK ***** */
 #include "resources.h"
 #include "jsconsres.h"
-#include <winres.h>
+#include <winresrc.h>
 
 
 VIEWER MENU DISCARDABLE
@@ -181,8 +181,8 @@ VIEWER MENU DISCARDABLE
     }
     POPUP    "Editor Tests"
     {
-      MENUITEM  "Set Background RED" VIEWER_EDIT_SET_BGCOLOR_RED
-      MENUITEM  "Set Background YELLOW" VIEWER_EDIT_SET_BGCOLOR_YELLOW
+      MENUITEM  "Set Background RED", VIEWER_EDIT_SET_BGCOLOR_RED
+      MENUITEM  "Set Background YELLOW", VIEWER_EDIT_SET_BGCOLOR_YELLOW
     }
   }
 #if defined(PURIFY)