June 2023 - Wine-commits - list.winehq.org

Connor McAdams : uiautomationcore: Get IRawElementProviderAdviseEvents interfaces from embedded fragment root providers.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 7e19aef0f3922f9e1b11b6686dbf7bb3d49e315e URL: https://gitlab.winehq.org/wine/wine/-/commit/7e19aef0f3922f9e1b11b6686dbf7b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 23 11:36:25 2023 -0400 uiautomationcore: Get IRawElementProviderAdviseEvents interfaces from embedded fragment root providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 14 +++---- dlls/uiautomationcore/uia_client.c | 63 ++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 3ff530057f6..838ff3fbe11 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -13746,7 +13746,7 @@ static const struct prov_method_sequence event_seq5[] = { { &Provider, FRAG_GET_RUNTIME_ID, METHOD_OPTIONAL }, /* Only done on Win10v1809+. */ { &Provider, FRAG_GET_FRAGMENT_ROOT }, { &Provider, FRAG_GET_FRAGMENT_ROOT, METHOD_OPTIONAL }, /* Called twice on Win11. */ - { &Provider, FRAG_GET_EMBEDDED_FRAGMENT_ROOTS, METHOD_TODO }, + { &Provider, FRAG_GET_EMBEDDED_FRAGMENT_ROOTS }, NODE_CREATE_SEQ_OPTIONAL(&Provider), /* Only done in Win11. */ { &Provider, FRAG_GET_RUNTIME_ID, METHOD_OPTIONAL }, /* Only done on Win8+. */ { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Win10v1809+. */ @@ -13756,8 +13756,8 @@ static const struct prov_method_sequence event_seq5[] = { static const struct prov_method_sequence event_seq6[] = { { &Provider, ADVISE_EVENTS_EVENT_REMOVED }, - { &Provider_child, ADVISE_EVENTS_EVENT_REMOVED, METHOD_TODO }, - { &Provider_child2, ADVISE_EVENTS_EVENT_REMOVED, METHOD_TODO }, + { &Provider_child, ADVISE_EVENTS_EVENT_REMOVED }, + { &Provider_child2, ADVISE_EVENTS_EVENT_REMOVED }, { 0 }, }; @@ -14121,13 +14121,13 @@ static void test_UiaAddEvent(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!!event, "event == NULL\n"); ok(Provider.ref == 3, "Unexpected refcnt %ld\n", Provider.ref); - todo_wine ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); - todo_wine ok(Provider_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child2.ref); + ok(Provider_child.ref == 2, "Unexpected refcnt %ld\n", Provider_child.ref); + ok(Provider_child2.ref == 2, "Unexpected refcnt %ld\n", Provider_child2.ref); ok(Provider.advise_events_added_event_id == UIA_AutomationFocusChangedEventId, "Unexpected advise event added, event ID %d\n", Provider.advise_events_added_event_id); - todo_wine ok(Provider_child.advise_events_added_event_id == UIA_AutomationFocusChangedEventId, + ok(Provider_child.advise_events_added_event_id == UIA_AutomationFocusChangedEventId, "Unexpected advise event added, event ID %d\n", Provider_child.advise_events_added_event_id); - todo_wine ok(Provider_child2.advise_events_added_event_id == UIA_AutomationFocusChangedEventId, + ok(Provider_child2.advise_events_added_event_id == UIA_AutomationFocusChangedEventId, "Unexpected advise event added, event ID %d\n", Provider_child2.advise_events_added_event_id); method_sequences_enabled = TRUE; diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 32f16c0731d..9c5595eaf4b 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -1722,6 +1722,7 @@ static HRESULT WINAPI uia_provider_attach_event(IWineUiaProvider *iface, LONG_PT struct uia_event *event = (struct uia_event *)huiaevent; IRawElementProviderFragmentRoot *elroot; IRawElementProviderFragment *elfrag; + SAFEARRAY *embedded_roots = NULL; HRESULT hr; TRACE("%p, %#Ix\n", iface, huiaevent); @@ -1731,9 +1732,19 @@ static HRESULT WINAPI uia_provider_attach_event(IWineUiaProvider *iface, LONG_PT return S_OK; hr = IRawElementProviderFragment_get_FragmentRoot(elfrag, &elroot); - IRawElementProviderFragment_Release(elfrag); if (FAILED(hr)) - return hr; + goto exit; + + /* + * For now, we only support embedded fragment roots on providers that + * don't represent a nested node. + */ + if (event->scope & (TreeScope_Descendants | TreeScope_Children) && !prov->return_nested_node) + { + hr = IRawElementProviderFragment_GetEmbeddedFragmentRoots(elfrag, &embedded_roots); + if (FAILED(hr)) + WARN("GetEmbeddedFragmentRoots failed with hr %#lx\n", hr); + } if (elroot) { @@ -1747,11 +1758,55 @@ static HRESULT WINAPI uia_provider_attach_event(IWineUiaProvider *iface, LONG_PT hr = uia_event_add_provider_event_adviser(advise_events, event); IRawElementProviderAdviseEvents_Release(advise_events); if (FAILED(hr)) - return hr; + goto exit; } } - return S_OK; + if (embedded_roots) + { + LONG lbound, elems, i; + HUIANODE node; + + hr = get_safearray_bounds(embedded_roots, &lbound, &elems); + if (FAILED(hr)) + goto exit; + + for (i = 0; i < elems; i++) + { + IRawElementProviderSimple *elprov; + IUnknown *unk; + LONG idx; + + idx = lbound + i; + hr = SafeArrayGetElement(embedded_roots, &idx, &unk); + if (FAILED(hr)) + goto exit; + + hr = IUnknown_QueryInterface(unk, &IID_IRawElementProviderSimple, (void **)&elprov); + IUnknown_Release(unk); + if (FAILED(hr)) + goto exit; + + hr = create_uia_node_from_elprov(elprov, &node, !prov->return_nested_node); + IRawElementProviderSimple_Release(elprov); + if (SUCCEEDED(hr)) + { + hr = attach_event_to_uia_node(node, event); + UiaNodeRelease(node); + if (FAILED(hr)) + { + WARN("attach_event_to_uia_node failed with hr %#lx\n", hr); + goto exit; + } + } + } + } + +exit: + IRawElementProviderFragment_Release(elfrag); + SafeArrayDestroy(embedded_roots); + + return hr; } static const IWineUiaProviderVtbl uia_provider_vtbl = {

