July 2021 - Wine-Commits - list.winehq.org

Zebediah Figura : quartz: Free outstanding advise requests when destroying a system clock.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 4e74fdcebeaf7a98ef72194fdd27ce5db85d2bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e74fdcebeaf7a98ef72194f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 19 22:25:27 2021 -0500 quartz: Free outstanding advise requests when destroying a system clock. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/systemclock.c | 8 ++++++++ dlls/quartz/tests/systemclock.c | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 597373a4112..73a923a7b99 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -90,6 +90,7 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) { struct system_clock *clock = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&clock->refcount); + struct advise_sink *sink, *cursor; TRACE("%p decreasing refcount to %u.\n", clock, refcount); @@ -104,6 +105,13 @@ static ULONG WINAPI system_clock_inner_Release(IUnknown *iface) WaitForSingleObject(clock->thread, INFINITE); CloseHandle(clock->thread); } + + LIST_FOR_EACH_ENTRY_SAFE(sink, cursor, &clock->sinks, struct advise_sink, entry) + { + list_remove(&sink->entry); + heap_free(sink); + } + clock->cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&clock->cs); heap_free(clock); diff --git a/dlls/quartz/tests/systemclock.c b/dlls/quartz/tests/systemclock.c index fa9464429f0..be5472ed6e1 100644 --- a/dlls/quartz/tests/systemclock.c +++ b/dlls/quartz/tests/systemclock.c @@ -272,11 +272,19 @@ static void test_advise(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(WaitForSingleObject(semaphore, 200) == WAIT_TIMEOUT, "Semaphore should not be signaled.\n"); - CloseHandle(event); - CloseHandle(semaphore); + ResetEvent(event); + hr = IReferenceClock_GetTime(clock, &current); + ok(SUCCEEDED(hr), "Got hr %#x.\n", hr); + hr = IReferenceClock_AdviseTime(clock, current, 500 * 10000, (HEVENT)event, &cookie); + ok(hr == S_OK, "Got hr %#x.\n", hr); ref = IReferenceClock_Release(clock); ok(!ref, "Got outstanding refcount %d.\n", ref); + + ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + CloseHandle(event); + CloseHandle(semaphore); } START_TEST(systemclock)

1 0

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

July 20, 2021

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

Huw Davies : nsiproxy: Implement IP unicast enumerate_all.
by Alexandre Julliard July 20, 2021

July 20, 2021

Module: wine Branch: master Commit: 0978421102910d7a7443f9f57ea0bfe3c882270e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0978421102910d7a7443f9f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jul 20 08:43:24 2021 +0100 nsiproxy: Implement IP unicast enumerate_all. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/tests/nsi.c | 72 +++++++++++ dlls/nsiproxy.sys/Makefile.in | 1 + dlls/nsiproxy.sys/ip.c | 223 +++++++++++++++++++++++++++++++++++ dlls/nsiproxy.sys/ndis.c | 21 ++++ dlls/nsiproxy.sys/nsi.c | 2 + dlls/nsiproxy.sys/nsiproxy_private.h | 4 + include/netioapi.h | 1 + include/wine/nsi.h | 39 ++++++ 8 files changed, 363 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0978421102910d7a7443…

1 0

Zebediah Figura : quartz: Use a condition variable to wake up the system clock advise thread.
by Alexandre Julliard July 20, 2021

July 20, 2021

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

Paul Gofman : mshtml: Implement IWineDOMTokenList_remove() method.
by Alexandre Julliard July 19, 2021

July 19, 2021

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 July 19, 2021

July 19, 2021

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 July 19, 2021

July 19, 2021

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 July 19, 2021

July 19, 2021

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

