wine-commits October 2023

wine-commits@winehq.org

1 participants
702 discussions

Piotr Caban : gdi32: Fix METADC handling in PlayMetaFile.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 5e507b3e3dc999ae55f314f863ea613a14f0ae84 URL: https://gitlab.winehq.org/wine/wine/-/commit/5e507b3e3dc999ae55f314f863ea61… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 11 00:39:01 2023 +0200 gdi32: Fix METADC handling in PlayMetaFile. --- dlls/gdi32/metafile.c | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/metafile.c b/dlls/gdi32/metafile.c index 50910956e1d..911dfeecf61 100644 --- a/dlls/gdi32/metafile.c +++ b/dlls/gdi32/metafile.c @@ -360,6 +360,7 @@ HMETAFILE WINAPI CopyMetaFileA( HMETAFILE hSrcMetaFile, LPCSTR lpFilename ) */ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) { + BOOL metadc = GetObjectType(hdc) == OBJ_METADC; METAHEADER *mh = get_metafile_bits( hmf ); METARECORD *mr; HANDLETABLE *ht; @@ -372,16 +373,19 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) if (!mh) return FALSE; - /* save DC */ - hPen = GetCurrentObject(hdc, OBJ_PEN); - hBrush = GetCurrentObject(hdc, OBJ_BRUSH); - hPal = GetCurrentObject(hdc, OBJ_PAL); - - hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); - if (!GetClipRgn(hdc, hRgn)) + if (!metadc) { - DeleteObject(hRgn); - hRgn = 0; + /* save DC */ + hPen = GetCurrentObject(hdc, OBJ_PEN); + hBrush = GetCurrentObject(hdc, OBJ_BRUSH); + hPal = GetCurrentObject(hdc, OBJ_PAL); + + hRgn = NtGdiCreateRectRgn(0, 0, 0, 0); + if (!GetClipRgn(hdc, hRgn)) + { + DeleteObject(hRgn); + hRgn = 0; + } } /* create the handle table */ @@ -414,12 +418,15 @@ BOOL WINAPI PlayMetaFile( HDC hdc, HMETAFILE hmf ) PlayMetaFileRecord( hdc, ht, mr, mh->mtNoObjects ); } - /* restore DC */ - SelectObject(hdc, hPen); - SelectObject(hdc, hBrush); - SelectPalette(hdc, hPal, FALSE); - ExtSelectClipRgn(hdc, hRgn, RGN_COPY); - DeleteObject(hRgn); + if (!metadc) + { + /* restore DC */ + SelectObject(hdc, hPen); + SelectObject(hdc, hBrush); + SelectPalette(hdc, hPal, FALSE); + ExtSelectClipRgn(hdc, hRgn, RGN_COPY); + DeleteObject(hRgn); + } /* free objects in handle table */ for(i = 0; i < mh->mtNoObjects; i++)

1 0

Daniel Lehman : msxml6/tests: Copy namespaces as attributes tests.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 043cc2414d5a67d6d234c83863cb1e107a8b4297 URL: https://gitlab.winehq.org/wine/wine/-/commit/043cc2414d5a67d6d234c83863cb1e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 8 08:09:08 2023 -0700 msxml6/tests: Copy namespaces as attributes tests. --- configure | 1 + configure.ac | 1 + dlls/msxml3/tests/domdoc.c | 3 +- dlls/msxml4/tests/domdoc.c | 2 +- dlls/msxml6/tests/Makefile.in | 5 + dlls/msxml6/tests/domdoc.c | 229 ++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 238 insertions(+), 3 deletions(-)

1 0

