diff src/emacs.c @ 48888:f0df5f687c15

Revisited my earlier fix for the following entry in etc/PROBLEMS: 'Emacs built on Windows 9x/ME crashes at startup on Windows XP, or Emacs builtpart of on XP crashes at startup on Windows 9x/ME.' Fixed several Windows API errors detected by BoundsChecker

--- a/src/emacs.c	Wed Dec 18 05:16:09 2002 +0000
+++ b/src/emacs.c	Wed Dec 18 06:16:28 2002 +0000
@@ -1375,6 +1375,7 @@
 #endif /* MSDOS */
 
 #ifdef WINDOWSNT
+  globals_of_w32 ();
   /* Initialize environment from registry settings.  */
   init_environment (argv);
   init_ntproc ();	/* must precede init_editfns.  */
@@ -1541,6 +1542,17 @@
       keys_of_minibuf ();
       keys_of_window ();
     }
+	else
+    {
+      /*
+        Initialization that must be done even if the global variable
+        initialized is non zero
+      */
+#ifdef HAVE_NTGUI
+      globals_of_w32fns ();
+      globals_of_w32menu ();
+#endif  /* end #ifdef HAVE_NTGUI */
+    }
 
   if (!noninteractive)
     {