April 2015 - Wine-Commits - list.winehq.org

Nikolay Sivov : shlwapi/tests: Fix uninitialized memory reads (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: d6180c05b5a6fd3f0f5eae897c00d30527dc4ff0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6180c05b5a6fd3f0f5eae897… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 12:05:25 2015 +0300 shlwapi/tests: Fix uninitialized memory reads (Valgrind). --- dlls/shlwapi/tests/path.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 7ffa000..84b3f4d 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -183,13 +183,18 @@ static const struct { /* ################ */ -static LPWSTR GetWideString(const char* szString) +static LPWSTR GetWideString(const char *src) { - LPWSTR wszString = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); - - MultiByteToWideChar(CP_ACP, 0, szString, -1, wszString, INTERNET_MAX_URL_LENGTH); + WCHAR *ret; - return wszString; + if (!src) + return NULL; + + ret = HeapAlloc(GetProcessHeap(), 0, (2*INTERNET_MAX_URL_LENGTH) * sizeof(WCHAR)); + + MultiByteToWideChar(CP_ACP, 0, src, -1, ret, INTERNET_MAX_URL_LENGTH); + + return ret; } static void FreeWideString(LPWSTR wszString)

1 0

Nikolay Sivov : rpcrt4/tests: Fix a minor leak (Valgrind).
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: 4cf70b1418260fda95d69bcb50374a64f1ce895b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cf70b1418260fda95d69bcb5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 11 11:01:09 2015 +0300 rpcrt4/tests: Fix a minor leak (Valgrind). --- dlls/rpcrt4/tests/ndr_marshall.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 315a452..917c9e5 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1590,6 +1590,7 @@ todo_wine { "mem not pointing at buffer %p/%p\n", mem, StubMsg.BufferStart + 12 ); ok(my_alloc_called == 0, "alloc called %d\n", my_alloc_called); } + HeapFree(GetProcessHeap(), 0, mem_orig); my_alloc_called = 0; mem = mem_orig = HeapAlloc(GetProcessHeap(), 0, sizeof(memsrc));

1 0

Francois Gouget : windowscodecs/tests: Fix compilation on systems that don 't support nameless unions.
by Alexandre Julliard April 13, 2015

April 13, 2015

Module: wine Branch: master Commit: af4324e4330c92b41e6fed20f918d4da627f0258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af4324e4330c92b41e6fed20f… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Apr 11 16:28:19 2015 +0200 windowscodecs/tests: Fix compilation on systems that don't support nameless unions. --- dlls/windowscodecs/tests/metadata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 1818b26..6c2d6b7 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -451,7 +451,7 @@ static void test_metadata_gAMA(void) PropVariantClear(&id); ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt); - ok(value.ulVal == 33333, "unexpected value: %u\n", value.ulVal); + ok(U(value).ulVal == 33333, "unexpected value: %u\n", U(value).ulVal); PropVariantClear(&value); IWICMetadataReader_Release(reader);

1 0

