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
b3abc343
Commit
b3abc343
authored
Nov 22, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
setupapi: Handle copy errors in SetupCommitFileQueueW().
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1ff4a8fa
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
4 deletions
+19
-4
queue.c
dlls/setupapi/queue.c
+19
-4
No files found.
dlls/setupapi/queue.c
View file @
b3abc343
...
...
@@ -1051,9 +1051,6 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
VersionSizeTarget
=
GetFileVersionInfoSizeW
(
target
,
&
zero
);
}
TRACE
(
"SizeTarget %i ... SizeSource %i
\n
"
,
VersionSizeTarget
,
VersionSizeSource
);
if
(
VersionSizeSource
&&
VersionSizeTarget
)
{
LPVOID
VersionSource
;
...
...
@@ -1143,7 +1140,7 @@ static BOOL do_file_copyW( LPCWSTR source, LPCWSTR target, DWORD style,
if
(
docopy
)
{
rc
=
CopyFileW
(
source
,
target
,
FALSE
);
TRACE
(
"Did copy... rc was %i
\n
"
,
rc
);
if
(
!
rc
)
WARN
(
"failed to copy, err %u
\n
"
,
GetLastError
()
);
}
else
SetLastError
(
ERROR_SUCCESS
);
...
...
@@ -1468,6 +1465,24 @@ BOOL WINAPI SetupCommitFileQueueW( HWND owner, HSPFILEQ handle, PSP_FILE_CALLBAC
handler
(
context
,
SPFILENOTIFY_ENDCOPY
,
(
UINT_PTR
)
&
paths
,
0
);
break
;
}
paths
.
Win32Error
=
GetLastError
();
if
(
paths
.
Win32Error
==
ERROR_PATH_NOT_FOUND
||
paths
.
Win32Error
==
ERROR_FILE_NOT_FOUND
)
continue
;
newpath
[
0
]
=
0
;
op_result
=
handler
(
context
,
SPFILENOTIFY_COPYERROR
,
(
UINT_PTR
)
&
paths
,
(
UINT_PTR
)
newpath
);
if
(
op_result
==
FILEOP_ABORT
)
goto
done
;
else
if
(
op_result
==
FILEOP_SKIP
)
break
;
else
if
(
op_result
==
FILEOP_NEWPATH
)
{
lstrcpyW
(
op
->
media
->
root
,
newpath
);
build_filepathsW
(
op
,
&
paths
);
}
else
if
(
op_result
!=
FILEOP_DOIT
)
FIXME
(
"Unhandled return value %#x.
\n
"
,
op_result
);
}
}
else
...
...
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