--- a/src/gui-msw.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/gui-msw.c	Mon Aug 13 11:13:30 2007 +0200
@@ -27,6 +27,7 @@
 #include "frame.h"
 #include "elhash.h"
 #include "console-msw.h"
+#include "buffer.h"
 
 /*
  * Return value is Qt if we have dispatched the command,
@@ -35,18 +36,21 @@
  * command if we return nil
  */
 Lisp_Object
-mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, WORD id)
+mswindows_handle_gui_wm_command (struct frame* f, HWND ctrl, DWORD id)
 {
   /* Try to map the command id through the proper hash table */
   Lisp_Object data, fn, arg, frame;
 
+  /* #### make_int should assert that --kkm */
+  assert (XINT (make_int (id)) == id);
+
   data = Fgethash (make_int (id), 
 		   FRAME_MSWINDOWS_WIDGET_HASH_TABLE (f), Qnil);
   
   if (NILP (data) || UNBOUNDP (data))
     return Qnil;
 
-  MARK_SUBWINDOWS_CHANGED;
+  MARK_SUBWINDOWS_STATE_CHANGED;
   /* Ok, this is our one. Enqueue it. */
   get_gui_callback (data, &fn, &arg);
   XSETFRAME (frame, f);
@@ -55,3 +59,97 @@
   return Qt;
 }
 
+DEFUN ("mswindows-shell-execute", Fmswindows_shell_execute, 2, 4, 0, /*
+Get Windows to perform OPERATION on DOCUMENT.
+This is a wrapper around the ShellExecute system function, which
+invokes the application registered to handle OPERATION for DOCUMENT.
+OPERATION is typically \"open\", \"print\" or \"explore\" (but can be
+nil for the default action), and DOCUMENT is typically the name of a
+document file or URL, but can also be a program executable to run or
+a directory to open in the Windows Explorer.
+
+If DOCUMENT is a program executable, PARAMETERS can be a string
+containing command line parameters, but otherwise should be nil.
+
+SHOW-FLAG can be used to control whether the invoked application is hidden
+or minimized.  If SHOW-FLAG is nil, the application is displayed normally,
+otherwise it is an integer representing a ShowWindow flag:
+
+  0 - start hidden
+  1 - start normally
+  3 - start maximized
+  6 - start minimized
+*/
+       (operation, document, parameters, show_flag))
+{
+  /* Encode filename and current directory.  */
+  Lisp_Object current_dir = Ffile_name_directory (document);
+  char* path = NULL;
+  char* doc = NULL;
+  Extbyte* f=0;
+  int ret;
+  struct gcpro gcpro1, gcpro2;
+
+  CHECK_STRING (document);
+
+  /* Just get the filename if we were given it. */
+  document = Ffile_name_nondirectory (document);
+
+  if (NILP (current_dir))
+    current_dir = current_buffer->directory;
+
+  GCPRO2 (current_dir, document);
+
+  /* Use mule and cygwin-safe APIs top get at file data. */
+  if (STRINGP (current_dir))
+    {
+      TO_EXTERNAL_FORMAT (LISP_STRING, current_dir,
+			  C_STRING_ALLOCA, f,
+			  Qfile_name);
+#ifdef __CYGWIN32__
+      CYGWIN_WIN32_PATH (f, path);
+#else
+      path = f;
+#endif
+    }
+
+  if (STRINGP (document))
+    {
+      TO_EXTERNAL_FORMAT (LISP_STRING, document,
+			  C_STRING_ALLOCA, f,
+			  Qfile_name);
+      doc = f;
+    }
+
+  UNGCPRO;
+
+  ret = (int) ShellExecute (NULL,
+			    (STRINGP (operation) ?
+			     XSTRING_DATA (operation) : NULL),
+			    doc, 
+			    (STRINGP (parameters) ?
+			     XSTRING_DATA (parameters) : NULL),
+			    path,
+			    (INTP (show_flag) ?
+			     XINT (show_flag) : SW_SHOWDEFAULT));
+
+  if (ret > 32)
+    return Qt;
+  
+  if (ret == ERROR_FILE_NOT_FOUND || ret == SE_ERR_FNF)
+    signal_simple_error ("file not found", document);
+  else if (ret == ERROR_PATH_NOT_FOUND || ret == SE_ERR_PNF)
+    signal_simple_error ("path not found", current_dir);
+  else if (ret == ERROR_BAD_FORMAT)
+    signal_simple_error ("bad executable format", document);
+  else
+    error ("internal error");
+
+  return Qnil;
+}
+
+void
+syms_of_gui_mswindows (void)
+{
+  DEFSUBR (Fmswindows_shell_execute);
+}