Daniel Lehman : msxml4/tests: Copy namespaces as attributes tests.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 7c94aa9d98371aa0b809c0c0441b5ecbcf3ed36b URL: https://gitlab.winehq.org/wine/wine/-/commit/7c94aa9d98371aa0b809c0c0441b5e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 8 08:09:08 2023 -0700 msxml4/tests: Copy namespaces as attributes tests. --- configure | 1 + configure.ac | 1 + dlls/msxml3/tests/domdoc.c | 2 +- dlls/msxml4/tests/Makefile.in | 5 + dlls/msxml4/tests/domdoc.c | 228 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 236 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 2370d6e954e..6948d46dc34 100755 --- a/configure +++ b/configure @@ -21635,6 +21635,7 @@ wine_fn_config_makefile dlls/msxml2 enable_msxml2 wine_fn_config_makefile dlls/msxml3 enable_msxml3 wine_fn_config_makefile dlls/msxml3/tests enable_tests wine_fn_config_makefile dlls/msxml4 enable_msxml4 +wine_fn_config_makefile dlls/msxml4/tests enable_tests wine_fn_config_makefile dlls/msxml6 enable_msxml6 wine_fn_config_makefile dlls/mtxdm enable_mtxdm wine_fn_config_makefile dlls/ncrypt enable_ncrypt diff --git a/configure.ac b/configure.ac index 3dfb4309094..9f8027ed862 100644 --- a/configure.ac +++ b/configure.ac @@ -2881,6 +2881,7 @@ WINE_CONFIG_MAKEFILE(dlls/msxml2) WINE_CONFIG_MAKEFILE(dlls/msxml3) WINE_CONFIG_MAKEFILE(dlls/msxml3/tests) WINE_CONFIG_MAKEFILE(dlls/msxml4) +WINE_CONFIG_MAKEFILE(dlls/msxml4/tests) WINE_CONFIG_MAKEFILE(dlls/msxml6) WINE_CONFIG_MAKEFILE(dlls/mtxdm) WINE_CONFIG_MAKEFILE(dlls/ncrypt) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b2cddb5d140..ffbd03970d1 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13661,11 +13661,11 @@ static const namespace_as_attribute_t namespace_as_attribute_test_data[] = { { &CLSID_DOMDocument2, "CLSID_DOMDocument2", "" }, { &CLSID_DOMDocument26, "CLSID_DOMDocument26", "" }, { &CLSID_DOMDocument30, "CLSID_DOMDocument30", "" }, - { &CLSID_DOMDocument40, "CLSID_DOMDocument40", "" }, { &CLSID_DOMDocument60, "CLSID_DOMDocument60", "http://www.w3.org/2000/xmlns/" }, { 0 } }; +/* see dlls/msxml4/tests/domdoc.c */ static void test_namespaces_as_attributes(void) { const namespace_as_attribute_t *entry = namespace_as_attribute_test_data; diff --git a/dlls/msxml4/tests/Makefile.in b/dlls/msxml4/tests/Makefile.in new file mode 100644 index 00000000000..6515c06f112 --- /dev/null +++ b/dlls/msxml4/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = msxml4.dll +IMPORTS = oleaut32 ole32 + +C_SRCS = \ + domdoc.c diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c new file mode 100644 index 00000000000..58b47b46e90 --- /dev/null +++ b/dlls/msxml4/tests/domdoc.c @@ -0,0 +1,228 @@ +/* + * XML test + * + * Copyright 2005 Mike McCormack for CodeWeavers + * Copyright 2007-2008 Alistair Leslie-Hughes + * Copyright 2010-2011 Adam Martinson for CodeWeavers + * Copyright 2010-2013 Nikolay Sivov for CodeWeavers + * Copyright 2023 Daniel Lehman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + + +#define COBJMACROS +#define CONST_VTABLE + +#include <stdio.h> +#include <assert.h> + +#include "windows.h" + +#include "initguid.h" +#include "msxml2.h" + +#include "wine/test.h" + +static BSTR alloced_bstrs[256]; +static int alloced_bstrs_count; + +static BSTR alloc_str_from_narrow(const char *str) +{ + int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); + BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ + MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); + return ret; +} + +static BSTR _bstr_(const char *str) +{ + assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); + alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + return alloced_bstrs[alloced_bstrs_count++]; +} + +static void free_bstrs(void) +{ + int i; + for (i = 0; i < alloced_bstrs_count; i++) + SysFreeString(alloced_bstrs[i]); + alloced_bstrs_count = 0; +} + +/* see dlls/msxml3/tests/domdoc.c */ +static void test_namespaces_as_attributes(void) +{ + struct test + { + const char *xml; + int explen; + const char *names[3]; + const char *prefixes[3]; + const char *basenames[3]; + const char *uris[3]; + const char *texts[3]; + }; + static const struct test tests[] = + { + { + "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, + { "ns:b", "d", "xmlns:ns" }, /* nodeName */ + { "ns", NULL, "xmlns" }, /* prefix */ + { "b", "d", "ns" }, /* baseName */ + { "nshref", NULL, "" }, /* namespaceURI */ + { "b attr", "d attr", "nshref" }, /* text */ + }, + /* property only */ + { + "<a d=\"d attr\" />", 1, + { "d" }, /* nodeName */ + { NULL }, /* prefix */ + { "d" }, /* baseName */ + { NULL }, /* namespaceURI */ + { "d attr" }, /* text */ + }, + /* namespace only */ + { + "<a xmlns:ns=\"nshref\" />", 1, + { "xmlns:ns" }, /* nodeName */ + { "xmlns" }, /* prefix */ + { "ns" }, /* baseName */ + { "" }, /* namespaceURI */ + { "nshref" }, /* text */ + }, + /* no properties or namespaces */ + { + "<a />", 0, + }, + + { NULL } + }; + const struct test *test; + IXMLDOMNamedNodeMap *map; + IXMLDOMNode *node, *item; + IXMLDOMDocument2 *doc; + VARIANT_BOOL b; + LONG len, i; + HRESULT hr; + BSTR str; + + test = tests; + while (test->xml) + { + hr = CoCreateInstance(&CLSID_DOMDocument40, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(test->xml), &b); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + node = NULL; + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("a"), &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXMLDOMNode_get_attributes(node, &map); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + len = -1; + hr = IXMLDOMNamedNodeMap_get_length(map, &len); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(len == test->explen, "got %ld\n", len); + + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, test->explen+1, &item); + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr); + ok(!item, "Item should be NULL\n"); + + for (i = 0; i < len; i++) + { + item = NULL; + hr = IXMLDOMNamedNodeMap_get_item(map, i, &item); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_nodeName(item, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_prefix(item, &str); + if (test->prefixes[i]) + { + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr ); + + str = NULL; + hr = IXMLDOMNode_get_baseName(item, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(item, &str); + if (test->uris[i]) + { + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) + ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); + else + ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + } + else + ok(hr == S_FALSE, "Unexpected hr %#lx.\n", hr ); + + str = NULL; + hr = IXMLDOMNode_get_text(item, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(item); + } + + IXMLDOMNamedNodeMap_Release(map); + IXMLDOMNode_Release(node); + IXMLDOMDocument2_Release(doc); + + test++; + } + free_bstrs(); +} + +START_TEST(domdoc) +{ + HRESULT hr; + IXMLDOMDocument2 *doc; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "failed to init com\n"); + + hr = CoCreateInstance(&CLSID_DOMDocument40, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + if (hr != S_OK) + { + win_skip("class &CLSID_DOMDocument40 not supported\n"); + return; + } + IXMLDOMDocument2_Release(doc); + + test_namespaces_as_attributes(); + + CoUninitialize(); +}

