Bug 317568: Stub executable opens console window, patch by Dave Townsend (Mossop) <mossop@blueprintit.co.uk>, r=bsmedberg

xulrunner/stub/Makefile.in

@@ -79,4 +79,12 @@ ifeq (WINNT,$(OS_ARCH))
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 endif
 
+ifndef MOZ_WINCONSOLE
+ifdef MOZ_DEBUG
+MOZ_WINCONSOLE = 1
+else
+MOZ_WINCONSOLE = 0
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk

xulrunner/stub/nsXULStub.cpp

@@ -209,3 +209,13 @@ main(int argc, char **argv)
   return 1;
 #endif
 }
+
+#if defined( XP_WIN ) && defined( WIN32 ) && !defined(__GNUC__)
+// We need WinMain in order to not be a console app.  This function is
+// unused if we are a console application.
+int WINAPI WinMain( HINSTANCE, HINSTANCE, LPSTR args, int )
+{
+  // Do the real work.
+  return main( __argc, __argv );
+}
+#endif