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

msi: Validate the dwOptions parameter of MsiSourceListSetInfo.

This commit is contained in:
James Hawkins 2008-02-19 02:11:42 -06:00 committed by Alexandre Julliard
parent 95ef6a1fbc
commit 4ee1745e81
2 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/msi/source.c
View File

@ -435,6 +435,13 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
return rc; return rc;
if (lstrcmpW(szProperty, INSTALLPROPERTY_LASTUSEDSOURCEW) &&
dwOptions & (MSISOURCETYPE_NETWORK | MSISOURCETYPE_URL))
{
RegCloseKey(sourcekey);
return ERROR_INVALID_PARAMETER;
}
if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) || if (!lstrcmpW(szProperty, INSTALLPROPERTY_MEDIAPACKAGEPATHW) ||
!lstrcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW)) !lstrcmpW(szProperty, INSTALLPROPERTY_DISKPROMPTW))
{ {

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

@ -1452,16 +1452,15 @@ static void test_MsiSourceListSetInfo(void)
r = MsiSourceListSetInfoA(prodcode, usersid, r = MsiSourceListSetInfoA(prodcode, usersid,
MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PATCH, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PATCH,
INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); INSTALLPROPERTY_MEDIAPACKAGEPATH, "path");
ok(r == ERROR_UNKNOWN_PATCH, ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
"Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
/* dwOptions is both MSICODE_PRODUCT and MSICODE_PATCH */ /* dwOptions is both MSICODE_PRODUCT and MSICODE_PATCH */
r = MsiSourceListSetInfoA(prodcode, usersid, r = MsiSourceListSetInfoA(prodcode, usersid,
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL, MSICODE_PRODUCT | MSICODE_PATCH | MSISOURCETYPE_URL,
INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); INSTALLPROPERTY_MEDIAPACKAGEPATH, "path");
ok(r == ERROR_UNKNOWN_PATCH, ok(r == ERROR_UNKNOWN_PATCH, "Expected ERROR_UNKNOWN_PATCH, got %d\n", r);
"Expected ERROR_SUCCESS, got %d\n", r);
/* dwOptions has both MSISOURCETYPE_NETWORK and MSISOURCETYPE_URL */ /* dwOptions has both MSISOURCETYPE_NETWORK and MSISOURCETYPE_URL */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
@ -1556,22 +1555,16 @@ static void test_MsiSourceListSetInfo(void)
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK,
INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); 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);
}
/* INSTALLPROPERTY_MEDIAPACKAGEPATH, MSISOURCETYPE_URL */ /* INSTALLPROPERTY_MEDIAPACKAGEPATH, MSISOURCETYPE_URL */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, MSICODE_PRODUCT | MSISOURCETYPE_URL,
INSTALLPROPERTY_MEDIAPACKAGEPATH, "path"); 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);
}
/* INSTALLPROPERTY_DISKPROMPT */ /* INSTALLPROPERTY_DISKPROMPT */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,
@ -1585,22 +1578,16 @@ static void test_MsiSourceListSetInfo(void)
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK,
INSTALLPROPERTY_DISKPROMPT, "prompt"); INSTALLPROPERTY_DISKPROMPT, "prompt");
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);
}
/* INSTALLPROPERTY_DISKPROMPT, MSISOURCETYPE_URL */ /* INSTALLPROPERTY_DISKPROMPT, MSISOURCETYPE_URL */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, MSICODE_PRODUCT | MSISOURCETYPE_URL,
INSTALLPROPERTY_DISKPROMPT, "prompt"); INSTALLPROPERTY_DISKPROMPT, "prompt");
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);
}
/* INSTALLPROPERTY_LASTUSEDSOURCE */ /* INSTALLPROPERTY_LASTUSEDSOURCE */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,
@ -1664,22 +1651,16 @@ static void test_MsiSourceListSetInfo(void)
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_NETWORK, MSICODE_PRODUCT | MSISOURCETYPE_NETWORK,
INSTALLPROPERTY_PACKAGENAME, "name"); INSTALLPROPERTY_PACKAGENAME, "name");
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);
}
/* INSTALLPROPERTY_PACKAGENAME, MSISOURCETYPE_URL */ /* INSTALLPROPERTY_PACKAGENAME, MSISOURCETYPE_URL */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,
MSIINSTALLCONTEXT_USERUNMANAGED, MSIINSTALLCONTEXT_USERUNMANAGED,
MSICODE_PRODUCT | MSISOURCETYPE_URL, MSICODE_PRODUCT | MSISOURCETYPE_URL,
INSTALLPROPERTY_PACKAGENAME, "name"); INSTALLPROPERTY_PACKAGENAME, "name");
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);
}
/* INSTALLPROPERTY_LASTUSEDTYPE */ /* INSTALLPROPERTY_LASTUSEDTYPE */
r = MsiSourceListSetInfoA(prodcode, NULL, r = MsiSourceListSetInfoA(prodcode, NULL,