January 2024 - Wine-commits

Fabian Maurer : windows.ui: Add stubs for InputPane class.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: d9c4b56e7198a96ec6ce56ffbdf45948bc8e25aa URL: https://gitlab.winehq.org/wine/wine/-/commit/d9c4b56e7198a96ec6ce56ffbdf459… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jan 21 18:30:09 2024 +0100 windows.ui: Add stubs for InputPane class. --- dlls/windows.ui/Makefile.in | 1 + dlls/windows.ui/inputpane.c | 325 ++++++++++++++++++++++++++++++++++++++++++++ dlls/windows.ui/main.c | 3 + dlls/windows.ui/private.h | 1 + 4 files changed, 330 insertions(+)

1 0

Daniel Lehman : msvcp120/tests: Add some tests for _Mtx_t fields.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: c3ee5751d55fa546391b088108524f01abfb8638 URL: https://gitlab.winehq.org/wine/wine/-/commit/c3ee5751d55fa546391b088108524f… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 21 13:53:08 2024 -0800 msvcp120/tests: Add some tests for _Mtx_t fields. --- dlls/msvcp120/tests/msvcp120.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 060dda5b45f..f3cce632f51 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2429,18 +2429,28 @@ static void test__Mtx(void) r = p__Mtx_init(&mtx, flags[i]); ok(!r, "failed to init mtx (flags %x)\n", flags[i]); + ok(mtx->thread_id == -1, "mtx.thread_id = %lx (flags %x)\n", mtx->thread_id, flags[i]); + ok(mtx->count == 0, "mtx.count = %lu (flags %x)\n", mtx->count, flags[i]); r = p__Mtx_trylock(&mtx); ok(!r, "_Mtx_trylock returned %x (flags %x)\n", r, flags[i]); + ok(mtx->thread_id == GetCurrentThreadId(), "mtx.thread_id = %lx (flags %x)\n", mtx->thread_id, flags[i]); + ok(mtx->count == 1, "mtx.count = %lu (flags %x)\n", mtx->count, flags[i]); r = p__Mtx_trylock(&mtx); ok(r == expect, "_Mtx_trylock returned %x (flags %x)\n", r, flags[i]); + ok(mtx->thread_id == GetCurrentThreadId(), "mtx.thread_id = %lx (flags %x)\n", mtx->thread_id, flags[i]); + ok(mtx->count == r ? 1 : 2, "mtx.count = %lu, expected %u (flags %x)\n", mtx->count, r ? 1 : 2, flags[i]); if(!r) p__Mtx_unlock(&mtx); r = p__Mtx_lock(&mtx); ok(r == expect, "_Mtx_lock returned %x (flags %x)\n", r, flags[i]); + ok(mtx->thread_id == GetCurrentThreadId(), "mtx.thread_id = %lx (flags %x)\n", mtx->thread_id, flags[i]); + ok(mtx->count == r ? 1 : 2, "mtx.count = %lu, expected %u (flags %x)\n", mtx->count, r ? 1 : 2, flags[i]); if(!r) p__Mtx_unlock(&mtx); p__Mtx_unlock(&mtx); + ok(mtx->thread_id == -1, "mtx.thread_id = %lx (flags %x)\n", mtx->thread_id, flags[i]); + ok(mtx->count == 0, "mtx.count = %lu (flags %x)\n", mtx->count, flags[i]); p__Mtx_destroy(&mtx); } }

1 0

Daniel Lehman : msvcp140: Pad _Mtx_t struct to match Windows.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 8536af685af8ac1707313c6383f37eb94f9caad0 URL: https://gitlab.winehq.org/wine/wine/-/commit/8536af685af8ac1707313c6383f37e… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Jan 21 13:53:08 2024 -0800 msvcp140: Pad _Mtx_t struct to match Windows. --- dlls/msvcp140/tests/msvcp140.c | 31 +++++++++++++++++++++++++++++++ dlls/msvcp90/misc.c | 3 +++ 2 files changed, 34 insertions(+) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 0140d4c3925..8966820f599 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -168,6 +168,7 @@ typedef struct { DWORD flags; critical_section cs; + ULONG_PTR unknown; DWORD thread_id; DWORD count; } *_Mtx_t; @@ -1640,6 +1641,35 @@ static void test_Copy_file(void) ok(SetCurrentDirectoryW(origin_path), "SetCurrentDirectoryW to origin_path failed\n"); } +static void test__Mtx(void) +{ + _Mtx_t mtx = NULL; + int r; + + r = p__Mtx_init(&mtx, 0); + ok(!r, "failed to init mtx\n"); + + ok(mtx->thread_id == -1, "mtx.thread_id = %lx\n", mtx->thread_id); + ok(mtx->count == 0, "mtx.count = %lx\n", mtx->count); + p__Mtx_lock(mtx); + ok(mtx->thread_id == GetCurrentThreadId(), "mtx.thread_id = %lx\n", mtx->thread_id); + ok(mtx->count == 1, "mtx.count = %lx\n", mtx->count); + p__Mtx_lock(mtx); + ok(mtx->thread_id == GetCurrentThreadId(), "mtx.thread_id = %lx\n", mtx->thread_id); + ok(mtx->count == 1, "mtx.count = %lx\n", mtx->count); + p__Mtx_unlock(mtx); + ok(mtx->thread_id == -1, "mtx.thread_id = %lx\n", mtx->thread_id); + ok(mtx->count == 0, "mtx.count = %lx\n", mtx->count); + p__Mtx_unlock(mtx); + ok(mtx->thread_id == -1, "mtx.thread_id = %lx\n", mtx->thread_id); + ok(mtx->count == -1, "mtx.count = %lx\n", mtx->count); + p__Mtx_unlock(mtx); + ok(mtx->thread_id == -1, "mtx.thread_id = %lx\n", mtx->thread_id); + ok(mtx->count == -2, "mtx.count = %lx\n", mtx->count); + + p__Mtx_destroy(mtx); +} + START_TEST(msvcp140) { if(!init()) return; @@ -1667,5 +1697,6 @@ START_TEST(msvcp140) test_Equivalent(); test_cnd(); test_Copy_file(); + test__Mtx(); FreeLibrary(msvcp); } diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index 3ae190abeb3..c297f635e90 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -716,6 +716,9 @@ typedef struct { DWORD flags; cs cs; +#if _MSVCP_VER >= 140 + ULONG_PTR unknown; +#endif DWORD thread_id; DWORD count; } *_Mtx_t;

1 0