Hans Leidekker : msi: Add support for patching global assembly files.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: dc2228305c821897091836b4d9593551a5ff9a65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc2228305c821897091836b4d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:59:01 2015 +0200 msi: Add support for patching global assembly files. --- dlls/msi/assembly.c | 71 ++++++++++++++++++++++++++++++++- dlls/msi/files.c | 110 ++++++++++++++++++++++++++++++++++++++++++---------- dlls/msi/msipriv.h | 2 + 3 files changed, 161 insertions(+), 22 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index a25b19d..7151a8b 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -38,6 +38,8 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); +static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); +static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); static HMODULE hfusion10, hfusion11, hfusion20, hfusion40, hmscoree, hsxs; @@ -79,8 +81,11 @@ static BOOL init_function_pointers( void ) pCreateAssemblyCacheNet20 = (void *)GetProcAddress( hfusion20, "CreateAssemblyCache" ); if (!pLoadLibraryShim( szFusion, szVersion40, NULL, &hfusion40 )) + { pCreateAssemblyCacheNet40 = (void *)GetProcAddress( hfusion40, "CreateAssemblyCache" ); - + pCreateAssemblyNameObject = (void *)GetProcAddress( hfusion40, "CreateAssemblyNameObject" ); + pCreateAssemblyEnum = (void *)GetProcAddress( hfusion40, "CreateAssemblyEnum" ); + } return TRUE; } @@ -259,6 +264,70 @@ static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_n return FALSE; } +WCHAR *msi_get_assembly_path( MSIPACKAGE *package, const WCHAR *displayname ) +{ + HRESULT hr; + ASSEMBLY_INFO info; + IAssemblyCache *cache = package->cache_net[CLR_VERSION_V40]; + + if (!cache) return NULL; + + memset( &info, 0, sizeof(info) ); + info.cbAssemblyInfo = sizeof(info); + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, displayname, &info ); + if (hr != E_NOT_SUFFICIENT_BUFFER) return NULL; + + if (!(info.pszCurrentAssemblyPathBuf = msi_alloc( info.cchBuf * sizeof(WCHAR) ))) return NULL; + + hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, displayname, &info ); + if (FAILED( hr )) + { + msi_free( info.pszCurrentAssemblyPathBuf ); + return NULL; + } + TRACE("returning %s\n", debugstr_w(info.pszCurrentAssemblyPathBuf)); + return info.pszCurrentAssemblyPathBuf; +} + +IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displayname ) +{ + HRESULT hr; + IAssemblyName *name; + IAssemblyEnum *ret; + WCHAR *str; + UINT len = 0; + + if (!pCreateAssemblyNameObject || !pCreateAssemblyEnum) return NULL; + + hr = pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); + if (FAILED( hr )) return NULL; + + hr = IAssemblyName_GetName( name, &len, NULL ); + if (hr != E_NOT_SUFFICIENT_BUFFER || !(str = msi_alloc( len * sizeof(WCHAR) ))) + { + IAssemblyName_Release( name ); + return NULL; + } + + hr = IAssemblyName_GetName( name, &len, str ); + IAssemblyName_Release( name ); + if (FAILED( hr )) + { + msi_free( str ); + return NULL; + } + + hr = pCreateAssemblyNameObject( &name, str, 0, NULL ); + msi_free( str ); + if (FAILED( hr )) return NULL; + + hr = pCreateAssemblyEnum( &ret, NULL, name, ASM_CACHE_GAC, NULL ); + IAssemblyName_Release( name ); + if (FAILED( hr )) return NULL; + + return ret; +} + static const WCHAR clr_version_v10[] = {'v','1','.','0','.','3','7','0','5',0}; static const WCHAR clr_version_v11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR clr_version_v20[] = {'v','2','.','0','.','5','0','7','2','7',0}; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index ca758dd..26e4cb1 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -32,6 +32,8 @@ #include <stdarg.h> +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winerror.h" @@ -493,6 +495,78 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, return TRUE; } +static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch ) +{ + UINT r = ERROR_SUCCESS; + WCHAR *tmpfile = msi_create_temp_file( package->db ); + + if (!tmpfile) return ERROR_INSTALL_FAILURE; + if (ApplyPatchToFileW( patch->path, patch->File->TargetPath, tmpfile, 0 )) + { + DeleteFileW( patch->File->TargetPath ); + MoveFileW( tmpfile, patch->File->TargetPath ); + } + else + { + WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); + r = ERROR_INSTALL_FAILURE; + } + DeleteFileW( patch->path ); + DeleteFileW( tmpfile ); + msi_free( tmpfile ); + return r; +} + +static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATCH *patch ) +{ + UINT r = ERROR_FUNCTION_FAILED; + IAssemblyName *name; + IAssemblyEnum *iter; + + if (!(iter = msi_create_assembly_enum( package, assembly->display_name ))) + return ERROR_FUNCTION_FAILED; + + while ((IAssemblyEnum_GetNextAssembly( iter, NULL, &name, 0 ) == S_OK)) + { + WCHAR *displayname, *path; + UINT len = 0; + HRESULT hr; + + hr = IAssemblyName_GetDisplayName( name, NULL, &len, 0 ); + if (hr != E_NOT_SUFFICIENT_BUFFER || !(displayname = msi_alloc( len * sizeof(WCHAR) ))) + break; + + hr = IAssemblyName_GetDisplayName( name, displayname, &len, 0 ); + if (FAILED( hr )) + { + msi_free( displayname ); + break; + } + + if ((path = msi_get_assembly_path( package, displayname ))) + { + if (!CopyFileW( path, patch->File->TargetPath, FALSE )) + { + ERR("Failed to copy file %s -> %s (%u)\n", debugstr_w(path), + debugstr_w(patch->File->TargetPath), GetLastError() ); + msi_free( path ); + msi_free( displayname ); + IAssemblyName_Release( name ); + break; + } + r = patch_file( package, patch ); + msi_free( path ); + } + + msi_free( displayname ); + IAssemblyName_Release( name ); + if (r == ERROR_SUCCESS) break; + } + + IAssemblyEnum_Release( iter ); + return r; +} + UINT ACTION_PatchFiles( MSIPACKAGE *package ) { MSIFILEPATCH *patch; @@ -549,34 +623,28 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) { - WCHAR *tmpfile; - BOOL ret; + MSICOMPONENT *comp = patch->File->Component; if (!patch->path) continue; - if (!(tmpfile = msi_create_temp_file( package->db ))) - { - rc = ERROR_INSTALL_FAILURE; - goto done; - } - ret = ApplyPatchToFileW( patch->path, patch->File->TargetPath, tmpfile, 0 ); - if (ret) - { - DeleteFileW( patch->File->TargetPath ); - MoveFileW( tmpfile, patch->File->TargetPath ); - } + if (msi_is_global_assembly( comp )) + rc = patch_assembly( package, comp->assembly, patch ); else - WARN("failed to patch %s: %08x\n", debugstr_w(patch->File->TargetPath), GetLastError()); - - DeleteFileW( patch->path ); - DeleteFileW( tmpfile ); - msi_free( tmpfile ); + rc = patch_file( package, patch ); - if (!ret && !(patch->Attributes & msidbPatchAttributesNonVital)) + if (rc && !(patch->Attributes & msidbPatchAttributesNonVital)) { ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); - rc = ERROR_INSTALL_FAILURE; - goto done; + break; + } + + if (msi_is_global_assembly( comp )) + { + if ((rc = msi_install_assembly( package, comp ))) + { + ERR("Failed to install patched assembly\n"); + break; + } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9bec75f..d457a54 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1042,6 +1042,8 @@ extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; +extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; +extern WCHAR *msi_get_assembly_path(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR *msi_font_version_from_file(const WCHAR *) DECLSPEC_HIDDEN; extern WCHAR **msi_split_string(const WCHAR *, WCHAR) DECLSPEC_HIDDEN; extern UINT msi_set_original_database_property(MSIDATABASE *, const WCHAR *) DECLSPEC_HIDDEN;

