Michael Martin : msi: Shedule rename operation also for ERROR_USER_MAPPED_FILE.
Alexandre Julliard
julliard at winehq.org
Fri Nov 20 10:48:03 CST 2009
Module: wine
Branch: master
Commit: d28eabda5c92ed66c362709f9771970634363725
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d28eabda5c92ed66c362709f9771970634363725
Author: Michael Martin <martinmnet at hotmail.com>
Date: Fri Oct 30 13:10:27 2009 +0000
msi: Shedule rename operation also for ERROR_USER_MAPPED_FILE.
---
dlls/msi/files.c | 2 +-
dlls/msi/media.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/msi/files.c b/dlls/msi/files.c
index d9470df..7e74dca 100644
--- a/dlls/msi/files.c
+++ b/dlls/msi/files.c
@@ -155,7 +155,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
gle = copy_file(file, source);
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;
DWORD len;
diff --git a/dlls/msi/media.c b/dlls/msi/media.c
index bc60b60..67d73cc 100644
--- a/dlls/msi/media.c
+++ b/dlls/msi/media.c
@@ -362,7 +362,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
if (handle != INVALID_HANDLE_VALUE) goto done;
err = GetLastError();
}
- if (err == ERROR_SHARING_VIOLATION)
+ if (err == ERROR_SHARING_VIOLATION || err == ERROR_USER_MAPPED_FILE)
{
WCHAR tmpfileW[MAX_PATH], *tmppathW, *p;
DWORD len;
More information about the wine-cvs
mailing list