minor fix to find contents file alright

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index 5f12734b4c1a1bca86434a744f513ceac3cc1d69..0c566962daaa297275fc6a63c8fa264ee959fbdc 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -36,7 +36,7 @@
 
 #include <ctype.h>
 
-#if !defined(__GNUWIN32__) && !defined(__SALFORDC__)
+#if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__)
 #include <direct.h>
 #ifndef __MWERKS__
 #include <dos.h>
@@ -50,7 +50,7 @@
 #endif
 #endif
 
-#ifdef __WIN32__
+#if defined(__WIN32__) && !defined(__WXWINE__)
 #include <io.h>
 
 #ifndef __GNUWIN32__
@@ -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
@@ -104,11 +106,11 @@ static DWORD wxExecuteThread(wxExecuteData *data)
     }
 
     wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
-                  "process should have terminated" );
+                  _T("process should have terminated") );
 
     // 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
@@ -145,11 +147,11 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
     return 0;
 }
 
-extern char wxPanelClassName[];
+extern wxChar wxPanelClassName[];
 
 long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 {
-    wxCHECK_MSG( !!command, 0, "empty command in wxExecute" );
+    wxCHECK_MSG( !!command, 0, _T("empty command in wxExecute") );
 
 #if defined(__WIN32__) && !defined(__TWIN32__)
     // the old code is disabled because we really need a process handle
@@ -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,14 +211,19 @@ 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;
 
     if ( ::CreateProcess(
                          NULL,       // application name (use only cmd line)
-                         (char *)command.c_str(),    // full command line
+                         (wxChar *)command.c_str(),  // full command line
                          NULL,       // security attributes: defaults for both
                          NULL,       //   the process and its main thread
                          FALSE,      // don't inherit handles
@@ -240,20 +247,30 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     // termination
     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" );
-    
+    wxASSERT_MSG( hwnd, _T("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, _T("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,30 +290,34 @@ 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 {
             wxYield();
-            running = GetModuleUsage((HANDLE)instanceID);
+            running = GetModuleUsage((HINSTANCE)instanceID);
         } while (running);
     }
 
@@ -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++ << ' ';
@@ -317,3 +338,34 @@ long wxExecute(char **argv, bool sync, wxProcess *handler)
 
     return wxExecute(command, sync, handler);
 }
+
+bool wxGetFullHostName(wxChar *buf, int maxSize)
+{
+#if defined(__WIN32__) && !defined(__TWIN32__)
+    DWORD nSize = maxSize ;
+    if ( !::GetComputerName(buf, &nSize) )
+    {
+        wxLogLastError("GetComputerName");
+
+        return FALSE;
+    }
+#else
+    char *sysname;
+    const char *default_host = "noname";
+static const char WX_SECTION[] = "wxWindows";
+static const char eHOSTNAME[]  = "HostName";
+
+    if ((sysname = getenv("SYSTEM_NAME")) == NULL) {
+       GetProfileString(WX_SECTION, eHOSTNAME, default_host, buf, maxSize - 1);
+    } else
+      strncpy(buf, sysname, maxSize - 1);
+    buf[maxSize] = '\0';
+    if ( *buf == '\0' )
+    {
+        wxLogLastError("GetComputerName");
+
+        return FALSE;
+    }
+#endif
+    return TRUE;
+}