1 0

Alexandre Julliard : ntdll: Use the standard syscall calling convention for NtFlushProcessWriteBuffers.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 3c0d0005f472201dd1c743820f33a47b6fcc7e5b URL: https://gitlab.winehq.org/wine/wine/-/commit/3c0d0005f472201dd1c743820f33a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 11 17:25:17 2023 +0200 ntdll: Use the standard syscall calling convention for NtFlushProcessWriteBuffers. --- dlls/ntdll/unix/virtual.c | 3 ++- dlls/wow64/process.c | 3 +-- include/winternl.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 855aa9cd1eb..24de360d983 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -6022,10 +6022,11 @@ NTSTATUS WINAPI NtFlushInstructionCache( HANDLE handle, const void *addr, SIZE_T /********************************************************************** * NtFlushProcessWriteBuffers (NTDLL.@) */ -void WINAPI NtFlushProcessWriteBuffers(void) +NTSTATUS WINAPI NtFlushProcessWriteBuffers(void) { static int once = 0; if (!once++) FIXME( "stub\n" ); + return STATUS_SUCCESS; } diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 880b7623b10..c144af7743c 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -431,8 +431,7 @@ NTSTATUS WINAPI wow64_NtDebugActiveProcess( UINT *args ) */ NTSTATUS WINAPI wow64_NtFlushProcessWriteBuffers( UINT *args ) { - NtFlushProcessWriteBuffers(); - return STATUS_SUCCESS; + return NtFlushProcessWriteBuffers(); } diff --git a/include/winternl.h b/include/winternl.h index 40d4ca4716a..aad7fe58105 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4404,7 +4404,7 @@ NTSYSAPI NTSTATUS WINAPI NtFindAtom(const WCHAR*,ULONG,RTL_ATOM*); NTSYSAPI NTSTATUS WINAPI NtFlushBuffersFile(HANDLE,IO_STATUS_BLOCK*); NTSYSAPI NTSTATUS WINAPI NtFlushInstructionCache(HANDLE,LPCVOID,SIZE_T); NTSYSAPI NTSTATUS WINAPI NtFlushKey(HANDLE); -NTSYSAPI void WINAPI NtFlushProcessWriteBuffers(void); +NTSYSAPI NTSTATUS WINAPI NtFlushProcessWriteBuffers(void); NTSYSAPI NTSTATUS WINAPI NtFlushVirtualMemory(HANDLE,LPCVOID*,SIZE_T*,ULONG); NTSYSAPI NTSTATUS WINAPI NtFlushWriteBuffer(VOID); NTSYSAPI NTSTATUS WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);

