ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Return the result of the call to OpenSourceKey.

This commit is contained in:
James Hawkins 2008-02-24 20:08:14 -06:00 committed by Alexandre Julliard
parent 34d50c1e3e
commit 08172ad1c4
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/msi/source.c
View File

@ -1016,7 +1016,7 @@ UINT WINAPI MsiSourceListAddMediaDiskW(LPCWSTR szProduct, LPCWSTR szUserSid,
rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE); rc = OpenSourceKey(szProduct, &sourcekey, MSICODE_PRODUCT, dwContext, FALSE);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
return ERROR_UNKNOWN_PRODUCT; return rc;
OpenMediaSubkey(sourcekey,&mediakey,TRUE); OpenMediaSubkey(sourcekey,&mediakey,TRUE);

21
dlls/msi/tests/source.c
View File

@ -2024,11 +2024,8 @@ static void test_MsiSourceListAddMediaDisk(void)
r = MsiSourceListAddMediaDiskA(prodcode, usersid, r = MsiSourceListAddMediaDiskA(prodcode, usersid,
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT, 1, "label", "prompt"); MSICODE_PRODUCT, 1, "label", "prompt");
todo_wine ok(r == ERROR_BAD_CONFIGURATION,
{ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
}
res = RegCreateKeyA(userkey, "SourceList", &source); res = RegCreateKeyA(userkey, "SourceList", &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@ -2158,11 +2155,8 @@ static void test_MsiSourceListAddMediaDisk(void)
r = MsiSourceListAddMediaDiskA(prodcode, usersid, r = MsiSourceListAddMediaDiskA(prodcode, usersid,
MSIINSTALLCONTEXT_USERMANAGED, MSIINSTALLCONTEXT_USERMANAGED,
MSICODE_PRODUCT, 1, "label", "prompt"); MSICODE_PRODUCT, 1, "label", "prompt");
todo_wine ok(r == ERROR_BAD_CONFIGURATION,
{ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
}
res = RegCreateKeyA(userkey, "SourceList", &source); res = RegCreateKeyA(userkey, "SourceList", &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);
@ -2199,11 +2193,8 @@ static void test_MsiSourceListAddMediaDisk(void)
r = MsiSourceListAddMediaDiskA(prodcode, NULL, r = MsiSourceListAddMediaDiskA(prodcode, NULL,
MSIINSTALLCONTEXT_MACHINE, MSIINSTALLCONTEXT_MACHINE,
MSICODE_PRODUCT, 1, "label", "prompt"); MSICODE_PRODUCT, 1, "label", "prompt");
todo_wine ok(r == ERROR_BAD_CONFIGURATION,
{ "Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
ok(r == ERROR_BAD_CONFIGURATION,
"Expected ERROR_BAD_CONFIGURATION, got %d\n", r);
}
res = RegCreateKeyA(prodkey, "SourceList", &source); res = RegCreateKeyA(prodkey, "SourceList", &source);
ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res);