system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-02 20:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

msi: Don't flag an error in the InstallServices action if the component does not exist.

Browse source
This commit is contained in:
Hans Leidekker 2010-12-23 17:08:47 +01:00 committed by Alexandre Julliard
parent 5f9dd9df1f
commit 6625f07ebf
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dlls/msi/action.c
View file

@ -5525,6 +5525,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param)
goto done; goto done;
} }
comp = MSI_RecordGetString( rec, 12 );
if (!get_loaded_component( package, comp ))
goto done;
start_type = MSI_RecordGetInteger(rec, 5); start_type = MSI_RecordGetInteger(rec, 5);
if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START) if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START)
goto done; goto done;
@ -5538,7 +5542,6 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param)
deformat_string(package, MSI_RecordGetString(rec, 9), &serv_name); deformat_string(package, MSI_RecordGetString(rec, 9), &serv_name);
deformat_string(package, MSI_RecordGetString(rec, 10), &pass); deformat_string(package, MSI_RecordGetString(rec, 10), &pass);
deformat_string(package, MSI_RecordGetString(rec, 11), &args); deformat_string(package, MSI_RecordGetString(rec, 11), &args);
comp = MSI_RecordGetString(rec, 12);
deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription); deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription);
/* fetch the service path */ /* fetch the service path */