Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
4ee1745e
Commit
4ee1745e
authored
Feb 19, 2008
by
James Hawkins
Committed by
Alexandre Julliard
Feb 19, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Validate the dwOptions parameter of MsiSourceListSetInfo.
parent
95ef6a1f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
34 deletions
+22
-34
source.c
dlls/msi/source.c
+7
-0
source.c
dlls/msi/tests/source.c
+15
-34
No files found.
dlls/msi/source.c
View file @
4ee1745e
...
...
@@ -435,6 +435,13 @@ UINT WINAPI MsiSourceListSetInfoW( LPCWSTR szProduct, LPCWSTR szUserSid,
if
(
rc
!=
ERROR_SUCCESS
)
return
rc
;
if
(
lstrcmpW
(
szProperty
,
INSTALLPROPERTY_LASTUSEDSOURCEW
)
&&
dwOptions
&
(
MSISOURCETYPE_NETWORK
|
MSISOURCETYPE_URL
))
{
RegCloseKey
(
sourcekey
);
return
ERROR_INVALID_PARAMETER
;
}
if
(
!
lstrcmpW
(
szProperty
,
INSTALLPROPERTY_MEDIAPACKAGEPATHW
)
||
!
lstrcmpW
(
szProperty
,
INSTALLPROPERTY_DISKPROMPTW
))
{
...
...
dlls/msi/tests/source.c
View file @
4ee1745e
...
...
@@ -1452,16 +1452,15 @@ static void test_MsiSourceListSetInfo(void)
r
=
MsiSourceListSetInfoA
(
prodcode
,
usersid
,
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PATCH
,
INSTALLPROPERTY_MEDIAPACKAGEPATH
,
"path"
);
ok
(
r
==
ERROR_UNKNOWN_PATCH
,
"Expected ERROR_UNKNOWN_PATCH, got %d
\n
"
,
r
);
ok
(
r
==
ERROR_UNKNOWN_PATCH
,
"Expected ERROR_UNKNOWN_PATCH, got %d
\n
"
,
r
);
/* dwOptions is both MSICODE_PRODUCT and MSICODE_PATCH */
r
=
MsiSourceListSetInfoA
(
prodcode
,
usersid
,
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSICODE_PATCH
|
MSISOURCETYPE_URL
,
INSTALLPROPERTY_MEDIAPACKAGEPATH
,
"path"
);
ok
(
r
==
ERROR_UNKNOWN_PATCH
,
"Expected ERROR_SUCCESS, got %d
\n
"
,
r
);
ok
(
r
==
ERROR_UNKNOWN_PATCH
,
"Expected ERROR_UNKNOWN_PATCH, got %d
\n
"
,
r
);
/* dwOptions has both MSISOURCETYPE_NETWORK and MSISOURCETYPE_URL */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
MSIINSTALLCONTEXT_USERUNMANAGED
,
...
...
@@ -1556,22 +1555,16 @@ static void test_MsiSourceListSetInfo(void)
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSISOURCETYPE_NETWORK
,
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 */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSISOURCETYPE_URL
,
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 */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
...
...
@@ -1585,22 +1578,16 @@ static void test_MsiSourceListSetInfo(void)
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSISOURCETYPE_NETWORK
,
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 */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSISOURCETYPE_URL
,
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 */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
...
...
@@ -1664,22 +1651,16 @@ static void test_MsiSourceListSetInfo(void)
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSISOURCETYPE_NETWORK
,
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 */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
MSIINSTALLCONTEXT_USERUNMANAGED
,
MSICODE_PRODUCT
|
MSISOURCETYPE_URL
,
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 */
r
=
MsiSourceListSetInfoA
(
prodcode
,
NULL
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment