From 21619964dab4f1a4f351c0870f1340351f022f3f Mon Sep 17 00:00:00 2001 From: James Hawkins Date: Mon, 5 Nov 2007 04:32:45 -0500 Subject: [PATCH] msi: szUserSid must be NULL if context is MSIINSTALLCONTEXT_MACHINE. --- dlls/msi/source.c | 4 ++-- dlls/msi/tests/source.c | 5 +---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/msi/source.c b/dlls/msi/source.c index e79cb615b1..5d2d60cd92 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -667,8 +667,8 @@ UINT WINAPI MsiSourceListAddSourceExW( LPCWSTR szProduct, LPCWSTR szUserSid, return ERROR_FUNCTION_FAILED; } - if (szUserSid) - FIXME("Unhandled UserSid %s\n",debugstr_w(szUserSid)); + if (szUserSid && (dwContext & MSIINSTALLCONTEXT_MACHINE)) + return ERROR_INVALID_PARAMETER; rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE); if (rc != ERROR_SUCCESS) diff --git a/dlls/msi/tests/source.c b/dlls/msi/tests/source.c index 991d2796ce..4a3f2d1025 100644 --- a/dlls/msi/tests/source.c +++ b/dlls/msi/tests/source.c @@ -659,10 +659,7 @@ static void test_MsiSourceListAddSourceEx(void) r = pMsiSourceListAddSourceExA(prodcode, usersid, MSIINSTALLCONTEXT_MACHINE, MSICODE_PRODUCT | MSISOURCETYPE_URL, "C:\\source", 0); - 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); r = pMsiSourceListAddSourceExA(prodcode, NULL, MSIINSTALLCONTEXT_MACHINE,