February 2017 - Wine-commits

Francois Gouget : advpack: Add a __WINE_ALLOC_SIZE attribute to heap_alloc ().
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 2ed059a46971db9fe097dab9db5584eb1b927350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed059a46971db9fe097dab9d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:40:56 2017 +0100 advpack: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). And standardize its parameter name. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advpack/advpack_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advpack/advpack_private.h b/dlls/advpack/advpack_private.h index 205cc60..252974f 100644 --- a/dlls/advpack/advpack_private.h +++ b/dlls/advpack/advpack_private.h @@ -27,9 +27,9 @@ void set_ldids(HINF hInf, LPCWSTR pszInstallSection, LPCWSTR pszWorkingDir) DECL HRESULT launch_exe(LPCWSTR cmd, LPCWSTR dir, HANDLE *phEXE) DECLSPEC_HIDDEN; -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc(GetProcessHeap(), 0, len); + return HeapAlloc(GetProcessHeap(), 0, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : browseui: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 9f0e5bf4b850aea53d50c27415e4c836771e8558 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f0e5bf4b850aea53d50c2741… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:44:00 2017 +0100 browseui: Add __WINE_ALLOC_SIZE attributes to heap_xxx() functions. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/browseui/browseui.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/browseui/browseui.h b/dlls/browseui/browseui.h index e03f47f..27691a1 100644 --- a/dlls/browseui/browseui.h +++ b/dlls/browseui/browseui.h @@ -31,19 +31,20 @@ extern HRESULT ACLShellSource_Constructor(IUnknown *punkOuter, IUnknown **ppOut) extern const GUID CLSID_CompCatCacheDaemon; -static inline void *heap_alloc(size_t size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static inline void *heap_alloc_zero(size_t size) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static inline void *heap_realloc(void *mem, size_t size) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return mem ? HeapReAlloc(GetProcessHeap(), 0, mem, size) : heap_alloc(size); + if (!mem) return heap_alloc(size); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } static inline BOOL heap_free(void *mem)

1 0

Francois Gouget : advapi32: Simplify and standardize the heap_xxx() declarations.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 32c066d1f271b30d3e86513e92f8a4b4e4f49ff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c066d1f271b30d3e86513e9… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:44:45 2017 +0100 advapi32: Simplify and standardize the heap_xxx() declarations. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32_misc.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 425a7be..d116ecb 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -35,28 +35,26 @@ DWORD SERV_OpenSCManagerW(LPCWSTR, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; DWORD SERV_OpenServiceW(SC_HANDLE, LPCWSTR, DWORD, SC_HANDLE*) DECLSPEC_HIDDEN; NTSTATUS SERV_QueryServiceObjectSecurity(SC_HANDLE, SECURITY_INFORMATION, PSECURITY_DESCRIPTOR, DWORD, LPDWORD) DECLSPEC_HIDDEN; -/* heap allocation helpers */ -static void *heap_alloc( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc( size_t len ) +/* memory allocation functions */ + +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) { - return HeapAlloc( GetProcessHeap(), 0, len ); + return HeapAlloc(GetProcessHeap(), 0, size); } -static void *heap_alloc_zero( size_t len ) __WINE_ALLOC_SIZE(1); -static inline void *heap_alloc_zero( size_t len ) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc_zero(size_t size) { - return HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, len ); + return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); } -static void *heap_realloc( void *mem, size_t len ) __WINE_ALLOC_SIZE(2); -static inline void *heap_realloc( void *mem, size_t len ) +static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) { - return HeapReAlloc( GetProcessHeap(), 0, mem, len ); + return HeapReAlloc(GetProcessHeap(), 0, mem, size); } -static inline BOOL heap_free( void *mem ) +static inline BOOL heap_free(void *mem) { - return HeapFree( GetProcessHeap(), 0, mem ); + return HeapFree(GetProcessHeap(), 0, mem); } static inline WCHAR *strdupAW( const char *src )

1 0

