wxNotebook fixes for Win16; VC++ 4 fixes for OLE files; wxGA_SMOOTH flag (wxMSW);

[wxWidgets.git] / src / msw / utilsexc.cpp

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 5f12734b4c1a1bca86434a744f513ceac3cc1d69..e54f9811fee9058733ec96804fabcb3b5b4829f4 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -77,10 +77,12 @@ struct wxExecuteData
 public:
     ~wxExecuteData()
     {
+#ifndef __WIN16__
         if ( !::CloseHandle(hProcess) )
         {
             wxLogLastError("CloseHandle(hProcess)");
         }
+#endif
     }
 
     HWND       hWnd;          // window to send wxWM_PROC_TERMINATED to
@@ -108,7 +110,7 @@ static DWORD wxExecuteThread(wxExecuteData *data)
 
     // send a message indicating process termination to the window
     SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);
-    
+
     return 0;
 }
 #endif
@@ -128,7 +130,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
             data->handler->OnTerminate((int)data->dwProcessId,
                                        (int)data->dwExitCode);
         }
-        
+
         if ( data->state )
         {
             // we're executing synchronously, tell the waiting thread
@@ -201,7 +203,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     result = ShellExecute(hwndTop, "open", commandName,
                           commandArgs, NULL, SW_SHOWNORMAL);
 #endif // GNUWIN32
-    
+
     if ( ((long)result) <= 32 )
         wxLogSysError(_("Can't execute command '%s'"), command.c_str());
 
@@ -209,7 +211,12 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 #else // 1
     // create the process
     STARTUPINFO si;
+#ifdef __GNUWIN32__
+    memset(&si, 0, sizeof(si));
+#else
     ::ZeroMemory(&si, sizeof(si));
+#endif
+
     si.cb = sizeof(si);
 
     PROCESS_INFORMATION pi;
@@ -241,19 +248,29 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     HWND hwnd = ::CreateWindow(wxPanelClassName, NULL, 0, 0, 0, 0, 0, NULL,
                                (HMENU)NULL, wxGetInstance(), 0);
     wxASSERT_MSG( hwnd, "can't create a hidden window for wxExecute" );
-    
+
     FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk,
                                                      wxGetInstance());
-    
+
     ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) ExecuteWindowInstance);
-    
+
     // Alloc data
     wxExecuteData *data = new wxExecuteData;
     data->hProcess    = pi.hProcess;
     data->dwProcessId = pi.dwProcessId;
     data->hWnd        = hwnd;
     data->state       = sync;
-    data->handler     = handler;
+    if ( sync )
+    {
+        wxASSERT_MSG( !handler, "wxProcess param ignored for sync execution" );
+
+        data->handler = NULL;
+    }
+    else
+    {
+        // may be NULL or not
+        data->handler = handler;
+    }
 
     DWORD tid;
     HANDLE hThread = ::CreateThread(NULL,
@@ -273,25 +290,29 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
         // the process still started up successfully...
         return pi.dwProcessId;
     }
-    
+
     if ( !sync )
     {
         // clean up will be done when the process terminates
+
+        // return the pid
         return pi.dwProcessId;
     }
-    
+
     // waiting until command executed
     while ( data->state )
         wxYield();
-    
+
+    DWORD dwExitCode = data->dwExitCode;
     delete data;
 
-    return pi.dwProcessId;
+    // return the exit code
+    return dwExitCode;
 #endif // 0/1
 #else // Win16
     long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);
     if (instanceID < 32) return(0);
-    
+
     if (sync) {
         int running;
         do {
@@ -307,7 +328,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 long wxExecute(char **argv, bool sync, wxProcess *handler)
 {
     wxString command;
-    
+
     while ( *argv != NULL )
     {
         command << *argv++ << ' ';