December 2017 - Wine-commits

Zebediah Figura : po: Fix some MSI translations.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: b9f32e16722fab5c6b9acf3e99c8a4720c7e14b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9f32e16722fab5c6b9acf3e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Dec 13 18:39:59 2017 -0600 po: Fix some MSI translations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 16 ++++------------ po/bg.po | 4 +--- po/ca.po | 16 ++++------------ po/cs.po | 16 ++++------------ po/da.po | 16 ++++------------ po/el.po | 4 +--- po/eo.po | 12 +++--------- po/es.po | 16 ++++------------ po/fr.po | 16 ++++------------ po/he.po | 12 +++--------- po/hr.po | 16 ++++------------ po/hu.po | 16 ++++------------ po/it.po | 16 ++++------------ po/ko.po | 16 ++++------------ po/nb_NO.po | 12 ++++++------ po/nl.po | 16 ++++------------ po/pl.po | 12 ++++-------- po/pt_BR.po | 16 ++++------------ po/pt_PT.po | 16 ++++------------ po/ro.po | 16 ++++------------ po/sk.po | 4 +--- po/sl.po | 16 ++++------------ po/sr_RS(a)cyrillic.po | 12 +++--------- po/sr_RS(a)latin.po | 11 +++-------- po/sv.po | 16 ++++------------ po/th.po | 4 +--- po/uk.po | 24 ++++++------------------ po/wa.po | 7 ++----- po/zh_CN.po | 8 ++++---- po/zh_TW.po | 16 ++++------------ 30 files changed, 106 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9f32e16722fab5c6b9ac…

1 0

Martin Payne : user.exe16: Fix handling of 16-bit HBITMAPs in InsertMenu16.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 81fb745e407fa297fdb8167d4f3b8acbe327308c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81fb745e407fa297fdb8167d4… Author: Martin Payne <development(a)martinpayne.me.uk> Date: Wed Dec 13 10:24:32 2017 +0000 user.exe16: Fix handling of 16-bit HBITMAPs in InsertMenu16. Signed-off-by: Martin Payne <development(a)martinpayne.me.uk> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user.exe16/user.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user.exe16/user.c b/dlls/user.exe16/user.c index 729e973..f7d4109 100644 --- a/dlls/user.exe16/user.c +++ b/dlls/user.exe16/user.c @@ -2405,6 +2405,10 @@ BOOL16 WINAPI InsertMenu16( HMENU16 hMenu, UINT16 pos, UINT16 flags, if ((pos == (UINT16)-1) && (flags & MF_BYPOSITION)) pos32 = (UINT)-1; if (IS_MENU_STRING_ITEM(flags) && data) return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, MapSL(data) ); + + /* If "data" is an HBITMAP, the high WORD will contain the application's DGROUP selector if the + * application cast (LPSTR)hBitmap rather than (LPSTR)(LONG)hBitmap. */ + if (flags & MF_BITMAP) data = (SEGPTR)HBITMAP_32(LOWORD(data)); return InsertMenuA( HMENU_32(hMenu), pos32, flags, id, (LPSTR)data ); }

1 0

Dmitry Timoshkov : secur32/tests: Add a test for Negotiate behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 8d4d7c7251e6f0279757a6f0cba0a654db5fb9c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4d7c7251e6f0279757a6f0c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 14 17:17:02 2017 +0800 secur32/tests: Add a test for Negotiate behaviour with SECPKG_ATTR_NEGOTIATION_INFO query. To show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/negotiate.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/tests/negotiate.c b/dlls/secur32/tests/negotiate.c index a1c430d..2f1228c 100644 --- a/dlls/secur32/tests/negotiate.c +++ b/dlls/secur32/tests/negotiate.c @@ -284,13 +284,16 @@ static void test_authentication(void) memset( &info, 0, sizeof(info) ); status_c = QueryContextAttributesA( &client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info ); - ok( status_c == SEC_E_OK, "pQueryContextAttributesA returned %08x\n", status_c ); + ok( status_c == SEC_E_OK, "QueryContextAttributesA returned %08x\n", status_c ); pi = info.PackageInfo; ok( info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState ); ok( pi != NULL, "expected non-NULL PackageInfo\n" ); if (pi) { + UINT expected, got; + char *eob; + ok( pi->fCapabilities == NTLM_BASE_CAPS || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || @@ -300,6 +303,19 @@ static void test_authentication(void) ok( pi->wVersion == 1, "got %u\n", pi->wVersion ); ok( pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID ); ok( !lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name ); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); +todo_wine + ok( got == expected, "got %u, expected %u\n", got, expected ); + eob = (char *)pi + expected; +todo_wine + ok( pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n" ); +todo_wine + ok( pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n" ); + + status = FreeContextBuffer( pi ); + ok( status == SEC_E_OK, "FreeContextBuffer error %#x\n", status ); } done:

