[MSI] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72292

diff --git a/reactos/dll/win32/msi/instabsent.bmp b/reactos/dll/win32/msi/instabsent.bmp
index 9347961..187ef79 100644 (file)
Binary files a/reactos/dll/win32/msi/instabsent.bmp and b/reactos/dll/win32/msi/instabsent.bmp differ

diff --git a/reactos/dll/win32/msi/instadvert.bmp b/reactos/dll/win32/msi/instadvert.bmp
index 77b5309..95d6754 100644 (file)
Binary files a/reactos/dll/win32/msi/instadvert.bmp and b/reactos/dll/win32/msi/instadvert.bmp differ

diff --git a/reactos/dll/win32/msi/instlocal.bmp b/reactos/dll/win32/msi/instlocal.bmp
index c9591ad..a402f6b 100644 (file)
Binary files a/reactos/dll/win32/msi/instlocal.bmp and b/reactos/dll/win32/msi/instlocal.bmp differ

diff --git a/reactos/dll/win32/msi/patch.c b/reactos/dll/win32/msi/patch.c
index d18ee53..12f2efe 100644 (file)
--- a/reactos/dll/win32/msi/patch.c
+++ b/reactos/dll/win32/msi/patch.c
@@ -130,6 +130,9 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform
     wanted_flags &= 0xffff; /* mask off error condition flags */
     TRACE("validation flags 0x%04x\n", wanted_flags);
 
+    /* native is not validating platform */
+    wanted_flags &= ~MSITRANSFORM_VALIDATE_PLATFORM;
+
     if (wanted_flags & ~supported_flags)
     {
         FIXME("unsupported validation flags 0x%04x\n", wanted_flags);
@@ -183,15 +186,6 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform
         }
         msi_free( product_code_installed );
     }
-    if (wanted_flags & MSITRANSFORM_VALIDATE_PLATFORM)
-    {
-        if ((p = strchrW( template, ';' )))
-        {
-            *p = 0;
-            if (package->platform == parse_platform( template ))
-                valid_flags |= MSITRANSFORM_VALIDATE_PLATFORM;
-        }
-    }
     msi_free( template );
     if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION)
     {

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index b343ed1..a75ab52 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -114,7 +114,7 @@ reactos/dll/win32/msg711.acm          # Synced to WineStaging-1.9.11
 reactos/dll/win32/msgsm32.acm         # Synced to WineStaging-1.9.11
 reactos/dll/win32/mshtml              # Synced to WineStaging-1.7.55
 reactos/dll/win32/mshtml.tlb          # Synced to WineStaging-1.7.55
-reactos/dll/win32/msi                 # Synced to WineStaging-1.9.12
+reactos/dll/win32/msi                 # Synced to WineStaging-1.9.16
 reactos/dll/win32/msimg32             # Synced to WineStaging-1.9.11
 reactos/dll/win32/msimtf              # Synced to WineStaging-1.9.11
 reactos/dll/win32/msisip              # Synced to WineStaging-1.9.11