Hans Leidekker : msi: Don't assume unversioned files are present.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9a9faeffd8b1140dca7cce63d1b7c88ccd198b92
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=9a9faeffd8b1140dca7cce63d1...

Author: Hans Leidekker 
Date:   Mon Apr 19 12:38:30 2010 +0200

msi: Don't assume unversioned files are present.

---

dlls/msi/action.c      |    5 ++++-
 dlls/msi/tests/patch.c |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index a4af27c..fb1346b 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -2002,7 +2002,10 @@ static UINT msi_check_file_install_states( MSIPACKAGE *package )
             msi_free( file_version );
         }
         else
-            file->state = msifs_present;
+        {
+            file->state = msifs_overwrite;
+            comp->Cost += file->FileSize;
+        }
     }

return ERROR_SUCCESS;
diff --git a/dlls/msi/tests/patch.c b/dlls/msi/tests/patch.c
index 7e8d453..92eee6c 100644
--- a/dlls/msi/tests/patch.c
+++ b/dlls/msi/tests/patch.c
@@ -706,7 +706,7 @@ static void test_simple_patch( void )
     }

size = get_pf_file_size( "msitest\patch.txt" );
-    todo_wine ok( size == 1002, "expected 1002, got %u\n", size );
+    ok( size == 1002, "expected 1002, got %u\n", size );

strcpy( path, CURR_DIR );
     strcat( path, "\" );