Hans Leidekker : msi: Reduce the indentation level in ACTION_GetComponentInstallStates.
Alexandre Julliard
julliard at winehq.org
Mon Apr 23 13:41:38 CDT 2012
Module: wine
Branch: master
Commit: f1af03fa169d4fded80063ae43422cb5cc5b07a2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1af03fa169d4fded80063ae43422cb5cc5b07a2
Author: Hans Leidekker <hans at codeweavers.com>
Date: Mon Apr 23 15:46:12 2012 +0200
msi: Reduce the indentation level in ACTION_GetComponentInstallStates.
---
dlls/msi/action.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index b3472f8..eb755be 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -1620,16 +1620,19 @@ static void ACTION_GetComponentInstallStates(MSIPACKAGE *package)
r = MsiQueryComponentStateW( package->ProductCode, NULL,
MSIINSTALLCONTEXT_USERMANAGED, comp->ComponentId,
&comp->Installed );
- if (r != ERROR_SUCCESS)
- r = MsiQueryComponentStateW( package->ProductCode, NULL,
- MSIINSTALLCONTEXT_USERUNMANAGED, comp->ComponentId,
- &comp->Installed );
- if (r != ERROR_SUCCESS)
- r = MsiQueryComponentStateW( package->ProductCode, NULL,
- MSIINSTALLCONTEXT_MACHINE, comp->ComponentId,
- &comp->Installed );
- if (r != ERROR_SUCCESS)
- comp->Installed = INSTALLSTATE_ABSENT;
+ if (r == ERROR_SUCCESS) continue;
+
+ r = MsiQueryComponentStateW( package->ProductCode, NULL,
+ MSIINSTALLCONTEXT_USERUNMANAGED, comp->ComponentId,
+ &comp->Installed );
+ if (r == ERROR_SUCCESS) continue;
+
+ r = MsiQueryComponentStateW( package->ProductCode, NULL,
+ MSIINSTALLCONTEXT_MACHINE, comp->ComponentId,
+ &comp->Installed );
+ if (r == ERROR_SUCCESS) continue;
+
+ comp->Installed = INSTALLSTATE_ABSENT;
}
}
More information about the wine-cvs
mailing list