1 0

Hans Leidekker : msi: Don' t read past the end of the patch list in MsiApplyMultiplePatchesW.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 17b80c8ec00bba070972eefb8c9f9eafbc810034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b80c8ec00bba070972eefb8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:40 2015 +0200 msi: Don't read past the end of the patch list in MsiApplyMultiplePatchesW. --- dlls/msi/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 9dc30be..2c476fa 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -487,7 +487,7 @@ UINT WINAPI MsiApplyMultiplePatchesW(LPCWSTR szPatchPackages, r = MSI_ApplyPatchW(patch, szProductCode, szPropertiesList); msi_free(patch); - if (r != ERROR_SUCCESS) + if (r != ERROR_SUCCESS || !*end) break; beg = ++end;

1 0

Hans Leidekker : fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 2eda884bd70c48605a2a857ebe7cb1c7f7ab4948 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2eda884bd70c48605a2a857eb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:57:15 2015 +0200 fusion: Fix insufficient buffer size handling in IAssemblyName::GetDisplayName. --- dlls/fusion/asmname.c | 16 ++++++++++------ dlls/fusion/tests/asmname.c | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/fusion/asmname.c b/dlls/fusion/asmname.c index c417a23..f7a9452 100644 --- a/dlls/fusion/asmname.c +++ b/dlls/fusion/asmname.c @@ -228,12 +228,10 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, LPDWORD pccDisplayName, DWORD dwDisplayFlags) { + static const WCHAR equals[] = {'=',0}; IAssemblyNameImpl *name = impl_from_IAssemblyName(iface); - WCHAR verstr[30]; + WCHAR verstr[30], *cultureval = NULL; DWORD size; - LPWSTR cultureval = 0; - - static const WCHAR equals[] = {'=',0}; TRACE("(%p, %p, %p, %d)\n", iface, szDisplayName, pccDisplayName, dwDisplayFlags); @@ -243,9 +241,15 @@ static HRESULT WINAPI IAssemblyNameImpl_GetDisplayName(IAssemblyName *iface, if (!name->displayname || !*name->displayname) return FUSION_E_INVALID_NAME; - size = min(*pccDisplayName, lstrlenW(name->displayname) + 1); + size = strlenW(name->displayname) + 1; + + if (*pccDisplayName < size) + { + *pccDisplayName = size; + return E_NOT_SUFFICIENT_BUFFER; + } - lstrcpynW(szDisplayName, name->displayname, size); + if (szDisplayName) strcpyW(szDisplayName, name->displayname); *pccDisplayName = size; return S_OK; diff --git a/dlls/fusion/tests/asmname.c b/dlls/fusion/tests/asmname.c index 68309f2..e415c3a9 100644 --- a/dlls/fusion/tests/asmname.c +++ b/dlls/fusion/tests/asmname.c @@ -508,6 +508,23 @@ static void test_CreateAssemblyNameObject(void) ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); ok(name != NULL, "Expected non-NULL name\n"); + size = 0; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(size == 5, "got %u\n", size); + + size = 3; + hr = IAssemblyName_GetDisplayName(name, NULL, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER || broken(hr == E_INVALIDARG), "got %08x\n", hr); + ok(size == 5 || broken(size == 3), "got %u\n", size); + + size = 3; + str[0] = 'a'; + hr = IAssemblyName_GetDisplayName(name, str, &size, 0); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got %08x\n", hr); + ok(str[0] == 'a', "got %c\n", str[0]); + ok(size == 5, "got %u\n", size); + size = MAX_PATH; hr = IAssemblyName_GetDisplayName(name, str, &size, ASM_DISPLAYF_FULL); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr);

1 0

Stefan Dösinger : wined3d: Move alpha test states to the fragment pipeline.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: 5c7707dc775235ec98ada59dc196c33ca2000600 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7707dc775235ec98ada59dc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:16 2015 +0200 wined3d: Move alpha test states to the fragment pipeline. This will allow some color keying cleanups. For Core Contexts we'll have to emulate alpha testing in shaders anyway. --- dlls/wined3d/arb_program_shader.c | 4 ++++ dlls/wined3d/ati_fragment_shader.c | 4 ++++ dlls/wined3d/glsl_shader.c | 4 ++++ dlls/wined3d/nvidia_texture_shader.c | 4 ++++ dlls/wined3d/state.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 6 files changed, 25 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c7707dc775235ec98ada…

1 0

Hans Leidekker : msi: Assume that file patches from registered MSI patches have already been applied.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: d263c91ce28b39102770c03d65ecab0d71a97e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d263c91ce28b39102770c03d6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:26 2015 +0200 msi: Assume that file patches from registered MSI patches have already been applied. --- dlls/msi/files.c | 14 +++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/patch.c | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 3116754..ca758dd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -448,6 +448,17 @@ static MSIFILEPATCH *find_filepatch( MSIPACKAGE *package, UINT disk_id, const WC return NULL; } +static BOOL is_registered_patch_media( MSIPACKAGE *package, UINT disk_id ) +{ + MSIPATCHINFO *patch; + + LIST_FOR_EACH_ENTRY( patch, &package->patches, MSIPATCHINFO, entry ) + { + if (patch->disk_id == disk_id && patch->registered) return TRUE; + } + return FALSE; +} + static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, LPWSTR *path, DWORD *attrs, PVOID user) { @@ -457,7 +468,8 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, { MSICOMPONENT *comp; - if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + if (is_registered_patch_media( package, patch->disk_id ) || + !(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; comp = patch->File->Component; comp->Action = msi_get_component_action( package, comp ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 5a8c24f..9bec75f 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -193,6 +193,7 @@ typedef struct tagMSIPATCHINFO LPWSTR localfile; MSIPATCHSTATE state; BOOL delete_on_close; + BOOL registered; UINT disk_id; } MSIPATCHINFO; diff --git a/dlls/msi/patch.c b/dlls/msi/patch.c index b7bf2ef..5456359 100644 --- a/dlls/msi/patch.c +++ b/dlls/msi/patch.c @@ -918,6 +918,7 @@ static UINT msi_apply_patch_package( MSIPACKAGE *package, const WCHAR *file ) goto done; r = ERROR_OUTOFMEMORY; + patch->registered = FALSE; if (!(patch->filename = strdupW( file ))) goto done; if (!(patch->localfile = strdupW( localfile ))) goto done; @@ -1034,6 +1035,7 @@ UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) msiobj_release( &patch_db->hdr ); return r; } + patch_info->registered = TRUE; patch_info->localfile = strdupW( patch_file ); if (!patch_info->localfile) {

1 0

Hans Leidekker : msi: Take the component action into account for file patches.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: e4fd6265ebc18a152b4c24f0bd7c8d44ad8ace16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd6265ebc18a152b4c24f0b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 12:58:01 2015 +0200 msi: Take the component action into account for file patches. --- dlls/msi/files.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index d1e3ecf..3116754 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -455,8 +455,19 @@ static BOOL patchfiles_cb(MSIPACKAGE *package, LPCWSTR file, DWORD action, if (action == MSICABEXTRACT_BEGINEXTRACT) { + MSICOMPONENT *comp; + if (!(patch = find_filepatch( package, patch->disk_id, file ))) return FALSE; + comp = patch->File->Component; + comp->Action = msi_get_component_action( package, comp ); + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) + { + TRACE("file %s component %s not installed or disabled\n", + debugstr_w(patch->File->File), debugstr_w(comp->Component)); + return FALSE; + } + patch->path = msi_create_temp_file( package->db ); *path = strdupW( patch->path ); *attrs = patch->File->Attributes;

1 0

Stefan Dösinger : wined3d: Simplify alpha test and color keying in GLSL.
by Alexandre Julliard April 10, 2015

April 10, 2015

Module: wine Branch: master Commit: c5c713721285282c1ed466d287435a88b7b533ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c713721285282c1ed466d28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:17 2015 +0200 wined3d: Simplify alpha test and color keying in GLSL. --- dlls/wined3d/glsl_shader.c | 35 +++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 3 --- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c67243f..1a1b6b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7572,6 +7572,37 @@ static void glsl_fragment_pipe_invalidate_constants(struct wined3d_context *cont context->constant_update_mask |= WINED3D_SHADER_CONST_FFP_PS; } +static void glsl_fragment_pipe_alpha_test(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + int glParm; + float ref; + + TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); + + if (state->render_states[WINED3D_RS_ALPHATESTENABLE]) + { + gl_info->gl_ops.gl.p_glEnable(GL_ALPHA_TEST); + checkGLcall("glEnable GL_ALPHA_TEST"); + } + else + { + gl_info->gl_ops.gl.p_glDisable(GL_ALPHA_TEST); + checkGLcall("glDisable GL_ALPHA_TEST"); + return; + } + + ref = ((float)state->render_states[WINED3D_RS_ALPHAREF]) / 255.0f; + glParm = wined3d_gl_compare_func(state->render_states[WINED3D_RS_ALPHAFUNC]); + + if (glParm) + { + gl_info->gl_ops.gl.p_glAlphaFunc(glParm, ref); + checkGLcall("glAlphaFunc"); + } +} + static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, @@ -7651,8 +7682,8 @@ static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), glsl_fragment_pipe_shader }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), state_alpha_test }, WINED3D_GL_EXT_NONE }, - {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), {STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), glsl_fragment_pipe_alpha_test }, WINED3D_GL_EXT_NONE }, + {STATE_RENDER(WINED3D_RS_COLORKEYENABLE), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGENABLE), {STATE_RENDER(WINED3D_RS_FOGENABLE), glsl_fragment_pipe_fog }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGTABLEMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_FOGVERTEXMODE), {STATE_RENDER(WINED3D_RS_FOGENABLE), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index edf1e71..b3ac4f1 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -528,9 +528,6 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat context_apply_state(context, state, STATE_TEXTURESTAGE(0, WINED3D_TSS_ALPHA_OP)); context->last_was_ckey = enable_ckey; - if (context->d3d_info->shader_color_key) - enable_ckey = FALSE; - if (state->render_states[WINED3D_RS_ALPHATESTENABLE] || (state->render_states[WINED3D_RS_COLORKEYENABLE] && enable_ckey)) {

1 0