Eric Pouech : include: Avoid defining intrinsic functions as inline.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 72c4adc036435a51a79ecbffa1eca22fd3186ba9 URL: https://gitlab.winehq.org/wine/wine/-/commit/72c4adc036435a51a79ecbffa1eca2… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 15 16:43:15 2024 +0100 include: Avoid defining intrinsic functions as inline. Now clang provides intrinsic variant of Interlocked*64 family on i386 machine. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- include/winnt.h | 58 +++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 22 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 20db9a8aabd..6b47d0e41c0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6745,6 +6745,10 @@ typedef enum _FIRMWARE_TYPE FirmwareTypeMax } FIRMWARE_TYPE, *PFIRMWARE_TYPE; +#ifndef __has_builtin +# define __has_builtin(x) 0 +#endif + /* Intrinsic functions */ #define BitScanForward _BitScanForward @@ -6809,63 +6813,73 @@ long _InterlockedOr(long volatile *,long); long _InterlockedXor(long volatile *,long); DECLSPEC_NORETURN void __fastfail(unsigned int); -#ifndef __i386__ - +#if !defined(__i386__) || __has_builtin(_InterlockedAnd64) #pragma intrinsic(_InterlockedAnd64) -#pragma intrinsic(_InterlockedDecrement64) -#pragma intrinsic(_InterlockedExchangeAdd64) -#pragma intrinsic(_InterlockedIncrement64) -#pragma intrinsic(_InterlockedOr64) -#pragma intrinsic(_InterlockedXor64) - __int64 _InterlockedAnd64(__int64 volatile *, __int64); -__int64 _InterlockedDecrement64(__int64 volatile *); -__int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); -__int64 _InterlockedIncrement64(__int64 volatile *); -__int64 _InterlockedOr64(__int64 volatile *, __int64); -__int64 _InterlockedXor64(__int64 volatile *, __int64); - #else - static FORCEINLINE __int64 InterlockedAnd64( __int64 volatile *dest, __int64 val ) { __int64 prev; do prev = *dest; while (InterlockedCompareExchange64( dest, prev & val, prev ) != prev); return prev; } +#endif +#if !defined(__i386__) || __has_builtin(_InterlockedDecrement64) +#pragma intrinsic(_InterlockedDecrement64) +__int64 _InterlockedDecrement64(__int64 volatile *); +#else +static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) +{ + return InterlockedExchangeAdd64( dest, -1 ) - 1; +} +#endif + +#if !defined(__i386__) || __has_builtin(_InterlockedExchangeAdd64) +#pragma intrinsic(_InterlockedExchangeAdd64) +__int64 _InterlockedExchangeAdd64(__int64 volatile *, __int64); +#else static FORCEINLINE __int64 InterlockedExchangeAdd64( __int64 volatile *dest, __int64 val ) { __int64 prev; do prev = *dest; while (InterlockedCompareExchange64( dest, prev + val, prev ) != prev); return prev; } +#endif +#if !defined(__i386__) || __has_builtin(_InterlockedIncrement64) +#pragma intrinsic(_InterlockedIncrement64) +__int64 _InterlockedIncrement64(__int64 volatile *); +#else static FORCEINLINE __int64 InterlockedIncrement64( __int64 volatile *dest ) { return InterlockedExchangeAdd64( dest, 1 ) + 1; } +#endif -static FORCEINLINE __int64 InterlockedDecrement64( __int64 volatile *dest ) -{ - return InterlockedExchangeAdd64( dest, -1 ) - 1; -} - +#if !defined(__i386__) || __has_builtin(_InterlockedOr64) +#pragma intrinsic(_InterlockedOr64) +__int64 _InterlockedOr64(__int64 volatile *, __int64); +#else static FORCEINLINE __int64 InterlockedOr64( __int64 volatile *dest, __int64 val ) { __int64 prev; do prev = *dest; while (InterlockedCompareExchange64( dest, prev | val, prev ) != prev); return prev; } +#endif +#if !defined(__i386__) || __has_builtin(_InterlockedXor64) +#pragma intrinsic(_InterlockedXor64) +__int64 _InterlockedXor64(__int64 volatile *, __int64); +#else static FORCEINLINE __int64 InterlockedXor64( __int64 volatile *dest, __int64 val ) { __int64 prev; do prev = *dest; while (InterlockedCompareExchange64( dest, prev ^ val, prev ) != prev); return prev; } - -#endif /* __i386__ */ +#endif static FORCEINLINE long InterlockedAdd( long volatile *dest, long val ) {

1 0

Eric Pouech : include: Avoid redefining _InterlockedCompareExchange128 as inline.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 46ab4f0ce7295d7b3a31a5a10e6314ad9444c35a URL: https://gitlab.winehq.org/wine/wine/-/commit/46ab4f0ce7295d7b3a31a5a10e6314… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Fri Jan 19 15:39:43 2024 +0100 include: Avoid redefining _InterlockedCompareExchange128 as inline. Note the _InterlockedCompareExchange128 for a x86_64 machine is only defined as intrinsic when -mcx16 option is enabled. But we use always use the intrinsic definition on x86_64 so that compilation done without the -mcx16 could be detected (on C++ only). And the intrinsic has been added recently to aarch64 machine for clang. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 6b47d0e41c0..e9fef20c76d 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -7184,7 +7184,7 @@ static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -#if defined(_MSC_VER) && !defined(__clang__) +#if defined(_MSC_VER) && (!defined(__clang__) || !defined(__aarch64__) || __has_builtin(_InterlockedCompareExchange128)) #pragma intrinsic(_InterlockedCompareExchange128) unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *);

1 0

