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
56aab6aa
Commit
56aab6aa
authored
May 23, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
May 24, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Always fill output parameters in SetupCopyOEMInfA().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
29f65bc6
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
10 deletions
+3
-10
misc.c
dlls/setupapi/misc.c
+3
-9
misc.c
dlls/setupapi/tests/misc.c
+0
-1
No files found.
dlls/setupapi/misc.c
View file @
56aab6aa
...
...
@@ -851,12 +851,9 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location,
if
(
source
&&
!
(
sourceW
=
strdupAtoW
(
source
)))
goto
done
;
if
(
location
&&
!
(
locationW
=
strdupAtoW
(
location
)))
goto
done
;
if
(
!
(
ret
=
SetupCopyOEMInfW
(
sourceW
,
locationW
,
media_type
,
style
,
destW
,
buffer_size
,
&
size
,
NULL
)))
{
if
(
required_size
)
*
required_size
=
size
;
goto
done
;
}
ret
=
SetupCopyOEMInfW
(
sourceW
,
locationW
,
media_type
,
style
,
destW
,
buffer_size
,
&
size
,
NULL
);
if
(
required_size
)
*
required_size
=
size
;
if
(
dest
)
{
...
...
@@ -866,10 +863,7 @@ BOOL WINAPI SetupCopyOEMInfA( PCSTR source, PCSTR location,
if
(
component
)
*
component
=
strrchr
(
dest
,
'\\'
)
+
1
;
}
else
{
SetLastError
(
ERROR_INSUFFICIENT_BUFFER
);
goto
done
;
}
}
done:
...
...
dlls/setupapi/tests/misc.c
View file @
56aab6aa
...
...
@@ -246,7 +246,6 @@ static void test_SetupCopyOEMInf(void)
ok
(
res
==
FALSE
,
"Expected FALSE, got %d
\n
"
,
res
);
ok
(
GetLastError
()
==
ERROR_FILE_EXISTS
,
"Expected ERROR_FILE_EXISTS, got %d
\n
"
,
GetLastError
());
todo_wine
ok
(
!
strcmp
(
orig_dest
,
dest
),
"Expected '%s', got '%s'.
\n
"
,
orig_dest
,
dest
);
SetLastError
(
0xdeadbeef
);
...
...
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