1 0

Zebediah Figura : wow32: Use spec file imports.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 47c8dcc96a68c29e54885d4a0b464f665fc766b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/47c8dcc96a68c29e54885d4a0b464f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 30 23:21:43 2023 -0500 wow32: Use spec file imports. --- dlls/wow32/Makefile.in | 2 - dlls/wow32/wow32.spec | 34 +++++----- dlls/wow32/wow_main.c | 180 ------------------------------------------------- 3 files changed, 17 insertions(+), 199 deletions(-) diff --git a/dlls/wow32/Makefile.in b/dlls/wow32/Makefile.in index 5f0e13a7fb6..9b29b00dfb7 100644 --- a/dlls/wow32/Makefile.in +++ b/dlls/wow32/Makefile.in @@ -1,5 +1,3 @@ MODULE = wow32.dll IMPORTLIB = wow32 IMPORTS = kernel - -C_SRCS = wow_main.c diff --git a/dlls/wow32/wow32.spec b/dlls/wow32/wow32.spec index 5459685b487..6065a059b29 100644 --- a/dlls/wow32/wow32.spec +++ b/dlls/wow32/wow32.spec @@ -1,19 +1,19 @@ # ordinal exports -1 stdcall WOWGetDescriptor(long ptr) +1 stdcall -import WOWGetDescriptor(long ptr) K32WOWGetDescriptor -@ stdcall WOWCallback16(long long) -@ stdcall WOWCallback16Ex(long long long ptr ptr) -@ stdcall WOWDirectedYield16(long) -@ stdcall WOWGetVDMPointer(long long long) -@ stdcall WOWGetVDMPointerFix(long long long) -@ stdcall WOWGetVDMPointerUnfix(long) -@ stdcall WOWGlobalAlloc16(long long) -@ stdcall WOWGlobalAllocLock16(long long ptr) -@ stdcall WOWGlobalFree16(long) -@ stdcall WOWGlobalLock16(long) -@ stdcall WOWGlobalLockSize16(long ptr) -@ stdcall WOWGlobalUnlock16(long) -@ stdcall WOWGlobalUnlockFree16(long) -@ stdcall WOWHandle16(long long) -@ stdcall WOWHandle32(long long) -@ stdcall WOWYield16() +@ stdcall -import WOWCallback16(long long) K32WOWCallback16 +@ stdcall -import WOWCallback16Ex(long long long ptr ptr) K32WOWCallback16Ex +@ stdcall -import WOWDirectedYield16(long) K32WOWDirectedYield16 +@ stdcall -import WOWGetVDMPointer(long long long) K32WOWGetVDMPointer +@ stdcall -import WOWGetVDMPointerFix(long long long) K32WOWGetVDMPointerFix +@ stdcall -import WOWGetVDMPointerUnfix(long) K32WOWGetVDMPointerUnfix +@ stdcall -import WOWGlobalAlloc16(long long) K32WOWGlobalAlloc16 +@ stdcall -import WOWGlobalAllocLock16(long long ptr) K32WOWGlobalAllocLock16 +@ stdcall -import WOWGlobalFree16(long) K32WOWGlobalFree16 +@ stdcall -import WOWGlobalLock16(long) K32WOWGlobalLock16 +@ stdcall -import WOWGlobalLockSize16(long ptr) K32WOWGlobalLockSize16 +@ stdcall -import WOWGlobalUnlock16(long) K32WOWGlobalUnlock16 +@ stdcall -import WOWGlobalUnlockFree16(long) K32WOWGlobalUnlockFree16 +@ stdcall -import WOWHandle16(long long) K32WOWHandle16 +@ stdcall -import WOWHandle32(long long) K32WOWHandle32 +@ stdcall -import WOWYield16() K32WOWYield16 diff --git a/dlls/wow32/wow_main.c b/dlls/wow32/wow_main.c deleted file mode 100644 index e2795830d37..00000000000 --- a/dlls/wow32/wow_main.c +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Win32 Windows-on-Windows support - * - * Copyright 2005 Alexandre Julliard - * - * 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 - */ - -#include <stdarg.h> -#include "windef.h" -#include "winbase.h" -#include "wownt32.h" - -#undef WOWCallback16 -#undef WOWCallback16Ex -#undef WOWDirectedYield16 -#undef WOWGetVDMPointer -#undef WOWGetVDMPointerFix -#undef WOWGetVDMPointerUnfix -#undef WOWGlobalAlloc16 -#undef WOWGlobalAllocLock16 -#undef WOWGlobalFree16 -#undef WOWGlobalLock16 -#undef WOWGlobalLockSize16 -#undef WOWGlobalUnlock16 -#undef WOWGlobalUnlockFree16 -#undef WOWHandle16 -#undef WOWHandle32 -#undef WOWYield16 - -BOOL WINAPI K32WOWGetDescriptor(DWORD,LPLDT_ENTRY); - -/********************************************************************** - * WOWGetDescriptor (WOW32.1) - */ -BOOL WINAPI WOWGetDescriptor( DWORD segptr, LPLDT_ENTRY ldtent ) -{ - return K32WOWGetDescriptor( segptr, ldtent ); -} - -/********************************************************************** - * WOWGetVDMPointer (WOW32.@) - */ -LPVOID WINAPI WOWGetVDMPointer( DWORD vp, DWORD dwBytes, BOOL fProtectedMode ) -{ - return K32WOWGetVDMPointer( vp, dwBytes, fProtectedMode ); -} - -/********************************************************************** - * WOWGetVDMPointerFix (WOW32.@) - */ -LPVOID WINAPI WOWGetVDMPointerFix( DWORD vp, DWORD dwBytes, BOOL fProtectedMode ) -{ - return K32WOWGetVDMPointerFix( vp, dwBytes, fProtectedMode ); -} - -/********************************************************************** - * WOWGetVDMPointerUnfix (WOW32.@) - */ -void WINAPI WOWGetVDMPointerUnfix( DWORD vp ) -{ - K32WOWGetVDMPointerUnfix( vp ); -} - -/********************************************************************** - * WOWGlobalAlloc16 (WOW32.@) - */ -WORD WINAPI WOWGlobalAlloc16( WORD wFlags, DWORD cb ) -{ - return K32WOWGlobalAlloc16( wFlags, cb ); -} - -/********************************************************************** - * WOWGlobalFree16 (WOW32.@) - */ -WORD WINAPI WOWGlobalFree16( WORD hMem ) -{ - return K32WOWGlobalFree16( hMem ); -} - -/********************************************************************** - * WOWGlobalLock16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalLock16( WORD hMem ) -{ - return K32WOWGlobalLock16( hMem ); -} - -/********************************************************************** - * WOWGlobalUnlock16 (WOW32.@) - */ -BOOL WINAPI WOWGlobalUnlock16( WORD hMem ) -{ - return K32WOWGlobalUnlock16( hMem ); -} - -/********************************************************************** - * WOWGlobalAllocLock16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalAllocLock16( WORD wFlags, DWORD cb, WORD *phMem ) -{ - return K32WOWGlobalAllocLock16( wFlags, cb, phMem ); -} - -/********************************************************************** - * WOWGlobalLockSize16 (WOW32.@) - */ -DWORD WINAPI WOWGlobalLockSize16( WORD hMem, PDWORD pcb ) -{ - return K32WOWGlobalLockSize16( hMem, pcb ); -} - -/********************************************************************** - * WOWGlobalUnlockFree16 (WOW32.@) - */ -WORD WINAPI WOWGlobalUnlockFree16( DWORD vpMem ) -{ - return K32WOWGlobalUnlockFree16( vpMem ); -} - -/********************************************************************** - * WOWYield16 (WOW32.@) - */ -void WINAPI WOWYield16(void) -{ - K32WOWYield16(); -} - -/********************************************************************** - * WOWDirectedYield16 (WOW32.@) - */ -void WINAPI WOWDirectedYield16( WORD htask16 ) -{ - K32WOWDirectedYield16( htask16 ); -} - -/*********************************************************************** - * WOWHandle32 (WOW32.@) - */ -HANDLE WINAPI WOWHandle32( WORD handle, WOW_HANDLE_TYPE type ) -{ - return K32WOWHandle32( handle, type ); -} - -/*********************************************************************** - * WOWHandle16 (WOW32.@) - */ -WORD WINAPI WOWHandle16( HANDLE handle, WOW_HANDLE_TYPE type ) -{ - return K32WOWHandle16( handle, type ); -} - -/********************************************************************** - * WOWCallback16Ex (WOW32.@) - */ -BOOL WINAPI WOWCallback16Ex( DWORD vpfn16, DWORD dwFlags, - DWORD cbArgs, PVOID pArgs, PDWORD pdwRetCode ) -{ - return K32WOWCallback16Ex( vpfn16, dwFlags, cbArgs, pArgs, pdwRetCode ); -} - -/********************************************************************** - * WOWCallback16 (WOW32.@) - */ -DWORD WINAPI WOWCallback16( DWORD vpfn16, DWORD dwParam ) -{ - return K32WOWCallback16( vpfn16, dwParam ); -}

