wine-commits November 2021

wine-commits@winehq.org

2 participants
951 discussions

Zebediah Figura : ntdll: Reimplement the critical section fast path on top of Win32 futexes.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: c577ce2671ba8b003dbbdb329ada56368a370778 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c577ce2671ba8b003dbbdb32… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:55 2021 -0600 ntdll: Reimplement the critical section fast path on top of Win32 futexes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 35 ++++++++----- dlls/ntdll/unix/loader.c | 3 -- dlls/ntdll/unix/sync.c | 109 ----------------------------------------- dlls/ntdll/unix/unix_private.h | 4 -- dlls/ntdll/unixlib.h | 5 +- 5 files changed, 24 insertions(+), 132 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 78c68ddbe38..34b804b1463 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -172,19 +172,26 @@ static inline HANDLE get_semaphore( RTL_CRITICAL_SECTION *crit ) static inline NTSTATUS wait_semaphore( RTL_CRITICAL_SECTION *crit, int timeout ) { - NTSTATUS ret; + LARGE_INTEGER time = {.QuadPart = timeout * (LONGLONG)-10000000}; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpWaitForCriticalSection( crit, timeout )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit )) { HANDLE sem = get_semaphore( crit ); - LARGE_INTEGER time; - - time.QuadPart = timeout * (LONGLONG)-10000000; - ret = NtWaitForSingleObject( sem, FALSE, &time ); + return NtWaitForSingleObject( sem, FALSE, &time ); + } + else + { + int *lock = (int *)&crit->LockSemaphore; + while (!InterlockedCompareExchange( lock, 0, 1 )) + { + static const int zero; + /* this may wait longer than specified in case of multiple wake-ups */ + if (RtlWaitOnAddress( lock, &zero, sizeof(int), &time ) == STATUS_TIMEOUT) + return STATUS_TIMEOUT; + } + return STATUS_WAIT_0; } - return ret; } /****************************************************************************** @@ -274,8 +281,6 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) RtlFreeHeap( GetProcessHeap(), 0, crit->DebugInfo ); crit->DebugInfo = NULL; } - if (unix_funcs->fast_RtlDeleteCriticalSection( crit ) == STATUS_NOT_IMPLEMENTED) - NtClose( crit->LockSemaphore ); } else NtClose( crit->LockSemaphore ); crit->LockSemaphore = 0; @@ -351,12 +356,18 @@ NTSTATUS WINAPI RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) NTSTATUS ret; /* debug info is cleared by MakeCriticalSectionGlobal */ - if (!crit_section_has_debuginfo( crit ) || - ((ret = unix_funcs->fast_RtlpUnWaitCriticalSection( crit )) == STATUS_NOT_IMPLEMENTED)) + if (!crit_section_has_debuginfo( crit )) { HANDLE sem = get_semaphore( crit ); ret = NtReleaseSemaphore( sem, 1, NULL ); } + else + { + int *lock = (int *)&crit->LockSemaphore; + InterlockedExchange( lock, 1 ); + RtlWakeAddressSingle( lock ); + ret = STATUS_SUCCESS; + } if (ret) RtlRaiseStatus( ret ); return ret; } diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 05ae264297a..1dbcc0d7a7b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -2145,9 +2145,6 @@ static struct unix_funcs unix_funcs = NtCurrentTeb, #endif RtlGetSystemTimePrecise, - fast_RtlpWaitForCriticalSection, - fast_RtlpUnWaitCriticalSection, - fast_RtlDeleteCriticalSection, fast_RtlTryAcquireSRWLockExclusive, fast_RtlAcquireSRWLockExclusive, fast_RtlTryAcquireSRWLockShared, diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 47a0a03b45f..12df0c90d73 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2550,115 +2550,6 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG #endif -#ifdef __linux__ - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - int val; - struct timespec timespec; - - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - while ((val = InterlockedCompareExchange( (int *)&crit->LockSemaphore, 0, 1 )) != 1) - { - /* note: this may wait longer than specified in case of signals or */ - /* multiple wake-ups, but that shouldn't be a problem */ - if (futex_wait( (int *)&crit->LockSemaphore, val, &timespec ) == -1 && errno == ETIMEDOUT) - return STATUS_TIMEOUT; - } - return STATUS_WAIT_0; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - - *(int *)&crit->LockSemaphore = 1; - futex_wake( (int *)&crit->LockSemaphore, 1 ); - return STATUS_SUCCESS; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - if (!use_futexes()) return STATUS_NOT_IMPLEMENTED; - return STATUS_SUCCESS; -} - -#elif defined(__APPLE__) - -static inline semaphore_t get_mach_semaphore( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_t ret = *(int *)&crit->LockSemaphore; - if (!ret) - { - semaphore_t sem; - if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) return 0; - if (!(ret = InterlockedCompareExchange( (int *)&crit->LockSemaphore, sem, 0 ))) - ret = sem; - else - semaphore_destroy( mach_task_self(), sem ); /* somebody beat us to it */ - } - return ret; -} - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - mach_timespec_t timespec; - semaphore_t sem = get_mach_semaphore( crit ); - - timespec.tv_sec = timeout; - timespec.tv_nsec = 0; - for (;;) - { - switch( semaphore_timedwait( sem, timespec )) - { - case KERN_SUCCESS: - return STATUS_WAIT_0; - case KERN_ABORTED: - continue; /* got a signal, restart */ - case KERN_OPERATION_TIMED_OUT: - return STATUS_TIMEOUT; - default: - return STATUS_INVALID_HANDLE; - } - } -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_t sem = get_mach_semaphore( crit ); - semaphore_signal( sem ); - return STATUS_SUCCESS; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - semaphore_destroy( mach_task_self(), *(int *)&crit->LockSemaphore ); - return STATUS_SUCCESS; -} - -#else /* __APPLE__ */ - -NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) -{ - return STATUS_NOT_IMPLEMENTED; -} - -#endif - - #ifdef __linux__ /* Futex-based SRW lock implementation: diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 641de0c465f..d44a9e128ff 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -100,10 +100,6 @@ extern void (WINAPI *pLdrInitializeThunk)(CONTEXT*,void**,ULONG_PTR,ULONG_PT extern void (WINAPI *pRtlUserThreadStart)( PRTL_THREAD_START_ROUTINE entry, void *arg ) DECLSPEC_HIDDEN; extern void (WINAPI *p__wine_ctrl_routine)(void *) DECLSPEC_HIDDEN; extern SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock DECLSPEC_HIDDEN; - -extern NTSTATUS CDECL fast_RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit, int timeout ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlpUnWaitCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; -extern NTSTATUS CDECL fast_RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlAcquireSRWLockExclusive( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; extern NTSTATUS CDECL fast_RtlTryAcquireSRWLockShared( RTL_SRWLOCK *lock ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unixlib.h b/dlls/ntdll/unixlib.h index ded05c40e17..535f76a647e 100644 --- a/dlls/ntdll/unixlib.h +++ b/dlls/ntdll/unixlib.h @@ -26,7 +26,7 @@ struct _DISPATCHER_CONTEXT; /* increment this when you change the function table */ -#define NTDLL_UNIXLIB_VERSION 129 +#define NTDLL_UNIXLIB_VERSION 130 struct unix_funcs { @@ -39,9 +39,6 @@ struct unix_funcs LONGLONG (WINAPI *RtlGetSystemTimePrecise)(void); /* fast locks */ - NTSTATUS (CDECL *fast_RtlpWaitForCriticalSection)( RTL_CRITICAL_SECTION *crit, int timeout ); - NTSTATUS (CDECL *fast_RtlpUnWaitCriticalSection)( RTL_CRITICAL_SECTION *crit ); - NTSTATUS (CDECL *fast_RtlDeleteCriticalSection)( RTL_CRITICAL_SECTION *crit ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlAcquireSRWLockExclusive)( RTL_SRWLOCK *lock ); NTSTATUS (CDECL *fast_RtlTryAcquireSRWLockShared)( RTL_SRWLOCK *lock );

