[ros-diffs] [mjmartin] 43845: [msi] - 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.

Author: mjmartin
Date: Fri Oct 30 13:53:19 2009
New Revision: 43845

URL: http://svn.reactos.org/svn/reactos?rev=43845&view=rev
Log:
[msi]
- 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.

Modified:
    trunk/reactos/dll/win32/msi/files.c
    trunk/reactos/dll/win32/msi/media.c

Modified: trunk/reactos/dll/win32/msi/files.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/files.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/files.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/files.c [iso-8859-1] Fri Oct 30 13:53:19 2009
@@ -155,7 +155,7 @@
         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;

Modified: trunk/reactos/dll/win32/msi/media.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/media.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/msi/media.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/media.c [iso-8859-1] Fri Oct 30 13:53:19 2009
@@ -353,7 +353,7 @@
             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;