(x_make_frame_visible): Use SystemParametersInfo with SPI_GETWORKAREA to find

[gnu-emacs] / nt / runemacs.c

diff --git a/nt/runemacs.c b/nt/runemacs.c
index c1b2895174844b4748b111e6f0ed741bd7dc34f5..c43c7b61366f346bf3faa70ff45689def0b24ffc 100644 (file)
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,3 +1,23 @@
+/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
+
+
 /*
   Simple program to start Emacs with its console window hidden.
 
@@ -20,8 +40,6 @@
 
 /* #define CHOOSE_NEWEST_EXE */
 
-#define WIN32
-
 #include <windows.h>
 #include <string.h>
 #include <malloc.h>
@@ -46,8 +64,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
     goto error;
   *p = 0;
 
-  new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 1);
-  strcpy (new_cmdline, modname);
+  new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 3);
+  /* Quote executable name in case of spaces in the path. */
+  *new_cmdline = '"';
+  strcpy (new_cmdline + 1, modname);
 
 #ifdef CHOOSE_NEWEST_EXE
   {
@@ -59,7 +79,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
     WIN32_FIND_DATA wfd;
     HANDLE fh;
     p = new_cmdline + strlen (new_cmdline);
-    strcpy (p, "\\emacs*.exe ");
+    strcpy (p, "\\emacs*.exe\" ");
     fh = FindFirstFile (new_cmdline, &wfd);
     if (fh == INVALID_HANDLE_VALUE)
       goto error;
@@ -80,7 +100,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
     strcat (p, " ");
   }
 #else
-  strcat (new_cmdline, "\\emacs.exe ");
+  strcat (new_cmdline, "\\emacs.exe\" ");
 #endif
 
   /* Append original arguments if any; first look for arguments we
@@ -118,15 +138,19 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
 
   memset (&start, 0, sizeof (start));
   start.cb = sizeof (start);
-  start.dwFlags = STARTF_USESHOWWINDOW;
+  start.dwFlags = STARTF_USESHOWWINDOW | STARTF_USECOUNTCHARS;
   start.wShowWindow = SW_HIDE;
+  /* Ensure that we don't waste memory if the user has specified a huge
+     default screen buffer for command windows.  */
+  start.dwXCountChars = 80;
+  start.dwYCountChars = 25;
 
   sec_attrs.nLength = sizeof (sec_attrs);
   sec_attrs.lpSecurityDescriptor = NULL;
   sec_attrs.bInheritHandle = FALSE;
 
   if (CreateProcess (NULL, new_cmdline, &sec_attrs, NULL, TRUE, priority_class,
-                    GetEnvironmentStrings (), NULL, &start, &child))
+                    NULL, NULL, &start, &child))
     {
       if (wait_for_child)
        {
@@ -144,3 +168,6 @@ error:
   MessageBox (NULL, "Could not start Emacs.", "Error", MB_ICONSTOP);
   return 1;
 }
+
+/* arch-tag: 7e02df73-4df7-4aa0-baea-99c6d047a384
+   (do not change this comment) */