[ros-diffs] [cwittich] 36368: sync msiexec with wine 1.1.5

Author: cwittich
Date: Sun Sep 21 07:00:07 2008
New Revision: 36368

URL: http://svn.reactos.org/svn/reactos?rev=36368&view=rev
Log:
sync msiexec with wine 1.1.5

Modified:
    trunk/reactos/base/system/msiexec/msiexec.c
    trunk/reactos/base/system/msiexec/service.c

Modified: trunk/reactos/base/system/msiexec/msiexec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe…
==============================================================================
--- trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/msiexec.c [iso-8859-1] Sun Sep 21 07:00:07 2008
@@ -344,14 +344,14 @@
     CHAR path[MAX_PATH+12];
     DWORD ret = 0;
 
-    scm = OpenSCManager(NULL, SERVICES_ACTIVE_DATABASE, SC_MANAGER_CREATE_SERVICE);
+    scm = OpenSCManagerA(NULL, SERVICES_ACTIVE_DATABASEA, SC_MANAGER_CREATE_SERVICE);
     if (!scm)
     {
         fprintf(stderr, "Failed to open the service control manager.\n");
         return 1;
     }
 
-    GetSystemDirectory(path, MAX_PATH);
+    GetSystemDirectoryA(path, MAX_PATH);
     lstrcatA(path, "\\msiexec.exe /V");
 
     service = CreateServiceA(scm, "MSIServer", "MSIServer",
GENERIC_ALL,

Modified: trunk/reactos/base/system/msiexec/service.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/servic…
==============================================================================
--- trunk/reactos/base/system/msiexec/service.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/service.c [iso-8859-1] Sun Sep 21 07:00:07 2008
@@ -132,7 +132,7 @@
 
     UpdateSCMStatus(SERVICE_START_PENDING, NO_ERROR, 0);
 
-    kill_event = CreateEvent(0, TRUE, FALSE, 0);
+    kill_event = CreateEventW(0, TRUE, FALSE, 0);
     if (!kill_event)
     {
         fprintf(stderr, "Failed to create event\n");
@@ -156,7 +156,7 @@
 {
     char service_name[] = "MSIServer";
 
-    const SERVICE_TABLE_ENTRY service[] =
+    const SERVICE_TABLE_ENTRYA service[] =
     {
         {service_name, ServiceMain},
         {NULL, NULL},
@@ -164,7 +164,7 @@
 
     WINE_TRACE("Starting MSIServer service\n");
 
-    if (!StartServiceCtrlDispatcher(service))
+    if (!StartServiceCtrlDispatcherA(service))
     {
         fprintf(stderr, "Failed to start MSIServer service\n");
         return 1;