forked from Mirrors/wine-wine
msi: Shedule rename operation also for ERROR_USER_MAPPED_FILE.
parent
647491418b
commit
d28eabda5c
|
@ -155,7 +155,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
|
||||||
gle = copy_file(file, source);
|
gle = copy_file(file, source);
|
||||||
TRACE("Overwriting existing file: %d\n", gle);
|
TRACE("Overwriting existing file: %d\n", gle);
|
||||||
}
|
}
|
||||||
if (gle == ERROR_SHARING_VIOLATION)
|
if (gle == ERROR_SHARING_VIOLATION || gle == ERROR_USER_MAPPED_FILE)
|
||||||
{
|
{
|
||||||
WCHAR tmpfileW[MAX_PATH], *pathW, *p;
|
WCHAR tmpfileW[MAX_PATH], *pathW, *p;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
|
|
@ -362,7 +362,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
|
||||||
if (handle != INVALID_HANDLE_VALUE) goto done;
|
if (handle != INVALID_HANDLE_VALUE) goto done;
|
||||||
err = GetLastError();
|
err = GetLastError();
|
||||||
}
|
}
|
||||||
if (err == ERROR_SHARING_VIOLATION)
|
if (err == ERROR_SHARING_VIOLATION || err == ERROR_USER_MAPPED_FILE)
|
||||||
{
|
{
|
||||||
WCHAR tmpfileW[MAX_PATH], *tmppathW, *p;
|
WCHAR tmpfileW[MAX_PATH], *tmppathW, *p;
|
||||||
DWORD len;
|
DWORD len;
|
||||||
|
|
Loading…
Reference in New Issue