1 0

Zebediah Figura : ntdll: Do not throw deadlock exceptions for Wine critical sections.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 7520294840ac59fcc6b2f3d4a92ef160c43f87b5 URL: https://gitlab.winehq.org/wine/wine/-/commit/7520294840ac59fcc6b2f3d4a92ef1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 25 16:39:45 2023 -0500 ntdll: Do not throw deadlock exceptions for Wine critical sections. This is actually a public debugging facility, but currently applies exclusively to Wine internal locks. While we could expand this feature to all critical sections, no application is known to depend on it, and the fact that it is a debugging feature means it is not very likely we will ever find one. As far as Wine is concerned, I believe this feature is unused. I have not heard any mention of it in at least five years. Moreover, we have a different tool for debugging critical section timeouts, namely, the ERR messages in the same function. These messages provide just as much information while being less destructive to the process state. --- dlls/ntdll/sync.c | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index ec974ee2af0..9e4aa38ff2b 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -299,8 +299,6 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { - LONGLONG timeout = NtCurrentTeb()->Peb->CriticalSectionTimeout.QuadPart / -10000000; - /* Don't allow blocking on a critical section during process termination */ if (RtlDllShutdownInProgress()) { @@ -311,9 +309,7 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) for (;;) { - EXCEPTION_RECORD rec; NTSTATUS status = wait_semaphore( crit, 5 ); - timeout -= 5; if ( status == STATUS_TIMEOUT ) { @@ -322,31 +318,15 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 60 ); - timeout -= 60; if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) { ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); status = wait_semaphore( crit, 300 ); - timeout -= 300; } } if (status == STATUS_WAIT_0) break; - - /* Throw exception only for Wine internal locks */ - if (!crit_section_has_debuginfo( crit ) || !crit->DebugInfo->Spare[0]) continue; - - /* only throw deadlock exception if configured timeout is reached */ - if (timeout > 0) continue; - - rec.ExceptionCode = STATUS_POSSIBLE_DEADLOCK; - rec.ExceptionFlags = 0; - rec.ExceptionRecord = NULL; - rec.ExceptionAddress = RtlRaiseException; /* sic */ - rec.NumberParameters = 1; - rec.ExceptionInformation[0] = (ULONG_PTR)crit; - RtlRaiseException( &rec ); } if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS;

