Changeset 685

Timestamp:

2005年08月24日 16時55分44秒 (3 years ago)

Author:

fujii

Message:

* desktop.cc (run_installer): New Function.
(install_ImageMagick): Call run_installer() instead of system().

Files:

• branches/3.00/src/ChangeLog.Meadow (modified) (1 diff)
• branches/3.00/src/desktop.cc (modified) (2 diffs)

branches/3.00/src/ChangeLog.Meadow

@@ -1 +1 @@
-2005-08-24  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * desktop.cc (run_installer): New Function.
+        (install_ImageMagick): Call run_installer() instead of system().
-
-        * Makefile.am (AM_CXXFLAGS): Warning options is modified

branches/3.00/src/desktop.cc

@@ -216 +216 @@
-#ifdef MEADOW_NETINSTALL
-static void
+run_installer (String &cmdline)
+{
+  STARTUPINFO si = {sizeof si};
+  PROCESS_INFORMATION pi = {0};
+
+  char *c_cmdline = cmdline.cstr ();
+
+  bool success = CreateProcess (0, c_cmdline, NULL, NULL, FALSE,
+                                0, NULL, get_root_dir ().cstr_oneuse (),
+                                &si, &pi);
+  if (success)
+    WaitForSingleObject (pi.hProcess, INFINITE);
+  CloseHandle (pi.hProcess);
+  CloseHandle (pi.hThread);
+
+  delete c_cmdline;
+}
+
+static void
-install_Meadow ()
-{
@@ -264 +283 @@
-      SetCurrentDirectory (get_root_dir ().cstr_oneuse ());
-
-system (path.cstr_oneuse ()
+run_installer (path
-    }
-}