[1/5] msi: Reduce the indentation level in ACTION_GetComponentInstallStates.
Hans Leidekker
hans at codeweavers.com
Mon Apr 23 08:46:12 CDT 2012
---
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;
}
}
--
1.7.5.4
More information about the wine-patches
mailing list