1 0

Zebediah Figura : ntdll: Reimplement Win32 futexes on top of thread-ID alerts.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 6bdb914a25ab31399e68943dc30a6d77a879f8ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bdb914a25ab31399e68943d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:54 2021 -0600 ntdll: Reimplement Win32 futexes on top of thread-ID alerts. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++- dlls/ntdll/unix/loader.c | 3 - dlls/ntdll/unix/sync.c | 162 ------------------------------------------- dlls/ntdll/unixlib.h | 6 +- 4 files changed, 173 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bdb914a25ab31399e68…

1 0

Zebediah Figura : ntdll: Implement thread-ID alerts using Mach semaphores on Mac.
by Alexandre Julliard 18 Nov '21

18 Nov '21

Module: wine Branch: master Commit: 842ecb45f433d458220eaefa6bedb3e3ed635deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=842ecb45f433d458220eaefa… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Nov 17 20:18:53 2021 -0600 ntdll: Implement thread-ID alerts using Mach semaphores on Mac. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/sync.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/sync.c b/dlls/ntdll/unix/sync.c index 59fe6bea8f5..cdc63c8a6ef 100644 --- a/dlls/ntdll/unix/sync.c +++ b/dlls/ntdll/unix/sync.c @@ -2341,10 +2341,14 @@ NTSTATUS WINAPI NtQueryInformationAtom( RTL_ATOM atom, ATOM_INFORMATION_CLASS cl union tid_alert_entry { +#ifdef __APPLE__ + semaphore_t sem; +#else HANDLE event; #ifdef __linux__ int futex; #endif +#endif }; #define TID_ALERT_BLOCK_SIZE (65536 / sizeof(union tid_alert_entry)) @@ -2379,6 +2383,17 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) entry = &tid_alert_blocks[block_idx][idx % TID_ALERT_BLOCK_SIZE]; +#ifdef __APPLE__ + if (!entry->sem) + { + semaphore_t sem; + + if (semaphore_create( mach_task_self(), &sem, SYNC_POLICY_FIFO, 0 )) + return NULL; + if (InterlockedCompareExchange( (int *)&entry->sem, sem, NULL )) + semaphore_destroy( mach_task_self(), sem ); + } +#else #ifdef __linux__ if (use_futexes()) return entry; @@ -2393,6 +2408,7 @@ static union tid_alert_entry *get_tid_alert_entry( HANDLE tid ) if (InterlockedCompareExchangePointer( &entry->event, event, NULL )) NtClose( event ); } +#endif return entry; } @@ -2409,6 +2425,10 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) if (!entry) return STATUS_INVALID_CID; +#ifdef __APPLE__ + semaphore_signal( entry->sem ); + return STATUS_SUCCESS; +#else #ifdef __linux__ if (use_futexes()) { @@ -2420,10 +2440,11 @@ NTSTATUS WINAPI NtAlertThreadByThreadId( HANDLE tid ) #endif return NtSetEvent( entry->event, NULL ); +#endif } -#ifdef __linux__ +#if defined(__linux__) || defined(__APPLE__) static LONGLONG get_absolute_timeout( const LARGE_INTEGER *timeout ) { LARGE_INTEGER now; @@ -2446,6 +2467,57 @@ static LONGLONG update_timeout( ULONGLONG end ) #endif +#ifdef __APPLE__ + +/*********************************************************************** + * NtWaitForAlertByThreadId (NTDLL.@) + */ +NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEGER *timeout ) +{ + union tid_alert_entry *entry = get_tid_alert_entry( NtCurrentTeb()->ClientId.UniqueThread ); + semaphore_t sem; + ULONGLONG end; + kern_return_t ret; + + TRACE( "%p %s\n", address, debugstr_timeout( timeout ) ); + + if (!entry) return STATUS_INVALID_CID; + sem = entry->sem; + + if (timeout) + { + if (timeout->QuadPart == TIMEOUT_INFINITE) + timeout = NULL; + else + end = get_absolute_timeout( timeout ); + } + + for (;;) + { + if (timeout) + { + LONGLONG timeleft = update_timeout( end ); + mach_timespec_t timespec; + + timespec.tv_sec = timeleft / (ULONGLONG)TICKSPERSEC; + timespec.tv_nsec = (timeleft % TICKSPERSEC) * 100; + ret = semaphore_timedwait( sem, timespec ); + } + else + ret = semaphore_wait( sem ); + + switch (ret) + { + case KERN_SUCCESS: return STATUS_ALERTED; + case KERN_ABORTED: continue; + case KERN_OPERATION_TIMED_OUT: return STATUS_TIMEOUT; + default: return STATUS_INVALID_HANDLE; + } + } +} + +#else + /*********************************************************************** * NtWaitForAlertByThreadId (NTDLL.@) */ @@ -2498,6 +2570,7 @@ NTSTATUS WINAPI NtWaitForAlertByThreadId( const void *address, const LARGE_INTEG return status; } +#endif #ifdef __linux__

1 0

André Zwing : avicap32: Fix typo in comment.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 161d61481f5d5ab8ee0b6237853af830e992afb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=161d61481f5d5ab8ee0b6237… Author: André Zwing <nerv(a)dawncrow.de> Date: Wed Nov 17 18:26:04 2021 +0100 avicap32: Fix typo in comment. Signed-off-by: André Zwing <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/avicap32/v4l.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/avicap32/v4l.c b/dlls/avicap32/v4l.c index ef41b7e281b..4b285d94c3c 100644 --- a/dlls/avicap32/v4l.c +++ b/dlls/avicap32/v4l.c @@ -143,4 +143,4 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = #endif /* _WIN64 */ -#endif /* HAVE_LINUX_VIDEODEV_2 */ +#endif /* HAVE_LINUX_VIDEODEV2_H */

1 0

Gabriel Ivăncescu : mshtml: Actually set the return value when removing an attribute.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: c74d8e17448ffd1e76154bd7754c9a6294e5d0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=c74d8e17448ffd1e76154bd7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 16 19:58:17 2021 +0200 mshtml: Actually set the return value when removing an attribute. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 8 ++++++-- dlls/mshtml/tests/documentmode.js | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 91ccfb97abc..d54f729b2e5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -1202,8 +1202,12 @@ static HRESULT WINAPI HTMLElement_removeAttribute(IHTMLElement *iface, BSTR strA TRACE("(%p)->(%s %x %p)\n", This, debugstr_w(strAttributeName), lFlags, pfSuccess); - if(dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) - return element_remove_attribute(This, strAttributeName); + if(dispex_compat_mode(&This->node.event_target.dispex) >= COMPAT_MODE_IE8) { + *pfSuccess = element_has_attribute(This, strAttributeName); + if(*pfSuccess) + return element_remove_attribute(This, strAttributeName); + return S_OK; + } hres = IDispatchEx_GetDispID(&This->node.event_target.dispex.IDispatchEx_iface, strAttributeName, lFlags&ATTRFLAG_CASESENSITIVE ? fdexNameCaseSensitive : fdexNameCaseInsensitive, &id); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 9db1b4f686b..d5f33dd9521 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1094,7 +1094,6 @@ sync_test("elem_attr", function() { r = elem.getAttribute("onclick"); ok(r === (v < 8 ? func : null), "onclick attr = " + r); r = elem.removeAttribute("onclick"); - todo_wine_if(v === 8). ok(r === (v < 9 ? false : undefined), "removeAttribute returned " + r); todo_wine_if(v === 8). ok(elem.onclick === (v != 8 ? func : null), "removed onclick = " + elem.onclick);

1 0

Gabriel Ivăncescu : mshtml: Clear the string dprop associated with the builtin attribute when removing it.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 6b2c20c6a1aa046c5f0317221b52609bcaa11295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b2c20c6a1aa046c5f031722… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Nov 16 19:58:16 2021 +0200 mshtml: Clear the string dprop associated with the builtin attribute when removing it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 13 ++++++--- dlls/mshtml/tests/documentmode.js | 56 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 96a776d9594..4605fdac0f0 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1463,13 +1463,18 @@ HRESULT remove_attribute(DispatchEx *This, DISPID id, VARIANT_BOOL *success) *success = VARIANT_TRUE; return S_OK; } + *success = VARIANT_TRUE; V_VT(&var) = VT_EMPTY; hres = builtin_propput(This, func, &dp, NULL); - if(FAILED(hres)) - return hres; - - *success = VARIANT_TRUE; + if(FAILED(hres)) { + VARIANT *ref; + hres = dispex_get_dprop_ref(This, func->name, FALSE, &ref); + if(FAILED(hres) || V_VT(ref) != VT_BSTR) + *success = VARIANT_FALSE; + else + VariantClear(ref); + } return S_OK; } default: diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index d5662239bfa..9db1b4f686b 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -1087,6 +1087,62 @@ sync_test("elem_attr", function() { ok(r === "cls2", "class attr = " + r); r = elem.getAttribute("className"); ok(r === "cls3", "className attr = " + r); + + var func = function() { }; + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + ok(r === (v < 8 ? func : null), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? false : undefined), "removeAttribute returned " + r); + todo_wine_if(v === 8). + ok(elem.onclick === (v != 8 ? func : null), "removed onclick = " + elem.onclick); + + elem.onclick_test = func; + ok(elem.onclick_test === func, "onclick_test = " + elem.onclick_test); + r = elem.getAttribute("onclick_test"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? func.toString() : null)), "onclick_test attr = " + r); + + elem.setAttribute("onclick", "test"); + r = elem.getAttribute("onclick"); + ok(r === "test", "onclick attr after setAttribute = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute after setAttribute returned " + r); + + /* IE11 returns an empty function, which we can't check directly */ + todo_wine_if(v >= 8). + ok((v < 11) ? (elem.onclick === null) : (elem.onclick !== func), "removed onclick after setAttribute = " + elem.onclick); + + r = Object.prototype.toString.call(elem.onclick); + todo_wine_if(v >= 8 && v < 11). + ok(r === (v < 9 ? "[object Object]" : (v < 11 ? "[object Null]" : "[object Function]")), + "removed onclick after setAttribute Object.toString returned " + r); + + elem.setAttribute("onclick", "string"); + r = elem.getAttribute("onclick"); + ok(r === "string", "onclick attr after setAttribute = " + r); + elem.onclick = func; + ok(elem.onclick === func, "onclick = " + elem.onclick); + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 8 ? func : (v < 9 ? null : "string")), "onclick attr = " + r); + elem.onclick = "test"; + r = elem.getAttribute("onclick"); + todo_wine_if(v === 8). + ok(r === (v < 9 ? "test" : "string"), "onclick attr = " + r); + r = elem.removeAttribute("onclick"); + ok(r === (v < 9 ? true : undefined), "removeAttribute returned " + r); + todo_wine_if(v >= 8). + ok(elem.onclick === null, "removed onclick = " + elem.onclick); + + elem.setAttribute("ondblclick", "string"); + r = elem.getAttribute("ondblclick"); + ok(r === "string", "ondblclick string = " + r); + r = elem.removeAttribute("ondblclick"); + ok(r === (v < 9 ? true : undefined), "ondblclick string removeAttribute returned " + r); + ok(elem.ondblclick === null, "removed ondblclick string = " + elem.ondblclick); }); sync_test("__proto__", function() {

1 0

Dmitry Timoshkov : crypt32: Avoid truncating unicode chars.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 8afb89436f182c1b0e581bdf175e5f9310f0d872 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8afb89436f182c1b0e581bdf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 17 21:57:08 2021 +0300 crypt32: Avoid truncating unicode chars. So that strings containing Cyrillic Capital Letter ER (0x420) won't be quoted when not needed. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 0ab4c7c6e85..0e75a674b55 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -156,7 +156,7 @@ DWORD WINAPI CertRDNValueToStrW(DWORD dwValueType, PCERT_RDN_VALUE_BLOB pValue, return ret; } -static inline BOOL is_quotable_char(char c) +static inline BOOL is_quotable_char(WCHAR c) { switch(c) {

1 0

Serge Gautherie : riched20: Check font_cache in select_style() too.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 177f808aa86e5442be1a0a92ddccc4904bf2e743 URL: https://source.winehq.org/git/wine.git/?a=commit;h=177f808aa86e5442be1a0a92… Author: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Date: Mon Nov 8 16:23:05 2021 +0100 riched20: Check font_cache in select_style() too. Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/style.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 917a5bd8100..266bb934753 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -429,7 +429,7 @@ void select_style( ME_Context *c, ME_Style *s ) c->orig_font = NULL; } - if (c->current_style) + if (c->current_style && c->current_style->font_cache) { release_font_cache( c->current_style->font_cache ); c->current_style->font_cache = NULL;

1 0

Alexandre Julliard : wow64win: Add missing thunk for NtUserGetKeyboardLayout().
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: 4138ef14fa844e98a876de42c1ca1827b7bb658a URL: https://source.winehq.org/git/wine.git/?a=commit;h=4138ef14fa844e98a876de42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 17 17:27:40 2021 +0100 wow64win: Add missing thunk for NtUserGetKeyboardLayout(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 9a267025527..2ffe10b733c 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -99,6 +99,7 @@ SYSCALL_ENTRY( NtUserGetClipboardSequenceNumber ) \ SYSCALL_ENTRY( NtUserGetClipboardViewer ) \ SYSCALL_ENTRY( NtUserGetKeyState ) \ + SYSCALL_ENTRY( NtUserGetKeyboardLayout ) \ SYSCALL_ENTRY( NtUserGetKeyboardState ) \ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetMouseMovePointsEx ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 1c667889252..da94ea02dc0 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -250,6 +250,13 @@ NTSTATUS WINAPI wow64_NtUserGetKeyState( UINT *args ) return NtUserGetKeyState( vkey ); } +NTSTATUS WINAPI wow64_NtUserGetKeyboardLayout( UINT *args ) +{ + DWORD tid = get_ulong( &args ); + + return HandleToUlong( NtUserGetKeyboardLayout( tid )); +} + NTSTATUS WINAPI wow64_NtUserGetKeyboardState( UINT *args ) { BYTE *state = get_ptr( &args );

1 0

Floris Renaud : winecfg: Add the command line options to the man page.
by Alexandre Julliard 17 Nov '21

17 Nov '21

Module: wine Branch: master Commit: a6a2580c3355df6bce914cb5635e94e987e646a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6a2580c3355df6bce914cb5… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Wed Nov 17 16:54:45 2021 +0100 winecfg: Add the command line options to the man page. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/winecfg.man.in | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/programs/winecfg/winecfg.man.in b/programs/winecfg/winecfg.man.in index 522d2a0e812..e6fdf376aa8 100644 --- a/programs/winecfg/winecfg.man.in +++ b/programs/winecfg/winecfg.man.in @@ -1,14 +1,32 @@ -.TH WINECFG 1 "November 2010" "@PACKAGE_STRING@" "Wine Programs" +.TH WINECFG 1 "November 2021" "@PACKAGE_STRING@" "Wine Programs" .SH NAME winecfg \- Wine Configuration Editor .SH SYNOPSIS -.BR "winecfg" +.B winecfg +.RI [ options ] .SH DESCRIPTION .B winecfg is the Wine configuration editor. It allows you to change several settings, such as DLL load order (native versus builtin), enable a virtual desktop, setup disk drives, and change the Wine audio driver, among others. Many of these settings can be made on a per application basis, for example, preferring native riched20.dll for wordpad.exe, but not for notepad.exe. + +If no option is given launch the graphical version of +.BR winecfg . +.SH OPTIONS +.TP +\fB\-v \fR[\fIversion\fR], \fB/v \fR[\fB\fIversion\fR] +Set global Windows version to +.I version +and exit. +If +.I version +is not specified, display the current global Windows version and exit. +.TP +.BR \-? ", " /? +Display help, valid versions for +.I version +and exit. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2021