1 0

Brendan Shanks : wow64cpu: Use RTL_CONSTANT_STRING.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: 5ae7ca0b78df60c77d95f6b0b2228fe70ca45fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ae7ca0b78df60c77d95f6b0b2228f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Oct 10 16:41:20 2023 -0700 wow64cpu: Use RTL_CONSTANT_STRING. --- dlls/wow64cpu/cpu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wow64cpu/cpu.c b/dlls/wow64cpu/cpu.c index 5a679c56d1e..acfd21f474b 100644 --- a/dlls/wow64cpu/cpu.c +++ b/dlls/wow64cpu/cpu.c @@ -288,7 +288,7 @@ NTSTATUS WINAPI BTCpuProcessInit(void) ULONG old_prot; CONTEXT context; HMODULE module; - UNICODE_STRING str; + UNICODE_STRING str = RTL_CONSTANT_STRING( L"ntdll.dll" ); void **p__wine_unix_call_dispatcher; WOW64INFO *wow64info = NtCurrentTeb()->TlsSlots[WOW64_TLS_WOW64INFO]; @@ -300,7 +300,6 @@ NTSTATUS WINAPI BTCpuProcessInit(void) wow64info->CpuFlags |= WOW64_CPUFLAGS_MSFT64; - RtlInitUnicodeString( &str, L"ntdll.dll" ); LdrGetDllHandle( NULL, 0, &str, &module ); p__wine_unix_call_dispatcher = RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" );

1 0