Esdras Tarsis : api-ms-win-core-kernel32-legacy-l1-1-5: Add stub dll.
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 3515da1b823feb014f599c1ce8d47ffd4b05bbdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3515da1b823feb014f599c1c… Author: Esdras Tarsis <esdrastarsis(a)gmail.com> Date: Fri Jul 16 05:23:47 2021 -0300 api-ms-win-core-kernel32-legacy-l1-1-5: Add stub dll. Signed-off-by: Esdras Tarsis <esdrastarsis(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in | 1 + .../api-ms-win-core-kernel32-legacy-l1-1-5.spec | 2 ++ tools/make_specfiles | 1 + 5 files changed, 7 insertions(+) diff --git a/configure b/configure index bf5c5b71992..3ddf6959a9e 100755 --- a/configure +++ b/configure @@ -975,6 +975,7 @@ enable_api_ms_win_core_job_l2_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 enable_api_ms_win_core_kernel32_legacy_l1_1_1 enable_api_ms_win_core_kernel32_legacy_l1_1_2 +enable_api_ms_win_core_kernel32_legacy_l1_1_5 enable_api_ms_win_core_kernel32_private_l1_1_1 enable_api_ms_win_core_largeinteger_l1_1_0 enable_api_ms_win_core_libraryloader_l1_1_0 @@ -20125,6 +20126,7 @@ wine_fn_config_makefile dlls/api-ms-win-core-job-l2-1-0 enable_api_ms_win_core_j wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-0 enable_api_ms_win_core_kernel32_legacy_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-1 enable_api_ms_win_core_kernel32_legacy_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-2 enable_api_ms_win_core_kernel32_legacy_l1_1_2 +wine_fn_config_makefile dlls/api-ms-win-core-kernel32-legacy-l1-1-5 enable_api_ms_win_core_kernel32_legacy_l1_1_5 wine_fn_config_makefile dlls/api-ms-win-core-kernel32-private-l1-1-1 enable_api_ms_win_core_kernel32_private_l1_1_1 wine_fn_config_makefile dlls/api-ms-win-core-largeinteger-l1-1-0 enable_api_ms_win_core_largeinteger_l1_1_0 wine_fn_config_makefile dlls/api-ms-win-core-libraryloader-l1-1-0 enable_api_ms_win_core_libraryloader_l1_1_0 diff --git a/configure.ac b/configure.ac index 084990c0cd6..b5d3217f2a0 100644 --- a/configure.ac +++ b/configure.ac @@ -2795,6 +2795,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-job-l2-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-2) +WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-legacy-l1-1-5) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-kernel32-private-l1-1-1) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-largeinteger-l1-1-0) WINE_CONFIG_MAKEFILE(dlls/api-ms-win-core-libraryloader-l1-1-0) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in new file mode 100644 index 00000000000..3bfa42e968e --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-kernel32-legacy-l1-1-5.dll diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/api-ms-win-core-kernel32-legacy-l1-1-5.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/api-ms-win-core-kernel32-legacy-l1-1-5.spec new file mode 100644 index 00000000000..868a457cb79 --- /dev/null +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-5/api-ms-win-core-kernel32-legacy-l1-1-5.spec @@ -0,0 +1,2 @@ +@ stdcall GetDllDirectoryW(long ptr) kernel32.GetDllDirectoryW +@ stdcall SetThreadExecutionState(long) kernel32.SetThreadExecutionState diff --git a/tools/make_specfiles b/tools/make_specfiles index 50d848b4ce8..44abb58b0a8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -254,6 +254,7 @@ my @dll_groups = "api-ms-win-core-kernel32-legacy-l1-1-0", "api-ms-win-core-kernel32-legacy-l1-1-1", "api-ms-win-core-kernel32-legacy-l1-1-2", + "api-ms-win-core-kernel32-legacy-l1-1-5", "api-ms-win-core-kernel32-private-l1-1-1", "api-ms-win-core-largeinteger-l1-1-0", "api-ms-win-core-libraryloader-l1-2-1",

1 0

Paul Gofman : ntdll: Add stub for ProcessInstrumentationCallback info class in NtSetInformationProcess().
by Alexandre Julliard July 19, 2021

July 19, 2021

Module: wine Branch: master Commit: 20fff538c49c87abffd583f6b63371592ebdd835 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20fff538c49c87abffd583f6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jul 19 15:16:29 2021 +0300 ntdll: Add stub for ProcessInstrumentationCallback info class in NtSetInformationProcess(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/unix/process.c | 11 +++++++++++ include/winternl.h | 7 +++++++ 3 files changed, 45 insertions(+) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 85e27e92663..a00cb5a6a5b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -3256,6 +3256,32 @@ static void test_debug_object(void) ok( event.u.LoadDll.fUnicode == TRUE, "event not updated %x\n", event.u.LoadDll.fUnicode ); } +static void test_process_instrumentation_callback(void) +{ + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION info; + NTSTATUS status; + + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, NULL, 0 ); + ok( status == STATUS_INFO_LENGTH_MISMATCH /* Win10 */ || status == STATUS_INVALID_INFO_CLASS + || status == STATUS_NOT_SUPPORTED, "Got unexpected status %#x.\n", status ); + if (status != STATUS_INFO_LENGTH_MISMATCH) + { + win_skip( "ProcessInstrumentationCallback is not supported.\n" ); + return; + } + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, sizeof(info) ); + ok( status == STATUS_SUCCESS /* Win 10 */ || broken( status == STATUS_PRIVILEGE_NOT_HELD ) + || broken( status == STATUS_INFO_LENGTH_MISMATCH ), "Got unexpected status %#x.\n", status ); + + memset(&info, 0, sizeof(info)); + status = NtSetInformationProcess( GetCurrentProcess(), ProcessInstrumentationCallback, &info, 2 * sizeof(info) ); + ok( status == STATUS_SUCCESS || status == STATUS_INFO_LENGTH_MISMATCH + || broken( status == STATUS_PRIVILEGE_NOT_HELD ) /* some versions and machines before Win10 */, + "Got unexpected status %#x.\n", status ); +} + START_TEST(info) { char **argv; @@ -3322,4 +3348,5 @@ START_TEST(info) test_NtGetCurrentProcessorNumber(); test_ThreadEnableAlignmentFaultFixup(); + test_process_instrumentation_callback(); } diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 77fb81fe404..2cd91974462 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1485,6 +1485,17 @@ NTSTATUS WINAPI NtSetInformationProcess( HANDLE handle, PROCESSINFOCLASS class, } break; + case ProcessInstrumentationCallback: + { + PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION *instr = info; + + FIXME( "ProcessInstrumentationCallback stub.\n" ); + + if (size < sizeof(*instr)) return STATUS_INFO_LENGTH_MISMATCH; + ret = STATUS_SUCCESS; + break; + } + case ProcessThreadStackAllocation: { void *addr = NULL; diff --git a/include/winternl.h b/include/winternl.h index c632328b322..09804a21571 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1472,6 +1472,13 @@ typedef struct _FILE_IO_COMPLETION_NOTIFICATION_INFORMATION { #define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 #define FILE_SKIP_SET_USER_EVENT_ON_FAST_IO 0x4 +typedef struct _PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION +{ + ULONG Version; + ULONG Reserved; + VOID *Callback; +} PROCESS_INSTRUMENTATION_CALLBACK_INFORMATION, *PPROCESS_INSTRUMENTATION_CALLBACK_INFORMATION; + typedef enum _FSINFOCLASS { FileFsVolumeInformation = 1, FileFsLabelInformation,

1 0