Alex Henrie : include: Add POOL_FLAGS and POOL_FLAG_*.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 87761a8a92c24edb2f16d31a8bbf764364ea3971 URL: https://gitlab.winehq.org/wine/wine/-/commit/87761a8a92c24edb2f16d31a8bbf76… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 21 19:04:54 2024 -0700 include: Add POOL_FLAGS and POOL_FLAG_*. --- include/ddk/wdm.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 54b9e6aa199..940c074b713 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -306,6 +306,23 @@ typedef enum _POOL_TYPE { MaxPoolType } POOL_TYPE; +typedef ULONG64 POOL_FLAGS; + +#define POOL_FLAG_REQUIRED_START 0x00000001 +#define POOL_FLAG_USE_QUOTA 0x00000001 +#define POOL_FLAG_UNINITIALIZED 0x00000002 +#define POOL_FLAG_SESSION 0x00000004 +#define POOL_FLAG_CACHE_ALIGNED 0x00000008 +#define POOL_FLAG_RESERVED1 0x00000010 +#define POOL_FLAG_RAISE_ON_FAILURE 0x00000020 +#define POOL_FLAG_NON_PAGED 0x00000040 +#define POOL_FLAG_NON_PAGED_EXECUTE 0x00000080 +#define POOL_FLAG_PAGED 0x00000100 +#define POOL_FLAG_RESERVED2 0x00000200 +#define POOL_FLAG_RESERVED3 0x00000400 +#define POOL_FLAG_LAST_KNOWN_REQUIRED POOL_FLAG_RESERVED3 +#define POOL_FLAG_REQUIRED_END 0x80000000 + typedef struct _WAIT_CONTEXT_BLOCK { KDEVICE_QUEUE_ENTRY WaitQueueEntry; struct _DRIVER_CONTROL *DeviceRoutine;

1 0