Conor McCarthy : vkd3d-shader/dxil: Emit an error on allocation failure in dxil_record_to_string().
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: 05d516bb00ff8916b38aeccf79a47a1af5ad1a31 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/05d516bb00ff8916b38aeccf79a47… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Sep 25 15:12:47 2023 +1000 vkd3d-shader/dxil: Emit an error on allocation failure in dxil_record_to_string(). --- libs/vkd3d-shader/dxil.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index fd7aeb33..bfb34d24 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -973,14 +973,18 @@ static const struct dxil_block *sm6_parser_get_level_one_block(const struct sm6_ return found; } -static char *dxil_record_to_string(const struct dxil_record *record, unsigned int offset) +static char *dxil_record_to_string(const struct dxil_record *record, unsigned int offset, struct sm6_parser *sm6) { unsigned int i; char *str; assert(offset <= record->operand_count); if (!(str = vkd3d_calloc(record->operand_count - offset + 1, 1))) + { + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory allocating a string of length %u.", record->operand_count - offset); return NULL; + } for (i = offset; i < record->operand_count; ++i) str[i - offset] = record->operands[i]; @@ -1235,7 +1239,7 @@ static enum vkd3d_result sm6_parser_type_table_init(struct sm6_parser *sm6) break; case TYPE_CODE_STRUCT_NAME: - if (!(struct_name = dxil_record_to_string(record, 0))) + if (!(struct_name = dxil_record_to_string(record, 0, sm6))) { ERR("Failed to allocate struct name.\n"); return VKD3D_ERROR_OUT_OF_MEMORY; @@ -1459,7 +1463,7 @@ static enum vkd3d_result sm6_parser_symtab_init(struct sm6_parser *sm6) symbol = &sm6->global_symbols[sm6->global_symbol_count]; symbol->id = record->operands[0]; - if (!(symbol->name = dxil_record_to_string(record, 1))) + if (!(symbol->name = dxil_record_to_string(record, 1, sm6))) { ERR("Failed to allocate symbol name.\n"); return VKD3D_ERROR_OUT_OF_MEMORY;

1 0

Conor McCarthy : vkd3d-shader/dxil: Read global constants in sm6_parser_globals_init().
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: 52dc6f252ccafe83af950b80d95a47d357415edc URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/52dc6f252ccafe83af950b80d95a4… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Jun 1 15:40:32 2023 +1000 vkd3d-shader/dxil: Read global constants in sm6_parser_globals_init(). These are needed for reading metadata. --- libs/vkd3d-shader/dxil.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 4963ceac..fd7aeb33 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2156,6 +2156,7 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) { const struct dxil_block *block = &sm6->root_block; const struct dxil_record *record; + enum vkd3d_result ret; uint64_t version; size_t i; @@ -2198,6 +2199,13 @@ static enum vkd3d_result sm6_parser_globals_init(struct sm6_parser *sm6) } } + for (i = 0; i < block->child_block_count; ++i) + { + if (block->child_blocks[i]->id == CONSTANTS_BLOCK + && (ret = sm6_parser_constants_init(sm6, block->child_blocks[i])) < 0) + return ret; + } + return VKD3D_OK; } @@ -2770,6 +2778,9 @@ static enum vkd3d_result sm6_parser_module_init(struct sm6_parser *sm6, const st switch (block->id) { case CONSTANTS_BLOCK: + /* Level 1 (global) constants are already done in sm6_parser_globals_init(). */ + if (level < 2) + break; function = &sm6->functions[sm6->function_count]; sm6->cur_max_value = function->value_count; return sm6_parser_constants_init(sm6, block);

1 0

Conor McCarthy : vkd3d-shader/dxil: Read immediate constant arrays.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: df4e1b73930f7fa1719634a36776d5c6bd7b6d96 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/df4e1b73930f7fa1719634a36776d… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Sep 29 10:17:51 2023 +1000 vkd3d-shader/dxil: Read immediate constant arrays. --- libs/vkd3d-shader/d3d_asm.c | 3 +- libs/vkd3d-shader/dxil.c | 96 +++++++++++++++++++++++++++++++- libs/vkd3d-shader/spirv.c | 11 ++-- libs/vkd3d-shader/tpf.c | 4 +- libs/vkd3d-shader/vkd3d_shader_main.c | 8 +-- libs/vkd3d-shader/vkd3d_shader_private.h | 7 ++- 6 files changed, 115 insertions(+), 14 deletions(-)

1 0

Brendan Shanks : winemac.drv: Use ObjC literals.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: wine Branch: master Commit: bb2e02ab66c5c602d635722cf3a5820d6b366006 URL: https://gitlab.winehq.org/wine/wine/-/commit/bb2e02ab66c5c602d635722cf3a582… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Oct 5 15:37:21 2023 -0700 winemac.drv: Use ObjC literals. --- dlls/winemac.drv/cocoa_app.m | 41 +++++++++++----------- dlls/winemac.drv/cocoa_clipboard.m | 34 ++++++++---------- dlls/winemac.drv/cocoa_cursorclipping.m | 2 +- dlls/winemac.drv/cocoa_display.m | 4 +-- dlls/winemac.drv/cocoa_event.m | 61 +++++++++++++++------------------ dlls/winemac.drv/cocoa_window.m | 29 +++++++--------- 6 files changed, 78 insertions(+), 93 deletions(-)

1 0

Conor McCarthy : tests/shader-runner: Test shaders with dxcompiler.
by Alexandre Julliard 11 Oct '23

11 Oct '23

Module: vkd3d Branch: master Commit: 57280673e51f6b60487e91369bd57213a8243a56 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/57280673e51f6b60487e91369bd57… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 14 19:29:24 2023 +1000 tests/shader-runner: Test shaders with dxcompiler. The location of dxcompiler should be set during configuration with 'DXCOMPILER_LIBS=-L/path/to/dxcompiler', and then at runtime with LD_LIBRARY_PATH, WINEPATH or PATH as applicable. A new 'fail(sm<6)' decoration is needed on many shader declarations because dxcompiler succeeds on many shaders which fail with fxc. The opposite case is less common and is flagged with 'fail(sm>=6)'. A few tests cause dxcompiler to crash or hang, so these are avoided using [require], which now skips tests until reset instead of exiting. Also, 'todo(sm<6)' and 'todo(sm>=6)' are used to separate checking of results. --- Makefile.am | 10 +- README | 10 + configure.ac | 7 + tests/dxcompiler.idl | 168 ++++++++++++++ tests/hlsl/abs.shader_test | 8 +- tests/hlsl/all.shader_test | 14 +- tests/hlsl/any.shader_test | 36 +-- tests/hlsl/arithmetic-float-uniform.shader_test | 12 +- tests/hlsl/arithmetic-float.shader_test | 2 +- tests/hlsl/arithmetic-int-uniform.shader_test | 16 +- tests/hlsl/arithmetic-int.shader_test | 17 +- tests/hlsl/arithmetic-uint.shader_test | 12 +- tests/hlsl/array-dimension.shader_test | 7 +- tests/hlsl/array-index-expr.shader_test | 16 +- tests/hlsl/array-parameters.shader_test | 2 +- tests/hlsl/array-size-expr.shader_test | 2 +- tests/hlsl/asfloat.shader_test | 16 +- tests/hlsl/asuint.shader_test | 14 +- tests/hlsl/attributes.shader_test | 20 +- tests/hlsl/bool-cast.shader_test | 4 +- tests/hlsl/bool-semantics.shader_test | 2 +- .../hlsl/cast-componentwise-compatible.shader_test | 14 +- tests/hlsl/cast-componentwise-equal.shader_test | 10 +- tests/hlsl/cast-to-float.shader_test | 9 +- tests/hlsl/cast-to-half.shader_test | 8 +- tests/hlsl/cast-to-int.shader_test | 8 +- tests/hlsl/cast-to-uint.shader_test | 8 +- tests/hlsl/cbuffer.shader_test | 56 +++-- tests/hlsl/clamp.shader_test | 6 +- tests/hlsl/clip.shader_test | 8 +- tests/hlsl/combined-samplers.shader_test | 3 + tests/hlsl/compute.shader_test | 2 +- tests/hlsl/conditional.shader_test | 26 ++- tests/hlsl/const.shader_test | 4 +- tests/hlsl/cross.shader_test | 13 +- tests/hlsl/d3dcolor-to-ubyte4.shader_test | 12 +- tests/hlsl/ddxddy.shader_test | 8 +- tests/hlsl/discard.shader_test | 4 +- tests/hlsl/distance.shader_test | 2 +- tests/hlsl/dot.shader_test | 10 +- tests/hlsl/duplicate-modifiers.shader_test | 4 + tests/hlsl/entry-point-semantics.shader_test | 22 +- tests/hlsl/exp.shader_test | 4 +- tests/hlsl/expr-indexing.shader_test | 14 +- tests/hlsl/floor.shader_test | 18 +- tests/hlsl/fmod.shader_test | 16 +- tests/hlsl/for.shader_test | 4 +- tests/hlsl/frac.shader_test | 2 +- tests/hlsl/function-cast.shader_test | 9 +- tests/hlsl/function-overload.shader_test | 2 +- tests/hlsl/function-return.shader_test | 24 +- tests/hlsl/function.shader_test | 8 +- tests/hlsl/fwidth.shader_test | 2 +- tests/hlsl/gather-offset.shader_test | 12 +- tests/hlsl/gather.shader_test | 12 +- tests/hlsl/getdimensions.shader_test | 4 +- tests/hlsl/initializer-implicit-array.shader_test | 55 +++-- tests/hlsl/initializer-objects.shader_test | 4 +- tests/hlsl/intrinsic-override.shader_test | 24 +- tests/hlsl/invalid.shader_test | 12 +- tests/hlsl/is-front-face.shader_test | 4 +- tests/hlsl/ldexp.shader_test | 4 +- tests/hlsl/length.shader_test | 10 +- tests/hlsl/lerp.shader_test | 4 +- tests/hlsl/lit.shader_test | 37 ++- tests/hlsl/load-level.shader_test | 6 +- tests/hlsl/log.shader_test | 6 +- tests/hlsl/loop.shader_test | 8 +- tests/hlsl/majority-pragma.shader_test | 30 +-- tests/hlsl/majority-syntax.shader_test | 4 +- tests/hlsl/majority-typedef.shader_test | 2 +- tests/hlsl/math.shader_test | 7 +- tests/hlsl/matrix-indexing.shader_test | 10 +- tests/hlsl/matrix-semantics.shader_test | 16 +- tests/hlsl/max.shader_test | 12 +- tests/hlsl/nested-arrays.shader_test | 4 +- tests/hlsl/nointerpolation.shader_test | 10 +- tests/hlsl/normalize.shader_test | 10 +- tests/hlsl/numeric-types.shader_test | 6 +- tests/hlsl/numthreads.shader_test | 10 +- tests/hlsl/object-field-offsets.shader_test | 6 +- tests/hlsl/object-parameters.shader_test | 18 +- tests/hlsl/object-references.shader_test | 18 +- tests/hlsl/pow.shader_test | 6 +- tests/hlsl/reflect.shader_test | 12 +- tests/hlsl/register-reservations.shader_test | 22 +- tests/hlsl/return-implicit-conversion.shader_test | 2 +- tests/hlsl/return.shader_test | 34 +-- tests/hlsl/round.shader_test | 18 +- tests/hlsl/sample-bias.shader_test | 6 +- tests/hlsl/sample-grad.shader_test | 6 +- tests/hlsl/sample-level.shader_test | 6 +- tests/hlsl/sampler-offset.shader_test | 6 +- tests/hlsl/sampler.shader_test | 8 +- tests/hlsl/saturate.shader_test | 12 +- tests/hlsl/shader-interstage-interface.shader_test | 2 +- tests/hlsl/side-effects.shader_test | 5 + tests/hlsl/sign.shader_test | 20 +- tests/hlsl/smoothstep.shader_test | 2 +- tests/hlsl/sqrt.shader_test | 4 +- tests/hlsl/state-block-syntax.shader_test | 20 +- tests/hlsl/static-initializer.shader_test | 6 +- tests/hlsl/step.shader_test | 2 +- tests/hlsl/storage-qualifiers.shader_test | 29 ++- tests/hlsl/struct-array.shader_test | 2 +- tests/hlsl/swizzle-constant-prop.shader_test | 6 +- tests/hlsl/swizzle-matrix.shader_test | 6 +- tests/hlsl/swizzles.shader_test | 6 +- tests/hlsl/ternary.shader_test | 10 +- tests/hlsl/texture-load-offset.shader_test | 4 +- tests/hlsl/texture-load-typed.shader_test | 17 ++ tests/hlsl/texture-load.shader_test | 6 +- tests/hlsl/texture-ordering.shader_test | 3 + tests/hlsl/trigonometry.shader_test | 8 +- tests/hlsl/trunc.shader_test | 20 +- tests/hlsl/type-names.shader_test | 6 +- tests/hlsl/uav-load.shader_test | 2 +- tests/hlsl/uav-out-param.shader_test | 4 +- tests/hlsl/uav-rwbuffer.shader_test | 8 +- tests/hlsl/uav-rwstructuredbuffer.shader_test | 2 +- tests/hlsl/uav-rwtexture.shader_test | 22 +- tests/hlsl/uniform-parameters.shader_test | 35 +++ tests/hlsl/uniform-semantics.shader_test | 4 +- tests/hlsl/vector-indexing-uniform.shader_test | 2 +- tests/hlsl/vector-indexing.shader_test | 4 +- tests/hlsl/writemask-assignop-0.shader_test | 2 +- tests/hlsl/writemask-assignop-1.shader_test | 2 +- tests/shader_runner.c | 257 +++++++++++++++++++-- tests/shader_runner.h | 10 +- tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 42 +++- tests/shader_runner_d3d9.c | 2 +- tests/shader_runner_vulkan.c | 2 +- 133 files changed, 1268 insertions(+), 556 deletions(-)

1 0

← Newer
1
...
43
44
45
46
47
48
49
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2023