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
5cb30bbf
Commit
5cb30bbf
authored
Dec 15, 2017
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cabinet: Treat only -1 as an error from the FDICopy callback.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
c2f34d1b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
fdi.c
dlls/cabinet/fdi.c
+2
-2
fdi.c
dlls/cabinet/tests/fdi.c
+1
-1
No files found.
dlls/cabinet/fdi.c
View file @
5cb30bbf
...
...
@@ -2496,7 +2496,7 @@ BOOL __cdecl FDICopy(
fdin
.
psz2
=
(
CAB
(
mii
).
nextinfo
)
?
CAB
(
mii
).
nextinfo
:
&
emptystring
;
fdin
.
psz3
=
pszCabPath
;
if
(
((
*
pfnfdin
)(
fdintCABINET_INFO
,
&
fdin
))
)
{
if
(
pfnfdin
(
fdintCABINET_INFO
,
&
fdin
)
==
-
1
)
{
set_error
(
fdi
,
FDIERROR_USER_ABORT
,
0
);
goto
bail_and_fail
;
}
...
...
@@ -2623,7 +2623,7 @@ BOOL __cdecl FDICopy(
fdin
.
psz2
=
(
CAB
(
mii
).
prevname
)
?
CAB
(
mii
).
prevname
:
&
emptystring
;
fdin
.
psz3
=
(
CAB
(
mii
).
previnfo
)
?
CAB
(
mii
).
previnfo
:
&
emptystring
;
if
(
((
*
pfnfdin
)(
fdintPARTIAL_FILE
,
&
fdin
))
)
{
if
(
pfnfdin
(
fdintPARTIAL_FILE
,
&
fdin
)
==
-
1
)
{
set_error
(
fdi
,
FDIERROR_USER_ABORT
,
0
);
goto
bail_and_fail
;
}
...
...
dlls/cabinet/tests/fdi.c
View file @
5cb30bbf
...
...
@@ -744,7 +744,7 @@ static void test_FDIIsCabinet(void)
static
INT_PTR
__cdecl
CopyProgress
(
FDINOTIFICATIONTYPE
fdint
,
PFDINOTIFICATION
pfdin
)
{
return
0
;
return
37
;
/* doc says 0, but anything != -1 apparently means success as well */
}
static
INT_PTR
CDECL
fdi_mem_open
(
char
*
name
,
int
oflag
,
int
pmode
)
...
...
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