1 0

Zebediah Figura : ntdll: Simplify critical section timeout logic.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: ead421b744fd311be9b0c3e7c388e89fe377773f URL: https://gitlab.winehq.org/wine/wine/-/commit/ead421b744fd311be9b0c3e7c388e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu May 25 17:30:13 2023 -0500 ntdll: Simplify critical section timeout logic. Make it more consistent, as well. Currently we alternate between 5 seconds and 60; instead just make it a consistent 60 after the first wait. When +relay is on, always wait for 300 seconds, instead of alternating between 60 and 300. --- dlls/ntdll/sync.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 9e4aa38ff2b..fa64917029a 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -299,6 +299,8 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) */ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) { + unsigned int timeout = 5; + /* Don't allow blocking on a critical section during process termination */ if (RtlDllShutdownInProgress()) { @@ -309,24 +311,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit ) for (;;) { - NTSTATUS status = wait_semaphore( crit, 5 ); + NTSTATUS status = wait_semaphore( crit, timeout ); - if ( status == STATUS_TIMEOUT ) - { - const char *name = crit_section_get_name( crit ); + if (status == STATUS_WAIT_0) break; - ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 60 ); + timeout = (TRACE_ON(relay) ? 300 : 60); - if ( status == STATUS_TIMEOUT && TRACE_ON(relay) ) - { - ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n", - crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) ); - status = wait_semaphore( crit, 300 ); - } - } - if (status == STATUS_WAIT_0) break; + ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (%u sec)\n", + crit, debugstr_a(crit_section_get_name(crit)), GetCurrentThreadId(), HandleToULong(crit->OwningThread), timeout ); } if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++; return STATUS_SUCCESS;

