Author: akhaldi Date: Thu Aug 18 10:22:22 2016 New Revision: 72292
URL: http://svn.reactos.org/svn/reactos?rev=72292&view=rev Log: [MSI] Sync with Wine Staging 1.9.16. CORE-11866
Modified: trunk/reactos/dll/win32/msi/instabsent.bmp trunk/reactos/dll/win32/msi/instadvert.bmp trunk/reactos/dll/win32/msi/instlocal.bmp trunk/reactos/dll/win32/msi/patch.c trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/dll/win32/msi/instabsent.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/instabsent.bm... ============================================================================== Binary files - no diff available.
Modified: trunk/reactos/dll/win32/msi/instadvert.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/instadvert.bm... ============================================================================== Binary files - no diff available.
Modified: trunk/reactos/dll/win32/msi/instlocal.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/instlocal.bmp... ============================================================================== Binary files - no diff available.
Modified: trunk/reactos/dll/win32/msi/patch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/patch.c?rev=7... ============================================================================== --- trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/patch.c [iso-8859-1] Thu Aug 18 10:22:22 2016 @@ -130,6 +130,9 @@ 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); @@ -182,15 +185,6 @@ valid_flags |= MSITRANSFORM_VALIDATE_PRODUCT; } 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)
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=7... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Thu Aug 18 10:22:22 2016 @@ -114,7 +114,7 @@ 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