wxUSE_RICHeDIT added

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

diff --git a/src/msw/utilsexc.cpp b/src/msw/utilsexc.cpp
index d33c8215e86850ef09ba6952aaf5ddc251499c04..e6570d80a32335080ed32637c974da706d75306a 100644 (file)
--- a/src/msw/utilsexc.cpp
+++ b/src/msw/utilsexc.cpp
@@ -28,7 +28,10 @@
 #endif
 
 #include "wx/log.h"
+
+#ifdef __WIN32__
 #include "wx/process.h"
+#endif
 
 #include "wx/msw/private.h"
 
@@ -106,14 +109,13 @@ static DWORD wxExecuteThread(wxExecuteData *data)
     }
 
     wxASSERT_MSG( data->dwExitCode != STILL_ACTIVE,
-                  "process should have terminated" );
+                  wxT("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
 
 // window procedure of a hidden window which is created just to receive
 // the notification message when a process exits
@@ -146,12 +148,13 @@ LRESULT APIENTRY _EXPORT wxExecuteWindowCbk(HWND hWnd, UINT message,
 
     return 0;
 }
+#endif
 
-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, wxT("empty command in wxExecute") );
 
 #if defined(__WIN32__) && !defined(__TWIN32__)
     // the old code is disabled because we really need a process handle
@@ -211,11 +214,7 @@ 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
+    wxZeroMemory(si);
 
     si.cb = sizeof(si);
 
@@ -223,7 +222,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
 
     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
@@ -247,7 +246,7 @@ 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, wxT("can't create a hidden window for wxExecute") );
 
     FARPROC ExecuteWindowInstance = MakeProcInstance((FARPROC)wxExecuteWindowCbk,
                                                      wxGetInstance());
@@ -262,7 +261,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
     data->state       = sync;
     if ( sync )
     {
-        wxASSERT_MSG( !handler, "wxProcess param ignored for sync execution" );
+        wxASSERT_MSG( !handler, wxT("wxProcess param ignored for sync execution") );
 
         data->handler = NULL;
     }
@@ -317,7 +316,7 @@ long wxExecute(const wxString& command, bool sync, wxProcess *handler)
         int running;
         do {
             wxYield();
-            running = GetModuleUsage((HANDLE)instanceID);
+            running = GetModuleUsage((HINSTANCE)instanceID);
         } while (running);
     }
 
@@ -341,13 +340,31 @@ long wxExecute(char **argv, bool sync, wxProcess *handler)
 
 bool wxGetFullHostName(wxChar *buf, int maxSize)
 {
-    DWORD nSize = 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;
 }