November 2023 - Wine-Commits

Alexandre Julliard : ntdll: Store the syscall table in the TEB on x86-64.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: wine Branch: master Commit: f2fa8ca29b4f3894daaafc7cf47260bc56ae5cb3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2fa8ca29b4f3894daaafc7cf47260… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Nov 25 11:38:55 2023 +0100 ntdll: Store the syscall table in the TEB on x86-64. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55935 --- dlls/ntdll/unix/signal_x86_64.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 851655a0b5a..17a558da74c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -420,13 +420,15 @@ struct amd64_thread_data DWORD_PTR dr7; /* 0318 */ void *pthread_teb; /* 0320 thread data for pthread */ struct syscall_frame *syscall_frame; /* 0328 syscall frame pointer */ - DWORD fs; /* 0330 WOW TEB selector */ + SYSTEM_SERVICE_TABLE *syscall_table; /* 0330 syscall table */ + DWORD fs; /* 0338 WOW TEB selector */ }; C_ASSERT( sizeof(struct amd64_thread_data) <= sizeof(((struct ntdll_thread_data *)0)->cpu_data) ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, pthread_teb ) == 0x320 ); C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_frame ) == 0x328 ); -C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, syscall_table ) == 0x330 ); +C_ASSERT( offsetof( TEB, GdiTebBatch ) + offsetof( struct amd64_thread_data, fs ) == 0x338 ); static inline struct amd64_thread_data *amd64_thread_data(void) { @@ -1585,7 +1587,7 @@ __ASM_GLOBAL_FUNC( call_user_mode_callback, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw 0x330(%r11),%fs\n" /* amd64_thread_data()->fs */ + "movw 0x338(%r11),%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq %rdi,%rcx\n\t" /* id */ @@ -2463,9 +2465,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB CONTEXT *ctx, context = { 0 }; I386_CONTEXT *wow_context; + thread_data->syscall_table = KeServiceDescriptorTable; + #if defined __linux__ arch_prctl( ARCH_SET_GS, teb ); - arch_prctl( ARCH_GET_FS, &amd64_thread_data()->pthread_teb ); + arch_prctl( ARCH_GET_FS, &thread_data->pthread_teb ); if (fs32_sel) alloc_fs_sel( fs32_sel >> 3, get_wow_teb( teb )); #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__) amd64_set_gsbase( teb ); @@ -2474,11 +2478,11 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB #elif defined (__APPLE__) __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self))); __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer))); - amd64_thread_data()->pthread_teb = mac_thread_gsbase(); + thread_data->pthread_teb = mac_thread_gsbase(); /* alloc_tls_slot() needs to poke a value to an address relative to each thread's gsbase. Have each thread record its gsbase pointer into its TEB so alloc_tls_slot() can find it. */ - teb->Instrumentation[0] = amd64_thread_data()->pthread_teb; + teb->Instrumentation[0] = thread_data->pthread_teb; #else # error Please define setting %gs for your architecture #endif @@ -2685,7 +2689,12 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, "movl %eax,%ebx\n\t" "shrl $8,%ebx\n\t" "andl $0x30,%ebx\n\t" /* syscall table number */ - "leaq " __ASM_NAME("KeServiceDescriptorTable") "(%rip),%rcx\n\t" +#ifdef __APPLE__ + "movq %gs:0x30,%rcx\n\t" + "movq 0x330(%rcx),%rcx\n\t" +#else + "movq %gs:0x330,%rcx\n\t" /* amd64_thread_data()->syscall_table */ +#endif "leaq (%rcx,%rbx,2),%rbx\n\t" "andl $0xfff,%eax\n\t" /* syscall number */ "cmpq 16(%rbx),%rax\n\t" /* table->ServiceLimit */ @@ -2714,7 +2723,7 @@ __ASM_GLOBAL_FUNC( __wine_syscall_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "testl $0x48,%edx\n\t" /* CONTEXT_FLOATING_POINT | CONTEXT_XSTATE */ @@ -2899,7 +2908,7 @@ __ASM_GLOBAL_FUNC( __wine_unix_call_dispatcher, #ifdef __linux__ "testl $12,%r14d\n\t" /* SYSCALL_HAVE_PTHREAD_TEB | SYSCALL_HAVE_WRFSGSBASE */ "jz 1f\n\t" - "movw %gs:0x330,%fs\n" /* amd64_thread_data()->fs */ + "movw %gs:0x338,%fs\n" /* amd64_thread_data()->fs */ "1:\n\t" #endif "movq 0x60(%rcx),%r14\n\t"

1 0

Stefan Dösinger : vkd3d: Forward MakeResident to EnqueueMakeResident.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: 2935ac5c7edfb19a5f601aa3cfe717c2fb3b872b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2935ac5c7edfb19a5f601aa3cfe71… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 22 20:03:45 2023 +0300 vkd3d: Forward MakeResident to EnqueueMakeResident. --- libs/vkd3d/device.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 8efaab85..5c801ca4 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3736,10 +3736,19 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_OpenSharedHandleByName(ID3D12Devic static HRESULT STDMETHODCALLTYPE d3d12_device_MakeResident(ID3D12Device5 *iface, UINT object_count, ID3D12Pageable * const *objects) { - FIXME_ONCE("iface %p, object_count %u, objects %p stub!\n", - iface, object_count, objects); + ID3D12Fence *fence; + HRESULT hr; - return S_OK; + TRACE("iface %p, object_count %u, objects %p.\n", iface, object_count, objects); + + if (FAILED(hr = ID3D12Device5_CreateFence(iface, 0, 0, &IID_ID3D12Fence, (void **)&fence))) + return hr; + + hr = ID3D12Device5_EnqueueMakeResident(iface, 0, object_count, objects, fence, 1); + if (SUCCEEDED(hr)) + ID3D12Fence_SetEventOnCompletion(fence, 1, NULL); + ID3D12Fence_Release(fence); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_device_Evict(ID3D12Device5 *iface,

1 0

Stefan Dösinger : vkd3d: Improve the EnqueueMakeResident stub.
by Alexandre Julliard Nov. 27, 2023

Nov. 27, 2023

Module: vkd3d Branch: master Commit: bd35c91227e3379b2839e35bae855176b5a1da62 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/bd35c91227e3379b2839e35bae855… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Nov 22 19:49:02 2023 +0300 vkd3d: Improve the EnqueueMakeResident stub. --- libs/vkd3d/device.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 79028fc3..8efaab85 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3994,10 +3994,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_EnqueueMakeResident(ID3D12Device5 D3D12_RESIDENCY_FLAGS flags, UINT num_objects, ID3D12Pageable *const *objects, ID3D12Fence *fence, UINT64 fence_value) { - FIXME("iface %p, flags %#x, num_objects %u, objects %p, fence %p, fence_value %#"PRIx64" stub!\n", + FIXME_ONCE("iface %p, flags %#x, num_objects %u, objects %p, fence %p, fence_value %#"PRIx64" stub!\n", iface, flags, num_objects, objects, fence, fence_value); - return E_NOTIMPL; + ID3D12Fence_Signal(fence, fence_value); + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_device_CreateCommandList1(ID3D12Device5 *iface,

1 0

Nikolay Sivov : oleaut32: Remove some deadcode from VarMod().
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: bb96e264408002118217c38776195a9a729aa4bf URL: https://gitlab.winehq.org/wine/wine/-/commit/bb96e264408002118217c38776195a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 20:25:24 2023 +0100 oleaut32: Remove some deadcode from VarMod(). Always true/false conditions appear to exist since initial implementation was introduced in 2d1bccd0c478274c727de0a531df2da35039e136. --- dlls/oleaut32/variant.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index fa4492b968a..b3c96b18c2b 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -5401,7 +5401,6 @@ end: */ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { - BOOL lOk = TRUE; HRESULT rc = E_FAIL; int resT = 0; VARIANT lv,rv; @@ -5429,7 +5428,6 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) } /* check for invalid inputs */ - lOk = TRUE; switch (V_VT(left) & VT_TYPEMASK) { case VT_BOOL : case VT_I1 : @@ -5531,15 +5529,10 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) { V_VT(result) = VT_EMPTY; rc = DISP_E_BADVARTYPE; - } else if((V_VT(left) == VT_NULL) || (V_VT(left) == VT_EMPTY) || (V_VT(left) == VT_ERROR) || - lOk) + } else { V_VT(result) = VT_NULL; rc = S_OK; - } else - { - V_VT(result) = VT_NULL; - rc = DISP_E_BADVARTYPE; } goto end; case VT_VARIANT: @@ -5551,7 +5544,7 @@ HRESULT WINAPI VarMod(LPVARIANT left, LPVARIANT right, LPVARIANT result) rc = DISP_E_TYPEMISMATCH; goto end; case VT_RECORD: - if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35)) || !lOk) + if((V_VT(left) == 15) || ((V_VT(left) >= 24) && (V_VT(left) <= 35))) { V_VT(result) = VT_EMPTY; rc = DISP_E_BADVARTYPE;

1 0

Alexandre Julliard : Release 8.21.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 13c43cf3d06178dc39d98981f55d27e3cbd79ad0 URL: https://gitlab.winehq.org/wine/wine/-/commit/13c43cf3d06178dc39d98981f55d27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 22:48:09 2023 +0100 Release 8.21. --- ANNOUNCE | 909 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 434 insertions(+), 497 deletions(-)

1 0

Tag wine-8.21 : Alexandre Julliard : Release 8.21
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: refs/tags/wine-8.21 Tag: b76485b69841715650b1a77c7d77d8acae4edf1d URL: https://gitlab.winehq.org/wine/wine/-/tags/b76485b69841715650b1a77c7d77d8ac… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 24 22:48:09 2023 +0100 Release 8.21

1 0

Daniel Lehman : msxml6/tests: Copy create namespace tests.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 969c8afa14720c16d2ab5f78129e51ee94c15343 URL: https://gitlab.winehq.org/wine/wine/-/commit/969c8afa14720c16d2ab5f78129e51… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 21 22:09:12 2023 -0800 msxml6/tests: Copy create namespace tests. With changes for msxml6 and TODOs for wine. --- dlls/msxml3/tests/domdoc.c | 1 + dlls/msxml6/tests/domdoc.c | 107 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index d8a4bd47ef6..d9dfa1d1be6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13327,6 +13327,7 @@ static struct attrtest_t attrtests[] = { { 0 } }; +/* see dlls/msxml[46]/tests/domdoc.c */ static void test_create_attribute(void) { struct attrtest_t *ptr = attrtests; diff --git a/dlls/msxml6/tests/domdoc.c b/dlls/msxml6/tests/domdoc.c index 0c156023b6b..1eabe97dd79 100644 --- a/dlls/msxml6/tests/domdoc.c +++ b/dlls/msxml6/tests/domdoc.c @@ -54,6 +54,112 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } +struct attrtest_t { + const WCHAR *name; + const WCHAR *uri; + const WCHAR *prefix; + const WCHAR *href; + BOOL todo; +}; + +static struct attrtest_t attrtests[] = { + { L"xmlns", L"http://www.w3.org/2000/xmlns/", NULL, L"http://www.w3.org/2000/xmlns/", TRUE }, + { L"xmlns", L"nondefaulturi", NULL, L"http://www.w3.org/2000/xmlns/", TRUE }, + { L"c", L"http://www.w3.org/2000/xmlns/", NULL, L"http://www.w3.org/2000/xmlns/" }, + { L"c", L"nsref1", NULL, L"nsref1" }, + { L"ns:c", L"nsref1", L"ns", L"nsref1" }, + { L"xmlns:c", L"http://www.w3.org/2000/xmlns/", L"xmlns", L"http://www.w3.org/2000/xmlns/" }, + { L"xmlns:c", L"nondefaulturi", L"xmlns", L"http://www.w3.org/2000/xmlns/" }, + { 0 } +}; + +/* see dlls/msxml[34]/tests/domdoc.c */ +static void test_create_attribute(void) +{ + struct attrtest_t *ptr = attrtests; + IXMLDOMElement *el; + IXMLDOMDocument2 *doc; + IXMLDOMNode *node; + VARIANT var; + HRESULT hr; + int i = 0; + BSTR str; + + hr = CoCreateInstance(&CLSID_DOMDocument60, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + ok(hr == S_OK, "Failed to create DOMDocument60, hr %#lx.\n", hr); + + while (ptr->name) + { + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument2_createNode(doc, var, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_prefix(node, &str); + if (ptr->prefix) + { + ok(hr == S_OK, "%d: unexpected hr %#lx\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->prefix)), "%d: got prefix %s, expected %s\n", + i, wine_dbgstr_w(str), wine_dbgstr_w(ptr->prefix)); + } + else + { + todo_wine_if(ptr->todo) { + ok(hr == S_FALSE, "%d: unexpected hr %#lx\n", i, hr); + ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); + } + } + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "%d: unexpected hr %#lx\n", i, hr); + todo_wine_if(ptr->todo) + ok(!lstrcmpW(str, _bstr_(ptr->href)) || + broken(!ptr->prefix && !lstrcmpW(str, L"xmlns")), /* win7 msxml6 */ + "%d: got uri %s, expected %s\n", i, wine_dbgstr_w(str), wine_dbgstr_w(ptr->href)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + free_bstrs(); + + i++; + ptr++; + } + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + hr = IXMLDOMDocument2_createNode(doc, var, _bstr_(L"e"), NULL, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&el); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IXMLDOMNode_Release(node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument2_createNode(doc, var, _bstr_(L"xmlns:a"), + _bstr_(L"http://www.w3.org/2000/xmlns/"), &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXMLDOMElement_setAttributeNode(el, (IXMLDOMAttribute*)node, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* for some reason default namespace uri is not reported */ + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, L"http://www.w3.org/2000/xmlns/") || + broken(!ptr->prefix && !lstrcmpW(str, L"xmlns")), /* win7 msxml6 */ + "got uri %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMElement_Release(el); + IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + /* see dlls/msxml[34]/tests/domdoc.c */ static void test_namespaces_as_attributes(void) { @@ -240,6 +346,7 @@ START_TEST(domdoc) IXMLDOMDocument2_Release(doc); test_namespaces_as_attributes(); + test_create_attribute(); CoUninitialize(); }

1 0

Daniel Lehman : msxml4/tests: Copy create namespace tests.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: bd7213ec383dabe42cf11a41a425dd3853f705df URL: https://gitlab.winehq.org/wine/wine/-/commit/bd7213ec383dabe42cf11a41a425dd… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 21 22:09:12 2023 -0800 msxml4/tests: Copy create namespace tests. With changes for msxml4. --- dlls/msxml4/tests/domdoc.c | 100 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 530a481679f..d294732283f 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -54,6 +54,105 @@ static void free_bstrs(void) alloced_bstrs_count = 0; } +struct attrtest_t { + const WCHAR *name; + const WCHAR *uri; + const WCHAR *prefix; + const WCHAR *href; +}; + +static struct attrtest_t attrtests[] = { + { L"xmlns", L"http://www.w3.org/2000/xmlns/", L"xmlns", L"xmlns" }, + { L"xmlns", L"nondefaulturi", L"xmlns", L"xmlns" }, + { L"c", L"http://www.w3.org/2000/xmlns/", NULL, L"http://www.w3.org/2000/xmlns/" }, + { L"c", L"nsref1", NULL, L"nsref1" }, + { L"ns:c", L"nsref1", L"ns", L"nsref1" }, + { L"xmlns:c", L"http://www.w3.org/2000/xmlns/", L"xmlns", L"" }, + { L"xmlns:c", L"nondefaulturi", L"xmlns", L"" }, + { 0 } +}; + +/* see dlls/msxml[36]/tests/domdoc.c */ +static void test_create_attribute(void) +{ + struct attrtest_t *ptr = attrtests; + IXMLDOMElement *el; + IXMLDOMDocument2 *doc; + IXMLDOMNode *node; + VARIANT var; + HRESULT hr; + int i = 0; + BSTR str; + + hr = CoCreateInstance(&CLSID_DOMDocument40, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (void **)&doc); + ok(hr == S_OK, "Failed to create DOMDocument40, hr %#lx.\n", hr); + + while (ptr->name) + { + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument2_createNode(doc, var, _bstr_(ptr->name), _bstr_(ptr->uri), &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + str = NULL; + hr = IXMLDOMNode_get_prefix(node, &str); + if (ptr->prefix) + { + /* MSXML4 can report different results with different service packs */ + ok(hr == S_OK || broken(hr == S_FALSE), "Failed to get prefix, hr %#lx.\n", hr); + ok(!lstrcmpW(str, _bstr_(ptr->prefix)) || broken(!str), "got %s\n", wine_dbgstr_w(str)); + } + else + { + ok(hr == S_FALSE, "%d: unexpected hr %#lx\n", i, hr); + ok(str == NULL, "%d: got prefix %s\n", i, wine_dbgstr_w(str)); + } + SysFreeString(str); + + str = NULL; + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "%d: unexpected hr %#lx\n", i, hr); + ok(!lstrcmpW(str, _bstr_(ptr->href)), "%d: got uri %s, expected %s\n", + i, wine_dbgstr_w(str), wine_dbgstr_w(ptr->href)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + free_bstrs(); + + i++; + ptr++; + } + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ELEMENT; + hr = IXMLDOMDocument2_createNode(doc, var, _bstr_(L"e"), NULL, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMElement, (void**)&el); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + IXMLDOMNode_Release(node); + + V_VT(&var) = VT_I1; + V_I1(&var) = NODE_ATTRIBUTE; + hr = IXMLDOMDocument2_createNode(doc, var, _bstr_(L"xmlns:a"), + _bstr_(L"http://www.w3.org/2000/xmlns/"), &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IXMLDOMElement_setAttributeNode(el, (IXMLDOMAttribute*)node, NULL); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + /* for some reason default namespace uri is not reported */ + hr = IXMLDOMNode_get_namespaceURI(node, &str); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!lstrcmpW(str, L""), "got uri %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IXMLDOMNode_Release(node); + IXMLDOMElement_Release(el); + IXMLDOMDocument2_Release(doc); + free_bstrs(); +} + /* see dlls/msxml[36]/tests/domdoc.c */ static void test_namespaces_as_attributes(void) { @@ -243,6 +342,7 @@ START_TEST(domdoc) IXMLDOMDocument2_Release(doc); test_namespaces_as_attributes(); + test_create_attribute(); CoUninitialize(); }

1 0

Louis Lenders : shcore: Add stub for RegisterScaleChangeEvent.
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 5f0537046d7430cf198e5156922c62e0e8616d9b URL: https://gitlab.winehq.org/wine/wine/-/commit/5f0537046d7430cf198e5156922c62… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Nov 24 09:41:43 2023 +0100 shcore: Add stub for RegisterScaleChangeEvent. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55671 --- dlls/shcore/main.c | 9 +++++++++ dlls/shcore/shcore.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index 67ee3b25171..494da202283 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -2520,3 +2520,12 @@ FEATURE_ENABLED_STATE WINAPI GetFeatureEnabledState(UINT32 feature, FEATURE_CHAN FIXME("(%u, %u) stub\n", feature, change_time); return FEATURE_ENABLED_STATE_DEFAULT; } + +/************************************************************************* + * RegisterScaleChangeEvent [SHCORE.@] + */ +HRESULT WINAPI RegisterScaleChangeEvent(HANDLE handle, DWORD_PTR *cookie) +{ + FIXME("(%p, %p) stub\n", handle, cookie); + return E_NOTIMPL; +} diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec index 9ed7c87b0fe..c5de17de590 100644 --- a/dlls/shcore/shcore.spec +++ b/dlls/shcore/shcore.spec @@ -32,7 +32,7 @@ # @ stub IsProcessInWDAGContainer # @ stub RecordFeatureError # @ stub RecordFeatureUsage -@ stub RegisterScaleChangeEvent +@ stdcall RegisterScaleChangeEvent(ptr ptr) @ stub RegisterScaleChangeNotifications @ stub RevokeScaleChangeNotifications @ stdcall SHAnsiToAnsi(str ptr long)

1 0

Paul Gofman : d3dx9: Support loading mesh user data in D3DXLoadMeshHierarchyFromXInMemory().
by Alexandre Julliard Nov. 24, 2023

Nov. 24, 2023

Module: wine Branch: master Commit: 557a4e061b9593b4d010c01900a9cb047e6b7f10 URL: https://gitlab.winehq.org/wine/wine/-/commit/557a4e061b9593b4d010c01900a9cb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 21 12:35:35 2023 -0600 d3dx9: Support loading mesh user data in D3DXLoadMeshHierarchyFromXInMemory(). --- dlls/d3dx9_36/mesh.c | 49 ++++++++++++++++++++++++++++++++++------------ dlls/d3dx9_36/tests/mesh.c | 9 ++++----- 2 files changed, 41 insertions(+), 17 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 338ca1eaefe..7d2b2c0071d 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3830,7 +3830,8 @@ static HRESULT filedata_get_name(ID3DXFileData *filedata, char **name) } static HRESULT load_mesh_container(struct ID3DXFileData *filedata, DWORD options, struct IDirect3DDevice9 *device, - struct ID3DXAllocateHierarchy *alloc_hier, D3DXMESHCONTAINER **mesh_container) + struct ID3DXAllocateHierarchy *alloc_hier, D3DXMESHCONTAINER **mesh_container, + struct ID3DXLoadUserData *load_user_data) { HRESULT hr; ID3DXBuffer *adjacency = NULL; @@ -3840,6 +3841,10 @@ static HRESULT load_mesh_container(struct ID3DXFileData *filedata, DWORD options D3DXMESHDATA mesh_data; DWORD num_materials = 0; char *name = NULL; + SIZE_T child_count; + ID3DXFileData *child = NULL; + GUID type; + unsigned int i; mesh_data.Type = D3DXMESHTYPE_MESH; mesh_data.pMesh = NULL; @@ -3852,17 +3857,38 @@ static HRESULT load_mesh_container(struct ID3DXFileData *filedata, DWORD options hr = filedata_get_name(filedata, &name); if (FAILED(hr)) goto cleanup; - if (mesh_data.pMesh) + if (!mesh_data.pMesh) + goto cleanup; + hr = alloc_hier->lpVtbl->CreateMeshContainer(alloc_hier, name, &mesh_data, + materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL, + effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL, + num_materials, + adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL, + skin_info, mesh_container); + if (FAILED(hr) || !load_user_data) + goto cleanup; + + hr = filedata->lpVtbl->GetChildren(filedata, &child_count); + if (FAILED(hr)) + goto cleanup; + + for (i = 0; i < child_count; i++) { - hr = alloc_hier->lpVtbl->CreateMeshContainer(alloc_hier, name, &mesh_data, - materials ? ID3DXBuffer_GetBufferPointer(materials) : NULL, - effects ? ID3DXBuffer_GetBufferPointer(effects) : NULL, - num_materials, - adjacency ? ID3DXBuffer_GetBufferPointer(adjacency) : NULL, - skin_info, mesh_container); + if (FAILED(hr = filedata->lpVtbl->GetChild(filedata, i, &child))) + goto cleanup; + if (FAILED(hr = child->lpVtbl->GetType(child, &type))) + goto cleanup; + + if (!mesh_get_parse_func(&type) + && FAILED(hr = load_user_data->lpVtbl->LoadMeshChildData(load_user_data, *mesh_container, child))) + goto cleanup; + + IUnknown_Release(child); + child = NULL; } cleanup: + if (child) IUnknown_Release(child); if (materials) ID3DXBuffer_Release(materials); if (effects) ID3DXBuffer_Release(effects); if (adjacency) ID3DXBuffer_Release(adjacency); @@ -3941,7 +3967,7 @@ static HRESULT load_frame(struct ID3DXFileData *filedata, DWORD options, struct goto err; if (IsEqualGUID(&type, &TID_D3DRMMesh)) { - hr = load_mesh_container(child, options, device, alloc_hier, next_container); + hr = load_mesh_container(child, options, device, alloc_hier, next_container, load_user_data); if (SUCCEEDED(hr)) next_container = &(*next_container)->pNextMeshContainer; } else if (IsEqualGUID(&type, &TID_D3DRMFrameTransformMatrix)) { @@ -3987,8 +4013,6 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo if (!memory || !memory_size || !device || !frame_hierarchy || !alloc_hier) return D3DERR_INVALIDCALL; - if (load_user_data) - FIXME("Loading mesh user data not implemented for mesh.\n"); hr = D3DXFileCreate(&d3dxfile); if (FAILED(hr)) goto cleanup; @@ -4022,7 +4046,8 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXInMemory(const void *memory, DWORD memo D3DXMatrixIdentity(&(*next_frame)->TransformationMatrix); - hr = load_mesh_container(filedata, options, device, alloc_hier, &(*next_frame)->pMeshContainer); + hr = load_mesh_container(filedata, options, device, alloc_hier, &(*next_frame)->pMeshContainer, + load_user_data); if (FAILED(hr)) goto cleanup; } else if (IsEqualGUID(&guid, &TID_D3DRMFrame)) { hr = load_frame(filedata, options, device, alloc_hier, next_frame, load_user_data); diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index d46b984be84..1af4532790a 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -2136,20 +2136,19 @@ static void check_user_data(struct test_load_user_data *user_data, unsigned int { unsigned int i; - todo_wine ok(user_data->data_count == expected_count, "got %u, expected %u.\n", user_data->data_count, expected_count); - expected_count = min(expected_count, user_data->data_count); + ok(user_data->data_count == expected_count, "got %u, expected %u.\n", user_data->data_count, expected_count); for (i = 0; i < expected_count; ++i) { winetest_push_context("i %u", i); - todo_wine_if(i == 3) ok(user_data->data[i].data_type == expected[i].data_type, "got %u, expected %u.\n", + ok(user_data->data[i].data_type == expected[i].data_type, "got %u, expected %u.\n", user_data->data[i].data_type, expected[i].data_type); ok(IsEqualGUID(&user_data->guids[i], expected[i].type), "got %s, expected %s.\n", debugstr_guid(&user_data->guids[i]), debugstr_guid(expected[i].type)); ok(user_data->data[i].size == expected[i].size, "got %Iu, expected %Iu.\n", user_data->data[i].size, expected[i].size); - todo_wine_if(i == 3) ok(user_data->data[i].value == expected[i].value, "got %u, expected %u.\n", + ok(user_data->data[i].value == expected[i].value, "got %u, expected %u.\n", user_data->data[i].value, expected[i].value); - todo_wine_if(i == 3) ok(user_data->data[i].mesh_container == expected[i].mesh_container, "got %u, expected %u.\n", + ok(user_data->data[i].mesh_container == expected[i].mesh_container, "got %u, expected %u.\n", user_data->data[i].mesh_container, expected[i].mesh_container); ok(user_data->data[i].num_materials == expected[i].num_materials, "got %u, expected %u.\n", user_data->data[i].num_materials, expected[i].num_materials);

1 0