December 2021 - Wine-devel - list.winehq.org

[PATCH 1/6] win32u: Fix return types on lock_display_devices failures.
by Jacek Caban 07 Dec '21

07 Dec '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/sysparams.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)

2 1

[PATCH 00/17] Winedbg: enhance integer and float set / get
by Eric Pouech 07 Dec '21

07 Dec '21

With this series: - all expression computations inside WineDbg are done with largest available integer (64bit currently) - improved reading / writing integers (esp. on bit fields or different sizes) - implemented writing floats & doubles (including conversion when needed) - improved detection of incompatible types in assigment - code simplification (removed methods for managing floats and integers) v1 -> v2: - no change to basic types (esp. long) (new internal type int64 has been added) - removed console related patch (some more testing required) there will be another serie after this one that will better integrate debuggee's generated types (but requires a bit of reworking in WineDbg parser that would be too large here) A+ --- Eric Pouech (17): programs/winedbg: don't pretend all dbg_internal_var instances will hold DWORD_PTR programs/winedbg: let savable variables' size be a DWORD programs/winedbg: set pid and tid internal variables' type to be a DWORD programs/winedbg: introduce dbg_lg(u)int_t and migrate all integral computations on this type programs/winedbg: remove methods for fetching/storing integers in CPU backends programs/winedbg: renamed extract_longlong() into extract_lgint() for clarity programs/winedbg: split print_longlong into print_(s|u)decimal (to mimic print_hex) programs/winedbg: revamp dbg_lvalue structure and add helpers for init programs/winedbg: add bitfield capability to dbg_lvalue programs/winedbg: move bitfield extraction to extract_lgint dbghelp: in SymGetTypeInfo(), return the correct basetype for enums programs/winedbg: add helper to compare types and use it to detect wrong assigments programs/winedbg: add helper to transfer memory between lvalues programs/winedbg: correctly store integers into a bitfield programs/winedbg: remove fetch_float() method from CPU backends programs/winedbg: implement proper assignements of floating point numbers programs/winedbg: don't hard code sizes dlls/dbghelp/type.c | 3 +- programs/winedbg/be_arm.c | 82 +++-------- programs/winedbg/be_arm64.c | 118 +++++---------- programs/winedbg/be_cpu.h | 7 - programs/winedbg/be_i386.c | 150 +++++++------------ programs/winedbg/be_x86_64.c | 196 ++++++++++--------------- programs/winedbg/break.c | 4 +- programs/winedbg/dbg.y | 6 +- programs/winedbg/debug.l | 8 +- programs/winedbg/debugger.h | 77 +++++++--- programs/winedbg/expr.c | 82 ++++------- programs/winedbg/memory.c | 192 ++++++++++++++++++++---- programs/winedbg/stack.c | 6 +- programs/winedbg/symbol.c | 21 +-- programs/winedbg/tgt_active.c | 6 +- programs/winedbg/types.c | 268 ++++++++++++++++++++++++++-------- programs/winedbg/winedbg.c | 14 +- 17 files changed, 665 insertions(+), 575 deletions(-)

2 19

[PATCH v2 0/2] Use +threadname channel for both methods of thread renaming.
by Brendan Shanks 07 Dec '21

07 Dec '21

Currently, the two methods of setting thread names in Windows (SetThreadDescription() and the 0x406D1388 exception) log to different channels. I think it would be useful for these to both log to the same +threadname channel. My thinking is that this would be similar to +debugstr, in that all messages are human-readable descriptions which would be useful for debugging crashes. v2: Specify whether thread ID or handle is being renamed. Brendan Shanks (2): kernelbase: Use +threadname channel for SetThreadDescription(). ntdll: Use +threadname channel for thread rename exceptions. dlls/kernelbase/thread.c | 6 +++++- dlls/ntdll/signal_arm.c | 7 ++++++- dlls/ntdll/signal_arm64.c | 7 ++++++- dlls/ntdll/signal_i386.c | 7 ++++++- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 5 files changed, 29 insertions(+), 6 deletions(-) -- 2.30.1 (Apple Git-130)

