ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 19:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[msi]

Browse Source 
- Schedule a rename operation also for ERROR_USER_MAPPED_FILE. Prevents msi from aborting an install when attempting to overwrite font files. Open Office should now install successfully.

svn path=/trunk/; revision=43845
This commit is contained in:
Michael Martin
2009-10-30 12:53:19 +00:00
parent dbd53d6738
commit 95e552de39
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/dll/win32/msi/files.c
+1 -1
View File
@@ -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;
reactos/dll/win32/msi/media.c
+1 -1
View File
@@ -353,7 +353,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;