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

Hans Leidekker : msi: Add support for patching global assembly files.
by Alexandre Julliard 10 Apr '15

10 Apr '15

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

Marcus Meissner : wininet: Avoid memory leak in error exit (Coverity).
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: c1c06a9093d98c22256c649934dee0bc9c8e62bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c06a9093d98c22256c64993… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Thu Apr 9 18:59:57 2015 +0200 wininet: Avoid memory leak in error exit (Coverity). --- dlls/wininet/cookie.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wininet/cookie.c b/dlls/wininet/cookie.c index af9dcdf..4784b33 100644 --- a/dlls/wininet/cookie.c +++ b/dlls/wininet/cookie.c @@ -341,8 +341,10 @@ static BOOL load_persistent_cookie(LPCWSTR domain, LPCWSTR path) UnlockUrlCacheEntryStream(cookie, 0); cookie_container = get_cookie_container(domain, path, TRUE); - if(!cookie_container) + if(!cookie_container) { + heap_free(str); return FALSE; + } GetSystemTimeAsFileTime(&time); for(pbeg=str; pbeg && *pbeg; name=data=NULL) {

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: c6b999b90181744261f964ce24ae1d1870d3571e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b999b90181744261f964ce2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 9 15:28:26 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 347 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 40 ++--- 2 files changed, 347 insertions(+), 40 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6b999b90181744261f96…

1 0

Mark Harmstone : uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: a1c3b30f491f978206e5caa2f03f636e9c2d85d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1c3b30f491f978206e5caa2f… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Thu Apr 9 23:45:51 2015 +0100 uxtheme: Fix a copy-paste error which mean that GetThemeString would always fail. --- dlls/uxtheme/property.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uxtheme/property.c b/dlls/uxtheme/property.c index 146649e..9dffbdd 100644 --- a/dlls/uxtheme/property.c +++ b/dlls/uxtheme/property.c @@ -210,7 +210,7 @@ HRESULT WINAPI GetThemeString(HTHEME hTheme, int iPartId, int iStateId, if(!hTheme) return E_HANDLE; - if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_FILENAME, iPropId))) + if(!(tp = MSSTYLES_FindProperty(hTheme, iPartId, iStateId, TMT_STRING, iPropId))) return E_PROP_ID_UNSUPPORTED; return MSSTYLES_GetPropertyString(tp, pszBuff, cchMaxBuffChars); }

1 0