1 0

Dmitry Timoshkov : secur32/tests: Add a test for NTLM behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 09f6e200d9b220e28a98a74f466d69bb243c9e22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09f6e200d9b220e28a98a74f4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 14 17:18:04 2017 +0800 secur32/tests: Add a test for NTLM behaviour with SECPKG_ATTR_NEGOTIATION_INFO query. To show that QueryContextAttributes(SECPKG_ATTR_NEGOTIATION_INFO) allocates flat memory block for the PackageInfo structure. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index 355af5a..c060420 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -36,6 +36,29 @@ #include "wine/test.h" +#define NEGOTIATE_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_EXTENDED_ERROR | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_GSS_COMPATIBLE | \ + SECPKG_FLAG_LOGON ) + +#define NTLM_BASE_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON ) + static HMODULE secdll; static PSecurityFunctionTableA (SEC_ENTRY * pInitSecurityInterfaceA)(void); static SECURITY_STATUS (SEC_ENTRY * pFreeContextBuffer)(PVOID pv); @@ -797,6 +820,8 @@ static void testAuth(ULONG data_rep, BOOL fake) SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; + SecPkgContext_NegotiationInfoA info; + SecPkgInfoA *pi; if(pQuerySecurityPackageInfoA( sec_pkg_name, &pkg_info)!= SEC_E_OK) { @@ -889,6 +914,41 @@ static void testAuth(ULONG data_rep, BOOL fake) "cbBlockSize should be 0 but is %u\n", ctxt_sizes.cbBlockSize); + memset(&info, 0, sizeof(info)); + sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); +todo_wine + ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); + + pi = info.PackageInfo; + ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); +todo_wine + ok(pi != NULL, "expected non-NULL PackageInfo\n"); + if (pi) + { + UINT expected, got; + char *eob; + + ok(pi->fCapabilities == NTLM_BASE_CAPS || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_READONLY_WITH_CHECKSUM) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS) || + pi->fCapabilities == (NTLM_BASE_CAPS|SECPKG_FLAG_RESTRICTED_TOKENS| + SECPKG_FLAG_APPCONTAINER_CHECKS), + "got %08x\n", pi->fCapabilities); + ok(pi->wVersion == 1, "got %u\n", pi->wVersion); + ok(pi->wRPCID == RPC_C_AUTHN_WINNT, "got %u\n", pi->wRPCID); + ok(!lstrcmpA( pi->Name, "NTLM" ), "got %s\n", pi->Name); + + expected = sizeof(*pi) + lstrlenA(pi->Name) + 1 + lstrlenA(pi->Comment) + 1; + got = HeapSize(GetProcessHeap(), 0, pi); + ok(got == expected, "got %u, expected %u\n", got, expected); + eob = (char *)pi + expected; + ok(pi->Name + lstrlenA(pi->Name) < eob, "Name doesn't fit into allocated block\n"); + ok(pi->Comment + lstrlenA(pi->Comment) < eob, "Comment doesn't fit into allocated block\n"); + + sec_status = FreeContextBuffer(pi); + ok(sec_status == SEC_E_OK, "FreeContextBuffer error %#x\n", sec_status); + } + tAuthend: cleanupBuffers(&client); cleanupBuffers(&server);

1 0

Dmitry Timoshkov : secur32/tests: Add a test for Schannel behaviour with SECPKG_ATTR_NEGOTIATION_INFO query.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: dfb09f480780107d6b1c9beb7dadf85db4aadc67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfb09f480780107d6b1c9beb7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Dec 14 17:19:06 2017 +0800 secur32/tests: Add a test for Schannel behaviour with SECPKG_ATTR_NEGOTIATION_INFO query. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/schannel.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index b5ed169..21ebb62 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -686,6 +686,7 @@ static void test_communication(void) SecPkgContext_ConnectionInfo conn_info; SecPkgContext_KeyInfoA key_info; CERT_CONTEXT *cert; + SecPkgContext_NegotiationInfoA info; SecBufferDesc buffers[2]; SecBuffer *buf; @@ -939,6 +940,9 @@ todo_wine status = pQueryContextAttributesA(&context, SECPKG_ATTR_STREAM_SIZES, &sizes); ok(status == SEC_E_OK, "QueryContextAttributesW(SECPKG_ATTR_STREAM_SIZES) failed: %08x\n", status); + status = QueryContextAttributesA(&context, SECPKG_ATTR_NEGOTIATION_INFO, &info); + ok(status == SEC_E_UNSUPPORTED_FUNCTION, "QueryContextAttributesA returned %08x\n", status); + reset_buffers(&buffers[0]); /* Send a simple request so we get data for testing DecryptMessage */

1 0