1 0

Rémi Bernon : kernelbase: Comment out DECLSPEC_HOTPATCH for ConvertThreadToFiber.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 6e2381425332bade9e298a6c8b41cc06b8f5fc49 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e2381425332bade9e298a6c8b41cc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 2 21:45:34 2023 +0200 kernelbase: Comment out DECLSPEC_HOTPATCH for ConvertThreadToFiber. --- dlls/kernelbase/thread.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c index f6eb6b0e51e..721d61f60f5 100644 --- a/dlls/kernelbase/thread.c +++ b/dlls/kernelbase/thread.c @@ -1035,7 +1035,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH ConvertFiberToThread(void) /*********************************************************************** * ConvertThreadToFiber (kernelbase.@) */ -LPVOID WINAPI DECLSPEC_HOTPATCH ConvertThreadToFiber( LPVOID param ) +LPVOID WINAPI /* DECLSPEC_HOTPATCH */ ConvertThreadToFiber( LPVOID param ) { return ConvertThreadToFiberEx( param, 0 ); }

1 0

Alexandre Julliard : kernelbase: Update timezone data to version 2023c.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 58bc99dce6ce30a9a343ba2532ebe6f2d8e04a1c URL: https://gitlab.winehq.org/wine/wine/-/commit/58bc99dce6ce30a9a343ba2532ebe6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 4 14:34:34 2023 +0200 kernelbase: Update timezone data to version 2023c. --- dlls/kernelbase/kernelbase.rgs | 38 ++++++++++++++++++++++++++------------ tools/make_unicode | 4 ++-- 2 files changed, 28 insertions(+), 14 deletions(-)

