James Hawkins : msi: Return ERROR_INVALID_PARAMETER if the context is machine and szUserSid is non-NULL .

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7cf6be8aeb1cb5563bdf70320f4f566f4a611700
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7cf6be8aeb1cb5563bdf70320f...

Author: James Hawkins 
Date:   Tue Feb 19 02:12:30 2008 -0600

msi: Return ERROR_INVALID_PARAMETER if the context is machine and szUserSid is non-NULL.

---

dlls/msi/source.c       |    3 +++
 dlls/msi/tests/source.c |    7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/msi/source.c b/dlls/msi/source.c
index 737c8cf..b43a23b 100644
--- a/dlls/msi/source.c
+++ b/dlls/msi/source.c
@@ -415,6 +415,9 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
     if (!szValue)
         return ERROR_UNKNOWN_PROPERTY;

+    if (dwContext == MSIINSTALLCONTEXT_MACHINE && szUserSid)
+        return ERROR_INVALID_PARAMETER;
+
     if (dwOptions & MSICODE_PATCH)
     {
         FIXME("Unhandled options MSICODE_PATCH\n");
diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c
index b2e88ee..6f704df 100644
--- a/dlls/msi/tests/source.c
+++ b/dlls/msi/tests/source.c
@@ -1764,11 +1764,8 @@ static void test_MsiSourceListSetInfo(void)
     r = MsiSourceListSetInfoA(prodcode, usersid,
                               MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT,
                               INSTALLPROPERTY_MEDIAPACKAGEPATH, "path");
-    todo_wine
-    {
-        ok(r == ERROR_INVALID_PARAMETER,
-           "Expected ERROR_INVALID_PARAMETER, got %d\n", r);
-    }
+    ok(r == ERROR_INVALID_PARAMETER,
+       "Expected ERROR_INVALID_PARAMETER, got %d\n", r);

RegDeleteValueA(media, "MediaPackage");
     RegDeleteKeyA(media, "");