wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Zebediah Figura : quartz/tests: Check that system clock measurements are in sequence instead of comparing absolute time.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: ff231dad75dd9e9dccba52ec41e1a5eb879b9cdc URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff231dad75dd9e9dccba52ec… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 19 22:25:26 2021 -0500 quartz/tests: Check that system clock measurements are in sequence instead of comparing absolute time. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/systemclock.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index f13e89abedb..fa9464429f0 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -24,12 +24,6 @@ static ULONGLONG (WINAPI *pGetTickCount64)(void); -static BOOL compare_time(REFERENCE_TIME x, REFERENCE_TIME y, unsigned int max_diff) -{ - REFERENCE_TIME diff = x > y ? x - y : y - x; - return diff <= max_diff; -} - static IReferenceClock *create_system_clock(void) { IReferenceClock *clock = NULL; @@ -172,7 +166,7 @@ static void test_aggregation(void) static void test_get_time(void) { IReferenceClock *clock = create_system_clock(); - REFERENCE_TIME time1, time2; + REFERENCE_TIME time1, ticks, time2; HRESULT hr; ULONG ref; @@ -180,18 +174,21 @@ static void test_get_time(void) ok(hr == E_POINTER, "Got hr %#x.\n", hr); hr = IReferenceClock_GetTime(clock, &time1); - if (pGetTickCount64) - time2 = pGetTickCount64() * 10000; - else - time2 = (REFERENCE_TIME)GetTickCount() * 10000; ok(hr == S_OK, "Got hr %#x.\n", hr); ok(time1 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", wine_dbgstr_longlong(time1)); - ok(compare_time(time1, time2, 20 * 10000), "Expected about %s, got %s.\n", - wine_dbgstr_longlong(time2), wine_dbgstr_longlong(time1)); + + if (pGetTickCount64) + ticks = pGetTickCount64() * 10000; + else + ticks = (REFERENCE_TIME)GetTickCount() * 10000; hr = IReferenceClock_GetTime(clock, &time2); ok(hr == (time2 == time1 ? S_FALSE : S_OK), "Got hr %#x.\n", hr); + ok(time2 % 10000 == 0, "Expected no less than 1ms coarseness, but got time %s.\n", + wine_dbgstr_longlong(time1)); + + ok(time2 >= ticks && ticks >= time1, "Got timestamps %I64d, %I64d, %I64d.\n", time1, ticks, time2); Sleep(100); hr = IReferenceClock_GetTime(clock, &time2);

1 0

Zebediah Figura : quartz: Use a condition variable to wake up the system clock advise thread.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 4df1a5831ca5b71c78c20fe2abca3b8b3d78389b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4df1a5831ca5b71c78c20fe2… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 19 22:25:25 2021 -0500 quartz: Use a condition variable to wake up the system clock advise thread. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index cbe5f395258..597373a4112 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -42,10 +42,11 @@ struct system_clock IUnknown *outer_unk; LONG refcount; - BOOL thread_created; - HANDLE thread, notify_event, stop_event; + BOOL thread_created, thread_stopped; + HANDLE thread; REFERENCE_TIME last_time; CRITICAL_SECTION cs; + CONDITION_VARIABLE cv; struct list sinks; }; @@ -96,11 +97,12 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) { if (clock->thread) { - SetEvent(clock->stop_event); + EnterCriticalSection(&clock->cs); + clock->thread_stopped = TRUE; + LeaveCriticalSection(&clock->cs); + WakeConditionVariable(&clock->cv); WaitForSingleObject(clock->thread, INFINITE); CloseHandle(clock->thread); - CloseHandle(clock->notify_event); - CloseHandle(clock->stop_event); } clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); @@ -128,7 +130,6 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) struct system_clock *clock = param; struct advise_sink *sink, *cursor; REFERENCE_TIME current_time; - HANDLE handles[2] = {clock->stop_event, clock->notify_event}; TRACE("Starting advise thread for clock %p.\n", clock); @@ -162,10 +163,13 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) timeout = min(timeout, (sink->due_time - current_time) / 10000); } - LeaveCriticalSection(&clock->cs); - - if (WaitForMultipleObjects(2, handles, FALSE, timeout) == 0) + SleepConditionVariableCS(&clock->cv, &clock->cs, timeout); + if (clock->thread_stopped) + { + LeaveCriticalSection(&clock->cs); return 0; + } + LeaveCriticalSection(&clock->cs); } } @@ -194,11 +198,9 @@ static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { - clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); - clock->stop_event = CreateEventW(NULL, TRUE, FALSE, NULL); clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } - SetEvent(clock->notify_event); + WakeConditionVariable(&clock->cv); *cookie = sink->cookie; return S_OK;