1 0

Alexandre Julliard : nls: Update locale data to CLDR version 43.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 50c5eb31cbcbfc2c158c1b2f9d00513676ee8b28 URL: https://gitlab.winehq.org/wine/wine/-/commit/50c5eb31cbcbfc2c158c1b2f9d0051… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jun 4 18:26:01 2023 +0200 nls: Update locale data to CLDR version 43. --- nls/locale.nls | Bin 742598 -> 745142 bytes tools/make_unicode | 158 ++++++++++++++++++++++++++--------------------------- 2 files changed, 79 insertions(+), 79 deletions(-)

1 0

Alexandre Julliard : xslt: Import upstream release 1.1.38.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: wine Branch: master Commit: 6b678a4e9b7bf0fcbdfbe49d75fa8911807fe9d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b678a4e9b7bf0fcbdfbe49d75fa89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 5 12:09:29 2023 +0200 xslt: Import upstream release 1.1.38. --- libs/xslt/libxslt/attributes.c | 19 +- libs/xslt/libxslt/attributes.h | 1 + libs/xslt/libxslt/attrvt.c | 33 ++-- libs/xslt/libxslt/documents.c | 2 + libs/xslt/libxslt/extensions.c | 16 +- libs/xslt/libxslt/functions.c | 145 +++++++++++--- libs/xslt/libxslt/imports.c | 60 +++--- libs/xslt/libxslt/keys.c | 26 +-- libs/xslt/libxslt/numbers.c | 96 ++++++---- libs/xslt/libxslt/pattern.c | 92 +++------ libs/xslt/libxslt/preproc.c | 10 - libs/xslt/libxslt/templates.c | 4 +- libs/xslt/libxslt/transform.c | 117 ++++++++---- libs/xslt/libxslt/variables.c | 96 +++++----- libs/xslt/libxslt/variables.h | 6 +- libs/xslt/libxslt/xslt.c | 91 ++++----- libs/xslt/libxslt/xsltInternals.h | 18 +- libs/xslt/libxslt/xsltconfig.h | 6 +- libs/xslt/libxslt/xsltlocale.c | 150 +++++++++------ libs/xslt/libxslt/xsltlocale.h | 68 ++----- libs/xslt/libxslt/xsltutils.c | 386 +++++++++++++++++++++++++++++--------- libs/xslt/libxslt/xsltutils.h | 37 +++- 22 files changed, 927 insertions(+), 552 deletions(-)

1 0

Alexandre Julliard : xml2: Import upstream release 2.11.4.
by Alexandre Julliard 05 Jun '23

05 Jun '23

1 0

Nikolay Sivov : vkd3d-shader/d3d-asm: Fix 3D sampler declaration instruction name.
by Alexandre Julliard 05 Jun '23

05 Jun '23

Module: vkd3d Branch: master Commit: ccad49d486fa44f5e0767fa7733a1a3927d3bd94 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ccad49d486fa44f5e0767fa7733a1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed May 31 12:42:52 2023 +0200 vkd3d-shader/d3d-asm: Fix 3D sampler declaration instruction name. --- libs/vkd3d-shader/d3d_asm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/d3d_asm.c b/libs/vkd3d-shader/d3d_asm.c index 3357b450..0a821b5c 100644 --- a/libs/vkd3d-shader/d3d_asm.c +++ b/libs/vkd3d-shader/d3d_asm.c @@ -646,7 +646,7 @@ static void shader_dump_decl_usage(struct vkd3d_d3d_asm_compiler *compiler, break; case VKD3D_SHADER_RESOURCE_TEXTURE_3D: - shader_addline(buffer, "_3d"); + shader_addline(buffer, "_volume"); break; case VKD3D_SHADER_RESOURCE_TEXTURE_CUBE:

1 0