Francois Gouget : wldap32: Keep the error constants ordered.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: ba68d864230a77ebf4dc8f5b6dc2b3d757718060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba68d864230a77ebf4dc8f5b6… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:47:37 2017 +0100 wldap32: Keep the error constants ordered. This simplifies verifying consistency with the corresponding error messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winldap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winldap.h b/include/winldap.h index 6d24575..2014e06 100644 --- a/include/winldap.h +++ b/include/winldap.h @@ -92,8 +92,8 @@ typedef enum { LDAP_NO_MEMORY = 0x5a, LDAP_CONNECT_ERROR = 0x5b, LDAP_NOT_SUPPORTED = 0x5c, - LDAP_NO_RESULTS_RETURNED = 0x5e, LDAP_CONTROL_NOT_FOUND = 0x5d, + LDAP_NO_RESULTS_RETURNED = 0x5e, LDAP_MORE_RESULTS_TO_RETURN = 0x5f, LDAP_CLIENT_LOOP = 0x60,

1 0

Francois Gouget : wldap32: Add an error message and an explanation for the lack of error constants.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 9743328859c2fdc4cc3f6c8b02dd19d3ff62bbac URL: http://source.winehq.org/git/wine.git/?a=commit;h=9743328859c2fdc4cc3f6c8b0… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Feb 10 16:47:56 2017 +0100 wldap32: Add an error message and an explanation for the lack of error constants. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/wldap32.rc | 4 +- po/ar.po | 124 +++++++++++++++++++++++++----------------------- po/bg.po | 122 ++++++++++++++++++++++++----------------------- po/ca.po | 124 +++++++++++++++++++++++++----------------------- po/cs.po | 124 +++++++++++++++++++++++++----------------------- po/da.po | 124 +++++++++++++++++++++++++----------------------- po/de.po | 124 +++++++++++++++++++++++++----------------------- po/el.po | 122 ++++++++++++++++++++++++----------------------- po/en.po | 122 ++++++++++++++++++++++++----------------------- po/en_US.po | 122 ++++++++++++++++++++++++----------------------- po/eo.po | 122 ++++++++++++++++++++++++----------------------- po/es.po | 124 +++++++++++++++++++++++++----------------------- po/fa.po | 122 ++++++++++++++++++++++++----------------------- po/fi.po | 124 +++++++++++++++++++++++++----------------------- po/fr.po | 124 +++++++++++++++++++++++++----------------------- po/he.po | 122 ++++++++++++++++++++++++----------------------- po/hi.po | 122 ++++++++++++++++++++++++----------------------- po/hr.po | 124 +++++++++++++++++++++++++----------------------- po/hu.po | 124 +++++++++++++++++++++++++----------------------- po/it.po | 124 +++++++++++++++++++++++++----------------------- po/ja.po | 124 +++++++++++++++++++++++++----------------------- po/ko.po | 124 +++++++++++++++++++++++++----------------------- po/lt.po | 124 +++++++++++++++++++++++++----------------------- po/ml.po | 122 ++++++++++++++++++++++++----------------------- po/nb_NO.po | 124 +++++++++++++++++++++++++----------------------- po/nl.po | 124 +++++++++++++++++++++++++----------------------- po/or.po | 122 ++++++++++++++++++++++++----------------------- po/pa.po | 122 ++++++++++++++++++++++++----------------------- po/pl.po | 124 +++++++++++++++++++++++++----------------------- po/pt_BR.po | 124 +++++++++++++++++++++++++----------------------- po/pt_PT.po | 124 +++++++++++++++++++++++++----------------------- po/rm.po | 122 ++++++++++++++++++++++++----------------------- po/ro.po | 122 ++++++++++++++++++++++++----------------------- po/ru.po | 124 +++++++++++++++++++++++++----------------------- po/sk.po | 122 ++++++++++++++++++++++++----------------------- po/sl.po | 124 +++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 122 ++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 122 ++++++++++++++++++++++++----------------------- po/sv.po | 124 +++++++++++++++++++++++++----------------------- po/te.po | 122 ++++++++++++++++++++++++----------------------- po/th.po | 122 ++++++++++++++++++++++++----------------------- po/tr.po | 124 +++++++++++++++++++++++++----------------------- po/uk.po | 124 +++++++++++++++++++++++++----------------------- po/wa.po | 122 ++++++++++++++++++++++++----------------------- po/wine.pot | 122 ++++++++++++++++++++++++----------------------- po/zh_CN.po | 124 +++++++++++++++++++++++++----------------------- po/zh_TW.po | 124 +++++++++++++++++++++++++----------------------- 47 files changed, 2953 insertions(+), 2715 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9743328859c2fdc4cc3f6…

1 0

Andrew Eikum : jsproxy: Use debugstr_a on URL.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: aee52678f29be426bb7108296f1ef0931bb2d160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aee52678f29be426bb7108296… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Feb 10 13:35:07 2017 -0600 jsproxy: Use debugstr_a on URL. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jsproxy/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 11a671a..1ad57aa 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -635,7 +635,7 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW WCHAR *urlW = NULL, *hostnameW = NULL; BOOL ret = FALSE; - TRACE( "%s, %u, %s, %u, %p, %p\n", url, len_url, hostname, len_hostname, proxy, len_proxy ); + TRACE( "%s, %u, %s, %u, %p, %p\n", debugstr_a(url), len_url, hostname, len_hostname, proxy, len_proxy ); EnterCriticalSection( &cs_jsproxy );

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 7c10daf2db45384a0eed109afe41eaba42d2fa1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c10daf2db45384a0eed109af… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Feb 10 21:24:26 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/po/lt.po b/po/lt.po index 3672b8c..7e399ed 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 08:02+0300\n" +"PO-Revision-Date: 2017-02-10 21:23+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -11948,17 +11948,12 @@ msgstr "Nepavyko pervadinti pasirinktos registro reikšmės." #: regedit.rc:220 msgid "" "The keys and values contained in %1 were successfully added to the registry." -msgstr "" +msgstr "Raktai ir reikšmės iš %1 buvo sėkmingai pridėti į registrą." #: regedit.rc:221 -#, fuzzy -#| msgid "" -#| "Unable to rename the key '%1'.\n" -#| "The specified key name already exists." msgid "Unable to import %1. The specified file is not a valid registry file." msgstr "" -"Nepavyko pervadinti rakto „%1“.\n" -"Nurodytas rakto vardas jau egzistuoja." +"Nepavyko importuoti %1. Nurodytas failas nėra teisingas registro failas." #: regedit.rc:373 msgid ""

1 0

Alistair Leslie-Hughes : include: Correct value passed to __WINE_ALLOC_SIZE.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 1ca3a8b7cdfb3ff40d1dca7c7fae67034cafb38f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ca3a8b7cdfb3ff40d1dca7c7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Feb 10 06:39:15 2017 +0000 include: Correct value passed to __WINE_ALLOC_SIZE. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winbase.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/winbase.h b/include/winbase.h index bf14d79..84cda0f 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2246,7 +2246,7 @@ WINBASEAPI HGLOBAL WINAPI GlobalHandle(LPCVOID); WINBASEAPI LPVOID WINAPI GlobalLock(HGLOBAL); WINBASEAPI VOID WINAPI GlobalMemoryStatus(LPMEMORYSTATUS); WINBASEAPI BOOL WINAPI GlobalMemoryStatusEx(LPMEMORYSTATUSEX); -WINBASEAPI HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(3); +WINBASEAPI HGLOBAL WINAPI GlobalReAlloc(HGLOBAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(2); WINBASEAPI SIZE_T WINAPI GlobalSize(HGLOBAL); WINBASEAPI VOID WINAPI GlobalUnfix(HGLOBAL); WINBASEAPI BOOL WINAPI GlobalUnlock(HGLOBAL); @@ -2321,7 +2321,7 @@ WINBASEAPI UINT WINAPI LocalFlags(HLOCAL); WINBASEAPI HLOCAL WINAPI LocalFree(HLOCAL); WINBASEAPI HLOCAL WINAPI LocalHandle(LPCVOID); WINBASEAPI LPVOID WINAPI LocalLock(HLOCAL); -WINBASEAPI HLOCAL WINAPI LocalReAlloc(HLOCAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(3); +WINBASEAPI HLOCAL WINAPI LocalReAlloc(HLOCAL,SIZE_T,UINT) __WINE_ALLOC_SIZE(2); WINBASEAPI SIZE_T WINAPI LocalShrink(HGLOBAL,UINT); WINBASEAPI SIZE_T WINAPI LocalSize(HLOCAL); WINBASEAPI BOOL WINAPI LocalUnlock(HLOCAL);

1 0

Józef Kucia : d3d11: Fix default shader resource views for cube textures.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 5ac8be243da1136ab9862688b715641342957819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ac8be243da1136ab9862688b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:51 2017 +0100 d3d11: Fix default shader resource views for cube textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 4 +++- dlls/d3d11/tests/d3d11.c | 16 +++++++++++++--- dlls/d3d11/view.c | 19 ++++++++++++++++++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index f9a93f2..79d7fbc 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -2578,6 +2578,8 @@ static void test_create_shader_resource_view(void) {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_3D, 0, 1}, {RGBA8_UNORM, TEX_3D, 0, 1}}, {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_3D, 0, ~0u}, {RGBA8_UNORM, TEX_3D, 0, 1}}, {{ 4, 12, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_3D, 0, ~0u}, {RGBA8_UNORM, TEX_3D, 0, 4}}, + {{ 1, 6, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_CUBE, 0, 1}}, + {{ 2, 6, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_CUBE, 0, 2}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_CUBE, 0, ~0u}, {RGBA8_UNORM, TEX_CUBE, 0, 2}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_CUBE, 0, 1}, {RGBA8_UNORM, TEX_CUBE , 0, 1}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_CUBE, 1, 1}, {RGBA8_UNORM, TEX_CUBE , 1, 1}}, @@ -2715,7 +2717,7 @@ static void test_create_shader_resource_view(void) texture2d_desc.Format = tests[i].texture.format; texture2d_desc.MiscFlags = 0; - if (tests[i].srv_desc.dimension == D3D10_SRV_DIMENSION_TEXTURECUBE) + if (tests[i].expected_srv_desc.dimension == D3D10_SRV_DIMENSION_TEXTURECUBE) texture2d_desc.MiscFlags |= D3D10_RESOURCE_MISC_TEXTURECUBE; hr = ID3D10Device_CreateTexture2D(device, &texture2d_desc, NULL, &texture2d); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index eec7ff5..807c845 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -3244,15 +3244,23 @@ static void test_create_shader_resource_view(void) {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_3D, 0, 1}, {RGBA8_UNORM, TEX_3D, 0, 1}}, {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_3D, 0, ~0u}, {RGBA8_UNORM, TEX_3D, 0, 1}}, {{ 4, 12, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_3D, 0, ~0u}, {RGBA8_UNORM, TEX_3D, 0, 4}}, + {{ 1, 6, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_CUBE, 0, 1}}, + {{ 2, 6, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_CUBE, 0, 2}}, + {{ 2, 9, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_CUBE, 0, 2}}, + {{ 2, 11, RGBA8_UNORM}, {0}, {RGBA8_UNORM, TEX_CUBE, 0, 2}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_CUBE, 0, ~0u}, {RGBA8_UNORM, TEX_CUBE, 0, 2}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_CUBE, 0, 1}, {RGBA8_UNORM, TEX_CUBE , 0, 1}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, TEX_CUBE, 1, 1}, {RGBA8_UNORM, TEX_CUBE , 1, 1}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, CUBE_ARRAY, 0, 1, 0, 1}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 1}}, {{ 2, 6, RGBA8_UNORM}, {FMT_UNKNOWN, CUBE_ARRAY, 0, ~0u, 0, ~0u}, {RGBA8_UNORM, CUBE_ARRAY, 0, 2, 0, 1}}, {{ 1, 8, RGBA8_UNORM}, {FMT_UNKNOWN, CUBE_ARRAY, 0, ~0u, 0, ~0u}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 1}}, + {{ 1, 12, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, CUBE_ARRAY, 0, ~0u, 0, ~0u}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, CUBE_ARRAY, 0, ~0u, 0, 1}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 1}}, {{ 1, 12, RGBA8_UNORM}, {FMT_UNKNOWN, CUBE_ARRAY, 0, ~0u, 0, 2}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, + {{ 1, 13, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, + {{ 1, 14, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 2}}, + {{ 1, 18, RGBA8_UNORM}, {0}, {RGBA8_UNORM, CUBE_ARRAY, 0, 1, 0, 3}}, }; static const struct { @@ -3438,11 +3446,13 @@ static void test_create_shader_resource_view(void) texture2d_desc.Format = tests[i].texture.format; texture2d_desc.MiscFlags = 0; - if (tests[i].srv_desc.dimension == D3D11_SRV_DIMENSION_TEXTURECUBE - || tests[i].srv_desc.dimension == D3D11_SRV_DIMENSION_TEXTURECUBEARRAY) + if (tests[i].expected_srv_desc.dimension == D3D11_SRV_DIMENSION_TEXTURECUBE + || tests[i].expected_srv_desc.dimension == D3D11_SRV_DIMENSION_TEXTURECUBEARRAY) texture2d_desc.MiscFlags |= D3D11_RESOURCE_MISC_TEXTURECUBE; - if (tests[i].srv_desc.dimension == D3D11_SRV_DIMENSION_TEXTURECUBEARRAY + if (texture2d_desc.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE + && (texture2d_desc.ArraySize != 6 + || tests[i].expected_srv_desc.dimension == D3D11_SRV_DIMENSION_TEXTURECUBEARRAY) && feature_level < D3D_FEATURE_LEVEL_10_1) { skip("Test %u: Cube map array textures require feature level 10_1.\n", i); diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 92fc37c..ac5395d 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -520,7 +520,24 @@ static HRESULT set_srv_desc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Texture2D_Release(texture); desc->Format = texture_desc.Format; - if (texture_desc.ArraySize == 1) + if (texture_desc.MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE) + { + if (texture_desc.ArraySize >= 12) + { + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBEARRAY; + desc->u.TextureCubeArray.MostDetailedMip = 0; + desc->u.TextureCubeArray.MipLevels = texture_desc.MipLevels; + desc->u.TextureCubeArray.First2DArrayFace = 0; + desc->u.TextureCubeArray.NumCubes = texture_desc.ArraySize / 6; + } + else + { + desc->ViewDimension = D3D11_SRV_DIMENSION_TEXTURECUBE; + desc->u.TextureCube.MostDetailedMip = 0; + desc->u.TextureCube.MipLevels = texture_desc.MipLevels; + } + } + else if (texture_desc.ArraySize == 1) { if (texture_desc.SampleDesc.Count == 1) {

1 0

Józef Kucia : d3d11: Validate array size for cube textures.
by Alexandre Julliard 10 Feb '17

10 Feb '17

Module: wine Branch: master Commit: 7ee0118471bd8ecc86dd408c16f5cf709b8ac59d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ee0118471bd8ecc86dd408c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Feb 10 12:26:52 2017 +0100 d3d11: Validate array size for cube textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 6 +++--- dlls/d3d11/tests/d3d11.c | 6 +++--- dlls/d3d11/texture.c | 34 +++++++++++++++++++++++----------- 3 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 79d7fbc..4868f70 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1218,11 +1218,11 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, - FALSE, TRUE}, + FALSE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, - FALSE, TRUE}, + FALSE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 5, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, - FALSE, TRUE}, + FALSE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 6, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 7, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 807c845..fb095e3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1647,11 +1647,11 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32G32B32A32_TYPELESS, 2, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 3, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, - FALSE, TRUE}, + FALSE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, - FALSE, TRUE}, + FALSE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 5, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, - FALSE, TRUE}, + FALSE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 6, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, TRUE, FALSE}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, 7, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index de1e865..92c4cdf 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -456,6 +456,25 @@ static BOOL is_gdi_compatible_texture(const D3D11_TEXTURE2D_DESC *desc) return TRUE; } +static BOOL validate_texture2d_desc(const D3D11_TEXTURE2D_DESC *desc) +{ + if (desc->MiscFlags & D3D11_RESOURCE_MISC_TEXTURECUBE + && desc->ArraySize < 6) + { + WARN("Invalid array size %u for cube texture.\n", desc->ArraySize); + return FALSE; + } + + if (desc->MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE + && !is_gdi_compatible_texture(desc)) + { + WARN("Incompatible description used to create GDI compatible texture.\n"); + return FALSE; + } + + return TRUE; +} + static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data) { @@ -464,6 +483,9 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi DWORD flags = 0; HRESULT hr; + if (!validate_texture2d_desc(desc)) + return E_INVALIDARG; + texture->ID3D11Texture2D_iface.lpVtbl = &d3d11_texture2d_vtbl; texture->ID3D10Texture2D_iface.lpVtbl = &d3d10_texture2d_vtbl; texture->refcount = 1; @@ -488,17 +510,7 @@ static HRESULT d3d_texture2d_init(struct d3d_texture2d *texture, struct d3d_devi levels = desc->MipLevels ? desc->MipLevels : wined3d_log2i(max(desc->Width, desc->Height)) + 1; if (desc->MiscFlags & D3D11_RESOURCE_MISC_GDI_COMPATIBLE) - { - if (is_gdi_compatible_texture(desc)) - flags |= WINED3D_TEXTURE_CREATE_GET_DC; - else - { - WARN("Incompatible description used to create GDI compatible texture.\n"); - wined3d_private_store_cleanup(&texture->private_store); - wined3d_mutex_unlock(); - return E_INVALIDARG; - } - } + flags |= WINED3D_TEXTURE_CREATE_GET_DC; if (FAILED(hr = wined3d_texture_create(device->wined3d_device, &wined3d_desc, desc->ArraySize, levels, flags, (struct wined3d_sub_resource_data *)data,

1 0