Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=72292
This commit is contained in:
Amine Khaldi 2016-08-18 10:22:22 +00:00
parent c99ab15017
commit 0cecc250b5
5 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
reactos/dll/win32/msi/instabsent.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

BIN
reactos/dll/win32/msi/instadvert.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

BIN
reactos/dll/win32/msi/instlocal.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 374 B

12
reactos/dll/win32/msi/patch.c
View file

@ -130,6 +130,9 @@ static UINT check_transform_applicable( MSIPACKAGE *package, IStorage *transform
wanted_flags &= 0xffff; /* mask off error condition flags */ wanted_flags &= 0xffff; /* mask off error condition flags */
TRACE("validation flags 0x%04x\n", wanted_flags); TRACE("validation flags 0x%04x\n", wanted_flags);
/* native is not validating platform */
wanted_flags &= ~MSITRANSFORM_VALIDATE_PLATFORM;
if (wanted_flags & ~supported_flags) if (wanted_flags & ~supported_flags)
{ {
FIXME("unsupported validation flags 0x%04x\n", wanted_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 ); 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 ); msi_free( template );
if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION) if (wanted_flags & MSITRANSFORM_VALIDATE_MAJORVERSION)
{ {

2
reactos/media/doc/README.WINE
View file

@ -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/msgsm32.acm # Synced to WineStaging-1.9.11
reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55 reactos/dll/win32/mshtml # Synced to WineStaging-1.7.55
reactos/dll/win32/mshtml.tlb # 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/msimg32 # Synced to WineStaging-1.9.11
reactos/dll/win32/msimtf # 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 reactos/dll/win32/msisip # Synced to WineStaging-1.9.11