Alex Henrie : ntoskrnl: Reimplement ExAllocatePool* on top of ExAllocatePool2.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: cba29adf063d59298782addabb2abd3aef2481b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/cba29adf063d59298782addabb2abd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jan 21 19:19:58 2024 -0700 ntoskrnl: Reimplement ExAllocatePool* on top of ExAllocatePool2. Microsoft deprecated all of these functions except ExAllocatePool2 and ExAllocatePool3, so it's a safe bet that in Windows the old functions are just wrappers around the new ones now. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54362 --- dlls/ntoskrnl.exe/ntoskrnl.c | 61 ++++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 + include/ddk/wdm.h | 1 + 3 files changed, 52 insertions(+), 11 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 45b8e1ab1c1..d2407d99448 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2212,44 +2212,83 @@ __ASM_FASTCALL_FUNC(RtlUlonglongByteSwap, 8, #endif /* __i386__ */ +/*********************************************************************** + * ExAllocatePool2 (NTOSKRNL.EXE.@) + */ +void * WINAPI ExAllocatePool2( POOL_FLAGS flags, SIZE_T size, ULONG tag ) +{ + /* FIXME: handle page alignment constraints */ + void *ret = HeapAlloc( ntoskrnl_heap, 0, size ); + TRACE( "(0x%I64x, %Iu, %s) -> %p\n", flags, size, debugstr_fourcc(tag), ret ); + return ret; +} + +static POOL_FLAGS pool_type_to_flags( POOL_TYPE type ) +{ + switch (type & 7) + { + case NonPagedPool: + case NonPagedPoolMustSucceed: + return POOL_FLAG_NON_PAGED; + case PagedPool: + return POOL_FLAG_PAGED; + case NonPagedPoolCacheAligned: + case NonPagedPoolCacheAlignedMustS: + return POOL_FLAG_NON_PAGED|POOL_FLAG_CACHE_ALIGNED; + case PagedPoolCacheAligned: + return POOL_FLAG_PAGED|POOL_FLAG_CACHE_ALIGNED; + default: + return 0; + } +} + /*********************************************************************** * ExAllocatePool (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePool( POOL_TYPE type, SIZE_T size ) { - return ExAllocatePoolWithTag( type, size, 0 ); -} + POOL_FLAGS flags = pool_type_to_flags( type ); + if (type & POOL_RAISE_IF_ALLOCATION_FAILURE) + flags |= POOL_FLAG_RAISE_ON_FAILURE; + return ExAllocatePool2( flags, size, 0 ); +} /*********************************************************************** * ExAllocatePoolWithQuota (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePoolWithQuota( POOL_TYPE type, SIZE_T size ) { - return ExAllocatePoolWithTag( type, size, 0 ); -} + POOL_FLAGS flags = pool_type_to_flags( type ) | POOL_FLAG_USE_QUOTA; + if (!(type & POOL_QUOTA_FAIL_INSTEAD_OF_RAISE)) + flags |= POOL_FLAG_RAISE_ON_FAILURE; + return ExAllocatePool2( flags, size, 0 ); +} /*********************************************************************** * ExAllocatePoolWithTag (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePoolWithTag( POOL_TYPE type, SIZE_T size, ULONG tag ) { - /* FIXME: handle page alignment constraints */ - void *ret = HeapAlloc( ntoskrnl_heap, 0, size ); - TRACE( "%Iu pool %u -> %p\n", size, type, ret ); - return ret; -} + POOL_FLAGS flags = pool_type_to_flags( type ); + if (type & POOL_RAISE_IF_ALLOCATION_FAILURE) + flags |= POOL_FLAG_RAISE_ON_FAILURE; + return ExAllocatePool2( flags, size, tag ); +} /*********************************************************************** * ExAllocatePoolWithQuotaTag (NTOSKRNL.EXE.@) */ PVOID WINAPI ExAllocatePoolWithQuotaTag( POOL_TYPE type, SIZE_T size, ULONG tag ) { - return ExAllocatePoolWithTag( type, size, tag ); -} + POOL_FLAGS flags = pool_type_to_flags( type ) | POOL_FLAG_USE_QUOTA; + if (!(type & POOL_QUOTA_FAIL_INSTEAD_OF_RAISE)) + flags |= POOL_FLAG_RAISE_ON_FAILURE; + return ExAllocatePool2( flags, size, tag ); +} /*********************************************************************** * ExCreateCallback (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index aa7831eac5f..d098cf19c78 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -135,6 +135,7 @@ @ stdcall ExAcquireSharedWaitForExclusive(ptr long) @ stub ExAllocateFromPagedLookasideList @ stdcall ExAllocatePool(long long) +@ stdcall ExAllocatePool2(int64 long long) @ stdcall ExAllocatePoolWithQuota(long long) @ stdcall ExAllocatePoolWithQuotaTag(long long long) @ stdcall ExAllocatePoolWithTag(long long long) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 940c074b713..78d14a95b6a 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1704,6 +1704,7 @@ BOOLEAN WINAPI ExAcquireSharedStarveExclusive(ERESOURCE*,BOOLEAN); BOOLEAN WINAPI ExAcquireSharedWaitForExclusive(ERESOURCE*,BOOLEAN); void WINAPI ExFreePool(PVOID); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(ExFreePool) __WINE_MALLOC; +PVOID WINAPI ExAllocatePool2(POOL_FLAGS,SIZE_T,ULONG) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(ExFreePool) __WINE_MALLOC; PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(ExFreePool) __WINE_MALLOC; void WINAPI ExFreePoolWithTag(PVOID,ULONG); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG) __WINE_ALLOC_SIZE(2) __WINE_DEALLOC(ExFreePoolWithTag) __WINE_MALLOC;

1 0