1 0

Zebediah Figura : quartz: Factor out more of AdviseTime() and AdvisePeriodic().
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 6c0ddfee9d94d4afa9cd391e580ab7494d4649ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c0ddfee9d94d4afa9cd391e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 19 22:25:24 2021 -0500 quartz: Factor out more of AdviseTime() and AdvisePeriodic(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 74 +++++++++++++++++------------------------------ 1 file changed, 27 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 24d8651aaba..cbe5f395258 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -169,8 +169,29 @@ static DWORD WINAPI SystemClockAdviseThread(void *param) } } -static void notify_thread(struct system_clock *clock) +static HRESULT add_sink(struct system_clock *clock, DWORD_PTR handle, + REFERENCE_TIME due_time, REFERENCE_TIME period, DWORD_PTR *cookie) { + struct advise_sink *sink; + + if (!handle) + return E_INVALIDARG; + + if (!cookie) + return E_POINTER; + + if (!(sink = heap_alloc_zero(sizeof(*sink)))) + return E_OUTOFMEMORY; + + sink->handle = (HANDLE)handle; + sink->due_time = due_time; + sink->period = period; + sink->cookie = InterlockedIncrement(&cookie_counter); + + EnterCriticalSection(&clock->cs); + list_add_tail(&clock->sinks, &sink->entry); + LeaveCriticalSection(&clock->cs); + if (!InterlockedCompareExchange(&clock->thread_created, TRUE, FALSE)) { clock->notify_event = CreateEventW(NULL, FALSE, FALSE, NULL); @@ -178,6 +199,9 @@ static void notify_thread(struct system_clock *clock) clock->thread = CreateThread(NULL, 0, SystemClockAdviseThread, clock, 0, NULL); } SetEvent(clock->notify_event); + + *cookie = sink->cookie; + return S_OK; } static HRESULT WINAPI SystemClockImpl_QueryInterface(IReferenceClock *iface, REFIID iid, void **out) @@ -225,72 +249,28 @@ static HRESULT WINAPI SystemClockImpl_AdviseTime(IReferenceClock *iface, REFERENCE_TIME base, REFERENCE_TIME offset, HEVENT event, DWORD_PTR *cookie) { struct system_clock *clock = impl_from_IReferenceClock(iface); - struct advise_sink *sink; TRACE("clock %p, base %s, offset %s, event %#lx, cookie %p.\n", clock, debugstr_time(base), debugstr_time(offset), event, cookie); - if (!event) - return E_INVALIDARG; - if (base + offset <= 0) return E_INVALIDARG; - if (!cookie) - return E_POINTER; - - if (!(sink = heap_alloc_zero(sizeof(*sink)))) - return E_OUTOFMEMORY; - - sink->handle = (HANDLE)event; - sink->due_time = base + offset; - sink->period = 0; - sink->cookie = InterlockedIncrement(&cookie_counter); - - EnterCriticalSection(&clock->cs); - list_add_tail(&clock->sinks, &sink->entry); - LeaveCriticalSection(&clock->cs); - - notify_thread(clock); - - *cookie = sink->cookie; - return S_OK; + return add_sink(clock, event, base + offset, 0, cookie); } static HRESULT WINAPI SystemClockImpl_AdvisePeriodic(IReferenceClock* iface, REFERENCE_TIME start, REFERENCE_TIME period, HSEMAPHORE semaphore, DWORD_PTR *cookie) { struct system_clock *clock = impl_from_IReferenceClock(iface); - struct advise_sink *sink; TRACE("clock %p, start %s, period %s, semaphore %#lx, cookie %p.\n", clock, debugstr_time(start), debugstr_time(period), semaphore, cookie); - if (!semaphore) - return E_INVALIDARG; - if (start <= 0 || period <= 0) return E_INVALIDARG; - if (!cookie) - return E_POINTER; - - if (!(sink = heap_alloc_zero(sizeof(*sink)))) - return E_OUTOFMEMORY; - - sink->handle = (HANDLE)semaphore; - sink->due_time = start; - sink->period = period; - sink->cookie = InterlockedIncrement(&cookie_counter); - - EnterCriticalSection(&clock->cs); - list_add_tail(&clock->sinks, &sink->entry); - LeaveCriticalSection(&clock->cs); - - notify_thread(clock); - - *cookie = sink->cookie; - return S_OK; + return add_sink(clock, semaphore, start, period, cookie); } static HRESULT WINAPI SystemClockImpl_Unadvise(IReferenceClock *iface, DWORD_PTR cookie)

1 0

Alistair Leslie-Hughes : secur32: Set error flag on pull callback.
by Alexandre Julliard 20 Jul '21

20 Jul '21

