commit 120009e9b4de8939c4aa41db115ba7c339f81658
author Aric Stewart <aric@codeweavers.com> Fri Oct 08 23:35:35 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Oct 08 23:35:35 2004 +0000
tree 8530f02767f0f6548b030e693730a3dda5411e64
parent b4c7e6c7e2b19fc241eabad61afb7fd7d35479ac

Properly compare file versions when upgrading files so that new
versions get properly installed.

dlls/msi/action.c

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 2df5389..f51c553 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2105,21 +2105,29 @@
                     DWORD versize;
                     UINT sz;
                     LPVOID version;
+                    static const WCHAR name[] = 
+                    {'\\',0};
+                    static const WCHAR name_fmt[] = 
+                    {'%','u','.','%','u','.','%','u','.','%','u',0};
                     WCHAR filever[0x100];
-                    static const WCHAR name[] =
-                        {'\\','V','a','r','F','i','l','e','I','n','f','o',
-                         '\\','F','i','l','e','V','e','r','s','i','o','n',0};
+                    VS_FIXEDFILEINFO *lpVer;
 
-                    FIXME("Version comparison.. Untried Untested and most "
-                          "likely very very wrong\n");
+                    FIXME("Version comparison.. \n");
                     versize = GetFileVersionInfoSizeW(file->TargetPath,&handle);
                     version = HeapAlloc(GetProcessHeap(),0,versize);
                     GetFileVersionInfoW(file->TargetPath, 0, versize, version);
-                    sz = 0x100;
-                    VerQueryValueW(version,name,(LPVOID)filever,&sz);
-                    HeapFree(GetProcessHeap(),0,version);
-                
-                    if (strcmpW(version,file->Version)<0)
+
+                    VerQueryValueW(version, name, (LPVOID*)&lpVer, &sz);
+
+                    sprintfW(filever,name_fmt,
+                        HIWORD(lpVer->dwFileVersionMS),
+                        LOWORD(lpVer->dwFileVersionMS),
+                        HIWORD(lpVer->dwFileVersionLS),
+                        LOWORD(lpVer->dwFileVersionLS));
+
+                    TRACE("new %s old %s\n", debugstr_w(file->Version),
+                          debugstr_w(filever));
+                    if (strcmpiW(filever,file->Version)<0)
                     {
                         file->State = 2;
                         FIXME("cost should be diff in size\n");
@@ -2127,6 +2135,7 @@
                     }
                     else
                         file->State = 3;
+                    HeapFree(GetProcessHeap(),0,version);
                 }
                 else
                     file->State = 3;
@@ -2586,8 +2595,17 @@
             if (!MoveFileW(file->SourcePath,file->TargetPath))
             {
                 rc = GetLastError();
-                ERR("Unable to move file (error %d)\n", rc);
-                break;
+                ERR("Unable to move file (%s -> %s) (error %d)\n",
+                     debugstr_w(file->SourcePath), debugstr_w(file->TargetPath),
+                      rc);
+                if (rc == ERROR_ALREADY_EXISTS && file->State == 2)
+                {
+                    CopyFileW(file->SourcePath,file->TargetPath,FALSE);
+                    DeleteFileW(file->SourcePath);
+                    rc = 0;
+                }
+                else
+                    break;
             }
             else
                 file->State = 4;