- Wine-Commits - list.winehq.org

Piotr Caban : gdi32: Add GdiGetSpoolFileHandle stub.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 8dfa1d66b1324fd334133d1aac2bc38ee817fda3 URL: https://gitlab.winehq.org/wine/wine/-/commit/8dfa1d66b1324fd334133d1aac2bc3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 16:55:49 2023 +0200 gdi32: Add GdiGetSpoolFileHandle stub. --- dlls/gdi32/dc.c | 10 ++++++++++ dlls/gdi32/gdi32.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 21005fa0719..3023f02eb79 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -2663,3 +2663,13 @@ ULONG WINAPI DdQueryDisplaySettingsUniqueness(void) if (!warn_once++) FIXME( "stub\n" ); return 0; } + +/******************************************************************* + * GdiGetSpoolFileHandle (GDI32.@) + */ +HANDLE WINAPI GdiGetSpoolFileHandle( WCHAR *printer_name, + DEVMODEW *devmode, WCHAR *doc_name ) +{ + FIXME( "%s %p %s\n", wine_dbgstr_w(printer_name), devmode, wine_dbgstr_w(doc_name) ); + return NULL; +} diff --git a/dlls/gdi32/gdi32.spec b/dlls/gdi32/gdi32.spec index 84c294c286f..6045f3c454a 100644 --- a/dlls/gdi32/gdi32.spec +++ b/dlls/gdi32/gdi32.spec @@ -198,7 +198,7 @@ @ stub GdiGetLocalFont # @ stub GdiGetPageCount # @ stub GdiGetPageHandle -# @ stub GdiGetSpoolFileHandle +@ stdcall GdiGetSpoolFileHandle(wstr ptr wstr) @ stdcall GdiGetSpoolMessage(ptr long ptr long) NtGdiGetSpoolMessage @ stdcall GdiGradientFill(long ptr long ptr long long) @ stdcall GdiInitSpool() NtGdiInitSpool

1 0

Piotr Caban : gdi32: Test PlayMetaFile on METADC.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 25e15e9e2c34b85d6aef5010532e7e343ccb9c80 URL: https://gitlab.winehq.org/wine/wine/-/commit/25e15e9e2c34b85d6aef5010532e7e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 11 11:59:15 2023 +0200 gdi32: Test PlayMetaFile on METADC. --- dlls/gdi32/tests/metafile.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 0e5da463f7f..b013fe1f196 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -5066,6 +5066,65 @@ static void test_emf_blit(void) ok(ret, "DeleteMetaFile(%p) error %ld\n", hmf, GetLastError()); } +struct check_mf_arg +{ + int pos; + const WORD *records; +}; + +static int WINAPI check_mf_records(HDC hdc, HANDLETABLE *htable, + METARECORD *rec, int n, LPARAM ctx) +{ + struct check_mf_arg *records = (struct check_mf_arg *)ctx; + + ok(rec->rdFunction == records->records[records->pos], "got record %x, expected %x\n", + rec->rdFunction, records->records[records->pos]); + return rec->rdFunction == records->records[records->pos++]; +} + +static void test_PlayMetaFile(void) +{ + static WORD line_records[] = { META_LINETO, 0 }; + struct check_mf_arg records; + HMETAFILE hmeta; + HDC dc, metadc; + BOOL r; + + dc = CreateCompatibleDC(NULL); + ok(dc != NULL, "CreateCompatibleDC failed\n"); + + metadc = CreateMetaFileW(NULL); + ok(metadc != NULL, "CreateMetaFile failed\n"); + r = LineTo(metadc, 10, 10); + ok(r, "LineTo failed\n"); + hmeta = CloseMetaFile(metadc); + ok(hmeta != NULL, "CloseMetaFile failed\n"); + + records.pos = 0; + records.records = line_records; + r = EnumMetaFile(dc, hmeta, check_mf_records, (LPARAM)&records); + ok(r, "EnumMetaFile failed\n"); + + metadc = CreateMetaFileW(NULL); + ok(metadc != NULL, "CreateMetaFile failed\n"); + r = PlayMetaFile(metadc, hmeta); + ok(r, "PlayMetaFile failed\n"); + r = DeleteMetaFile(hmeta); + ok(r, "DeleteMetaFile failed\n"); + hmeta = CloseMetaFile(metadc); + ok(hmeta != NULL, "CloseMetaFile failed\n"); + + records.pos = 0; + records.records = line_records; + r = EnumMetaFile(dc, hmeta, check_mf_records, (LPARAM)&records); + ok(r, "EnumMetaFile failed\n"); + + r = DeleteMetaFile(hmeta); + ok(r, "DeleteMetaFile failed\n"); + r = DeleteDC(dc); + ok(r, "DeleteDC failed\n"); +} + static void test_emf_mask_blit(void) { BITMAPINFO bmi = {{ sizeof(bmi) }}; @@ -10769,6 +10828,7 @@ START_TEST(metafile) test_mf_select(); test_mf_palette(); test_mf_blit(); + test_PlayMetaFile(); /* For metafile conversions */ test_mf_conversions();