Gabriel Ivăncescu : jscript: Move thread_id from JScript struct to TLS data.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: f55db65292da07a259651ef5b2c4998971bb0d90 URL: https://gitlab.winehq.org/wine/wine/-/commit/f55db65292da07a259651ef5b2c499… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 12 19:57:37 2023 +0200 jscript: Move thread_id from JScript struct to TLS data. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 32 +++++++++++++++++++++----------- dlls/jscript/jscript.h | 8 ++++++++ dlls/jscript/jscript_main.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index b1940b770d3..191747c7173 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -51,8 +51,8 @@ typedef struct { LONG ref; DWORD safeopt; + struct thread_data *thread_data; script_ctx_t *ctx; - LONG thread_id; LCID lcid; DWORD version; BOOL html_mode; @@ -524,8 +524,10 @@ static void decrease_state(JScript *This, SCRIPTSTATE state) FIXME("NULL ctx\n"); } - if(state == SCRIPTSTATE_UNINITIALIZED || state == SCRIPTSTATE_CLOSED) - This->thread_id = 0; + if((state == SCRIPTSTATE_UNINITIALIZED || state == SCRIPTSTATE_CLOSED) && This->thread_data) { + release_thread_data(This->thread_data); + This->thread_data = NULL; + } if(This->site) { IActiveScriptSite_Release(This->site); @@ -708,6 +710,8 @@ static ULONG WINAPI JScript_Release(IActiveScript *iface) This->ctx->active_script = NULL; script_release(This->ctx); } + if(This->thread_data) + release_thread_data(This->thread_data); free(This); unlock_module(); } @@ -726,6 +730,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, IActiveScriptSite *pass) { JScript *This = impl_from_IActiveScript(iface); + struct thread_data *thread_data; named_item_t *item; LCID lcid; HRESULT hres; @@ -738,8 +743,13 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, if(This->site) return E_UNEXPECTED; - if(InterlockedCompareExchange(&This->thread_id, GetCurrentThreadId(), 0)) + if(!(thread_data = get_thread_data())) + return E_OUTOFMEMORY; + + if(InterlockedCompareExchangePointer((void**)&This->thread_data, thread_data, NULL)) { + release_thread_data(thread_data); return E_UNEXPECTED; + } if(!This->ctx) { script_ctx_t *ctx = calloc(1, sizeof(script_ctx_t)); @@ -821,7 +831,7 @@ static HRESULT WINAPI JScript_SetScriptState(IActiveScript *iface, SCRIPTSTATE s TRACE("(%p)->(%d)\n", This, ss); - if(This->thread_id && GetCurrentThreadId() != This->thread_id) + if(This->thread_data && This->thread_data->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; if(ss == SCRIPTSTATE_UNINITIALIZED) { @@ -865,7 +875,7 @@ static HRESULT WINAPI JScript_GetScriptState(IActiveScript *iface, SCRIPTSTATE * if(!pssState) return E_POINTER; - if(This->thread_id && This->thread_id != GetCurrentThreadId()) + if(This->thread_data && This->thread_data->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; *pssState = This->ctx ? This->ctx->state : SCRIPTSTATE_UNINITIALIZED; @@ -878,7 +888,7 @@ static HRESULT WINAPI JScript_Close(IActiveScript *iface) TRACE("(%p)->()\n", This); - if(This->thread_id && This->thread_id != GetCurrentThreadId()) + if(This->thread_data && This->thread_data->thread_id != GetCurrentThreadId()) return E_UNEXPECTED; decrease_state(This, SCRIPTSTATE_CLOSED); @@ -897,7 +907,7 @@ static HRESULT WINAPI JScript_AddNamedItem(IActiveScript *iface, TRACE("(%p)->(%s %lx)\n", This, debugstr_w(pstrName), dwFlags); - if(This->thread_id != GetCurrentThreadId() || !This->ctx || This->ctx->state == SCRIPTSTATE_CLOSED) + if(!This->thread_data || This->thread_data->thread_id != GetCurrentThreadId() || !This->ctx || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; if(dwFlags & SCRIPTITEM_GLOBALMEMBERS) { @@ -959,7 +969,7 @@ static HRESULT WINAPI JScript_GetScriptDispatch(IActiveScript *iface, LPCOLESTR if(!ppdisp) return E_POINTER; - if(This->thread_id != GetCurrentThreadId() || !This->ctx->global) { + if(!This->thread_data || This->thread_data->thread_id != GetCurrentThreadId() || !This->ctx->global) { *ppdisp = NULL; return E_UNEXPECTED; } @@ -1101,7 +1111,7 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLine, dwFlags, pvarResult, pexcepinfo); - if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) + if(!This->thread_data || This->thread_data->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; if(pstrItemName) { @@ -1204,7 +1214,7 @@ static HRESULT WINAPI JScriptParseProcedure_ParseProcedureText(IActiveScriptPars debugstr_w(pstrProcedureName), debugstr_w(pstrItemName), punkContext, debugstr_w(pstrDelimiter), wine_dbgstr_longlong(dwSourceContextCookie), ulStartingLineNumber, dwFlags, ppdisp); - if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) + if(!This->thread_data || This->thread_data->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; if(pstrItemName) { diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 650c9278793..0e4f97b085d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -129,6 +129,14 @@ typedef HRESULT (*builtin_setter_t)(script_ctx_t*,jsdisp_t*,jsval_t); HRESULT builtin_set_const(script_ctx_t*,jsdisp_t*,jsval_t); +struct thread_data { + LONG ref; + LONG thread_id; +}; + +struct thread_data *get_thread_data(void); +void release_thread_data(struct thread_data*); + typedef struct named_item_t { jsdisp_t *script_obj; IDispatch *disp; diff --git a/dlls/jscript/jscript_main.c b/dlls/jscript/jscript_main.c index 882c419ff83..2afe6fb2ff7 100644 --- a/dlls/jscript/jscript_main.c +++ b/dlls/jscript/jscript_main.c @@ -37,8 +37,34 @@ LONG module_ref = 0; DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); HINSTANCE jscript_hinstance; +static DWORD jscript_tls; static ITypeInfo *dispatch_typeinfo; +struct thread_data *get_thread_data(void) +{ + struct thread_data *thread_data = TlsGetValue(jscript_tls); + + if(!thread_data) { + thread_data = calloc(1, sizeof(struct thread_data)); + if(!thread_data) + return NULL; + thread_data->thread_id = GetCurrentThreadId(); + TlsSetValue(jscript_tls, thread_data); + } + + thread_data->ref++; + return thread_data; +} + +void release_thread_data(struct thread_data *thread_data) +{ + if(--thread_data->ref) + return; + + free(thread_data); + TlsSetValue(jscript_tls, NULL); +} + HRESULT get_dispatch_typeinfo(ITypeInfo **out) { ITypeInfo *typeinfo; @@ -164,13 +190,16 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hInstDLL); jscript_hinstance = hInstDLL; - if(!init_strings()) + jscript_tls = TlsAlloc(); + if(jscript_tls == TLS_OUT_OF_INDEXES || !init_strings()) return FALSE; break; case DLL_PROCESS_DETACH: if (lpv) break; if (dispatch_typeinfo) ITypeInfo_Release(dispatch_typeinfo); + if(jscript_tls != TLS_OUT_OF_INDEXES) TlsFree(jscript_tls); free_strings(); + break; } return TRUE;

