James Hawkins : msi: Return INSTALLSTATE_ADVERTISED if the component list is empty.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 73e0a87477c4b0fe792988061397a5241b72a985
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=73e0a87477c4b0fe7929880613...

Author: James Hawkins 
Date:   Mon Jul  2 20:23:28 2007 -0700

msi: 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(-)

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 MsiQueryFeatureStateW(LPCWSTR szProduct, LPCWSTR szFeature)
     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 4e7b5e2..589b161 100644
--- a/dlls/msi/tests/msi.c
+++ b/dlls/msi/tests/msi.c
@@ -585,10 +585,7 @@ static void test_MsiQueryFeatureState(void)
     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);