bug in FindItemForId() fixed (?)

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index ade6c3077ab33b77df38fdb0e4a44f0241492cf0..e54f9811fee9058733ec96804fabcb3b5b4829f4 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -110,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);
 
     // send a message indicating process termination to the window
     SendMessage(data->hWnd, wxWM_PROC_TERMINATED, 0, (LPARAM)data);

-    
+

     return 0;
 }
 #endif
     return 0;
 }
 #endif


@@ -130,7 +130,7 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
             data->handler->OnTerminate((int)data->dwProcessId,
                                        (int)data->dwExitCode);
         }
             data->handler->OnTerminate((int)data->dwProcessId,
                                        (int)data->dwExitCode);
         }

-        
+

         if ( data->state )
         {
             // we're executing synchronously, tell the waiting thread
         if ( data->state )
         {
             // we're executing synchronously, tell the waiting thread


@@ -203,7 +203,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     result = ShellExecute(hwndTop, "open", commandName,
                           commandArgs, NULL, SW_SHOWNORMAL);
 #endif // GNUWIN32
     result = ShellExecute(hwndTop, "open", commandName,
                           commandArgs, NULL, SW_SHOWNORMAL);
 #endif // GNUWIN32

-    
+

     if ( ((long)result) <= 32 )
         wxLogSysError(_("Can't execute command '%s'"), command.c_str());
 
     if ( ((long)result) <= 32 )
         wxLogSysError(_("Can't execute command '%s'"), command.c_str());
 


@@ -211,7 +211,12 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 #else // 1
     // create the process
     STARTUPINFO si;
 #else // 1
     // create the process
     STARTUPINFO si;

+#ifdef __GNUWIN32__
+    memset(&si, 0, sizeof(si));
+#else

     ::ZeroMemory(&si, sizeof(si));
     ::ZeroMemory(&si, sizeof(si));

+#endif
+

     si.cb = sizeof(si);
 
     PROCESS_INFORMATION pi;
     si.cb = sizeof(si);
 
     PROCESS_INFORMATION pi;


@@ -243,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" );
     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());
     FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk,
                                                      wxGetInstance());

-    
+

     ::SetWindowLong(hwnd, GWL_WNDPROC, (LONG) ExecuteWindowInstance);
     ::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;
     // 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,
 
     DWORD tid;
     HANDLE hThread = ::CreateThread(NULL,


@@ -275,25 +290,29 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
         // the process still started up successfully...
         return pi.dwProcessId;
     }
         // the process still started up successfully...
         return pi.dwProcessId;
     }

-    
+

     if ( !sync )
     {
         // clean up will be done when the process terminates
     if ( !sync )
     {
         // clean up will be done when the process terminates

+
+        // return the pid

         return pi.dwProcessId;
     }
         return pi.dwProcessId;
     }

-    
+

     // waiting until command executed
     while ( data->state )
         wxYield();
     // waiting until command executed
     while ( data->state )
         wxYield();

-    
+
+    DWORD dwExitCode = data->dwExitCode;

     delete data;
 
     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);
 #endif // 0/1
 #else // Win16
     long instanceID = WinExec((LPCSTR) WXSTRINGCAST command, SW_SHOW);
     if (instanceID < 32) return(0);

-    
+

     if (sync) {
         int running;
         do {
     if (sync) {
         int running;
         do {


@@ -309,7 +328,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 long wxExecute(char **argv, bool sync, wxProcess *handler)
 {
     wxString command;
 long wxExecute(char **argv, bool sync, wxProcess *handler)
 {
     wxString command;

-    
+

     while ( *argv != NULL )
     {
         command << *argv++ << ' ';
     while ( *argv != NULL )
     {
         command << *argv++ << ' ';