msi: Clear last error on success in MsiQueryFeatureState and MsiQueryProductState.

ad6b7cd4 · Hans Leidekker · Alexandre Julliard · d2055e6e · ad6b7cd4 · ad6b7cd4
Commit ad6b7cd4 authored Dec 02, 2010 by Hans Leidekker Committed by Alexandre Julliard Dec 02, 2010
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

msi.c dlls/msi/msi.c +7 -0

msi.c dlls/msi/tests/msi.c +0 -0

No files found.
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -1980,6 +1980,11 @@ INSTALLSTATE WINAPI MsiQueryProductStateW(LPCWSTR szProduct)
    if (lstrlenW(szProduct) != GUID_SIZE - 1)
        return INSTALLSTATE_INVALIDARG;

+    if (szProduct[0] != '{' || szProduct[37] != '}')
+        return INSTALLSTATE_UNKNOWN;
+
+    SetLastError( ERROR_SUCCESS );
+
    if (MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERMANAGED,
                              &prodkey, FALSE) != ERROR_SUCCESS &&
        MSIREG_OpenProductKey(szProduct, NULL, MSIINSTALLCONTEXT_USERUNMANAGED,
@@ -2629,6 +2634,8 @@ INSTALLSTATE WINAPI MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature)
    if (!squash_guid( szProduct, squishProduct ))
        return INSTALLSTATE_INVALIDARG;

+    SetLastError( ERROR_SUCCESS );
+
    if (MSIREG_OpenFeaturesKey(szProduct, MSIINSTALLCONTEXT_USERMANAGED,
                               &hkey, FALSE) != ERROR_SUCCESS &&
        MSIREG_OpenFeaturesKey(szProduct, MSIINSTALLCONTEXT_USERUNMANAGED,

--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c