1 2

[PATCH] ntdll: Add stubs for Rtl*GenericTable*Avl functions
by Infinite Loop 07 Dec '21

07 Dec '21

Those are required to stop Fortnite from crashing during runtime Signed-off-by: Infinite Loop <teardown(a)inbox.ru> --- dlls/ntdll/ntdll.spec | 10 +++--- dlls/ntdll/rtl.c | 49 +++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 10 +++--- include/ddk/ntddk.h | 5 +++ 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 85bc32a..04bd76a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -589,7 +589,7 @@ @ stdcall RtlDeleteCriticalSection(ptr) @ stdcall -arch=arm,arm64,x86_64 RtlDeleteGrowableFunctionTable(ptr) @ stub RtlDeleteElementGenericTable -@ stub RtlDeleteElementGenericTableAvl +@ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) @ cdecl -arch=arm,arm64,x86_64 RtlDeleteFunctionTable(ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @@ -632,7 +632,7 @@ @ stdcall RtlEnterCriticalSection(ptr) @ stub RtlEnumProcessHeaps @ stub RtlEnumerateGenericTable -# @ stub RtlEnumerateGenericTableAvl +@ stdcall RtlEnumerateGenericTableAvl(ptr long) # @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) # @ stub RtlEnumerateGenericTableWithoutSplayingAvl @@ -709,7 +709,7 @@ @ stdcall RtlGetCurrentTransaction() @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stdcall RtlGetElementGenericTable(ptr long) -# @ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetElementGenericTableAvl(ptr long) @ stdcall RtlGetEnabledExtendedFeatures(int64) @ stdcall RtlGetExePath(wstr ptr) @ stdcall RtlGetExtendedContextLength(long ptr) @@ -854,7 +854,7 @@ # @ stub RtlLogStackBackTrace @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -# @ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) @ stdcall RtlMakeSelfRelativeSD(ptr ptr ptr) @ stdcall RtlMapGenericMask(ptr ptr) @@ -875,7 +875,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -# @ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stdcall RtlOemStringToUnicodeSize(ptr) diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c index 11067f4..d1b489b 100644 --- a/dlls/ntdll/rtl.c +++ b/dlls/ntdll/rtl.c @@ -2183,7 +2183,7 @@ BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature ) void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ROUTINE compare, PRTL_AVL_ALLOCATE_ROUTINE allocate, PRTL_AVL_FREE_ROUTINE free, void *context) { - FIXME("%p %p %p %p %p: stub\n", table, compare, allocate, free, context); + FIXME("(%p, %p, %p, %p, %p): stub\n", table, compare, allocate, free, context); } /*********************************************************************** @@ -2191,7 +2191,52 @@ void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ */ void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer, ULONG size, BOOL *element) { - FIXME("%p %p %u %p: stub\n", table, buffer, size, element); + FIXME("(%p, %p, %u, %p): stub\n", table, buffer, size, element); +} + +/*********************************************************************** + * RtlGetElementGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlGetElementGenericTableAvl(PRTL_AVL_TABLE table, ULONG index) +{ + FIXME("(%p, %u): stub\n", table, index); + return NULL; +} + +/*********************************************************************** + * RtlLookupElementGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer) +{ + FIXME("(%p, %p): stub\n", table, buffer); + return NULL; +} + +/*********************************************************************** + * RtlDeleteElementGenericTableAvl (NTDLL.@) + */ +BOOLEAN WINAPI RtlDeleteElementGenericTableAvl(PRTL_AVL_TABLE table, void *buffer) +{ + FIXME("(%p, %p): stub\n", table, buffer); + return FALSE; +} + +/*********************************************************************** + * RtlEnumerateGenericTableAvl (NTDLL.@) + */ +void * WINAPI RtlEnumerateGenericTableAvl(PRTL_AVL_TABLE table, BOOL restart) +{ + FIXME("(%p, %s): stub\n", table, restart ? "TRUE" : "FALSE"); + return NULL; +} + +/*********************************************************************** + * RtlNumberGenericTableElementsAvl (NTDLL.@) + */ +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE table) +{ + FIXME("(%p): stub\n", table); + return 0UL; } /********************************************************************* diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index d445c5a..4683dd3 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -1038,7 +1038,7 @@ @ stdcall RtlDeleteAce(ptr long) @ stdcall RtlDeleteAtomFromAtomTable(ptr long) @ stub RtlDeleteElementGenericTable -@ stub RtlDeleteElementGenericTableAvl +@ stdcall RtlDeleteElementGenericTableAvl(ptr ptr) @ stub RtlDeleteNoSplay @ stub RtlDeleteOwnersRanges @ stub RtlDeleteRange @@ -1054,7 +1054,7 @@ @ stdcall -arch=win32 RtlEnlargedUnsignedDivide(int64 long ptr) @ stdcall -arch=win32 -ret64 RtlEnlargedUnsignedMultiply(long long) @ stub RtlEnumerateGenericTable -@ stub RtlEnumerateGenericTableAvl +@ stdcall RtlEnumerateGenericTableAvl(ptr long) @ stub RtlEnumerateGenericTableLikeADirectory @ stdcall RtlEnumerateGenericTableWithoutSplaying(ptr ptr) @ stub RtlEnumerateGenericTableWithoutSplayingAvl @@ -1099,7 +1099,7 @@ @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr) @ stub RtlGetDefaultCodePage @ stdcall RtlGetElementGenericTable(ptr long) -@ stub RtlGetElementGenericTableAvl +@ stdcall RtlGetElementGenericTableAvl(ptr long) @ stdcall RtlGetExtendedContextLength(long ptr) @ stdcall RtlGetExtendedContextLength2(long ptr int64) @ stub RtlGetFirstRange @@ -1184,7 +1184,7 @@ @ stub RtlLockBootStatusData @ stdcall RtlLookupAtomInAtomTable(ptr wstr ptr) @ stdcall RtlLookupElementGenericTable(ptr ptr) -@ stub RtlLookupElementGenericTableAvl +@ stdcall RtlLookupElementGenericTableAvl(ptr ptr) @ stub RtlLookupElementGenericTableFull @ stub RtlLookupElementGenericTableFullAvl @ stdcall -arch=arm,arm64,x86_64 RtlLookupFunctionEntry(long ptr ptr) @@ -1199,7 +1199,7 @@ @ stdcall RtlNtStatusToDosError(long) @ stdcall RtlNtStatusToDosErrorNoTeb(long) @ stdcall RtlNumberGenericTableElements(ptr) -@ stub RtlNumberGenericTableElementsAvl +@ stdcall RtlNumberGenericTableElementsAvl(ptr) @ stdcall RtlNumberOfClearBits(ptr) @ stdcall RtlNumberOfSetBits(ptr) @ stub RtlOemStringToCountedUnicodeString diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index a6b2974..ba25ffd 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -269,6 +269,11 @@ void * WINAPI RtlGetElementGenericTable(PRTL_GENERIC_TABLE,ULONG); void WINAPI RtlInitializeGenericTable(PRTL_GENERIC_TABLE,PRTL_GENERIC_COMPARE_ROUTINE,PRTL_GENERIC_ALLOCATE_ROUTINE,PRTL_GENERIC_FREE_ROUTINE,void *); void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE,PRTL_AVL_COMPARE_ROUTINE,PRTL_AVL_ALLOCATE_ROUTINE, PRTL_AVL_FREE_ROUTINE,void *); void WINAPI RtlInsertElementGenericTableAvl(PRTL_AVL_TABLE,void *,ULONG,BOOL*); +void * WINAPI RtlGetElementGenericTableAvl(PRTL_AVL_TABLE,ULONG); +void * WINAPI RtlLookupElementGenericTableAvl(PRTL_AVL_TABLE,void *); +BOOLEAN WINAPI RtlDeleteElementGenericTableAvl(PRTL_AVL_TABLE,void *); +void * WINAPI RtlEnumerateGenericTableAvl(PRTL_AVL_TABLE,BOOL); +ULONG WINAPI RtlNumberGenericTableElementsAvl(PRTL_AVL_TABLE); void * WINAPI RtlLookupElementGenericTable(PRTL_GENERIC_TABLE,void *); ULONG WINAPI RtlNumberGenericTableElements(PRTL_GENERIC_TABLE); -- 2.25.1

2 1

[PATCH 0/2] Use +threadname channel for both methods of thread renaming.
by Brendan Shanks 07 Dec '21

07 Dec '21

Currently, the two methods of setting thread names in Windows (SetThreadDescription() and the 0x406D1388 exception) log to different channels. I think it would be useful for these to both log to the same +threadname channel. My thinking is that this would be similar to +debugstr, in that all messages are human-readable descriptions which would be useful for debugging crashes. Brendan Shanks (2): kernelbase: Use +threadname channel for SetThreadDescription(). ntdll: Use +threadname channel for thread rename exceptions. dlls/kernelbase/thread.c | 6 +++++- dlls/ntdll/signal_arm.c | 7 ++++++- dlls/ntdll/signal_arm64.c | 7 ++++++- dlls/ntdll/signal_i386.c | 7 ++++++- dlls/ntdll/signal_x86_64.c | 8 ++++++-- 5 files changed, 29 insertions(+), 6 deletions(-) -- 2.30.1 (Apple Git-130)

2 4

[PATCH v2 1/8] mshtml: Ignore named and extra arguments when invoking builtin functions.
by Gabriel Ivăncescu 07 Dec '21

07 Dec '21

Native just ignores the named and extra arguments completely. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 14 ++-- dlls/mshtml/tests/script.c | 137 +++++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 9f56a56..b7bc751 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -738,12 +738,17 @@ static HRESULT dispex_value(DispatchEx *This, LCID lcid, WORD flags, DISPPARAMS static HRESULT typeinfo_invoke(DispatchEx *This, func_info_t *func, WORD flags, DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei) { - DISPPARAMS params = {dp->rgvarg+dp->cNamedArgs, NULL, dp->cArgs-dp->cNamedArgs, 0}; + DISPPARAMS params = {dp->rgvarg, NULL, dp->cArgs, 0}; ITypeInfo *ti; IUnknown *unk; UINT argerr=0; HRESULT hres; + if(params.cArgs > func->argc) { + params.rgvarg += params.cArgs - func->argc; + params.cArgs = func->argc; + } + hres = get_typeinfo(func->tid, &ti); if(FAILED(hres)) { ERR("Could not get type info: %08x\n", hres); @@ -1170,12 +1175,7 @@ static HRESULT invoke_builtin_function(DispatchEx *This, func_info_t *func, DISP IUnknown *iface; HRESULT hres; - if(dp->cNamedArgs) { - FIXME("Named arguments not supported\n"); - return E_NOTIMPL; - } - - if(dp->cArgs > func->argc || dp->cArgs + func->default_value_cnt < func->argc) { + if(dp->cArgs + func->default_value_cnt < func->argc) { FIXME("Invalid argument count (expected %u, got %u)\n", func->argc, dp->cArgs); return E_INVALIDARG; } diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index a57468a..b667810 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -2170,6 +2170,142 @@ static void test_default_arg_conv(IHTMLWindow2 *window) IDispatchEx_Release(dispex); } +static void test_named_args(IHTMLWindow2 *window) +{ + DISPID named_args[] = { 0, 2, 1, 1337, 0xdeadbeef, DISPID_THIS }; + IHTMLDocument2 *doc; + IDispatchEx *dispex; + IHTMLElement *elem; + VARIANT args[4]; + DISPPARAMS dp; + HRESULT hres; + VARIANT var; + DISPID id; + BSTR bstr; + + hres = IHTMLWindow2_get_document(window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + + bstr = SysAllocString(L"div"); + hres = IHTMLDocument2_createElement(doc, bstr, &elem); + IHTMLDocument2_Release(doc); + SysFreeString(bstr); + ok(hres == S_OK, "createElement failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IDispatchEx, (void**)&dispex); + ok(hres == S_OK, "Could not get IDispatchEx iface: %08x\n", hres); + + bstr = SysAllocString(L"setAttribute"); + hres = IDispatchEx_GetDispID(dispex, bstr, fdexNameCaseSensitive, &id); + SysFreeString(bstr); + + dp.cArgs = 2; + dp.cNamedArgs = 3; + dp.rgvarg = args; + dp.rgdispidNamedArgs = named_args; + V_VT(&args[0]) = VT_BSTR; + V_BSTR(&args[0]) = SysAllocString(L"testattr"); + V_VT(&args[1]) = VT_I4; + V_I4(&args[1]) = 0; + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx returned: %08x\n", hres); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[0]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_NULL, "V_VT(var)=%d\n", V_VT(&var)); + + bstr = SysAllocString(L"0"); + hres = IHTMLElement_getAttribute(elem, bstr, 0, &var); + SysFreeString(bstr); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"testattr"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 3; + V_VT(&args[2]) = VT_BSTR; + V_BSTR(&args[2]) = SysAllocString(L"testval"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + VariantClear(&args[2]); + ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08x\n", hres); + + V_VT(&args[2]) = VT_I4; + V_I4(&args[2]) = 0; + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == DISP_E_TYPEMISMATCH, "InvokeEx returned: %08x\n", hres); + + args[2] = args[0]; + V_VT(&args[1]) = VT_BSTR; + V_BSTR(&args[1]) = SysAllocString(L"testval"); + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 0; + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[1]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[2]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"testval"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 2; + dp.cNamedArgs = 1; + args[1] = args[2]; + V_VT(&args[0]) = VT_BSTR; + V_BSTR(&args[0]) = SysAllocString(L"newValue"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[0]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[1]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"newValue"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 4; + dp.cNamedArgs = ARRAY_SIZE(named_args); + args[3] = args[1]; + V_VT(&args[2]) = VT_BSTR; + V_BSTR(&args[2]) = SysAllocString(L"foobar"); + V_VT(&args[1]) = VT_I4; + V_I4(&args[1]) = 1; + V_VT(&args[0]) = VT_BSTR; + V_BSTR(&args[0]) = SysAllocString(L"extra"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[2]); + VariantClear(&args[0]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[3]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"foobar"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&var); + + dp.cArgs = 4; + dp.cNamedArgs = 1; + named_args[0] = DISPID_THIS; + V_VT(&args[0]) = VT_DISPATCH; + V_DISPATCH(&args[0]) = (IDispatch*)&funcDisp; + V_VT(&args[2]) = VT_BSTR; + V_BSTR(&args[2]) = SysAllocString(L"withThis"); + hres = IDispatchEx_InvokeEx(dispex, id, LOCALE_NEUTRAL, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + ok(hres == S_OK, "InvokeEx failed: %08x\n", hres); + VariantClear(&args[2]); + + hres = IHTMLElement_getAttribute(elem, V_BSTR(&args[3]), 0, &var); + ok(hres == S_OK, "getAttribute failed: %08x\n", hres); + ok(V_VT(&var) == VT_BSTR, "V_VT(var)=%d\n", V_VT(&var)); + ok(!lstrcmpW(V_BSTR(&var), L"withThis"), "V_BSTR(&var) = %s\n", debugstr_w(V_BSTR(&var))); + VariantClear(&args[3]); + VariantClear(&var); + + IHTMLElement_Release(elem); + IDispatchEx_Release(dispex); +} + static void test_ui(void) { IActiveScriptSiteUIControl *ui_control; @@ -2381,6 +2517,7 @@ static void test_script_run(void) test_arg_conv(window); test_default_arg_conv(window); + test_named_args(window); IHTMLWindow2_Release(window); tmp = SysAllocString(L"test"); -- 2.31.1

3 13

[PATCH v2 1/3] ntdll/tests: Add tests for DebugPort* info query with security checks.
by Jinoh Kang 07 Dec '21

07 Dec '21

Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/tests/info.c | 190 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index 6c01ee092d4..4d6104b7502 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -46,6 +46,8 @@ static NTSTATUS (WINAPI * pNtQueryObject)(HANDLE, OBJECT_INFORMATION_CLASS, void static NTSTATUS (WINAPI * pNtCreateDebugObject)( HANDLE *, ACCESS_MASK, OBJECT_ATTRIBUTES *, ULONG ); static NTSTATUS (WINAPI * pNtSetInformationDebugObject)(HANDLE,DEBUGOBJECTINFOCLASS,PVOID,ULONG,ULONG*); static NTSTATUS (WINAPI * pDbgUiConvertStateChangeStructure)(DBGUI_WAIT_STATE_CHANGE*,DEBUG_EVENT*); +static HANDLE (WINAPI * pDbgUiGetThreadDebugObject)(void); +static void (WINAPI * pDbgUiSetThreadDebugObject)(HANDLE); static BOOL is_wow64; @@ -99,6 +101,8 @@ static void InitFunctionPtrs(void) NTDLL_GET_PROC(NtSetInformationDebugObject); NTDLL_GET_PROC(NtGetCurrentProcessorNumber); NTDLL_GET_PROC(DbgUiConvertStateChangeStructure); + NTDLL_GET_PROC(DbgUiGetThreadDebugObject); + NTDLL_GET_PROC(DbgUiSetThreadDebugObject); pIsWow64Process = (void *)GetProcAddress(hkernel32, "IsWow64Process"); if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -2024,6 +2028,146 @@ static void test_query_process_debug_port(int argc, char **argv) ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); } +static void subtest_query_process_debug_port_custom_dacl(int argc, char **argv, ACCESS_MASK access, PSID sid) +{ + HANDLE old_debug_obj, debug_obj; + OBJECT_ATTRIBUTES attr; + SECURITY_DESCRIPTOR sd; + union { + ACL acl; + DWORD buffer[(sizeof(ACL) + + (offsetof(ACCESS_ALLOWED_ACE, SidStart) + SECURITY_MAX_SID_SIZE) + + sizeof(DWORD) - 1) / sizeof(DWORD)]; + } acl; + char cmdline[MAX_PATH]; + PROCESS_INFORMATION pi; + STARTUPINFOA si; + DEBUG_EVENT ev; + NTSTATUS status; + BOOL ret; + + if (!InitializeAcl(&acl.acl, sizeof(acl), ACL_REVISION)) + { + ok(0, "Failed to initialise ACL: %u\n", GetLastError()); + return; + } + + if (!AddAccessAllowedAce(&acl.acl, ACL_REVISION, access, sid)) + { + ok(0, "Failed to add ACE: %u\n", GetLastError()); + return; + } + + if (!InitializeSecurityDescriptor(&sd, SECURITY_DESCRIPTOR_REVISION)) + { + ok(0, "Failed to initialise security descriptor: %u\n", GetLastError()); + return; + } + + if (!SetSecurityDescriptorDacl(&sd, TRUE, &acl.acl, FALSE)) + { + ok(0, "Failed to set DACL: %u\n", GetLastError()); + return; + } + + InitializeObjectAttributes(&attr, NULL, 0, NULL, &sd); + status = NtCreateDebugObject(&debug_obj, MAXIMUM_ALLOWED, &attr, DEBUG_KILL_ON_CLOSE); + ok(SUCCEEDED(status), "Failed to create debug object: %#010x\n", status); + if (!SUCCEEDED(status)) return; + + old_debug_obj = pDbgUiGetThreadDebugObject(); + pDbgUiSetThreadDebugObject(debug_obj); + + sprintf(cmdline, "%s %s %s %u", argv[0], argv[1], "debuggee:dbgport", access); + + memset(&si, 0, sizeof(si)); + si.cb = sizeof(si); + ret = CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, + DEBUG_PROCESS, NULL, NULL, &si, &pi); + ok(ret, "CreateProcess failed, last error %#x.\n", GetLastError()); + if (!ret) goto close_debug_obj; + + do + { + ret = WaitForDebugEvent(&ev, INFINITE); + ok(ret, "WaitForDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + + ret = ContinueDebugEvent(ev.dwProcessId, ev.dwThreadId, DBG_CONTINUE); + ok(ret, "ContinueDebugEvent failed, last error %#x.\n", GetLastError()); + if (!ret) break; + } while (ev.dwDebugEventCode != EXIT_PROCESS_DEBUG_EVENT); + + wait_child_process(pi.hProcess); + ret = CloseHandle(pi.hThread); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + ret = CloseHandle(pi.hProcess); + ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); + +close_debug_obj: + pDbgUiSetThreadDebugObject(old_debug_obj); + NtClose(debug_obj); +} + +static TOKEN_OWNER *get_current_owner(void) +{ + TOKEN_OWNER *owner; + ULONG length = 0; + HANDLE token; + BOOL ret; + + ret = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &token); + ok(ret, "Failed to get process token: %u\n", GetLastError()); + + ret = GetTokenInformation(token, TokenOwner, NULL, 0, &length); + ok(!ret && GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "GetTokenInformation failed: %u\n", GetLastError()); + ok(length != 0, "Failed to get token owner information length: %u\n", GetLastError()); + + owner = HeapAlloc(GetProcessHeap(), 0, length); + ret = GetTokenInformation(token, TokenOwner, owner, length, &length); + ok(ret, "Failed to get token owner information: %u)\n", GetLastError()); + + CloseHandle(token); + return owner; +} + +static void test_query_process_debug_port_custom_dacl(int argc, char **argv) +{ + static const ACCESS_MASK all_access_masks[] = { + GENERIC_ALL, + DEBUG_ALL_ACCESS, + STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE, + }; + TOKEN_OWNER *owner; + int i; + + if (!pDbgUiSetThreadDebugObject) + { + skip("DbgUiGetThreadDebugObject not found\n"); + return; + } + + if (!pDbgUiGetThreadDebugObject) + { + skip("DbgUiSetThreadDebugObject not found\n"); + return; + } + + owner = get_current_owner(); + + for (i = 0; i < ARRAY_SIZE(all_access_masks); i++) + { + ACCESS_MASK access = all_access_masks[i]; + + winetest_push_context("debug object access %08x", access); + subtest_query_process_debug_port_custom_dacl(argc, argv, access, owner->Owner); + winetest_pop_context(); + } + + HeapFree(GetProcessHeap(), 0, owner); +} + static void test_query_process_priority(void) { PROCESS_PRIORITY_CLASS priority[2]; @@ -3371,6 +3515,45 @@ static void test_process_instrumentation_callback(void) "Got unexpected status %#x.\n", status ); } +static void test_debuggee_dbgport(int argc, char **argv) +{ + NTSTATUS status, expect_status; + DWORD_PTR debug_port = 0xdeadbeef; + DWORD debug_flags = 0xdeadbeef; + HANDLE handle; + ACCESS_MASK access; + + if (argc < 2) + { + ok(0, "insufficient arguments for child process\n"); + return; + } + + access = strtoul(argv[1], NULL, 0); + winetest_push_context("debug object access %08x", access); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugPort, + &debug_port, sizeof(debug_port), NULL ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( !status, "NtQueryInformationProcess ProcessDebugPort failed, status %#x.\n", status ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( debug_port == ~(DWORD_PTR)0, "Expected port %#lx, got %#lx.\n", ~(DWORD_PTR)0, debug_port ); + + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugFlags, + &debug_flags, sizeof(debug_flags), NULL ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( !status, "NtQueryInformationProcess ProcessDebugFlags failed, status %#x.\n", status ); + + expect_status = access ? STATUS_SUCCESS : STATUS_ACCESS_DENIED; + status = pNtQueryInformationProcess( GetCurrentProcess(), ProcessDebugObjectHandle, + &handle, sizeof(handle), NULL ); + todo_wine_if(access != DEBUG_ALL_ACCESS && access != GENERIC_ALL) + ok( status == expect_status, "NtQueryInformationProcess ProcessDebugObjectHandle expected status %#x, actual %#x.\n", expect_status, status ); + if (SUCCEEDED( status )) NtClose( handle ); + + winetest_pop_context(); +} + START_TEST(info) { char **argv; @@ -3379,7 +3562,11 @@ START_TEST(info) InitFunctionPtrs(); argc = winetest_get_mainargs(&argv); - if (argc >= 3) return; /* Child */ + if (argc >= 3) + { + if (strcmp(argv[2], "debuggee:dbgport") == 0) test_debuggee_dbgport(argc - 2, argv + 2); + return; /* Child */ + } /* NtQuerySystemInformation */ test_query_basic(); @@ -3413,6 +3600,7 @@ START_TEST(info) test_query_process_vm(); test_query_process_times(); test_query_process_debug_port(argc, argv); + test_query_process_debug_port_custom_dacl(argc, argv); test_query_process_priority(); test_query_process_handlecount(); test_query_process_wow64(); -- 2.31.1

1 2

[PATCH 1/5] dwrite: Add flag for cached advance presence.
by Nikolay Sivov 07 Dec '21

07 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index f6ac43e65ac..76abedde770 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -66,6 +66,7 @@ struct cache_entry struct cache_key key; float advance; unsigned int has_contours : 1; + unsigned int has_advance : 1; }; static struct cache_entry * fontface_get_cache_entry(struct dwrite_fontface *fontface, const struct cache_key *key) @@ -97,9 +98,6 @@ static float fontface_get_glyph_advance(struct dwrite_fontface *fontface, float { if (!(entry = calloc(1, sizeof(*entry)))) return 0.0f; - - entry->advance = font_funcs->get_glyph_advance(fontface->get_font_object(fontface), fontsize, glyph, mode, &value); - entry->has_contours = !!value; entry->key = key; size = fontface_get_cache_entry_size(entry); @@ -123,6 +121,13 @@ static float fontface_get_glyph_advance(struct dwrite_fontface *fontface, float fontface->cache.size += size; } + if (!entry->has_advance) + { + entry->advance = font_funcs->get_glyph_advance(fontface->get_font_object(fontface), fontsize, glyph, mode, &value); + entry->has_contours = !!value; + entry->has_advance = 1; + } + *has_contours = entry->has_contours; return entry->advance; } -- 2.33.0

1 4

[PATCH v2 1/2] gdi32/tests: Add tests for replacement font properties.
by Akihiro Sagawa 07 Dec '21

07 Dec '21

In v2, add tests. These tests are only for Wine. They define replacement font behaviors, which are comparable to a normal font ones, and will prevent regressions in the future. At this point, replacement definitions are used in the font selection in NtGdiSelectFont(), enumeration and lfFaceName in EnumFonts() family. The following patches expands the usage to GetTextFace() and otmpFamilyName in GetOutlineTextMetrics(). Replacement font feature expansion helps to avoid copyright and license issues regarding missing MS fonts, e.g. MS Gothic and Segoe UI. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 115 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)

2 2

[PATCH] kernel32/tests: Check that the preferred UI languages are in uppercase.
by Francois Gouget 07 Dec '21

07 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/tests/locale.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 94c9ce3ad1b..f529b11a1a7 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5219,7 +5219,7 @@ static void test_GetSystemPreferredUILanguages(void) { BOOL ret; NTSTATUS status; - ULONG count, size, size_id, size_name, size_buffer; + ULONG i, count, size, size_id, size_name, size_buffer; WCHAR *buffer; if (!pGetSystemPreferredUILanguages) @@ -5347,6 +5347,10 @@ static void test_GetSystemPreferredUILanguages(void) ok(!buffer[size -2] && !buffer[size -1], "Expected last two WCHARs being empty, got 0x%x 0x%x\n", buffer[size -2], buffer[size -1]); + for (i = 0; buffer[i]; i++) + ok(('0' <= buffer[i] && buffer[i] <= '9') || + ('A' <= buffer[i] && buffer[i] <= 'F'), + "MUI_LANGUAGE_ID [%d] is bad in %s\n", i, wine_dbgstr_w(buffer)); count = 0; size = size_buffer; -- 2.30.2

2 1