Bruno Jesus : include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: fbde8fc0f0f6d341a8ef7eef2b30e67238a40979 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbde8fc0f0f6d341a8ef7eef2… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Apr 10 00:35:51 2015 -0300 include: Update iptypes.h with the old XP IP_ADAPTER_ADDRESSES structure. --- include/iptypes.h | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/include/iptypes.h b/include/iptypes.h index 997388e..fc9f860 100644 --- a/include/iptypes.h +++ b/include/iptypes.h @@ -199,7 +199,7 @@ typedef IP_ADAPTER_GATEWAY_ADDRESS_LH *PIP_ADAPTER_GATEWAY_ADDRESS; #define IP_ADAPTER_IPV6_ENABLED 0x100 #define IP_ADAPTER_IPV6_MANAGE_ADDRESS_CONFIG 0x200 -typedef struct _IP_ADAPTER_ADDRESSES { +typedef struct _IP_ADAPTER_ADDRESSES_LH { union { ULONGLONG Alignment; struct { @@ -207,7 +207,7 @@ typedef struct _IP_ADAPTER_ADDRESSES { DWORD IfIndex; } DUMMYSTRUCTNAME; } DUMMYUNIONNAME; - struct _IP_ADAPTER_ADDRESSES *Next; + struct _IP_ADAPTER_ADDRESSES_LH *Next; PCHAR AdapterName; PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; @@ -241,7 +241,38 @@ typedef struct _IP_ADAPTER_ADDRESSES { BYTE Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; ULONG Dhcpv6ClientDuidLength; ULONG Dhcpv6Iaid; -} IP_ADAPTER_ADDRESSES, *PIP_ADAPTER_ADDRESSES; +} IP_ADAPTER_ADDRESSES_LH, *PIP_ADAPTER_ADDRESSES_LH; + +typedef struct _IP_ADAPTER_ADDRESSES_XP { + union { + ULONGLONG Alignment; + struct { + ULONG Length; + DWORD IfIndex; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + struct _IP_ADAPTER_ADDRESSES_XP *Next; + PCHAR AdapterName; + PIP_ADAPTER_UNICAST_ADDRESS FirstUnicastAddress; + PIP_ADAPTER_ANYCAST_ADDRESS FirstAnycastAddress; + PIP_ADAPTER_MULTICAST_ADDRESS FirstMulticastAddress; + PIP_ADAPTER_DNS_SERVER_ADDRESS FirstDnsServerAddress; + PWCHAR DnsSuffix; + PWCHAR Description; + PWCHAR FriendlyName; + BYTE PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; + DWORD PhysicalAddressLength; + DWORD Flags; + DWORD Mtu; + DWORD IfType; + IF_OPER_STATUS OperStatus; + DWORD Ipv6IfIndex; + DWORD ZoneIndices[16]; + PIP_ADAPTER_PREFIX FirstPrefix; +} IP_ADAPTER_ADDRESSES_XP, *PIP_ADAPTER_ADDRESSES_XP; + +#define IP_ADAPTER_ADDRESSES IP_ADAPTER_ADDRESSES_LH +#define PIP_ADAPTER_ADDRESSES PIP_ADAPTER_ADDRESSES_LH #define GAA_FLAG_SKIP_UNICAST 0x00000001 #define GAA_FLAG_SKIP_ANYCAST 0x00000002

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMFrame2:: QueryInterface returning incorrect HRESULT.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 415b7c1feca042a416120d68f356e9862dcd1ba6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=415b7c1feca042a416120d68f… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:32 2015 +0530 d3drm: Fix IDirect3DRMFrame2::QueryInterface returning incorrect HRESULT. --- dlls/d3drm/frame.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 20acf56..ea7cfc8 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -483,8 +483,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Aaryaman Vasishta : d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 1b1d77268f725f12e175c3a919e8b981e6d199b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1d77268f725f12e175c3a91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Thu Apr 9 19:59:33 2015 +0530 d3drm: Add more interfaces to be queried from IDirect3DRMFrame2::QueryInterface. --- dlls/d3drm/frame.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index ea7cfc8..39c2e7b 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -472,6 +472,8 @@ static HRESULT WINAPI d3drm_frame2_QueryInterface(IDirect3DRMFrame2 *iface, REFI if (IsEqualGUID(riid, &IID_IDirect3DRMFrame2) || IsEqualGUID(riid, &IID_IDirect3DRMFrame) + || IsEqualGUID(riid, &IID_IDirect3DRMObject) + || IsEqualGUID(riid, &IID_IDirect3DRMVisual) || IsEqualGUID(riid, &IID_IUnknown)) { *out = &frame->IDirect3DRMFrame2_iface;

1 0

Maxime Lombard : wined3d: Add support for Nvidia GTX 970M.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 086d2af6299be6fd17d2c36ddbdf120faf7fefad URL: http://source.winehq.org/git/wine.git/?a=commit;h=086d2af6299be6fd17d2c36dd… Author: Maxime Lombard <berillions(a)gmail.com> Date: Thu Apr 9 20:09:23 2015 +0200 wined3d: Add support for Nvidia GTX 970M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13061f4..9412adb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1271,6 +1271,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780, "NVIDIA GeForce GTX 780", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX780TI, "NVIDIA GeForce GTX 780 Ti", DRIVER_NVIDIA_GEFORCE8, 3072}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970, "NVIDIA GeForce GTX 970", DRIVER_NVIDIA_GEFORCE8, 4096}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX970M, "NVIDIA GeForce GTX 970M", DRIVER_NVIDIA_GEFORCE8, 3072}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1698,6 +1699,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"GTX 970M", CARD_NVIDIA_GEFORCE_GTX970M}, /* GeForce 900 - highend mobile*/ {"GTX 970", CARD_NVIDIA_GEFORCE_GTX970}, /* GeForce 900 - highend */ {"GTX 780 Ti", CARD_NVIDIA_GEFORCE_GTX780TI}, /* Geforce 700 - highend */ {"GTX 780", CARD_NVIDIA_GEFORCE_GTX780}, /* Geforce 700 - highend */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5d736dd..f9e0100 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1575,6 +1575,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX780 = 0x1004, CARD_NVIDIA_GEFORCE_GTX780TI = 0x100a, CARD_NVIDIA_GEFORCE_GTX970 = 0x13c2, + CARD_NVIDIA_GEFORCE_GTX970M = 0x13d8, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Stefan Dösinger : wined3d: Set color keys through the command stream.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 82db5954c49d9de1db3dad200d6dc39316820698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82db5954c49d9de1db3dad200… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:11 2015 +0200 wined3d: Set color keys through the command stream. --- dlls/wined3d/cs.c | 84 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 4 +- dlls/wined3d/surface.c | 16 ++++---- dlls/wined3d/texture.c | 81 ++++++++++++++-------------------------- dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d_private.h | 25 +++++++++---- 6 files changed, 140 insertions(+), 74 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82db5954c49d9de1db3da…

1 0

Stefan Dösinger : wined3d: Allow ARB blits from converted surfaces.
by Alexandre Julliard 10 Apr '15

10 Apr '15

Module: wine Branch: master Commit: 439076d591fbf7f4e830be447c1abdbf6472a0a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=439076d591fbf7f4e830be447… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 22:48:12 2015 +0200 wined3d: Allow ARB blits from converted surfaces. --- dlls/wined3d/arb_program_shader.c | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 091ae1d..79439f5 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7572,13 +7572,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, struct arbfp_blit_type type; struct arbfp_blit_desc *desc; - if (surface->container->flags & WINED3D_TEXTURE_CONVERTED) - { - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); - return WINED3D_OK; - } - if (is_complex_fixup(surface->resource.format->color_fixup)) fixup = get_complex_fixup(surface->resource.format->color_fixup); else @@ -7644,8 +7637,6 @@ static HRESULT arbfp_blit_set(void *blit_priv, struct wined3d_context *context, if (!shader) { FIXME("Unsupported complex fixup %#x, not setting a shader\n", fixup); - gl_info->gl_ops.gl.p_glEnable(gl_texture_type); - checkGLcall("glEnable(gl_texture_type)"); return E_NOTIMPL; } @@ -7686,18 +7677,6 @@ static void arbfp_blit_unset(const struct wined3d_gl_info *gl_info) { gl_info->gl_ops.gl.p_glDisable(GL_FRAGMENT_PROGRAM_ARB); checkGLcall("glDisable(GL_FRAGMENT_PROGRAM_ARB)"); - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_2D); - checkGLcall("glDisable(GL_TEXTURE_2D)"); - if (gl_info->supported[ARB_TEXTURE_CUBE_MAP]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_CUBE_MAP_ARB); - checkGLcall("glDisable(GL_TEXTURE_CUBE_MAP_ARB)"); - } - if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) - { - gl_info->gl_ops.gl.p_glDisable(GL_TEXTURE_RECTANGLE_ARB); - checkGLcall("glDisable(GL_TEXTURE_RECTANGLE_ARB)"); - } } static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined3d_blit_op blit_op,

1 0