From ebb2791164e960c8caddef35ead73b6c5065d5b5 Mon Sep 17 00:00:00 2001
From: Dave Pickles <davep@cyw.uklinux.net>
Date: Thu, 2 Nov 2000 20:07:07 +0000
Subject: [PATCH] Pause command interpreter while executing a console-mode app.

---
 programs/wcmd/ChangeLog   |  4 ++++
 programs/wcmd/Makefile.in |  2 +-
 programs/wcmd/wcmdmain.c  | 16 +++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/programs/wcmd/ChangeLog b/programs/wcmd/ChangeLog
index 4fc945b73f..ebef49dbef 100644
--- a/programs/wcmd/ChangeLog
+++ b/programs/wcmd/ChangeLog
@@ -1,3 +1,7 @@
+v0.15 - 31 October 2000
+-Running console mode programs the interpreter now waits for the
+program to exit before issuing the next prompt.
+
 v0.14 - 1 August 2000
 Errorlevel support added
 Most errors reported via FormatMessage()
diff --git a/programs/wcmd/Makefile.in b/programs/wcmd/Makefile.in
index 3d7e3a4f32..edec5b46be 100644
--- a/programs/wcmd/Makefile.in
+++ b/programs/wcmd/Makefile.in
@@ -5,7 +5,7 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = none
 PROGRAMS  = wcmd
-IMPORTS   = user32 gdi32 kernel32 ntdll
+IMPORTS   = shell32 user32 gdi32 kernel32 ntdll
 
 C_SRCS = \
 	batch.c \
diff --git a/programs/wcmd/wcmdmain.c b/programs/wcmd/wcmdmain.c
index 832586860a..9e9eba5efd 100644
--- a/programs/wcmd/wcmdmain.c
+++ b/programs/wcmd/wcmdmain.c
@@ -25,7 +25,7 @@ DWORD errorlevel;
 int echo_mode = 1, verify_mode = 0;
 char nyi[] = "Not Yet Implemented\n\n";
 char newline[] = "\n";
-char version_string[] = "WCMD Version 0.14\n\n";
+char version_string[] = "WCMD Version 0.15\n\n";
 char anykey[] = "Press any key to continue: ";
 char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH];
 BATCH_CONTEXT *context = NULL;
@@ -339,8 +339,11 @@ void WCMD_run_program (char *command) {
 
 STARTUPINFO st;
 PROCESS_INFORMATION pe;
+SHFILEINFO psfi;
+DWORD console;
 BOOL status;
 HANDLE h;
+HINSTANCE hinst;
 char filetorun[MAX_PATH];
 
   WCMD_parse (command, quals, param1, param2);	/* Quick way to get the filename */
@@ -371,6 +374,16 @@ char filetorun[MAX_PATH];
 
 	/* No batch file found, assume executable */
 
+  hinst = FindExecutable (param1, NULL, filetorun);
+  if ((int)hinst < 32) {
+    WCMD_print_error ();
+    return;
+  }
+  console = SHGetFileInfo (filetorun, 0, &psfi, sizeof(psfi), SHGFI_EXETYPE);
+  if (!console) {
+    WCMD_print_error ();
+    return;
+  }
   ZeroMemory (&st, sizeof(STARTUPINFO));
   st.cb = sizeof(STARTUPINFO);
   status = CreateProcess (NULL, command, NULL, NULL, FALSE,
@@ -378,6 +391,7 @@ char filetorun[MAX_PATH];
   if (!status) {
     WCMD_print_error ();
   }
+  if (!HIWORD(console)) WaitForSingleObject (pe.hProcess, INFINITE);
   GetExitCodeProcess (pe.hProcess, &errorlevel);
   if (errorlevel == STILL_ACTIVE) errorlevel = 0;
 }
-- 
2.32.0.93.g670b81a890