msi: Return INSTALLSTATE_UNKNOWN from MsiGetComponentState if the component is disabled.

7bc7d091 · Hans Leidekker · Alexandre Julliard · 0f3ff8b4 · 7bc7d091
Commit 7bc7d091 authored Dec 23, 2010 by Hans Leidekker Committed by Alexandre Julliard Dec 23, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 3 deletions

install.c dlls/msi/install.c +12 -3

No files found.
--- a/dlls/msi/install.c
+++ b/dlls/msi/install.c
@@ -1181,13 +1181,22 @@ UINT MSI_GetComponentStateW(MSIPACKAGE *package, LPCWSTR szComponent,
        return ERROR_UNKNOWN_COMPONENT;

    if (piInstalled)
-        *piInstalled = comp->Installed;
+    {
+        if (comp->Enabled)
+            *piInstalled = comp->Installed;
+        else
+            *piInstalled = INSTALLSTATE_UNKNOWN;
+    }

    if (piAction)
-        *piAction = comp->Action;
+    {
+        if (comp->Enabled)
+            *piAction = comp->Action;
+        else
+            *piAction = INSTALLSTATE_UNKNOWN;
+    }

    TRACE("states (%i, %i)\n", comp->Installed, comp->Action );
-
    return ERROR_SUCCESS;
 }