Module: wine Branch: master Commit: 8ed81720e81b20a134d9cd5c6bb50183752d9e82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ed81720e81b20a134d9cd5c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jul 20 10:17:53 2021 +1000 secur32: Set error flag on pull callback. Fixes a regression introduced in b8aaf86b2dbb8ecb3f7094cc40a0df89bb2add27 Partial revert the pull_timeout function, which now return -1 and sets the transport error to try again. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51440 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_gnutls.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index bcf38e3f23f..4d8109721ce 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -292,7 +292,15 @@ static DWORD CDECL schan_get_enabled_protocols(void) static int pull_timeout(gnutls_transport_ptr_t transport, unsigned int timeout) { - return 0; + struct schan_transport *t = (struct schan_transport*)transport; + gnutls_session_t s = (gnutls_session_t)callbacks->get_session_for_transport(t); + SIZE_T count = 0; + + TRACE("\n"); + + if (callbacks->get_buffer(t, &t->in, &count)) return 1; + pgnutls_transport_set_errno(s, EAGAIN); + return -1; } static BOOL CDECL schan_create_session(schan_session *session, schan_credentials *cred)

1 0

Biswapriyo Nath : winecrt0: Add missing members in _JUMP_BUFFER for SJLJ.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: d60c450c7be196c2072f74e34f7760d39e3bad32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d60c450c7be196c2072f74e3… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Sat Jul 10 10:47:30 2021 +0530 winecrt0: Add missing members in _JUMP_BUFFER for SJLJ. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/exception.c | 4 +++- dlls/winecrt0/setjmp.c | 5 +++++ include/msvcrt/setjmp.h | 4 +++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index cc97a98e0d6..8bede41ee49 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -127,7 +127,9 @@ typedef struct _JUMP_BUFFER unsigned __int64 R14; unsigned __int64 R15; unsigned __int64 Rip; - unsigned __int64 Spare; + unsigned long MxCsr; + unsigned short FpCsr; + unsigned short Spare; SETJMP_FLOAT128 Xmm6; SETJMP_FLOAT128 Xmm7; SETJMP_FLOAT128 Xmm8; diff --git a/dlls/winecrt0/setjmp.c b/dlls/winecrt0/setjmp.c index d83df54b889..ffb3b243e75 100644 --- a/dlls/winecrt0/setjmp.c +++ b/dlls/winecrt0/setjmp.c @@ -66,6 +66,8 @@ __ASM_GLOBAL_FUNC( __wine_setjmpex, "movq %r15,0x48(%rcx)\n\t" /* jmp_buf->R15 */ "movq (%rsp),%rax\n\t" "movq %rax,0x50(%rcx)\n\t" /* jmp_buf->Rip */ + "stmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnstcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ "movdqa %xmm6,0x60(%rcx)\n\t" /* jmp_buf->Xmm6 */ "movdqa %xmm7,0x70(%rcx)\n\t" /* jmp_buf->Xmm7 */ "movdqa %xmm8,0x80(%rcx)\n\t" /* jmp_buf->Xmm8 */ @@ -89,6 +91,9 @@ __ASM_GLOBAL_FUNC( __wine_longjmp, "movq 0x38(%rcx),%r13\n\t" /* jmp_buf->R13 */ "movq 0x40(%rcx),%r14\n\t" /* jmp_buf->R14 */ "movq 0x48(%rcx),%r15\n\t" /* jmp_buf->R15 */ + "ldmxcsr 0x58(%rcx)\n\t" /* jmp_buf->MxCsr */ + "fnclex\n\t" + "fldcw 0x5c(%rcx)\n\t" /* jmp_buf->FpCsr */ "movdqa 0x60(%rcx),%xmm6\n\t" /* jmp_buf->Xmm6 */ "movdqa 0x70(%rcx),%xmm7\n\t" /* jmp_buf->Xmm7 */ "movdqa 0x80(%rcx),%xmm8\n\t" /* jmp_buf->Xmm8 */ diff --git a/include/msvcrt/setjmp.h b/include/msvcrt/setjmp.h index b539b22058f..6576605cf1b 100644 --- a/include/msvcrt/setjmp.h +++ b/include/msvcrt/setjmp.h @@ -65,7 +65,9 @@ typedef DECLSPEC_ALIGN(16) struct _JUMP_BUFFER unsigned __int64 R14; unsigned __int64 R15; unsigned __int64 Rip; - unsigned __int64 Spare; + unsigned long MxCsr; + unsigned short FpCsr; + unsigned short Spare; SETJMP_FLOAT128 Xmm6; SETJMP_FLOAT128 Xmm7; SETJMP_FLOAT128 Xmm8;

1 0

Paul Gofman : mshtml: Implement IWineDOMTokenList_remove() method.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 94fb93025180febc94984de44a3f026c20ade0e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94fb93025180febc94984de4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 15:53:18 2021 +0300 mshtml: Implement IWineDOMTokenList_remove() method. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 57 ++++++++++++++++++++++++++++++------ dlls/mshtml/mshtml_private_iface.idl | 2 ++ dlls/mshtml/tests/dom.js | 43 +++++++++++++++++++++++++++ 3 files changed, 93 insertions(+), 9 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index fd9ef686381..9ad538d2b00 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6515,14 +6515,15 @@ static const WCHAR *find_token(const WCHAR *list, const WCHAR *token, unsigned i return NULL; } -static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) +static HRESULT WINAPI token_list_add_remove(IWineDOMTokenList *iface, BSTR token, BOOL remove) { struct token_list *token_list = impl_from_IWineDOMTokenList(iface); unsigned int i, len, old_len, new_len; + const WCHAR *old_pos; BSTR new, old; HRESULT hr; - TRACE("iface %p, token %s.\n", iface, debugstr_w(token)); + TRACE("iface %p, token %s, remove %#x.\n", iface, debugstr_w(token), remove); len = token ? lstrlenW(token) : 0; if (!len) @@ -6543,14 +6544,33 @@ static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) TRACE("old %s.\n", debugstr_w(old)); - if (find_token(old, token, len)) + if (((old_pos = find_token(old, token, len)) && !remove) + || (!old_pos && remove)) { SysFreeString(old); return S_OK; } old_len = old ? lstrlenW(old) : 0; - new_len = old_len + len + !!old_len; + if (remove) + { + while (old_pos != old && iswspace(old_pos[-1])) + { + --old_pos; + ++len; + } + while (iswspace(old_pos[len])) + ++len; + + if (old_pos != old && old_pos[len]) + --len; + + new_len = old_len - len; + } + else + { + new_len = old_len + len + !!old_len; + } if (!(new = SysAllocStringLen(NULL, new_len))) { @@ -6559,11 +6579,19 @@ static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) return E_OUTOFMEMORY; } - memcpy(new, old, sizeof(*new) * old_len); - if (old_len) - new[old_len++]= L' '; - memcpy(new + old_len, token, sizeof(*new) * len); - new[old_len + len] = 0; + if (remove) + { + memcpy(new, old, sizeof(*new) * (old_pos - old)); + memcpy(new + (old_pos - old), old_pos + len, sizeof(*new) * (old_len - (old_pos - old) - len + 1)); + } + else + { + memcpy(new, old, sizeof(*new) * old_len); + if (old_len) + new[old_len++]= L' '; + memcpy(new + old_len, token, sizeof(*new) * len); + new[old_len + len] = 0; + } SysFreeString(old); @@ -6574,6 +6602,16 @@ static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) return hr; } +static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) +{ + return token_list_add_remove(iface, token, FALSE); +} + +static HRESULT WINAPI token_list_remove(IWineDOMTokenList *iface, BSTR token) +{ + return token_list_add_remove(iface, token, TRUE); +} + static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_QueryInterface, token_list_AddRef, @@ -6583,6 +6621,7 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_GetIDsOfNames, token_list_Invoke, token_list_add, + token_list_remove, }; static const tid_t token_list_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 8a2c9463dca..491f4afb0b6 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -113,6 +113,8 @@ interface IWineDOMTokenList : IDispatch { [id(1)] HRESULT add([in] BSTR token); + [id(2)] + HRESULT remove([in] BSTR token); } } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index ccbb3d8b69d..0085b40efed 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -562,4 +562,47 @@ sync_test("classList", function() { exception = true; } ok(exception, "Expected exception for classList.add(\"e f\")"); + + classList.remove("e"); + ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className); + + exception = false + try + { + classList.remove("e f"); + } + catch(e) + { + exception = true; + } + ok(exception, "remove: expected exception for classList.remove(\"e f\")"); + + exception = false + try + { + classList.remove(""); + } + catch(e) + { + exception = true; + } + ok(exception, "remove: expected exception for classList.remove(\"\")"); + + classList.remove("d"); + ok(elem.className === "a b c 4", "remove: expected className 'a b c 4', got " + elem.className); + + classList.remove("c"); + ok(elem.className === "a b 4", "remove: expected className 'a b 4', got " + elem.className); + + classList.remove(4); + ok(elem.className === "a b", "remove: expected className 'a b', got " + elem.className); + + classList.remove('a'); + ok(elem.className === "b", "remove: expected className 'b', got " + elem.className); + + classList.remove("a"); + ok(elem.className === "b", "remove (2): expected className 'b', got " + elem.className); + + classList.remove("b"); + ok(elem.className === "", "remove: expected className '', got " + elem.className); });

