msi [11/13]: Return INSTALLSTATE_ADVERTISED if the component list is empty

James Hawkins truiken at gmail.com
Mon Jul 2 22:23:28 CDT 2007


Hi,

Changelog:
* Return INSTALLSTATE_ADVERTISED if the component list is empty.

 dlls/msi/msi.c       |    6 +-----
 dlls/msi/tests/msi.c |    5 +----
 2 files changed, 2 insertions(+), 9 deletions(-)

-- 
James Hawkins
-------------- next part --------------
diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c
index 4511f34..6d69cf9 100644
--- a/dlls/msi/msi.c
+++ b/dlls/msi/msi.c
@@ -1270,11 +1270,7 @@ INSTALLSTATE WINAPI MsiQueryFeatureState
     TRACE("rc = %d buffer = %s\n", rc, debugstr_w(components));
 
     if (!components)
-    {
-        ERR("components missing %s %s\n",
-            debugstr_w(szProduct), debugstr_w(szFeature));
-        return INSTALLSTATE_UNKNOWN;
-    }
+        return INSTALLSTATE_ADVERTISED;
 
     for( p = components; *p != 2 ; p += 20)
     {
diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c
index 416823b..f847bd9 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -585,10 +585,7 @@ static void test_MsiQueryFeatureState(vo
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
 
     state = MsiQueryFeatureStateA(prodcode, "feature");
-    todo_wine
-    {
-        ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
-    }
+    ok(state == INSTALLSTATE_ADVERTISED, "Expected INSTALLSTATE_ADVERTISED, got %d\n", state);
 
     res = RegSetValueExA(localkey, "feature", 0, REG_SZ, (const BYTE *)"aaaaaaaaaaaaaaaaaaa", 20);
     ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
-- 
1.4.1


More information about the wine-patches mailing list