Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
5f7b95da
Commit
5f7b95da
authored
17 years ago
by
James Hawkins
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Validate the parameters of MsiEnumClients.
parent
64c75d1e
No related merge requests found
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
registry.c
dlls/msi/registry.c
+4
-1
msi.c
dlls/msi/tests/msi.c
+2
-8
No files found.
dlls/msi/registry.c
View file @
5f7b95da
...
...
@@ -1284,6 +1284,9 @@ UINT WINAPI MsiEnumClientsA(LPCSTR szComponent, DWORD index, LPSTR szProduct)
TRACE
(
"%s %d %p
\n
"
,
debugstr_a
(
szComponent
),
index
,
szProduct
);
if
(
!
szProduct
)
return
ERROR_INVALID_PARAMETER
;
if
(
szComponent
)
{
szwComponent
=
strdupAtoW
(
szComponent
);
...
...
@@ -1311,7 +1314,7 @@ UINT WINAPI MsiEnumClientsW(LPCWSTR szComponent, DWORD index, LPWSTR szProduct)
TRACE
(
"%s %d %p
\n
"
,
debugstr_w
(
szComponent
),
index
,
szProduct
);
if
(
!
szComponent
||
!
szProduct
)
if
(
!
szComponent
||
!
*
szComponent
||
!
szProduct
)
return
ERROR_INVALID_PARAMETER
;
r
=
MSIREG_OpenComponentsKey
(
szComponent
,
&
hkeyComp
,
FALSE
);
...
...
This diff is collapsed.
Click to expand it.
dlls/msi/tests/msi.c
View file @
5f7b95da
...
...
@@ -1618,18 +1618,12 @@ static void test_MsiEnumClients(void)
/* empty szComponent */
product
[
0
]
=
'\0'
;
r
=
MsiEnumClientsA
(
""
,
0
,
product
);
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
);
ok
(
!
lstrcmpA
(
product
,
""
),
"Expected product to be unchanged, got %s
\n
"
,
product
);
/* NULL lpProductBuf */
r
=
MsiEnumClientsA
(
component
,
0
,
NULL
);
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
);
/* all params correct, component missing */
product
[
0
]
=
'\0'
;
...
...
This diff is collapsed.
Click to expand it.
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