1 0

Paul Gofman : mshtml: Implement IWineDOMTokenList_add() method.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: 44031d7085a033f123db0f91fb7de8852d245375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44031d7085a033f123db0f91… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 15:53:17 2021 +0300 mshtml: Implement IWineDOMTokenList_add() method. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 85 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private_iface.idl | 2 + dlls/mshtml/tests/dom.js | 50 +++++++++++++++++++++ 3 files changed, 137 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5bb3f1eaf15..fd9ef686381 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6490,6 +6490,90 @@ static HRESULT WINAPI token_list_Invoke(IWineDOMTokenList *iface, DISPID dispIdM pDispParams, pVarResult, pExcepInfo, puArgErr); } +static const WCHAR *find_token(const WCHAR *list, const WCHAR *token, unsigned int token_len) +{ + const WCHAR *ptr, *next; + + if (!list || !token) + return NULL; + + ptr = list; + while (*ptr) + { + while (iswspace(*ptr)) + ++ptr; + if (!*ptr) + break; + next = ptr + 1; + while (*next && !iswspace(*next)) + ++next; + + if (next - ptr == token_len && !wcsncmp(ptr, token, token_len)) + return ptr; + ptr = next; + } + return NULL; +} + +static HRESULT WINAPI token_list_add(IWineDOMTokenList *iface, BSTR token) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + unsigned int i, len, old_len, new_len; + BSTR new, old; + HRESULT hr; + + TRACE("iface %p, token %s.\n", iface, debugstr_w(token)); + + len = token ? lstrlenW(token) : 0; + if (!len) + { + WARN("Empty token.\n"); + return E_INVALIDARG; + } + + for (i = 0; i < len; ++i) + if (iswspace(token[i])) + { + WARN("Token has spaces.\n"); + return E_INVALIDARG; + } + + if (FAILED(hr = IHTMLElement_get_className(token_list->element, &old))) + return hr; + + TRACE("old %s.\n", debugstr_w(old)); + + if (find_token(old, token, len)) + { + SysFreeString(old); + return S_OK; + } + + old_len = old ? lstrlenW(old) : 0; + new_len = old_len + len + !!old_len; + + if (!(new = SysAllocStringLen(NULL, new_len))) + { + ERR("No memory.\n"); + SysFreeString(old); + return E_OUTOFMEMORY; + } + + memcpy(new, old, sizeof(*new) * old_len); + if (old_len) + new[old_len++]= L' '; + memcpy(new + old_len, token, sizeof(*new) * len); + new[old_len + len] = 0; + + SysFreeString(old); + + TRACE("new %s.\n", debugstr_w(new)); + + hr = IHTMLElement_put_className(token_list->element, new); + SysFreeString(new); + return hr; +} + static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_QueryInterface, token_list_AddRef, @@ -6498,6 +6582,7 @@ static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { token_list_GetTypeInfo, token_list_GetIDsOfNames, token_list_Invoke, + token_list_add, }; static const tid_t token_list_iface_tids[] = { diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 1764b0a8c9d..8a2c9463dca 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -111,6 +111,8 @@ interface IWineHTMLElementPrivate : IDispatch ] interface IWineDOMTokenList : IDispatch { + [id(1)] + HRESULT add([in] BSTR token); } } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index f54cb0f7088..ccbb3d8b69d 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -512,4 +512,54 @@ sync_test("hasAttribute", function() { sync_test("classList", function() { var elem = document.createElement("div"); var classList = elem.classList; + + classList.add("a"); + ok(elem.className === "a", "Expected className 'a', got " + elem.className); + + classList.add("b"); + ok(elem.className === "a b", "Expected className 'a b', got " + elem.className); + + classList.add("c"); + ok(elem.className === "a b c", "Expected className 'a b c', got " + elem.className); + + classList.add(4); + ok(elem.className === "a b c 4", "Expected className 'a b c 4', got " + elem.className); + + classList.add("c"); + ok(elem.className === "a b c 4", "(2) Expected className 'a b c 4', got " + elem.className); + + var exception = false + + try + { + classList.add(); + } + catch(e) + { + exception = true; + } + ok(exception && elem.className === "a b c 4", "Expected exception, className 'a b c 4', got exception " + + exception + ", className" + elem.className); + + exception = false + try + { + classList.add(""); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.add(\"\")"); + + exception = false + try + { + classList.add("e f"); + } + catch(e) + { + exception = true; + } + ok(exception, "Expected exception for classList.add(\"e f\")"); });

1 0

Paul Gofman : mshtml: Add stub object for HTMLElement classList.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: a08d13ddb0365c13265635f8b06e38b3d62135cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a08d13ddb0365c13265635f8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 15:53:16 2021 +0300 mshtml: Add stub object for HTMLElement classList. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 143 ++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 11 +++ dlls/mshtml/tests/dom.js | 5 ++ 4 files changed, 157 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 961e4e79e08..5bb3f1eaf15 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6395,6 +6395,142 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_set_current_event }; +struct token_list { + DispatchEx dispex; + IWineDOMTokenList IWineDOMTokenList_iface; + IHTMLElement *element; + + LONG ref; +}; + +static inline struct token_list *impl_from_IWineDOMTokenList(IWineDOMTokenList *iface) +{ + return CONTAINING_RECORD(iface, struct token_list, IWineDOMTokenList_iface); +} + +static HRESULT WINAPI token_list_QueryInterface(IWineDOMTokenList *iface, REFIID riid, void **ppv) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + TRACE("(%p)->(%s %p)\n", token_list, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &token_list->IWineDOMTokenList_iface; + }else if(IsEqualGUID(&IID_IWineDOMTokenList, riid)) { + *ppv = &token_list->IWineDOMTokenList_iface; + }else if(dispex_query_interface(&token_list->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + WARN("(%p)->(%s %p)\n", token_list, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI token_list_AddRef(IWineDOMTokenList *iface) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + LONG ref = InterlockedIncrement(&token_list->ref); + + TRACE("(%p) ref=%d\n", token_list, ref); + + return ref; +} + +static ULONG WINAPI token_list_Release(IWineDOMTokenList *iface) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + LONG ref = InterlockedDecrement(&token_list->ref); + + TRACE("(%p) ref=%d\n", token_list, ref); + + if(!ref) { + IHTMLElement_Release(token_list->element); + release_dispex(&token_list->dispex); + heap_free(token_list); + } + + return ref; +} + +static HRESULT WINAPI token_list_GetTypeInfoCount(IWineDOMTokenList *iface, UINT *pctinfo) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + FIXME("(%p)->(%p)\n", token_list, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI token_list_GetTypeInfo(IWineDOMTokenList *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + return IDispatchEx_GetTypeInfo(&token_list->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI token_list_GetIDsOfNames(IWineDOMTokenList *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + return IDispatchEx_GetIDsOfNames(&token_list->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI token_list_Invoke(IWineDOMTokenList *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + struct token_list *token_list = impl_from_IWineDOMTokenList(iface); + + return IDispatchEx_Invoke(&token_list->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static const IWineDOMTokenListVtbl WineDOMTokenListVtbl = { + token_list_QueryInterface, + token_list_AddRef, + token_list_Release, + token_list_GetTypeInfoCount, + token_list_GetTypeInfo, + token_list_GetIDsOfNames, + token_list_Invoke, +}; + +static const tid_t token_list_iface_tids[] = { + IWineDOMTokenList_tid, + 0 +}; +static dispex_static_data_t token_list_dispex = { + NULL, + IWineDOMTokenList_tid, + token_list_iface_tids +}; + +static HRESULT create_token_list(compat_mode_t compat_mode, IHTMLElement *element, IWineDOMTokenList **ret) +{ + struct token_list *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + if(!obj) + { + ERR("No memory.\n"); + return E_OUTOFMEMORY; + } + + obj->IWineDOMTokenList_iface.lpVtbl = &WineDOMTokenListVtbl; + obj->ref = 1; + init_dispatch(&obj->dispex, (IUnknown*)&obj->IWineDOMTokenList_iface, &token_list_dispex, compat_mode); + IHTMLElement_AddRef(element); + obj->element = element; + + *ret = &obj->IWineDOMTokenList_iface; + return S_OK; +} + static inline HTMLElement *impl_from_IWineHTMLElementPrivateVtbl(IWineHTMLElementPrivate *iface) { return CONTAINING_RECORD(iface, HTMLElement, IWineHTMLElementPrivate_iface); @@ -6459,11 +6595,12 @@ static HRESULT WINAPI htmlelement_private_Invoke(IWineHTMLElementPrivate *iface, static HRESULT WINAPI htmlelement_private_get_classList(IWineHTMLElementPrivate *iface, IDispatch **class_list) { - FIXME("iface %p, class_list %p stub.\n", iface, class_list); + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); - *class_list = NULL; + TRACE("iface %p, class_list %p.\n", iface, class_list); - return S_OK; + return create_token_list(dispex_compat_mode(&This->node.event_target.dispex), &This->IHTMLElement_iface, + (IWineDOMTokenList **)class_list); } static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 56bef40b4d0..c1e7e78253d 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -273,6 +273,7 @@ typedef struct EventTarget EventTarget; XIID(ISVGTextContentElement) #define PRIVATE_TID_LIST \ + XIID(IWineDOMTokenList) \ XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineMSHTMLConsole) diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 9ca7e0d7421..1764b0a8c9d 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -102,4 +102,15 @@ interface IWineHTMLElementPrivate : IDispatch HRESULT classList([retval, out] IDispatch **class_list); } +[ + odl, + oleautomation, + dual, + hidden, + uuid(08ef0edd-5fb8-4178-a2f0-9f686e00441b) +] +interface IWineDOMTokenList : IDispatch +{ +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index a2c70540eba..f54cb0f7088 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -508,3 +508,8 @@ sync_test("hasAttribute", function() { r = elem.hasAttribute("attr"); ok(r === false, "hasAttribute(attr) returned " + r); }); + +sync_test("classList", function() { + var elem = document.createElement("div"); + var classList = elem.classList; +});

1 0

Paul Gofman : mshtml: Add stub for HTMLElement classList property.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: e3263aa01df53008f3299bdc3a8eae53c32968ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3263aa01df53008f3299bdc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 15:53:15 2021 +0300 mshtml: Add stub for HTMLElement classList property. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 88 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/mshtml_private_iface.idl | 13 ++++++ dlls/mshtml/tests/documentmode.js | 1 + 4 files changed, 104 insertions(+) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index b9677ec867a..961e4e79e08 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6065,6 +6065,8 @@ HRESULT HTMLElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) *ppv = &This->IProvideMultipleClassInfo_iface; }else if(IsEqualGUID(&IID_IProvideMultipleClassInfo, riid)) { *ppv = &This->IProvideMultipleClassInfo_iface; + }else if(IsEqualGUID(&IID_IWineHTMLElementPrivate, riid)) { + *ppv = &This->IWineHTMLElementPrivate_iface; }else { return HTMLDOMNode_QI(&This->node, riid, ppv); } @@ -6366,7 +6368,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) } if(mode >= COMPAT_MODE_IE10) + { dispex_info_add_interface(info, IHTMLElement7_tid, NULL); + dispex_info_add_interface(info, IWineHTMLElementPrivate_tid, NULL); + } } static const tid_t HTMLElement_iface_tids[] = { @@ -6390,6 +6395,88 @@ static event_target_vtbl_t HTMLElement_event_target_vtbl = { HTMLElement_set_current_event }; +static inline HTMLElement *impl_from_IWineHTMLElementPrivateVtbl(IWineHTMLElementPrivate *iface) +{ + return CONTAINING_RECORD(iface, HTMLElement, IWineHTMLElementPrivate_iface); +} + +static HRESULT WINAPI htmlelement_private_QueryInterface(IWineHTMLElementPrivate *iface, + REFIID riid, void **ppv) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_QueryInterface(&This->IHTMLElement_iface, riid, ppv); +} + +static ULONG WINAPI htmlelement_private_AddRef(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_AddRef(&This->IHTMLElement_iface); +} + +static ULONG WINAPI htmlelement_private_Release(IWineHTMLElementPrivate *iface) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return IHTMLElement_Release(&This->IHTMLElement_iface); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfoCount(IWineHTMLElementPrivate *iface, UINT *pctinfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfoCount(&This->IHTMLElement_iface, pctinfo); +} + +static HRESULT WINAPI htmlelement_private_GetTypeInfo(IWineHTMLElementPrivate *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetTypeInfo(&This->IHTMLElement_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI htmlelement_private_GetIDsOfNames(IWineHTMLElementPrivate *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_GetIDsOfNames(&This->IHTMLElement_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI htmlelement_private_Invoke(IWineHTMLElementPrivate *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLElement *This = impl_from_IWineHTMLElementPrivateVtbl(iface); + + return HTMLElement_Invoke(&This->IHTMLElement_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI htmlelement_private_get_classList(IWineHTMLElementPrivate *iface, IDispatch **class_list) +{ + FIXME("iface %p, class_list %p stub.\n", iface, class_list); + + *class_list = NULL; + + return S_OK; +} + +static const IWineHTMLElementPrivateVtbl WineHTMLElementPrivateVtbl = { + htmlelement_private_QueryInterface, + htmlelement_private_AddRef, + htmlelement_private_Release, + htmlelement_private_GetTypeInfoCount, + htmlelement_private_GetTypeInfo, + htmlelement_private_GetIDsOfNames, + htmlelement_private_Invoke, + htmlelement_private_get_classList, +}; + static dispex_static_data_t HTMLElement_dispex = { &HTMLElement_event_target_vtbl.dispex_vtbl, DispHTMLUnknownElement_tid, @@ -6409,6 +6496,7 @@ void HTMLElement_Init(HTMLElement *This, HTMLDocumentNode *doc, nsIDOMElement *n This->IElementSelector_iface.lpVtbl = &ElementSelectorVtbl; This->IElementTraversal_iface.lpVtbl = &ElementTraversalVtbl; This->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; + This->IWineHTMLElementPrivate_iface.lpVtbl = &WineHTMLElementPrivateVtbl; if(dispex_data && !dispex_data->vtbl) dispex_data->vtbl = &HTMLElement_event_target_vtbl.dispex_vtbl; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index e2c1f221372..56bef40b4d0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -273,6 +273,7 @@ typedef struct EventTarget EventTarget; XIID(ISVGTextContentElement) #define PRIVATE_TID_LIST \ + XIID(IWineHTMLElementPrivate) \ XIID(IWineHTMLWindowPrivate) \ XIID(IWineMSHTMLConsole) @@ -828,6 +829,7 @@ typedef struct { IElementSelector IElementSelector_iface; IElementTraversal IElementTraversal_iface; IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; + IWineHTMLElementPrivate IWineHTMLElementPrivate_iface; nsIDOMElement *dom_element; /* NULL for legacy comments represented as HTML elements */ nsIDOMHTMLElement *html_element; /* NULL for non-HTML elements (like SVG elements) */ diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index 6c5c5db991f..9ca7e0d7421 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -89,4 +89,17 @@ interface IWineHTMLWindowPrivate : IDispatch HRESULT console([retval, out] IDispatch **console); } +[ + odl, + oleautomation, + dual, + hidden, + uuid(465908fd-f394-489f-b7a3-4c00fbbe9eec) +] +interface IWineHTMLElementPrivate : IDispatch +{ + [propget, id(1)] + HRESULT classList([retval, out] IDispatch **class_list); +} + } /* library MSHTML_private */ diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 859e1fe53db..c20f6ee18df 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -57,6 +57,7 @@ sync_test("elem_props", function() { test_exposed("sheet", v >= 9); test_exposed("readyState", v < 11); test_exposed("styleSheet", v < 11); + test_exposed("classList", v >= 10); }); sync_test("doc_props", function() {

1 0

Francois Gouget : winetest: Create the -d directory if it does not exist already.
by Alexandre Julliard 19 Jul '21

19 Jul '21

Module: wine Branch: master Commit: dc8ef75904c0cace22f75b201c2c9f7c8b0f5cb1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc8ef75904c0cace22f75b20… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Jul 19 15:16:59 2021 +0200 winetest: Create the -d directory if it does not exist already. 'winetest.exe' automatically creates '%TEMP%\wct' (or an alternative new directory). 'winetext.exe -x DIR' automatically creates DIR. 'winetest.exe -d DIR' now automatically creates DIR too. In all cases newly created directories are removed after the tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winetest/main.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 81c7de2a020..fa773e28d4f 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -1024,6 +1024,7 @@ run_tests (char *logname, char *outdir) DWORD strsize; SECURITY_ATTRIBUTES sa; char tmppath[MAX_PATH], tempdir[MAX_PATH+4]; + BOOL newdir; DWORD needed; HMODULE kernel32; @@ -1064,22 +1065,23 @@ run_tests (char *logname, char *outdir) if (logfile == INVALID_HANDLE_VALUE) report (R_FATAL, "Could not open logfile: %u", GetLastError()); - /* try stable path for ZoneAlarm */ - if (!outdir) { + if (outdir) + strcpy( tempdir, outdir); + else + { strcpy( tempdir, tmppath ); - strcat( tempdir, "wct" ); - - if (!CreateDirectoryA( tempdir, NULL )) - { - if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) - report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); - DeleteFileA( tempdir ); - if (!CreateDirectoryA( tempdir, NULL )) - report (R_FATAL, "Could not create directory: %s", tempdir); - } + strcat( tempdir, "wct" ); /* try stable path for ZoneAlarm */ } - else - strcpy( tempdir, outdir); + newdir = CreateDirectoryA( tempdir, NULL ); + if (!newdir && !outdir) + { + if (!GetTempFileNameA( tmppath, "wct", 0, tempdir )) + report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); + DeleteFileA( tempdir ); + newdir = CreateDirectoryA( tempdir, NULL ); + } + if (!newdir && (!outdir || GetLastError() != ERROR_ALREADY_EXISTS)) + report (R_FATAL, "Could not create directory %s (%d)", tempdir, GetLastError()); report (R_DIR, tempdir); @@ -1172,7 +1174,7 @@ run_tests (char *logname, char *outdir) report (R_STATUS, "Cleaning up - %u failures", failures); CloseHandle( logfile ); logfile = 0; - if (!outdir) + if (newdir) remove_dir (tempdir); heap_free(wine_tests); heap_free(curpath);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
73
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 July 2021