Hans Leidekker : msi: Don' t flag an error in the InstallServices action if the component does not exist .
Alexandre Julliard
julliard at winehq.org
Thu Dec 23 11:28:07 CST 2010
Module: wine
Branch: master
Commit: 6625f07ebf7fabb39a93ac995adf2862d8921a09
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6625f07ebf7fabb39a93ac995adf2862d8921a09
Author: Hans Leidekker <hans at codeweavers.com>
Date: Thu Dec 23 17:08:47 2010 +0100
msi: Don't flag an error in the InstallServices action if the component does not exist.
---
dlls/msi/action.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 48e77a3..db3eda8 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -5525,6 +5525,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param)
goto done;
}
+ comp = MSI_RecordGetString( rec, 12 );
+ if (!get_loaded_component( package, comp ))
+ goto done;
+
start_type = MSI_RecordGetInteger(rec, 5);
if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START)
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, 10), &pass);
deformat_string(package, MSI_RecordGetString(rec, 11), &args);
- comp = MSI_RecordGetString(rec, 12);
deformat_string(package, MSI_RecordGetString(rec, 13), &sd.lpDescription);
/* fetch the service path */
More information about the wine-cvs
mailing list