Sergio Gómez Del Real : ole32: Correctly save the dib format if its data has not been set.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: wine Branch: master Commit: 179daf67a82945ee41f45f24d4bbf8f31fc2d7d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=179daf67a82945ee41f45f24d… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Thu Dec 14 13:17:37 2017 +0000 ole32: Correctly save the dib format if its data has not been set. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 75c9611..ae05b8e 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -792,8 +792,14 @@ static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *he static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream) { HRESULT hr = S_OK; - int data_size = GlobalSize(entry->stgmedium.u.hGlobal); - BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal); + int data_size = 0; + BITMAPINFO *bmi = NULL; + + if (entry->stgmedium.tymed != TYMED_NULL) + { + data_size = GlobalSize(entry->stgmedium.u.hGlobal); + bmi = GlobalLock(entry->stgmedium.u.hGlobal); + } if (!contents) {

1 0

Józef Kucia : libs/vkd3d-shader: Avoid theoretical crash in vkd3d_dxbc_compiler_emit_dot().
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 7ee3a02f9230b52c54df4bf55418901589072b86 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=7ee3a02f9230b52c54df4bf5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:59 2017 +0100 libs/vkd3d-shader: Avoid theoretical crash in vkd3d_dxbc_compiler_emit_dot(). 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> --- libs/vkd3d-shader/spirv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 0684cd3..e749873 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3806,7 +3806,7 @@ static void vkd3d_dxbc_compiler_emit_dot(struct vkd3d_dxbc_compiler *compiler, write_mask = VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_1; assert(instruction->src_count == ARRAY_SIZE(src_ids)); - for (i = 0; i < instruction->src_count; ++i) + for (i = 0; i < ARRAY_SIZE(src_ids); ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], write_mask); type_id = vkd3d_spirv_get_type_id(builder,

1 0

Józef Kucia : tests: Make sure that config.h is included before other headers.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: d100804e912ba050121c866f5647186af437ce16 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=d100804e912ba050121c866f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:54 2017 +0100 tests: Make sure that config.h is included before other headers. 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> --- include/private/vkd3d_test.h | 3 +-- tests/d3d12.c | 10 +++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/include/private/vkd3d_test.h b/include/private/vkd3d_test.h index 7eb72d3..c66b227 100644 --- a/include/private/vkd3d_test.h +++ b/include/private/vkd3d_test.h @@ -19,6 +19,7 @@ #ifndef __VKD3D_TEST_H #define __VKD3D_TEST_H +#include "vkd3d_common.h" #include <assert.h> #include <inttypes.h> #include <stdarg.h> @@ -27,8 +28,6 @@ #include <stdlib.h> #include <string.h> -#include "vkd3d_common.h" - static void vkd3d_test_main(int argc, char **argv); static const char *vkd3d_test_name; diff --git a/tests/d3d12.c b/tests/d3d12.c index 90f848f..caf94d2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36,11 +36,6 @@ typedef int HRESULT; #endif -#include <inttypes.h> -#include <limits.h> -#include <math.h> -#include <time.h> - #define COBJMACROS #define INITGUID #include "vkd3d_test.h" @@ -48,6 +43,11 @@ typedef int HRESULT; #define WIDL_C_INLINE_WRAPPERS #include "d3d12.h" +#include <inttypes.h> +#include <limits.h> +#include <math.h> +#include <time.h> + #ifdef _WIN32 # include "dxgi1_4.h" #else

1 0

Józef Kucia : build: Use AC_USE_SYSTEM_EXTENSIONS instead of ugly AC_EGREP_CPP test.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: ad8e27166ac564583e1fff0c76888f597ab6f792 URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=ad8e27166ac564583e1fff0c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:55 2017 +0100 build: Use AC_USE_SYSTEM_EXTENSIONS instead of ugly AC_EGREP_CPP test. In order to use C functions which are not part of C99, e.g. strdup() and strncmp(). 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> --- configure.ac | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index a4db072..27c03a6 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ AC_ARG_VAR([CROSSCC64], [64-bit Windows cross compiler]) AC_ARG_WITH([spirv-tools], AS_HELP_STRING([--with-spirv-tools], [Build with SPIRV-Tools library (default: disabled)])) +AC_USE_SYSTEM_EXTENSIONS + dnl Check for progs AM_PROG_AR AC_PROG_CC @@ -29,7 +31,7 @@ LT_PREREQ([2.4.2]) LT_INIT dnl Check compiler specific flags -AC_SUBST([VKD3D_CFLAGS], [""]) +AC_SUBST([VKD3D_CFLAGS]) AS_IF([test "x${GCC}" = "xyes"], [VKD3D_CFLAGS="-Wall -pipe" VKD3D_CHECK_CFLAGS([-std=c99]) @@ -39,17 +41,6 @@ AS_IF([test "x${GCC}" = "xyes"], VKD3D_CHECK_CFLAGS([-Wvla]) VKD3D_CHECK_CFLAGS([-Wl,--no-undefined])]) -AC_EGREP_CPP(yes, - [#define _POSIX_C_SOURCE 200809L - #include <unistd.h> - #ifdef _POSIX_VERSION - #if _POSIX_VERSION == 200809L - yes - #endif - #endif], - [AC_DEFINE([_POSIX_C_SOURCE], [200809L], [Define the POSIX version.])], - []) - dnl Check for cross compilers VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no])

1 0

Józef Kucia : libs/vkd3d-shader: Introduce vkd3d_dxbc_compiler_get_constant_uint_vector() helper.
by Alexandre Julliard 14 Dec '17

14 Dec '17

Module: vkd3d Branch: master Commit: 006f36c2ac79e12235c422d8bc22d3511cbb210d URL: http://source.winehq.org/git/vkd3d.git/?a=commit;h=006f36c2ac79e12235c422d8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Dec 14 11:45:56 2017 +0100 libs/vkd3d-shader: Introduce vkd3d_dxbc_compiler_get_constant_uint_vector() helper. 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> --- libs/vkd3d-shader/spirv.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc07d96..0684cd3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2078,6 +2078,13 @@ static uint32_t vkd3d_dxbc_compiler_get_constant_float(struct vkd3d_dxbc_compile return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_FLOAT, 1, (uint32_t *)&value); } +static uint32_t vkd3d_dxbc_compiler_get_constant_uint_vector(struct vkd3d_dxbc_compiler *compiler, + uint32_t value, unsigned int component_count) +{ + const uint32_t values[] = {value, value, value, value}; + return vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, values); +} + static uint32_t vkd3d_dxbc_compiler_get_constant_float_vector(struct vkd3d_dxbc_compiler *compiler, float value, unsigned int component_count) { @@ -2624,7 +2631,6 @@ static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler enum vkd3d_shader_conditional_op condition, unsigned int component_count, uint32_t val_id) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - static const uint32_t zero[VKD3D_VEC4_SIZE]; uint32_t type_id; SpvOp op; @@ -2633,20 +2639,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_int_to_bool(struct vkd3d_dxbc_compiler type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_BOOL, component_count); op = condition & VKD3D_SHADER_CONDITIONAL_OP_Z ? SpvOpIEqual : SpvOpINotEqual; return vkd3d_spirv_build_op_tr2(builder, &builder->function_stream, op, type_id, val_id, - vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, zero)); + vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0, component_count)); } static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler *compiler, unsigned int component_count, uint32_t val_id) { - static const uint32_t d3d_true[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}; - static const uint32_t d3d_false[] = {0, 0, 0, 0}; - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t type_id, true_id, false_id; - true_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, d3d_true); - false_id = vkd3d_dxbc_compiler_get_constant(compiler, VKD3D_TYPE_UINT, component_count, d3d_false); + true_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0xffffffff, component_count); + false_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, 0, component_count); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, component_count); return vkd3d_spirv_build_op_select(builder, type_id, val_id, true_id, false_id); } @@ -3885,9 +3888,7 @@ static void vkd3d_dxbc_compiler_emit_imad(struct vkd3d_dxbc_compiler *compiler, static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - static const uint32_t ffffffff[] = {0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}; - - uint32_t type_id, val_id, src0_id, src1_id, condition_id, ffffffff_id; + uint32_t type_id, val_id, src0_id, src1_id, condition_id, uint_max_id; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; @@ -3904,12 +3905,12 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - ffffffff_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_UINT, component_count, ffffffff); + uint_max_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, + 0xffffffff, component_count); val_id = vkd3d_spirv_build_op_udiv(builder, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ - val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, ffffffff_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, &dst[0], val_id); } @@ -3927,13 +3928,13 @@ static void vkd3d_dxbc_compiler_emit_udiv(struct vkd3d_dxbc_compiler *compiler, condition_id = vkd3d_dxbc_compiler_emit_int_to_bool(compiler, VKD3D_SHADER_CONDITIONAL_OP_NZ, component_count, src1_id); - ffffffff_id = vkd3d_dxbc_compiler_get_constant(compiler, - VKD3D_TYPE_UINT, component_count, ffffffff); + uint_max_id = vkd3d_dxbc_compiler_get_constant_uint_vector(compiler, + 0xffffffff, component_count); } val_id = vkd3d_spirv_build_op_umod(builder, type_id, src0_id, src1_id); /* The SPIR-V spec says: "The resulting value is undefined if Operand 2 is 0." */ - val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, ffffffff_id); + val_id = vkd3d_spirv_build_op_select(builder, type_id, condition_id, val_id, uint_max_id); vkd3d_dxbc_compiler_emit_store_dst(compiler, &dst[1], val_id); }

1 0