mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 19:26:32 +00:00
sync msiexec with wine 1.1.5
svn path=/trunk/; revision=36368
This commit is contained in:
@@ -344,14 +344,14 @@ static DWORD DoRegServer(void)
|
||||
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,
|
||||
|
||||
@@ -132,7 +132,7 @@ static void WINAPI ServiceMain(DWORD argc, LPSTR *argv)
|
||||
|
||||
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 @@ DWORD DoService(void)
|
||||
{
|
||||
char service_name[] = "MSIServer";
|
||||
|
||||
const SERVICE_TABLE_ENTRY service[] =
|
||||
const SERVICE_TABLE_ENTRYA service[] =
|
||||
{
|
||||
{service_name, ServiceMain},
|
||||
{NULL, NULL},
|
||||
@@ -164,7 +164,7 @@ DWORD DoService(void)
|
||||
|
||||
WINE_TRACE("Starting MSIServer service\n");
|
||||
|
||||
if (!StartServiceCtrlDispatcher(service))
|
||||
if (!StartServiceCtrlDispatcherA(service))
|
||||
{
|
||||
fprintf(stderr, "Failed to start MSIServer service\n");
|
||||
return 1;
|
||||
|
||||
Reference in New Issue
Block a user