1 0

Gabriel Ivăncescu : jscript: Don't use atomic compare exchange when setting the script ctx.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: 39c7950aae9d2c0b3a51995c49713ed124898b28 URL: https://gitlab.winehq.org/wine/wine/-/commit/39c7950aae9d2c0b3a51995c49713e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 12 19:57:37 2023 +0200 jscript: Don't use atomic compare exchange when setting the script ctx. It already bails out early if the thread_data was already populated, so only one thread can reach here at one time. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/jscript.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 191747c7173..32e6278a5d0 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -776,11 +776,7 @@ static HRESULT WINAPI JScript_SetScriptSite(IActiveScript *iface, ctx->last_match = jsstr_empty(); - ctx = InterlockedCompareExchangePointer((void**)&This->ctx, ctx, NULL); - if(ctx) { - script_release(ctx); - return E_UNEXPECTED; - } + This->ctx = ctx; } /* Retrieve new dispatches for persistent named items */

1 0

Gabriel Ivăncescu : jscript: Make the garbage collector thread-wide rather than per-ctx.
by Alexandre Julliard 22 Jan '24

22 Jan '24

Module: wine Branch: master Commit: bc45b43a4984d9df7117f841506524ad7cc0566e URL: https://gitlab.winehq.org/wine/wine/-/commit/bc45b43a4984d9df7117f841506524… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Dec 12 19:57:37 2023 +0200 jscript: Make the garbage collector thread-wide rather than per-ctx. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 31 ++++++++++++++++--------------- dlls/jscript/jscript.c | 12 +++--------- dlls/jscript/jscript.h | 12 +++++++----- dlls/jscript/jscript_main.c | 9 +++++++++ dlls/jscript/set.c | 6 +++--- 5 files changed, 38 insertions(+), 32 deletions(-)

1 0