1 0

Piotr Caban : gdi32: Fix METADC handling in PlayMetaFile.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

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

Piotr Caban : include: Add winppi.h header.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

Module: wine Branch: master Commit: 81fa8615eb23c994724d809182f521b2eba310af URL: https://gitlab.winehq.org/wine/wine/-/commit/81fa8615eb23c994724d809182f521… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Oct 10 15:36:19 2023 +0200 include: Add winppi.h header. --- include/Makefile.in | 1 + include/winppi.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index ef0c48ed9ef..4fdee0c9b91 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -936,6 +936,7 @@ SOURCES = \ winnt.h \ winnt.rh \ winperf.h \ + winppi.h \ winreg.h \ winresrc.h \ winsafer.h \ diff --git a/include/winppi.h b/include/winppi.h new file mode 100644 index 00000000000..0cb04593c08 --- /dev/null +++ b/include/winppi.h @@ -0,0 +1,39 @@ +/* + * Copyright 2023 Piotr Caban for CodeWeavers + * + * 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 + */ + +#ifndef _WINPPI_ +#define _WINPPI_ + +HANDLE WINAPI GdiGetSpoolFileHandle(LPWSTR pwszPrinterName, + LPDEVMODEW pDevmode, LPWSTR pwszDocName); +BOOL WINAPI GdiDeleteSpoolFileHandle(HANDLE SpoolFileHandle); +DWORD WINAPI GdiGetPageCount(HANDLE SpoolFileHandle); +HDC WINAPI GdiGetDC(HANDLE SpoolFileHandle); +HANDLE WINAPI GdiGetPageHandle(HANDLE SpoolFileHandle, + DWORD Page, LPDWORD pdwPageType); +BOOL WINAPI GdiStartDocEMF(HANDLE SpoolFileHandle, DOCINFOW *pDocInfo); +BOOL WINAPI GdiStartPageEMF(HANDLE SpoolFileHandle); +BOOL WINAPI GdiPlayPageEMF(HANDLE SpoolFileHandle, HANDLE hemf, + RECT *prectDocument, RECT *prectBorder, RECT *prectClip); +BOOL WINAPI GdiEndPageEMF(HANDLE SpoolFileHandle, DWORD dwOptimization); +BOOL WINAPI GdiEndDocEMF(HANDLE SpoolFileHandle); +BOOL WINAPI GdiGetDevmodeForPage(HANDLE SpoolFileHandle, DWORD dwPageNumber, + PDEVMODEW *pCurrDM, PDEVMODEW *pLastDM); +BOOL WINAPI GdiResetDCEMF(HANDLE SpoolFileHandle, PDEVMODEW pCurrDM); + +#endif /* _WINPPI_ */

1 0

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

Oct. 11, 2023

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

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

Oct. 11, 2023

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 Oct. 11, 2023

Oct. 11, 2023

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

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

Oct. 11, 2023

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

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

Oct. 11, 2023

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 immediate constant arrays.
by Alexandre Julliard Oct. 11, 2023

Oct. 11, 2023

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