- wine-devel - winehq.org

[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

[PATCH] kernel32: Store the ILANGUAGE values in uppercase.
by Francois Gouget 07 Dec '21

07 Dec '21

Some APIs (e.g. GetSystemPreferredUILanguages()) return them as a string so the case should match the one used by Windows in case developers used case sensitive string comparisons (e.g. as in advapi32:lsa) Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/kernel32/nls/are.nls | 4 ++-- dlls/kernel32/nls/arh.nls | 4 ++-- dlls/kernel32/nls/arj.nls | 4 ++-- dlls/kernel32/nls/art.nls | 4 ++-- dlls/kernel32/nls/ast.nls | 4 ++-- dlls/kernel32/nls/aze.nls | 4 ++-- dlls/kernel32/nls/azl.nls | 2 +- dlls/kernel32/nls/dea.nls | 4 ++-- dlls/kernel32/nls/ena.nls | 4 ++-- dlls/kernel32/nls/enb.nls | 2 +- dlls/kernel32/nls/ens.nls | 4 ++-- dlls/kernel32/nls/ent.nls | 4 ++-- dlls/kernel32/nls/eox.nls | 4 ++-- dlls/kernel32/nls/esa.nls | 4 ++-- dlls/kernel32/nls/esb.nls | 4 ++-- dlls/kernel32/nls/esc.nls | 4 ++-- dlls/kernel32/nls/esd.nls | 4 ++-- dlls/kernel32/nls/ese.nls | 4 ++-- dlls/kernel32/nls/esf.nls | 4 ++-- dlls/kernel32/nls/esg.nls | 4 ++-- dlls/kernel32/nls/esh.nls | 4 ++-- dlls/kernel32/nls/esi.nls | 4 ++-- dlls/kernel32/nls/esl.nls | 4 ++-- dlls/kernel32/nls/esm.nls | 4 ++-- dlls/kernel32/nls/esn.nls | 4 ++-- dlls/kernel32/nls/eso.nls | 4 ++-- dlls/kernel32/nls/esp.nls | 4 ++-- dlls/kernel32/nls/esr.nls | 4 ++-- dlls/kernel32/nls/ess.nls | 4 ++-- dlls/kernel32/nls/esu.nls | 4 ++-- dlls/kernel32/nls/esv.nls | 4 ++-- dlls/kernel32/nls/esy.nls | 4 ++-- dlls/kernel32/nls/esz.nls | 4 ++-- dlls/kernel32/nls/euq.nls | 4 ++-- dlls/kernel32/nls/fin.nls | 4 ++-- dlls/kernel32/nls/fra.nls | 4 ++-- dlls/kernel32/nls/frb.nls | 4 ++-- dlls/kernel32/nls/frc.nls | 4 ++-- dlls/kernel32/nls/frl.nls | 4 ++-- dlls/kernel32/nls/frm.nls | 4 ++-- dlls/kernel32/nls/frs.nls | 4 ++-- dlls/kernel32/nls/gae.nls | 4 ++-- dlls/kernel32/nls/glc.nls | 2 +- dlls/kernel32/nls/heb.nls | 4 ++-- dlls/kernel32/nls/hrv.nls | 4 ++-- dlls/kernel32/nls/hun.nls | 4 ++-- dlls/kernel32/nls/hye.nls | 4 ++-- dlls/kernel32/nls/isl.nls | 4 ++-- dlls/kernel32/nls/kan.nls | 4 ++-- dlls/kernel32/nls/kkz.nls | 4 ++-- dlls/kernel32/nls/mar.nls | 4 ++-- dlls/kernel32/nls/mki.nls | 4 ++-- dlls/kernel32/nls/msb.nls | 4 ++-- dlls/kernel32/nls/msl.nls | 4 ++-- dlls/kernel32/nls/nls.nls | 2 +- dlls/kernel32/nls/san.nls | 4 ++-- dlls/kernel32/nls/sky.nls | 4 ++-- dlls/kernel32/nls/sqi.nls | 4 ++-- dlls/kernel32/nls/srb.nls | 4 ++-- dlls/kernel32/nls/srl.nls | 4 ++-- dlls/kernel32/nls/srm.nls | 4 ++-- dlls/kernel32/nls/sve.nls | 4 ++-- dlls/kernel32/nls/svf.nls | 4 ++-- dlls/kernel32/nls/syr.nls | 4 ++-- dlls/kernel32/nls/tel.nls | 4 ++-- dlls/kernel32/nls/tha.nls | 4 ++-- dlls/kernel32/nls/trk.nls | 4 ++-- dlls/kernel32/nls/vit.nls | 4 ++-- dlls/kernel32/nls/zhh.nls | 4 ++-- 69 files changed, 134 insertions(+), 134 deletions(-) diff --git a/dlls/kernel32/nls/are.nls b/dlls/kernel32/nls/are.nls index b044d3299b4..6a2d49c2a84 100644 --- a/dlls/kernel32/nls/are.nls +++ b/dlls/kernel32/nls/are.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "20" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "0c01" + LOCALE_IDEFAULTLANGUAGE "0C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_EGYPT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "67" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "0c01" + LOCALE_ILANGUAGE "0C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/arh.nls b/dlls/kernel32/nls/arh.nls index ce2fe000d43..e0936e04df9 100644 --- a/dlls/kernel32/nls/arh.nls +++ b/dlls/kernel32/nls/arh.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "973" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "3c01" + LOCALE_IDEFAULTLANGUAGE "3C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_BAHRAIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "17" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "3c01" + LOCALE_ILANGUAGE "3C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/arj.nls b/dlls/kernel32/nls/arj.nls index fc4f15c509f..b8eca8144f3 100644 --- a/dlls/kernel32/nls/arj.nls +++ b/dlls/kernel32/nls/arj.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "962" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "2c01" + LOCALE_IDEFAULTLANGUAGE "2C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_JORDAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "126" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "2c01" + LOCALE_ILANGUAGE "2C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/art.nls b/dlls/kernel32/nls/art.nls index 55e34ac77f1..119db3295fd 100644 --- a/dlls/kernel32/nls/art.nls +++ b/dlls/kernel32/nls/art.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_IDEFAULTCODEPAGE "720" LOCALE_IDEFAULTCOUNTRY "216" LOCALE_IDEFAULTEBCDICCODEPAGE "20420" - LOCALE_IDEFAULTLANGUAGE "1c01" + LOCALE_IDEFAULTLANGUAGE "1C01" LOCALE_IDEFAULTMACCODEPAGE "10004" LOCALE_IDIGITS "3" LOCALE_IDIGITSUBSTITUTION "0" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARABIC, SUBLANG_ARABIC_TUNISIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "234" LOCALE_IINTLCURRDIGITS "3" - LOCALE_ILANGUAGE "1c01" + LOCALE_ILANGUAGE "1C01" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ast.nls b/dlls/kernel32/nls/ast.nls index 4a6a77aa721..5e63f4565b7 100644 --- a/dlls/kernel32/nls/ast.nls +++ b/dlls/kernel32/nls/ast.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTLANGUAGE "040A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ASTURIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "04a5" + LOCALE_ILANGUAGE "04A5" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/aze.nls b/dlls/kernel32/nls/aze.nls index e2860d088f0..9dfe7e41898 100644 --- a/dlls/kernel32/nls/aze.nls +++ b/dlls/kernel32/nls/aze.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_IDEFAULTCODEPAGE "866" LOCALE_IDEFAULTCOUNTRY "994" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "082c" + LOCALE_IDEFAULTLANGUAGE "082C" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_CYRILLIC LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "5" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "082c" + LOCALE_ILANGUAGE "082C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/azl.nls b/dlls/kernel32/nls/azl.nls index 86d49a6b5fc..d7aab6220a9 100644 --- a/dlls/kernel32/nls/azl.nls +++ b/dlls/kernel32/nls/azl.nls @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_AZERI, SUBLANG_AZERI_LATIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "5" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042c" + LOCALE_ILANGUAGE "042C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/dea.nls b/dlls/kernel32/nls/dea.nls index f97ae8ebe3e..3b9491728b8 100644 --- a/dlls/kernel32/nls/dea.nls +++ b/dlls/kernel32/nls/dea.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "43" LOCALE_IDEFAULTEBCDICCODEPAGE "20273" - LOCALE_IDEFAULTLANGUAGE "0c07" + LOCALE_IDEFAULTLANGUAGE "0C07" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_AUSTRIAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "14" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c07" + LOCALE_ILANGUAGE "0C07" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ena.nls b/dlls/kernel32/nls/ena.nls index f34a20b96d2..45f5486f378 100644 --- a/dlls/kernel32/nls/ena.nls +++ b/dlls/kernel32/nls/ena.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "61" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "0c09" + LOCALE_IDEFAULTLANGUAGE "0C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "12" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c09" + LOCALE_ILANGUAGE "0C09" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/enb.nls b/dlls/kernel32/nls/enb.nls index 8b09c536c23..8a765940a69 100644 --- a/dlls/kernel32/nls/enb.nls +++ b/dlls/kernel32/nls/enb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_CARIBBEAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "2c09" + LOCALE_IDEFAULTLANGUAGE "2C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" diff --git a/dlls/kernel32/nls/ens.nls b/dlls/kernel32/nls/ens.nls index ee2403196f2..44a8a5062c5 100644 --- a/dlls/kernel32/nls/ens.nls +++ b/dlls/kernel32/nls/ens.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA LOCALE_IDEFAULTCODEPAGE "437" LOCALE_IDEFAULTCOUNTRY "27" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "1c09" + LOCALE_IDEFAULTLANGUAGE "1C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_SOUTH_AFRICA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "209" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "1c09" + LOCALE_ILANGUAGE "1C09" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ent.nls b/dlls/kernel32/nls/ent.nls index 48bfb26b15c..5d733185b93 100644 --- a/dlls/kernel32/nls/ent.nls +++ b/dlls/kernel32/nls/ent.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "2c09" + LOCALE_IDEFAULTLANGUAGE "2C09" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_TRINIDAD LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "225" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "2c09" + LOCALE_ILANGUAGE "2C09" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/eox.nls b/dlls/kernel32/nls/eox.nls index bbd617eac48..d5928f75c92 100644 --- a/dlls/kernel32/nls/eox.nls +++ b/dlls/kernel32/nls/eox.nls @@ -50,7 +50,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "048f" + LOCALE_IDEFAULTLANGUAGE "048F" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -58,7 +58,7 @@ STRINGTABLE LANGUAGE LANG_ESPERANTO, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "39070" /* World */ LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "048f" + LOCALE_ILANGUAGE "048F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esa.nls b/dlls/kernel32/nls/esa.nls index a311d796eb7..f7b4a4dd1bc 100644 --- a/dlls/kernel32/nls/esa.nls +++ b/dlls/kernel32/nls/esa.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "507" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "180a" + LOCALE_IDEFAULTLANGUAGE "180A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PANAMA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "192" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "180a" + LOCALE_ILANGUAGE "180A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esb.nls b/dlls/kernel32/nls/esb.nls index ce95402300d..972577620bf 100644 --- a/dlls/kernel32/nls/esb.nls +++ b/dlls/kernel32/nls/esb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "591" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "400a" + LOCALE_IDEFAULTLANGUAGE "400A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_BOLIVIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "26" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "400a" + LOCALE_ILANGUAGE "400A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esc.nls b/dlls/kernel32/nls/esc.nls index 60ed24e7067..78b567aad50 100644 --- a/dlls/kernel32/nls/esc.nls +++ b/dlls/kernel32/nls/esc.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "506" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "140a" + LOCALE_IDEFAULTLANGUAGE "140A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COSTA_RICA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "54" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "140a" + LOCALE_ILANGUAGE "140A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esd.nls b/dlls/kernel32/nls/esd.nls index 93b6bb0005b..758fd8f3602 100644 --- a/dlls/kernel32/nls/esd.nls +++ b/dlls/kernel32/nls/esd.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "1c0a" + LOCALE_IDEFAULTLANGUAGE "1C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_DOMINICAN_REPUBLIC LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "65" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "1c0a" + LOCALE_ILANGUAGE "1C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ese.nls b/dlls/kernel32/nls/ese.nls index a68c027440b..4dab3cae0fd 100644 --- a/dlls/kernel32/nls/ese.nls +++ b/dlls/kernel32/nls/ese.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "503" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "440a" + LOCALE_IDEFAULTLANGUAGE "440A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_EL_SALVADOR LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "72" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "440a" + LOCALE_ILANGUAGE "440A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esf.nls b/dlls/kernel32/nls/esf.nls index 65f47d73a20..11285da4379 100644 --- a/dlls/kernel32/nls/esf.nls +++ b/dlls/kernel32/nls/esf.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "593" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "300a" + LOCALE_IDEFAULTLANGUAGE "300A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ECUADOR LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "66" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "300a" + LOCALE_ILANGUAGE "300A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esg.nls b/dlls/kernel32/nls/esg.nls index a9c9a8a8603..44638b1380e 100644 --- a/dlls/kernel32/nls/esg.nls +++ b/dlls/kernel32/nls/esg.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "502" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "100a" + LOCALE_IDEFAULTLANGUAGE "100A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_GUATEMALA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "99" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "100a" + LOCALE_ILANGUAGE "100A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esh.nls b/dlls/kernel32/nls/esh.nls index 5593836b44b..3f2352a5131 100644 --- a/dlls/kernel32/nls/esh.nls +++ b/dlls/kernel32/nls/esh.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "504" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "480a" + LOCALE_IDEFAULTLANGUAGE "480A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_HONDURAS LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "106" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "480a" + LOCALE_ILANGUAGE "480A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esi.nls b/dlls/kernel32/nls/esi.nls index ac4bdb79d0f..53c5f7d3922 100644 --- a/dlls/kernel32/nls/esi.nls +++ b/dlls/kernel32/nls/esi.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "505" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "4c0a" + LOCALE_IDEFAULTLANGUAGE "4C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_NICARAGUA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "182" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "4c0a" + LOCALE_ILANGUAGE "4C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esl.nls b/dlls/kernel32/nls/esl.nls index 57f35643b62..279adc473a0 100644 --- a/dlls/kernel32/nls/esl.nls +++ b/dlls/kernel32/nls/esl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "56" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "340a" + LOCALE_IDEFAULTLANGUAGE "340A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_CHILE LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "46" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "340a" + LOCALE_ILANGUAGE "340A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esm.nls b/dlls/kernel32/nls/esm.nls index 8c404f1733b..26ac3fd7b13 100644 --- a/dlls/kernel32/nls/esm.nls +++ b/dlls/kernel32/nls/esm.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "52" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "080a" + LOCALE_IDEFAULTLANGUAGE "080A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MEXICAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "166" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "080a" + LOCALE_ILANGUAGE "080A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esn.nls b/dlls/kernel32/nls/esn.nls index 0cb88fa3666..c73a392aa80 100644 --- a/dlls/kernel32/nls/esn.nls +++ b/dlls/kernel32/nls/esn.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "0c0a" + LOCALE_IDEFAULTLANGUAGE "0C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_MODERN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c0a" + LOCALE_ILANGUAGE "0C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/eso.nls b/dlls/kernel32/nls/eso.nls index 9f7131066a5..bdb17378541 100644 --- a/dlls/kernel32/nls/eso.nls +++ b/dlls/kernel32/nls/eso.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "57" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "240a" + LOCALE_IDEFAULTLANGUAGE "240A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_COLOMBIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "51" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "240a" + LOCALE_ILANGUAGE "240A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esp.nls b/dlls/kernel32/nls/esp.nls index a557a52b7d4..72849314ed0 100644 --- a/dlls/kernel32/nls/esp.nls +++ b/dlls/kernel32/nls/esp.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTLANGUAGE "040A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040a" + LOCALE_ILANGUAGE "040A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esr.nls b/dlls/kernel32/nls/esr.nls index 752120dadf1..ee6661c3367 100644 --- a/dlls/kernel32/nls/esr.nls +++ b/dlls/kernel32/nls/esr.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "51" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "280a" + LOCALE_IDEFAULTLANGUAGE "280A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PERU LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "187" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "280a" + LOCALE_ILANGUAGE "280A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/ess.nls b/dlls/kernel32/nls/ess.nls index 30c96a0bf78..8493dbbc90e 100644 --- a/dlls/kernel32/nls/ess.nls +++ b/dlls/kernel32/nls/ess.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "54" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "2c0a" + LOCALE_IDEFAULTLANGUAGE "2C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_ARGENTINA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "11" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "2c0a" + LOCALE_ILANGUAGE "2C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esu.nls b/dlls/kernel32/nls/esu.nls index eb2ec3b04a5..484d6275190 100644 --- a/dlls/kernel32/nls/esu.nls +++ b/dlls/kernel32/nls/esu.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "1" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "500a" + LOCALE_IDEFAULTLANGUAGE "500A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PUERTO_RICO LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "202" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "500a" + LOCALE_ILANGUAGE "500A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esv.nls b/dlls/kernel32/nls/esv.nls index 155ebef33c3..83de1f7302f 100644 --- a/dlls/kernel32/nls/esv.nls +++ b/dlls/kernel32/nls/esv.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "58" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "200a" + LOCALE_IDEFAULTLANGUAGE "200A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_VENEZUELA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "249" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "200a" + LOCALE_ILANGUAGE "200A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esy.nls b/dlls/kernel32/nls/esy.nls index 9444f436a11..66f6decea97 100644 --- a/dlls/kernel32/nls/esy.nls +++ b/dlls/kernel32/nls/esy.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "598" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "380a" + LOCALE_IDEFAULTLANGUAGE "380A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_URUGUAY LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "246" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "380a" + LOCALE_ILANGUAGE "380A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/esz.nls b/dlls/kernel32/nls/esz.nls index 82eb4241b2f..1a98f283fe7 100644 --- a/dlls/kernel32/nls/esz.nls +++ b/dlls/kernel32/nls/esz.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "595" LOCALE_IDEFAULTEBCDICCODEPAGE "20284" - LOCALE_IDEFAULTLANGUAGE "3c0a" + LOCALE_IDEFAULTLANGUAGE "3C0A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SPANISH, SUBLANG_SPANISH_PARAGUAY LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "185" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "3c0a" + LOCALE_ILANGUAGE "3C0A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/euq.nls b/dlls/kernel32/nls/euq.nls index 38d34312eab..af73fd58c80 100644 --- a/dlls/kernel32/nls/euq.nls +++ b/dlls/kernel32/nls/euq.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042d" + LOCALE_IDEFAULTLANGUAGE "042D" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_BASQUE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "217" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042d" + LOCALE_ILANGUAGE "042D" LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/fin.nls b/dlls/kernel32/nls/fin.nls index 29b7d2e8979..d3e7c76e679 100644 --- a/dlls/kernel32/nls/fin.nls +++ b/dlls/kernel32/nls/fin.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "358" LOCALE_IDEFAULTEBCDICCODEPAGE "20278" - LOCALE_IDEFAULTLANGUAGE "040b" + LOCALE_IDEFAULTLANGUAGE "040B" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "77" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040b" + LOCALE_ILANGUAGE "040B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/fra.nls b/dlls/kernel32/nls/fra.nls index 9a588a932e6..ca9b9d55aec 100644 --- a/dlls/kernel32/nls/fra.nls +++ b/dlls/kernel32/nls/fra.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "33" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "040c" + LOCALE_IDEFAULTLANGUAGE "040C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "84" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040c" + LOCALE_ILANGUAGE "040C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frb.nls b/dlls/kernel32/nls/frb.nls index 7ee0b297515..57c55e3cc16 100644 --- a/dlls/kernel32/nls/frb.nls +++ b/dlls/kernel32/nls/frb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "32" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "080c" + LOCALE_IDEFAULTLANGUAGE "080C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_BELGIAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "21" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "080c" + LOCALE_ILANGUAGE "080C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frc.nls b/dlls/kernel32/nls/frc.nls index 79eac11d96b..f2736f715fb 100644 --- a/dlls/kernel32/nls/frc.nls +++ b/dlls/kernel32/nls/frc.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "2" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "0c0c" + LOCALE_IDEFAULTLANGUAGE "0C0C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_CANADIAN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "39" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c0c" + LOCALE_ILANGUAGE "0C0C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frl.nls b/dlls/kernel32/nls/frl.nls index 29d2ad0c9cf..3001a6ba243 100644 --- a/dlls/kernel32/nls/frl.nls +++ b/dlls/kernel32/nls/frl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "352" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "140c" + LOCALE_IDEFAULTLANGUAGE "140C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_LUXEMBOURG LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "147" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "140c" + LOCALE_ILANGUAGE "140C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frm.nls b/dlls/kernel32/nls/frm.nls index fa38552812c..867d48e5aa9 100644 --- a/dlls/kernel32/nls/frm.nls +++ b/dlls/kernel32/nls/frm.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "377" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "180c" + LOCALE_IDEFAULTLANGUAGE "180C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_MONACO LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "158" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "180c" + LOCALE_ILANGUAGE "180C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/frs.nls b/dlls/kernel32/nls/frs.nls index cefb9d36db0..573d512488a 100644 --- a/dlls/kernel32/nls/frs.nls +++ b/dlls/kernel32/nls/frs.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "41" LOCALE_IDEFAULTEBCDICCODEPAGE "20297" - LOCALE_IDEFAULTLANGUAGE "100c" + LOCALE_IDEFAULTLANGUAGE "100C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_FRENCH, SUBLANG_FRENCH_SWISS LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "223" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "100c" + LOCALE_ILANGUAGE "100C" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/gae.nls b/dlls/kernel32/nls/gae.nls index e817403c431..359c816df1b 100644 --- a/dlls/kernel32/nls/gae.nls +++ b/dlls/kernel32/nls/gae.nls @@ -35,7 +35,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND LOCALE_IDEFAULTCODEPAGE "437" LOCALE_IDEFAULTCOUNTRY "353" LOCALE_IDEFAULTEBCDICCODEPAGE "20285" - LOCALE_IDEFAULTLANGUAGE "083c" + LOCALE_IDEFAULTLANGUAGE "083C" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_IRISH, SUBLANG_IRISH_IRELAND LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "68" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "083c" + LOCALE_ILANGUAGE "083C" LOCALE_ILDATE "0" LOCALE_ILZERO "1" LOCALE_IMEASURE "1" diff --git a/dlls/kernel32/nls/glc.nls b/dlls/kernel32/nls/glc.nls index f60a0aac69b..7f23993b888 100644 --- a/dlls/kernel32/nls/glc.nls +++ b/dlls/kernel32/nls/glc.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_GALICIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "34" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040a" + LOCALE_IDEFAULTLANGUAGE "040A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" diff --git a/dlls/kernel32/nls/heb.nls b/dlls/kernel32/nls/heb.nls index 2d69ffd4676..d6b6016f7fd 100644 --- a/dlls/kernel32/nls/heb.nls +++ b/dlls/kernel32/nls/heb.nls @@ -35,7 +35,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "862" LOCALE_IDEFAULTCOUNTRY "972" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040d" + LOCALE_IDEFAULTLANGUAGE "040D" LOCALE_IDEFAULTMACCODEPAGE "10005" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -43,7 +43,7 @@ STRINGTABLE LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "117" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040d" + LOCALE_ILANGUAGE "040D" LOCALE_ILDATE "1" LOCALE_ILZERO "0" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/hrv.nls b/dlls/kernel32/nls/hrv.nls index 958e15e59e4..0a238bfd1b9 100644 --- a/dlls/kernel32/nls/hrv.nls +++ b/dlls/kernel32/nls/hrv.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "385" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "041a" + LOCALE_IDEFAULTLANGUAGE "041A" LOCALE_IDEFAULTMACCODEPAGE "10082" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "108" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041a" + LOCALE_ILANGUAGE "041A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/hun.nls b/dlls/kernel32/nls/hun.nls index c3dbb9773f9..1f0a33508d8 100644 --- a/dlls/kernel32/nls/hun.nls +++ b/dlls/kernel32/nls/hun.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "36" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "040e" + LOCALE_IDEFAULTLANGUAGE "040E" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "109" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040e" + LOCALE_ILANGUAGE "040E" LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/hye.nls b/dlls/kernel32/nls/hye.nls index 2000280fe1e..1bea036afe0 100644 --- a/dlls/kernel32/nls/hye.nls +++ b/dlls/kernel32/nls/hye.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "374" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042b" + LOCALE_IDEFAULTLANGUAGE "042B" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ARMENIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "7" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042b" + LOCALE_ILANGUAGE "042B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/isl.nls b/dlls/kernel32/nls/isl.nls index 5a6c3d67e34..c2976b881a1 100644 --- a/dlls/kernel32/nls/isl.nls +++ b/dlls/kernel32/nls/isl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "354" LOCALE_IDEFAULTEBCDICCODEPAGE "20871" - LOCALE_IDEFAULTLANGUAGE "040f" + LOCALE_IDEFAULTLANGUAGE "040F" LOCALE_IDEFAULTMACCODEPAGE "10079" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ICELANDIC, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "110" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "040f" + LOCALE_ILANGUAGE "040F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/kan.nls b/dlls/kernel32/nls/kan.nls index e6934d1a428..87e9d092924 100644 --- a/dlls/kernel32/nls/kan.nls +++ b/dlls/kernel32/nls/kan.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044b" + LOCALE_IDEFAULTLANGUAGE "044B" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_KANNADA, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044b" + LOCALE_ILANGUAGE "044B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/kkz.nls b/dlls/kernel32/nls/kkz.nls index 5a8451563bd..2c45cc659e3 100644 --- a/dlls/kernel32/nls/kkz.nls +++ b/dlls/kernel32/nls/kkz.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "866" LOCALE_IDEFAULTCOUNTRY "7" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "043f" + LOCALE_IDEFAULTLANGUAGE "043F" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_KAZAK, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "137" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "043f" + LOCALE_ILANGUAGE "043F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/mar.nls b/dlls/kernel32/nls/mar.nls index 3069a59070b..1cd6cc00191 100644 --- a/dlls/kernel32/nls/mar.nls +++ b/dlls/kernel32/nls/mar.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044e" + LOCALE_IDEFAULTLANGUAGE "044E" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MARATHI, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044e" + LOCALE_ILANGUAGE "044E" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/mki.nls b/dlls/kernel32/nls/mki.nls index 30efc19b37c..af5f392ef55 100644 --- a/dlls/kernel32/nls/mki.nls +++ b/dlls/kernel32/nls/mki.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "866" LOCALE_IDEFAULTCOUNTRY "389" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042f" + LOCALE_IDEFAULTLANGUAGE "042F" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MACEDONIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "19618" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042f" + LOCALE_ILANGUAGE "042F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/msb.nls b/dlls/kernel32/nls/msb.nls index 0e232cfcb04..93c469c7d33 100644 --- a/dlls/kernel32/nls/msb.nls +++ b/dlls/kernel32/nls/msb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "673" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "083e" + LOCALE_IDEFAULTLANGUAGE "083E" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_BRUNEI_DARUSSALAM LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "37" LOCALE_IINTLCURRDIGITS "0" - LOCALE_ILANGUAGE "083e" + LOCALE_ILANGUAGE "083E" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/msl.nls b/dlls/kernel32/nls/msl.nls index 1df52003c28..e77e1ba09ce 100644 --- a/dlls/kernel32/nls/msl.nls +++ b/dlls/kernel32/nls/msl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "60" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "043e" + LOCALE_IDEFAULTLANGUAGE "043E" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_MALAY, SUBLANG_MALAY_MALAYSIA LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "167" LOCALE_IINTLCURRDIGITS "0" - LOCALE_ILANGUAGE "043e" + LOCALE_ILANGUAGE "043E" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/nls.nls b/dlls/kernel32/nls/nls.nls index b29f0bc3a1a..0dc5e889ca0 100644 --- a/dlls/kernel32/nls/nls.nls +++ b/dlls/kernel32/nls/nls.nls @@ -48,7 +48,7 @@ STRINGTABLE LANGUAGE LANG_DUTCH, SUBLANG_DUTCH_SURINAM LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "181" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c13" + LOCALE_ILANGUAGE "0C13" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/san.nls b/dlls/kernel32/nls/san.nls index 4f44f3e3d9b..0c7a8fdc2d7 100644 --- a/dlls/kernel32/nls/san.nls +++ b/dlls/kernel32/nls/san.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044f" + LOCALE_IDEFAULTLANGUAGE "044F" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SANSKRIT, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044f" + LOCALE_ILANGUAGE "044F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/sky.nls b/dlls/kernel32/nls/sky.nls index 29647b2b1b4..2bfe4bd868d 100644 --- a/dlls/kernel32/nls/sky.nls +++ b/dlls/kernel32/nls/sky.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "421" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "041b" + LOCALE_IDEFAULTLANGUAGE "041B" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "143" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041b" + LOCALE_ILANGUAGE "041B" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/sqi.nls b/dlls/kernel32/nls/sqi.nls index 6f4048230ea..eb449821784 100644 --- a/dlls/kernel32/nls/sqi.nls +++ b/dlls/kernel32/nls/sqi.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "355" LOCALE_IDEFAULTEBCDICCODEPAGE "20880" - LOCALE_IDEFAULTLANGUAGE "041c" + LOCALE_IDEFAULTLANGUAGE "041C" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_ALBANIAN, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "6" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041c" + LOCALE_ILANGUAGE "041C" LOCALE_ILDATE "2" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index eb500cf0fd8..108f70b4697 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_IDEFAULTCODEPAGE "855" LOCALE_IDEFAULTCOUNTRY "381" LOCALE_IDEFAULTEBCDICCODEPAGE "21025" - LOCALE_IDEFAULTLANGUAGE "0c1a" + LOCALE_IDEFAULTLANGUAGE "0C1A" LOCALE_IDEFAULTMACCODEPAGE "10007" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "271" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c1a" + LOCALE_ILANGUAGE "0C1A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 516bb512aae..aa287d5c0d9 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "381" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "081a" + LOCALE_IDEFAULTLANGUAGE "081A" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "271" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "081a" + LOCALE_ILANGUAGE "081A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/srm.nls b/dlls/kernel32/nls/srm.nls index f4b1169943a..593cc61dc14 100644 --- a/dlls/kernel32/nls/srm.nls +++ b/dlls/kernel32/nls/srm.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN LOCALE_IDEFAULTCODEPAGE "852" LOCALE_IDEFAULTCOUNTRY "381" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "241a" + LOCALE_IDEFAULTLANGUAGE "241A" LOCALE_IDEFAULTMACCODEPAGE "10029" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_SERBIA_LATIN LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "271" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "241a" + LOCALE_ILANGUAGE "241A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/sve.nls b/dlls/kernel32/nls/sve.nls index 6c8db124a6e..db3f05b7809 100644 --- a/dlls/kernel32/nls/sve.nls +++ b/dlls/kernel32/nls/sve.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "46" LOCALE_IDEFAULTEBCDICCODEPAGE "20278" - LOCALE_IDEFAULTLANGUAGE "041d" + LOCALE_IDEFAULTLANGUAGE "041D" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "221" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041d" + LOCALE_ILANGUAGE "041D" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/svf.nls b/dlls/kernel32/nls/svf.nls index 59982e8a39b..d0f63d0cb93 100644 --- a/dlls/kernel32/nls/svf.nls +++ b/dlls/kernel32/nls/svf.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND LOCALE_IDEFAULTCODEPAGE "850" LOCALE_IDEFAULTCOUNTRY "358" LOCALE_IDEFAULTEBCDICCODEPAGE "20278" - LOCALE_IDEFAULTLANGUAGE "081d" + LOCALE_IDEFAULTLANGUAGE "081D" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SWEDISH, SUBLANG_SWEDISH_FINLAND LOCALE_IFIRSTWEEKOFYEAR "2" LOCALE_IGEOID "77" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "081d" + LOCALE_ILANGUAGE "081D" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/syr.nls b/dlls/kernel32/nls/syr.nls index 6f8aa766027..a140509ce73 100644 --- a/dlls/kernel32/nls/syr.nls +++ b/dlls/kernel32/nls/syr.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "963" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "045a" + LOCALE_IDEFAULTLANGUAGE "045A" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_SYRIAC, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "222" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "045a" + LOCALE_ILANGUAGE "045A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/tel.nls b/dlls/kernel32/nls/tel.nls index 37586776ea7..206e89b8ece 100644 --- a/dlls/kernel32/nls/tel.nls +++ b/dlls/kernel32/nls/tel.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1" LOCALE_IDEFAULTCOUNTRY "91" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "044a" + LOCALE_IDEFAULTLANGUAGE "044A" LOCALE_IDEFAULTMACCODEPAGE "2" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_TELUGU, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "113" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "044a" + LOCALE_ILANGUAGE "044A" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/tha.nls b/dlls/kernel32/nls/tha.nls index 2097b3728da..39099c473e3 100644 --- a/dlls/kernel32/nls/tha.nls +++ b/dlls/kernel32/nls/tha.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "874" LOCALE_IDEFAULTCOUNTRY "66" LOCALE_IDEFAULTEBCDICCODEPAGE "20838" - LOCALE_IDEFAULTLANGUAGE "041e" + LOCALE_IDEFAULTLANGUAGE "041E" LOCALE_IDEFAULTMACCODEPAGE "10021" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_THAI, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "227" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041e" + LOCALE_ILANGUAGE "041E" LOCALE_ILDATE "1" LOCALE_ILZERO "0" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/trk.nls b/dlls/kernel32/nls/trk.nls index 3954b4b63e4..343d2de06b6 100644 --- a/dlls/kernel32/nls/trk.nls +++ b/dlls/kernel32/nls/trk.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "857" LOCALE_IDEFAULTCOUNTRY "90" LOCALE_IDEFAULTEBCDICCODEPAGE "20905" - LOCALE_IDEFAULTLANGUAGE "041f" + LOCALE_IDEFAULTLANGUAGE "041F" LOCALE_IDEFAULTMACCODEPAGE "10081" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "235" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "041f" + LOCALE_ILANGUAGE "041F" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/vit.nls b/dlls/kernel32/nls/vit.nls index 17389243dc6..7697e481c1e 100644 --- a/dlls/kernel32/nls/vit.nls +++ b/dlls/kernel32/nls/vit.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_IDEFAULTCODEPAGE "1258" LOCALE_IDEFAULTCOUNTRY "84" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "042a" + LOCALE_IDEFAULTLANGUAGE "042A" LOCALE_IDEFAULTMACCODEPAGE "10000" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_VIETNAMESE, SUBLANG_DEFAULT LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "251" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "042a" + LOCALE_ILANGUAGE "042A" LOCALE_ILDATE "1" LOCALE_ILZERO "0" LOCALE_IMEASURE "0" diff --git a/dlls/kernel32/nls/zhh.nls b/dlls/kernel32/nls/zhh.nls index f6aca66bd1d..624c2d8990d 100644 --- a/dlls/kernel32/nls/zhh.nls +++ b/dlls/kernel32/nls/zhh.nls @@ -34,7 +34,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_IDEFAULTCODEPAGE "950" LOCALE_IDEFAULTCOUNTRY "852" LOCALE_IDEFAULTEBCDICCODEPAGE "500" - LOCALE_IDEFAULTLANGUAGE "0c04" + LOCALE_IDEFAULTLANGUAGE "0C04" LOCALE_IDEFAULTMACCODEPAGE "10002" LOCALE_IDIGITS "2" LOCALE_IDIGITSUBSTITUTION "1" @@ -42,7 +42,7 @@ STRINGTABLE LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_HONGKONG LOCALE_IFIRSTWEEKOFYEAR "0" LOCALE_IGEOID "104" LOCALE_IINTLCURRDIGITS "2" - LOCALE_ILANGUAGE "0c04" + LOCALE_ILANGUAGE "0C04" LOCALE_ILDATE "1" LOCALE_ILZERO "1" LOCALE_IMEASURE "0" -- 2.30.2

1 0

[PATCH] msdasql/tests: Fix the spelling of the command_text variable.
by Francois Gouget 07 Dec '21

07 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msdasql/tests/provider.c | 56 +++++++++++++++++------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index b520b127d67..dfe3e3af886 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -187,7 +187,7 @@ static void test_command_interfaces(IUnknown *cmd) { HRESULT hr; ICommandProperties *commandProp; - ICommandText *comand_text; + ICommandText *command_text; IConvertType *convertype; ICommandPrepare *commandprepare; ICommandStream *commandstream; @@ -204,9 +204,9 @@ static void test_command_interfaces(IUnknown *cmd) ok(hr == S_OK, "got 0x%08x\n", hr); ICommandWithParameters_Release(cmdwithparams); - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); hr = IUnknown_QueryInterface(cmd, &IID_IConvertType, (void**)&convertype); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -238,70 +238,70 @@ static void test_command_interfaces(IUnknown *cmd) static void test_command_text(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; OLECHAR *str; GUID dialect; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); if (0) { /* Crashes under windows */ - hr = ICommandText_SetCommandText(comand_text, NULL, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, NULL, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); } - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, NULL); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, NULL); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_E_NOCOMMAND, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetCommandText(comand_text, NULL, &str); + hr = ICommandText_GetCommandText(command_text, NULL, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); /* dialect empty value */ - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == DB_S_DIALECTIGNORED, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); dialect = DBGUID_DEFAULT; - hr = ICommandText_GetCommandText(comand_text, &dialect, &str); + hr = ICommandText_GetCommandText(command_text, &dialect, &str); ok(hr == S_OK, "got 0x%08x\n", hr); ok(IsEqualGUID(&DBGUID_DEFAULT, &dialect), "got %s\n", debugstr_guid(&dialect)); ok (!lstrcmpW(L"select * from testing", str), "got %s\n", debugstr_w(str)); HeapFree(GetProcessHeap(), 0, str); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_command_dbsession(IUnknown *cmd, IUnknown *session) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *sess; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_GetDBSession(comand_text, &IID_IUnknown, &sess); + hr = ICommandText_GetDBSession(command_text, &IID_IUnknown, &sess); ok(hr == S_OK, "got 0x%08x\n", hr); ok(session == sess, "different session pointers\n"); - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) @@ -353,33 +353,33 @@ static void test_rowset_interfaces(IRowset *rowset, ICommandText *commandtext) static void test_command_rowset(IUnknown *cmd) { - ICommandText *comand_text; + ICommandText *command_text; HRESULT hr; IUnknown *unk = NULL; IRowset *rowset; DBROWCOUNT affected; - hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&comand_text); + hr = IUnknown_QueryInterface(cmd, &IID_ICommandText, (void**)&command_text); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"CREATE TABLE testing (col1 INT, col2 SHORT)"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(unk == NULL, "Unexepcted value\n"); + todo_wine ok(unk == NULL, "Unexpected value\n"); todo_wine ok(affected == -1, "got %ld\n", affected); if (unk) IUnknown_Release(unk); - hr = ICommandText_SetCommandText(comand_text, &DBGUID_DEFAULT, L"select * from testing"); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"select * from testing"); ok(hr == S_OK, "got 0x%08x\n", hr); affected = 9999; - hr = ICommandText_Execute(comand_text, NULL, &IID_IRowset, NULL, &affected, &unk); + hr = ICommandText_Execute(command_text, NULL, &IID_IRowset, NULL, &affected, &unk); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(unk != NULL, "Unexepcted value\n"); + ok(unk != NULL, "Unexpected value\n"); if (hr == S_OK) { ok(affected == -1, "wrong affected value\n"); @@ -387,13 +387,13 @@ static void test_command_rowset(IUnknown *cmd) hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08x\n", hr); - test_rowset_interfaces(rowset, comand_text); + test_rowset_interfaces(rowset, command_text); IRowset_Release(rowset); IUnknown_Release(unk); } - ICommandText_Release(comand_text); + ICommandText_Release(command_text); } -- 2.30.2

1 0

[PATCH] win32u: Fix the trailing linefeed in a TRACE().
by Francois Gouget 07 Dec '21

07 Dec '21

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/win32u/sysparams.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2072597a968..56523210bdf 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1291,7 +1291,7 @@ static BOOL update_display_cache(void) .state_flags = DISPLAY_DEVICE_ACTIVE | DISPLAY_DEVICE_ATTACHED, }; - TRACE( "adding default fake monitor\n "); + TRACE( "adding default fake monitor\n"); add_monitor( &default_monitor, &ctx ); } release_display_manager_ctx( &ctx ); -- 2.30.2

1 0

[PATCH] msvcp120/tests: Compare thread IDs in test_thrd, not thread handles
by Alex Henrie 07 Dec '21

07 Dec '21

Fixes an intermittent testbot failure. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/msvcp120/tests/msvcp120.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 495ee9dd6fb..3241e577b88 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -2093,8 +2093,8 @@ static void test_thrd(void) tb = p__Thrd_current(); ok(ta.id == tb.id, "got a %d b %d\n", ta.id, tb.id); ok(ta.id == GetCurrentThreadId(), "expected %d, got %d\n", GetCurrentThreadId(), ta.id); - /* these can be different if new threads are created at same time */ - ok(ta.hnd == tb.hnd, "got a %p b %p\n", ta.hnd, tb.hnd); + /* the handles can be different if new threads are created at same time, but the IDs are always the same */ + ok(GetThreadId(ta.hnd) == GetThreadId(tb.hnd), "got a %d b %d\n", GetThreadId(ta.hnd), GetThreadId(tb.hnd)); ok(!CloseHandle(ta.hnd), "handle %p not closed\n", ta.hnd); ok(!CloseHandle(tb.hnd), "handle %p not closed\n", tb.hnd); -- 2.34.1

2 1

[PATCH 1/4] server: Split waitable object off completion port.
by Paul Gofman 07 Dec '21

07 Dec '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- server/completion.c | 118 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 94 insertions(+), 24 deletions(-) diff --git a/server/completion.c b/server/completion.c index 6933195e72d..8dd8d4b1247 100644 --- a/server/completion.c +++ b/server/completion.c @@ -56,15 +56,50 @@ struct type_descr completion_type = }, }; -struct completion +struct completion_wait { struct object obj; struct list queue; unsigned int depth; }; +struct completion +{ + struct object obj; + struct completion_wait *wait; +}; + +static void completion_wait_dump( struct object*, int ); +static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ); +static void completion_wait_destroy( struct object * ); + +static const struct object_ops completion_wait_ops = +{ + sizeof(struct completion_wait), /* size */ + &no_type, /* type */ + completion_wait_dump, /* dump */ + add_queue, /* add_queue */ + remove_queue, /* remove_queue */ + completion_wait_signaled, /* signaled */ + no_satisfied, /* satisfied */ + no_signal, /* signal */ + no_get_fd, /* get_fd */ + default_map_access, /* map_access */ + default_get_sd, /* get_sd */ + default_set_sd, /* set_sd */ + no_get_full_name, /* get_full_name */ + no_lookup_name, /* lookup_name */ + no_link_name, /* link_name */ + NULL, /* unlink_name */ + no_open_file, /* open_file */ + no_kernel_obj_list, /* get_kernel_obj_list */ + no_close_handle, /* close_handle */ + completion_wait_destroy /* destroy */ +}; + static void completion_dump( struct object*, int ); -static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ); +static int completion_add_queue( struct object *obj, struct wait_queue_entry *entry ); +static void completion_remove_queue( struct object *obj, struct wait_queue_entry *entry ); static void completion_destroy( struct object * ); static const struct object_ops completion_ops = @@ -72,9 +107,9 @@ static const struct object_ops completion_ops = sizeof(struct completion), /* size */ &completion_type, /* type */ completion_dump, /* dump */ - add_queue, /* add_queue */ - remove_queue, /* remove_queue */ - completion_signaled, /* signaled */ + completion_add_queue, /* add_queue */ + completion_remove_queue, /* remove_queue */ + NULL, /* signaled */ no_satisfied, /* satisfied */ no_signal, /* signal */ no_get_fd, /* get_fd */ @@ -100,30 +135,63 @@ struct comp_msg unsigned int status; }; -static void completion_destroy( struct object *obj) +static void completion_wait_destroy( struct object *obj) { - struct completion *completion = (struct completion *) obj; + struct completion_wait *wait = (struct completion_wait *)obj; struct comp_msg *tmp, *next; - LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &completion->queue, struct comp_msg, queue_entry ) + LIST_FOR_EACH_ENTRY_SAFE( tmp, next, &wait->queue, struct comp_msg, queue_entry ) { free( tmp ); } } +static void completion_wait_dump( struct object *obj, int verbose ) +{ + struct completion_wait *wait = (struct completion_wait *)obj; + + assert( obj->ops == &completion_wait_ops ); + fprintf( stderr, "Completion depth=%u\n", wait->depth ); +} + +static int completion_wait_signaled( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion_wait *wait = (struct completion_wait *)obj; + + assert( obj->ops == &completion_wait_ops ); + return !list_empty( &wait->queue ); +} + static void completion_dump( struct object *obj, int verbose ) { - struct completion *completion = (struct completion *) obj; + struct completion *completion = (struct completion *)obj; + + assert( obj->ops == &completion_ops ); + completion->wait->obj.ops->dump( &completion->wait->obj, verbose ); +} + +static int completion_add_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion *completion = (struct completion *)obj; + + assert( obj->ops == &completion_ops ); + return completion->wait->obj.ops->add_queue( &completion->wait->obj, entry ); +} + +static void completion_remove_queue( struct object *obj, struct wait_queue_entry *entry ) +{ + struct completion *completion = (struct completion *)obj; assert( obj->ops == &completion_ops ); - fprintf( stderr, "Completion depth=%u\n", completion->depth ); + completion->wait->obj.ops->remove_queue( &completion->wait->obj, entry ); } -static int completion_signaled( struct object *obj, struct wait_queue_entry *entry ) +static void completion_destroy( struct object *obj ) { struct completion *completion = (struct completion *)obj; - return !list_empty( &completion->queue ); + assert( obj->ops == &completion_ops ); + release_object( &completion->wait->obj ); } static struct completion *create_completion( struct object *root, const struct unicode_str *name, @@ -132,15 +200,17 @@ static struct completion *create_completion( struct object *root, const struct u { struct completion *completion; - if ((completion = create_named_object( root, &completion_ops, name, attr, sd ))) + if (!(completion = create_named_object( root, &completion_ops, name, attr, sd ))) return NULL; + if (get_error() == STATUS_OBJECT_NAME_EXISTS) return completion; + if (!(completion->wait = alloc_object( &completion_wait_ops ))) { - if (get_error() != STATUS_OBJECT_NAME_EXISTS) - { - list_init( &completion->queue ); - completion->depth = 0; - } + release_object( completion ); + set_error( STATUS_NO_MEMORY ); + return NULL; } + list_init( &completion->wait->queue ); + completion->wait->depth = 0; return completion; } @@ -162,9 +232,9 @@ void add_completion( struct completion *completion, apc_param_t ckey, apc_param_ msg->status = status; msg->information = information; - list_add_tail( &completion->queue, &msg->queue_entry ); - completion->depth++; - wake_up( &completion->obj, 1 ); + list_add_tail( &completion->wait->queue, &msg->queue_entry ); + completion->wait->depth++; + wake_up( &completion->wait->obj, 1 ); } /* create a completion */ @@ -218,13 +288,13 @@ DECL_HANDLER(remove_completion) if (!completion) return; - entry = list_head( &completion->queue ); + entry = list_head( &completion->wait->queue ); if (!entry) set_error( STATUS_PENDING ); else { list_remove( entry ); - completion->depth--; + completion->wait->depth--; msg = LIST_ENTRY( entry, struct comp_msg, queue_entry ); reply->ckey = msg->ckey; reply->cvalue = msg->cvalue; @@ -243,7 +313,7 @@ DECL_HANDLER(query_completion) if (!completion) return; - reply->depth = completion->depth; + reply->depth = completion->wait->depth; release_object( completion ); } -- 2.33.1

1 3

[PATCH 1/9] gdi32/tests: Test deleting the bitmap used for pattern brush creation.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Test that the bitmap for pattern brush creation can be deleted after CreatePatternBrush() and the created brush will still function normally. However, the bitmap object can not be retrieved from LOGBRUSH.lbHatch if the bitmap is deleted. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/gdi32/tests/brush.c | 67 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/brush.c b/dlls/gdi32/tests/brush.c index f04ee22ab6d..0841eb2f2e1 100644 --- a/dlls/gdi32/tests/brush.c +++ b/dlls/gdi32/tests/brush.c @@ -120,9 +120,14 @@ static void test_pattern_brush(void) { char buffer[sizeof(BITMAPINFOHEADER) + 2 * sizeof(RGBQUAD) + 32 * 32 / 8]; BITMAPINFO *info = (BITMAPINFO *)buffer; - HBRUSH brush; - HBITMAP bitmap; + HBITMAP bitmap, bitmap2, old_bitmap; + HBRUSH brush, brush2; + HDC hdc, hdc_screen; + COLORREF color; + BOOL result; LOGBRUSH br; + BITMAP bm; + RECT rect; INT ret; void *bits; DIBSECTION dib; @@ -269,6 +274,64 @@ static void test_pattern_brush(void) ok( !brush, "CreatePatternBrush succeeded\n" ); GlobalFree( mem ); + + /* Test deleting bitmap after brush creation */ + /* Create hdc and bitmaps */ + hdc_screen = GetDC( NULL ); + hdc = CreateCompatibleDC( hdc_screen ); + bitmap = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + bitmap2 = CreateCompatibleBitmap( hdc_screen, 16, 16 ); + + /* Fill the first bitmap with 0xff5511 */ + old_bitmap = SelectObject( hdc, bitmap ); + SetRect( &rect, 0, 0, 16, 16 ); + brush = CreateSolidBrush( 0xff5511 ); + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + DeleteObject( brush ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + + /* Create a pattern brush with the first bitmap filled with 0xff5511 */ + brush = CreatePatternBrush( bitmap ); + ok( brush != NULL, "CreatePatternBrush failed, error %u.\n", GetLastError() ); + + /* Delete the first bitmap used for pattern brush creation */ + SelectObject( hdc, bitmap2 ); + DeleteObject( bitmap ); + + memset( &br, 0, sizeof(br) ); + ret = GetObjectW( brush, sizeof(br), &br ); + ok( ret == sizeof(br), "wrong size %u\n", ret ); + ok( br.lbColor == 0, "wrong color %u\n", br.lbColor ); + ok( br.lbStyle == BS_PATTERN, "wrong style %u\n", br.lbStyle ); + ok( (HBITMAP)br.lbHatch == bitmap, "wrong handle %p/%p\n", (HBITMAP)br.lbHatch, bitmap ); + + /* The first bitmap is now invalid */ + memset( &bm, 0, sizeof (bm)); + ret = GetObjectW( bitmap, sizeof(bm), &bm ); + ok( !ret, "wrong size %u\n", ret ); + + /* Fill hdc with 0xabcdef */ + brush2 = CreateSolidBrush( 0xabcdef ); + result = FillRect( hdc, &rect, brush2 ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xabcdef, "Expected color %#x, got %#x.\n", 0xabcdef, color ); + DeleteObject( brush2 ); + + /* Fill hdc with the brush created with the deleted bitmap */ + /* FillRect() succeeds and hdc is filled with the deleted bitmap content */ + result = FillRect( hdc, &rect, brush ); + ok( result, "FillRect failed, error %d.\n", GetLastError() ); + color = GetPixel( hdc, 10, 10 ); + ok( color == 0xff5511, "Expected color %#x, got %#x.\n", 0xff5511, color ); + DeleteObject( brush ); + + SelectObject( hdc, old_bitmap ); + DeleteObject( bitmap2 ); + DeleteDC( hdc ); + ReleaseDC( NULL, hdc_screen ); } static void test_palette_brush(void) -- 2.32.0

2 1

[PATCH 1/4] user32/tests: Fix cursor state test failures for win10.
by Ziqing Hui 07 Dec '21

07 Dec '21

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/user32/tests/cursoricon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 33ca2e3cb63..267aff70fb5 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -2505,7 +2505,7 @@ static void test_ShowCursor(void) memset( &info, 0, sizeof(info) ); info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } event_start = CreateEventW( NULL, FALSE, FALSE, NULL ); @@ -2529,7 +2529,7 @@ static void test_ShowCursor(void) info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); /* global show count is not affected since we don't have a window */ - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } parent_id = 0; @@ -2582,7 +2582,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } count = ShowCursor( TRUE ); @@ -2594,7 +2594,7 @@ static void test_ShowCursor(void) { info.cbSize = sizeof(info); ok( pGetCursorInfo( &info ), "GetCursorInfo failed\n" ); - ok( info.flags & CURSOR_SHOWING, "cursor not shown in info\n" ); + ok( info.flags & (CURSOR_SHOWING | CURSOR_SUPPRESSED), "Got unexpected cursor state\n" ); } } -- 2.25.1

1 3

[PATCH v2] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Huw Davies 07 Dec '21

07 Dec '21

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> Houkago Cinderella verifies that otmpFamilyName matches the desired font name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52176 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/win32u/font.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index fca3ed0fc76..3fa90ebc0f8 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -1799,17 +1799,17 @@ static struct gdi_font_face *find_best_matching_face( const struct gdi_font_fami static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, const WCHAR *subst, const LOGFONTW *lf, FONTSIGNATURE fs, - BOOL can_use_bitmap ) + BOOL can_use_bitmap, const WCHAR **orig_name ) { struct gdi_font_family *family; struct gdi_font_face *face; family = find_family_from_any_name( name ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; if (subst) { family = find_family_from_any_name( subst ); - if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; + if (family && (face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) goto found; } /* search by full face name */ @@ -1824,6 +1824,11 @@ static struct gdi_font_face *find_matching_face_by_name( const WCHAR *name, cons if ((face = find_best_matching_face( family, lf, fs, can_use_bitmap ))) return face; } return NULL; + +found: + if (orig_name && family != face->family) + *orig_name = family->family_name; + return face; } static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs, @@ -1863,7 +1868,7 @@ static struct gdi_font_face *find_any_face( const LOGFONTW *lf, FONTSIGNATURE fs } static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *csi, BOOL can_use_bitmap, - BOOL *substituted ) + BOOL *substituted, const WCHAR **orig_name ) { BOOL want_vertical = (lf->lfFaceName[0] == '@'); struct gdi_font_face *face; @@ -1888,7 +1893,7 @@ static struct gdi_font_face *find_matching_face( const LOGFONTW *lf, CHARSETINFO *substituted = TRUE; } - if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap ))) + if ((face = find_matching_face_by_name( lf->lfFaceName, subst, lf, csi->fs, can_use_bitmap, orig_name ))) return face; } *substituted = FALSE; /* substitution is no longer relevant */ @@ -2460,7 +2465,7 @@ static void add_child_font( struct gdi_font *font, const WCHAR *family_name ) struct gdi_font *child; struct gdi_font_face *face; - if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE ))) return; + if (!(face = find_matching_face_by_name( family_name, NULL, &font->lf, fs, FALSE, NULL ))) return; if (!(child = create_gdi_font( face, family_name, &font->lf ))) return; child->matrix = font->matrix; @@ -4077,6 +4082,7 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit struct gdi_font_face *face; INT height; CHARSETINFO csi; + const WCHAR *orig_name = NULL; BOOL substituted = FALSE; static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; @@ -4093,14 +4099,14 @@ static struct gdi_font *select_font( LOGFONTW *lf, FMAT2 dcmat, BOOL can_use_bit TRACE( "returning cached gdiFont(%p)\n", font ); return font; } - if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted ))) + if (!(face = find_matching_face( lf, &csi, can_use_bitmap, &substituted, &orig_name ))) { FIXME( "can't find a single appropriate font - bailing\n" ); return NULL; } height = lf->lfHeight; - font = create_gdi_font( face, NULL, lf ); + font = create_gdi_font( face, orig_name, lf ); font->use_logfont_name = substituted; font->matrix = dcmat; font->can_use_bitmap = can_use_bitmap; -- 2.23.0

1 0

[PATCH 9/9] comctl32/propsheet: Return a pattern brush when handling WM_CTLCOLORSTATIC for theming.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Fix a regression from 2f1bbd8 that makes the static control for DPI sample text in winecfg not refreshing its background when moving the DPI slider. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 11 ++++++++++- dlls/comctl32/tests/propsheet.c | 11 +---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4c9b42e6ed7..9309250f65a 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1309,10 +1309,19 @@ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM if (lr) return lr; + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + hdc = (HDC)wp; SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); SetBkMode(hdc, TRANSPARENT); - return (LRESULT)GetStockObject(NULL_BRUSH); + + org.x = 0; + org.y = 0; + MapWindowPoints((HWND)lp, hwnd, &org, 1); + SetBrushOrgEx(hdc, -org.x, -org.y, NULL); + return (LRESULT)brush; } } diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 0b012df1cca..6cc29a8b6f1 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1293,7 +1293,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); - todo_wine ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ @@ -1302,7 +1301,6 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1311,13 +1309,11 @@ static void test_WM_CTLCOLORSTATIC(void) count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); - todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, log_brush.lbStyle); memset(&bmp, 0, sizeof(bmp)); count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); - todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); @@ -1340,9 +1336,7 @@ static void test_WM_CTLCOLORSTATIC(void) size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); @@ -1415,13 +1409,11 @@ static void test_WM_CTLCOLORSTATIC(void) SetLastError(0xdeadbeef); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); error = GetLastError(); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); todo_wine ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", ERROR_INVALID_PARAMETER, error); ret = DeleteObject(hbrush); - todo_wine ok(!ret, "DeleteObject succeeded.\n"); /* Should still report the same brush handle after the brush handle was freed */ @@ -1432,10 +1424,8 @@ static void test_WM_CTLCOLORSTATIC(void) hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(is_theme_active) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); - todo_wine ok(!ret, "GetObjectA succeeded.\n"); } else @@ -1443,6 +1433,7 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that brush origin is at (0,0) */ ret = GetBrushOrgEx(child_hdc, &org); ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine_if(is_theme_active) ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); todo_wine_if(is_theme_active) -- 2.32.0

1 0

[PATCH 8/9] uxtheme: Do not hook DefDlgProc() for theming.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Currently there is no need to hook DefDlgProc(). Tests show that dialog theming shouldn't be implemented in DefDlgProc(). Also fix a double free bug because WM_DESTROY in UXTHEME_DefDlgProc() calls CloseThemeData() even when the theme handle is not opened when handling WM_CREATE in UXTHEME_DefDlgProc(). The bug can be demonstrated by running comctl32/tests/propsheet.c tests with Light theme. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 9 ++--- dlls/comctl32/tests/static.c | 5 +-- dlls/user32/defdlg.c | 34 +++++-------------- dlls/user32/hook.c | 1 - dlls/user32/user_private.h | 1 - dlls/uxtheme/Makefile.in | 1 - dlls/uxtheme/dialog.c | 59 --------------------------------- dlls/uxtheme/system.c | 1 - dlls/uxtheme/uxthemedll.h | 1 - include/winuser.h | 1 - 10 files changed, 11 insertions(+), 102 deletions(-) delete mode 100644 dlls/uxtheme/dialog.c diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 199b280879e..0b012df1cca 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1320,9 +1320,7 @@ static void test_WM_CTLCOLORSTATIC(void) todo_wine ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(hdlg) != NULL) ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); memset(&cls, 0, sizeof(cls)); @@ -1336,18 +1334,15 @@ static void test_WM_CTLCOLORSTATIC(void) hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); theme = pOpenThemeData(hwnd, L"Tab"); - /* Light theme triggers a double free bug in uxtheme */ - todo_wine_if(!theme) ok(theme != NULL, "OpenThemeData failed.\n"); size.cx = 0; size.cy = 0; hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); - todo_wine_if(!theme) ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); - todo_wine_if(theme) + todo_wine ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); - todo_wine_if(theme) + todo_wine ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); pCloseThemeData(theme); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index b507cf1e02b..529396b3f0d 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -408,11 +408,11 @@ static void test_WM_CTLCOLORSTATIC(void) HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; - BOOL ret, todo = FALSE; int mode, old_mode; HBRUSH brush; HRESULT hr; POINT org; + BOOL ret; struct { @@ -434,8 +434,6 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - todo = !!pGetWindowTheme(dialog); - dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); PatBlt(dialog_hdc, 0, 0, 80, 80, BLACKNESS); @@ -447,7 +445,6 @@ static void test_WM_CTLCOLORSTATIC(void) ret = pIsThemeDialogTextureEnabled(dialog); ok(ret, "Expected theme dialog texture supported.\n"); - todo_wine_if(todo) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 4f44a93cd49..81c7cb0f207 100644 --- a/dlls/user32/defdlg.c +++ b/dlls/user32/defdlg.c @@ -354,7 +354,10 @@ out: return dlgInfo; } -static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcA (USER32.@) + */ +LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -408,7 +411,10 @@ static LRESULT USER_DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } -static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) +/*********************************************************************** + * DefDlgProcW (USER32.@) + */ +LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { DIALOGINFO *dlgInfo; DLGPROC dlgproc; @@ -461,27 +467,3 @@ static LRESULT USER_DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return GetWindowLongPtrW( hwnd, DWLP_MSGRESULT ); } - -LRESULT WINAPI USER_DefDlgProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode ) -{ - if (unicode) - return USER_DefDlgProcW( hwnd, msg, wParam, lParam ); - else - return USER_DefDlgProcA( hwnd, msg, wParam, lParam ); -} - -/*********************************************************************** - * DefDlgProcA (USER32.@) - */ -LRESULT WINAPI DefDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, FALSE ); -} - -/*********************************************************************** - * DefDlgProcW (USER32.@) - */ -LRESULT WINAPI DefDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) -{ - return user_api->pDefDlgProc( hwnd, msg, wParam, lParam, TRUE ); -} diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c index f5b4c6ab8a1..159797020f2 100644 --- a/dlls/user32/hook.c +++ b/dlls/user32/hook.c @@ -83,7 +83,6 @@ WINE_DECLARE_DEBUG_CHANNEL(relay); static struct user_api_hook original_user_api = { - USER_DefDlgProc, USER_ScrollBarDraw, USER_ScrollBarProc, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c2152900a9b..96704ac68ae 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -302,7 +302,6 @@ extern BOOL get_icon_size( HICON handle, SIZE *size ) DECLSPEC_HIDDEN; #endif extern struct user_api_hook *user_api DECLSPEC_HIDDEN; -LRESULT WINAPI USER_DefDlgProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; LRESULT WINAPI USER_ScrollBarProc(HWND, UINT, WPARAM, LPARAM, BOOL) DECLSPEC_HIDDEN; void WINAPI USER_ScrollBarDraw(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, diff --git a/dlls/uxtheme/Makefile.in b/dlls/uxtheme/Makefile.in index 933650f4261..01751d3243a 100644 --- a/dlls/uxtheme/Makefile.in +++ b/dlls/uxtheme/Makefile.in @@ -5,7 +5,6 @@ DELAYIMPORTS = msimg32 C_SRCS = \ buffer.c \ - dialog.c \ draw.c \ main.c \ metric.c \ diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c deleted file mode 100644 index 776f54e1d31..00000000000 --- a/dlls/uxtheme/dialog.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Theming - Dialogs - * - * Copyright (c) 2005 by Frank Richter - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include <stdarg.h> -#include <string.h> -#include <stdlib.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "uxtheme.h" -#include "uxthemedll.h" -#include "vssym32.h" -#include "wine/debug.h" - -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam, BOOL unicode) -{ - HTHEME theme = GetWindowTheme ( hWnd ); - static const WCHAR themeClass[] = L"Window"; - LRESULT result; - - switch (msg) - { - case WM_CREATE: - result = user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - theme = OpenThemeData( hWnd, themeClass ); - return result; - - case WM_DESTROY: - CloseThemeData ( theme ); - SetWindowTheme( hWnd, NULL, NULL ); - OpenThemeData( hWnd, NULL ); - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - default: - /* Call old proc */ - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 0; -} diff --git a/dlls/uxtheme/system.c b/dlls/uxtheme/system.c index 37c484387ec..61a608e5962 100644 --- a/dlls/uxtheme/system.c +++ b/dlls/uxtheme/system.c @@ -1245,7 +1245,6 @@ BOOL WINAPI ThemeHooksInstall(void) { struct user_api_hook hooks; - hooks.pDefDlgProc = UXTHEME_DefDlgProc; hooks.pScrollBarDraw = UXTHEME_ScrollBarDraw; hooks.pScrollBarWndProc = UXTHEME_ScrollbarWndProc; return RegisterUserApiHook(&hooks, &user_api); diff --git a/dlls/uxtheme/uxthemedll.h b/dlls/uxtheme/uxthemedll.h index 67130774392..c43ad703884 100644 --- a/dlls/uxtheme/uxthemedll.h +++ b/dlls/uxtheme/uxthemedll.h @@ -106,7 +106,6 @@ extern HRESULT UXTHEME_SetActiveTheme(PTHEME_FILE tf) DECLSPEC_HIDDEN; extern void UXTHEME_UninitSystem(void) DECLSPEC_HIDDEN; extern struct user_api_hook user_api DECLSPEC_HIDDEN; -LRESULT WINAPI UXTHEME_DefDlgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode) DECLSPEC_HIDDEN; void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTEST hit_test, const struct SCROLL_TRACKING_INFO *tracking_info, BOOL draw_arrows, BOOL draw_interior, RECT *rect, INT arrowsize, diff --git a/include/winuser.h b/include/winuser.h index 898c9034e33..1d37bd44344 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -4435,7 +4435,6 @@ struct SCROLL_TRACKING_INFO struct user_api_hook { - LRESULT (WINAPI *pDefDlgProc)(HWND, UINT, WPARAM, LPARAM, BOOL); void (WINAPI *pScrollBarDraw)(HWND, HDC, INT, enum SCROLL_HITTEST, const struct SCROLL_TRACKING_INFO *, BOOL, BOOL, RECT *, INT, INT, INT, BOOL); -- 2.32.0

1 0

[PATCH 7/9] comctl32/propsheet: Handle WM_ERASEBKGND in the property sheet page window procedure.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Handle WM_ERASEBKGND in the property sheet page window procedure and use a pattern brush created from theme parts to fill background instead of calling DrawThemeBackground() directly. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 113 ++++++++++++++++++++++++++++++++++++++ dlls/uxtheme/dialog.c | 38 ------------- 2 files changed, 113 insertions(+), 38 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 4fe80241855..4c9b42e6ed7 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -63,6 +63,7 @@ #include "prsht.h" #include "comctl32.h" #include "uxtheme.h" +#include "vsstyle.h" #include "wine/debug.h" @@ -140,6 +141,7 @@ typedef struct */ static const WCHAR PropSheetInfoStr[] = L"PropertySheetInfo"; +static const WCHAR PropSheetPageBackgroundBrush[] = L"PropSheetPageBackgroundBrush"; #define PSP_INTERNAL_UNICODE 0x80000000 @@ -1196,16 +1198,107 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +static HBRUSH get_propsheet_background_brush(HWND hwnd) +{ + HBITMAP bitmap, old_bitmap; + HDC hdc, hdc_screen; + HBRUSH brush; + HTHEME theme; + HRESULT hr; + RECT rect; + SIZE size; + + brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); + if (brush) + return brush; + + theme = OpenThemeData(NULL, L"Tab"); + if (!theme) + return NULL; + + hr = GetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); + if (FAILED(hr)) + { + size.cx = 10; + size.cy = 600; + } + + hdc_screen = GetDC(NULL); + hdc = CreateCompatibleDC(hdc_screen); + bitmap = CreateCompatibleBitmap(hdc_screen, size.cx, size.cy); + old_bitmap = SelectObject(hdc, bitmap); + + SetRect(&rect, 0, 0, size.cx, size.cy); + /* FIXME: XP draws the tab body bitmap directly without transparency even if there is */ + FillRect(hdc, &rect, GetSysColorBrush(COLOR_3DFACE)); + hr = DrawThemeBackground(theme, hdc, TABP_BODY, 0, &rect, NULL); + if (SUCCEEDED(hr)) + { + brush = CreatePatternBrush(bitmap); + SetPropW(hwnd, PropSheetPageBackgroundBrush, brush); + } + + SelectObject(hdc, old_bitmap); + DeleteDC(hdc); + ReleaseDC(NULL, hdc_screen); + CloseThemeData(theme); + return brush; +} + /* Subclassing window procedure for theming dialogs in property sheet pages */ static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, UINT_PTR id, DWORD_PTR ref) { + POINT org, old_org; + LOGBRUSH logbrush; WNDPROC dlgproc; + HBRUSH brush; LRESULT lr; + RECT rect; HDC hdc; switch (msg) { + case WM_THEMECHANGED: + { + brush = GetPropW(hwnd, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(hwnd, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } + InvalidateRect(hwnd, NULL, TRUE); + break; + } + case WM_ERASEBKGND: + { + if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) + break; + + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + brush = get_propsheet_background_brush(hwnd); + if (!brush) + break; + + /* Using FillRect() to draw background could introduce a tiling effect if the destination + * rectangle is larger than the pattern brush size, which is usually 10x600. This bug is + * visible on property sheet pages if system DPI is set to 192. However, the same bug also + * exists on XP and explains why vista+ don't use gradient tab body backgound anymore */ + hdc = (HDC)wp; + GetViewportOrgEx(hdc, &org); + SetBrushOrgEx(hdc, org.x, org.y, &old_org); + GetClientRect(hwnd, &rect); + FillRect(hdc, &rect, brush); + SetBrushOrgEx(hdc, old_org.x, old_org.y, NULL); + return TRUE; + } + case WM_CTLCOLORSTATIC: { if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) @@ -2385,6 +2478,8 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, PropSheetInfo * psInfo = GetPropW(hwndDlg, PropSheetInfoStr); HWND hwndTabControl = GetDlgItem(hwndDlg, IDC_TABCONTROL); PropPageInfo* oldPages; + LOGBRUSH logbrush; + HBRUSH brush; TRACE("index %d, hpage %p\n", index, hpage); if (!psInfo) { @@ -2445,6 +2540,14 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, else { RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + brush = GetPropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(psInfo->proppage[index].hwndPage, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } } /* Destroy page dialog window */ @@ -2743,6 +2846,8 @@ static int PROPSHEET_GetPageIndex(HPROPSHEETPAGE page, const PropSheetInfo* psIn */ static void PROPSHEET_CleanUp(HWND hwndDlg) { + LOGBRUSH logbrush; + HBRUSH brush; int i; PropSheetInfo* psInfo = RemovePropW(hwndDlg, PropSheetInfoStr); @@ -2766,6 +2871,14 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) else { RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + brush = GetPropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); + if (brush) + { + RemovePropW(psInfo->proppage[i].hwndPage, PropSheetPageBackgroundBrush); + if (GetObjectW(brush, sizeof(logbrush), &logbrush) == sizeof(logbrush)) + DeleteObject((HBITMAP)logbrush.lbHatch); + DeleteObject(brush); + } } if(psInfo->proppage[i].hwndPage) diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index bbfdaba639b..776f54e1d31 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -36,9 +36,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa { HTHEME theme = GetWindowTheme ( hWnd ); static const WCHAR themeClass[] = L"Window"; - BOOL themingActive = IsThemeDialogTextureEnabled (hWnd); - BOOL doTheming = themingActive && (theme != NULL); - HRESULT hr = E_FAIL; LRESULT result; switch (msg) @@ -54,41 +51,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa OpenThemeData( hWnd, NULL ); return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - case WM_THEMECHANGED: - CloseThemeData ( theme ); - OpenThemeData( hWnd, themeClass ); - InvalidateRect( hWnd, NULL, TRUE ); - return 0; - - case WM_ERASEBKGND: - if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - { - RECT rc; - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - if (!CallWindowProcW(dlgp, hWnd, msg, wParam, lParam)) - { - /* Draw background*/ - GetClientRect (hWnd, &rc); - if (IsThemePartDefined (theme, WP_DIALOG, 0)) - /* Although there is a theme for the WINDOW class/DIALOG part, - * but I[res] haven't seen Windows using it yet... Even when - * dialog theming is activated, the good ol' BTNFACE - * background seems to be used. */ -#if 0 - DrawThemeBackground (theme, (HDC)wParam, WP_DIALOG, 0, &rc, - NULL); -#endif - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - /* We might have gotten a TAB theme class, so check if we can draw as a tab page */ - else if (IsThemePartDefined(theme, TABP_BODY, 0)) - hr = DrawThemeBackground(theme, (HDC)wParam, TABP_BODY, 0, &rc, NULL); - - if (FAILED(hr)) - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - } - return 1; - } - default: /* Call old proc */ return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); -- 2.32.0

1 0

[PATCH 6/9] comctl32/propsheet: Handle WM_CTLCOLORSTATIC in the property sheet page window procedure.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Move themed WM_CTLCOLORSTATIC handling from UXTHEME_DefDlgProc() to the property sheet page window procedure. Fix a regression from 2f1bbd8 that makes the static controls in file open dialog to have black background when using some themes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51987 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/propsheet.c | 42 +++++++++++++++++++++++++++++++++ dlls/comctl32/tests/propsheet.c | 12 +++------- dlls/comctl32/tests/static.c | 5 ---- dlls/uxtheme/dialog.c | 28 ---------------------- 4 files changed, 45 insertions(+), 42 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index 556d63f2c75..4fe80241855 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1196,6 +1196,36 @@ PROPSHEET_WizardSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, return DefSubclassProc(hwnd, uMsg, wParam, lParam); } +/* Subclassing window procedure for theming dialogs in property sheet pages */ +static LRESULT CALLBACK PROPSHEET_ThemedSubclassProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp, + UINT_PTR id, DWORD_PTR ref) +{ + WNDPROC dlgproc; + LRESULT lr; + HDC hdc; + + switch (msg) + { + case WM_CTLCOLORSTATIC: + { + if (!IsThemeActive() || !IsThemeDialogTextureEnabled(hwnd)) + break; + + dlgproc = (WNDPROC)GetWindowLongPtrW(hwnd, DWLP_DLGPROC); + lr = CallWindowProcW(dlgproc, hwnd, msg, wp, lp); + if (lr) + return lr; + + hdc = (HDC)wp; + SetBkColor(hdc, GetSysColor(COLOR_BTNFACE)); + SetBkMode(hdc, TRANSPARENT); + return (LRESULT)GetStockObject(NULL_BRUSH); + } + } + + return DefSubclassProc(hwnd, msg, wp, lp); +} + /* * Get the size of an in-memory Template * @@ -1467,6 +1497,10 @@ static BOOL PROPSHEET_CreatePage(HWND hwndParent, SetWindowSubclass(hwndPage, PROPSHEET_WizardSubclassProc, 1, (DWORD_PTR)ppshpage); } + else + { + SetWindowSubclass(hwndPage, PROPSHEET_ThemedSubclassProc, 1, (DWORD_PTR)ppshpage); + } if (!(psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)) EnableThemeDialogTexture (hwndPage, ETDT_ENABLETAB); @@ -2408,6 +2442,10 @@ static BOOL PROPSHEET_RemovePage(HWND hwndDlg, RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_WizardSubclassProc, 1); } + else + { + RemoveWindowSubclass(psInfo->proppage[index].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + } /* Destroy page dialog window */ DestroyWindow(psInfo->proppage[index].hwndPage); @@ -2725,6 +2763,10 @@ static void PROPSHEET_CleanUp(HWND hwndDlg) RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_WizardSubclassProc, 1); } + else + { + RemoveWindowSubclass(psInfo->proppage[i].hwndPage, PROPSHEET_ThemedSubclassProc, 1); + } if(psInfo->proppage[i].hwndPage) DestroyWindow(psInfo->proppage[i].hwndPage); diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index eaaa00efe97..199b280879e 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -1298,13 +1298,11 @@ static void test_WM_CTLCOLORSTATIC(void) /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); ok(hbrush2 != hbrush, "Expected a different brush.\n"); @@ -1312,7 +1310,6 @@ static void test_WM_CTLCOLORSTATIC(void) memset(&log_brush, 0, sizeof(log_brush)); count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); todo_wine ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, @@ -1360,10 +1357,8 @@ static void test_WM_CTLCOLORSTATIC(void) old_mode = SetBkMode(hdc, OPAQUE); ok(old_mode != 0, "SetBkMode failed.\n"); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) ok(hbrush2 == hbrush, "Expected the same brush.\n"); mode = SetBkMode(hdc, old_mode); - todo_wine ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); ReleaseDC(hwnd, hdc); DestroyWindow(hwnd); @@ -1374,7 +1369,6 @@ static void test_WM_CTLCOLORSTATIC(void) hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) ok(hbrush2 != hbrush, "Expected a different brush.\n"); ok(hbrush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), hbrush2); @@ -1456,11 +1450,11 @@ static void test_WM_CTLCOLORSTATIC(void) ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(hbrush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), hbrush); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + todo_wine_if(is_theme_active) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); } color = SetBkColor(child_hdc, old_color); diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index ce21e03df3c..b507cf1e02b 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -42,7 +42,6 @@ static int g_nReceivedColorStatic; static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); static HTHEME (WINAPI *pGetWindowTheme)(HWND); -static BOOL (WINAPI *pIsThemeActive)(void); static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); /* try to make sure pending X events have been processed before continuing */ @@ -452,14 +451,12 @@ static void test_WM_CTLCOLORSTATIC(void) ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(todo) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush); color = SetBkColor(child_hdc, old_color); ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", GetSysColor(COLOR_BTNFACE), color); mode = SetBkMode(child_hdc, old_mode); - todo_wine_if(todo) ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); color = GetPixel(dialog_hdc, 40, 40); ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); @@ -475,7 +472,6 @@ static void test_WM_CTLCOLORSTATIC(void) ok(ret, "Expected theme dialog texture enabled.\n"); brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); - todo_wine_if(pIsThemeActive()) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", GetSysColorBrush(COLOR_BTNFACE), brush); @@ -497,7 +493,6 @@ static void init_functions(void) #define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); X(EnableThemeDialogTexture) X(GetWindowTheme) - X(IsThemeActive) X(IsThemeDialogTextureEnabled) #undef X } diff --git a/dlls/uxtheme/dialog.c b/dlls/uxtheme/dialog.c index d0055e013a0..bbfdaba639b 100644 --- a/dlls/uxtheme/dialog.c +++ b/dlls/uxtheme/dialog.c @@ -89,34 +89,6 @@ LRESULT WINAPI UXTHEME_DefDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa return 1; } - case WM_CTLCOLORSTATIC: - if (!doTheming) return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - { - WNDPROC dlgp = (WNDPROC)GetWindowLongPtrW (hWnd, DWLP_DLGPROC); - LRESULT result = CallWindowProcW(dlgp, hWnd, msg, wParam, lParam); - if (!result) - { - /* Override defaults with more suitable values when themed */ - HDC controlDC = (HDC)wParam; - HWND controlWnd = (HWND)lParam; - WCHAR controlClass[32]; - - GetClassNameW (controlWnd, controlClass, ARRAY_SIZE(controlClass)); - if (lstrcmpiW (controlClass, WC_STATICW) == 0) - { - SetBkColor(controlDC, GetSysColor(COLOR_BTNFACE)); - SetBkMode (controlDC, TRANSPARENT); - - /* Return NULL brush since we painted the BG already */ - return (LRESULT)GetStockObject (NULL_BRUSH); - } - else - return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); - - } - return result; - } - default: /* Call old proc */ return user_api.pDefDlgProc(hWnd, msg, wParam, lParam, unicode); -- 2.32.0

1 0

[PATCH 5/9] comctl32/tests: Test WM_CTLCOLORSTATIC for themed property sheets.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

These tests show that it's the themed property sheet page window procedure that sets device contexts transparent and return a pattern brush created from the tab body part in a theme. Combined with test_WM_CTLCOLORSTATIC() in dlls/comctl32/tests/static.c, we can conclude that UXTHEME_DefDlgProc() shouldn't handle WM_CTLCOLORSTATIC. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/propsheet.c | 326 +++++++++++++++++++++++++++++++- 1 file changed, 324 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 3089454d18d..eaaa00efe97 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -20,18 +20,24 @@ #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> +#include <vsstyle.h> #include "msg.h" #include "resources.h" #include "wine/test.h" +#include "v6util.h" + static HWND parenthwnd; static HWND sheethwnd; static BOOL rtl; static LONG active_page = -1; +static BOOL is_v6, is_theme_active; + #define IDC_APPLY_BUTTON 12321 static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageA)(const PROPSHEETPAGEA *desc); @@ -39,6 +45,14 @@ static HPROPSHEETPAGE (WINAPI *pCreatePropertySheetPageW)(const PROPSHEETPAGEW * static BOOL (WINAPI *pDestroyPropertySheetPage)(HPROPSHEETPAGE proppage); static INT_PTR (WINAPI *pPropertySheetA)(const PROPSHEETHEADERA *header); +static HRESULT (WINAPI *pCloseThemeData)(HTHEME); +static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); +static HRESULT (WINAPI *pGetThemePartSize)(HTHEME, HDC, int, int, RECT *, THEMESIZE, SIZE *); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeActive)(void); +static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); +static HTHEME (WINAPI *pOpenThemeData)(HWND, LPCWSTR); + static void detect_locale(void) { DWORD reading_layout; @@ -1180,7 +1194,284 @@ static void test_bad_control_class(void) DestroyWindow((HWND)ret); } -static void init_functions(void) +static BOOL handle_WM_CTLCOLORSTATIC; + +static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) +{ + static HWND child; + + switch(msg) + { + case WM_INITDIALOG: + sheethwnd = hwnd; + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, + (HMENU)100, 0, NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + return FALSE; + + case WM_CTLCOLORSTATIC: + return (INT_PTR)(handle_WM_CTLCOLORSTATIC ? GetSysColorBrush(COLOR_MENU) : 0); + + case WM_CLOSE: + DestroyWindow(child); + return FALSE; + + default: + return FALSE; + } +} + +static void test_WM_CTLCOLORSTATIC(void) +{ + HWND hdlg, child, parent, hwnd; + COLORREF color, old_color; + int mode, old_mode, count; + HBRUSH hbrush, hbrush2; + HPROPSHEETPAGE hpsp[1]; + PROPSHEETHEADERA psh; + HDC child_hdc, hdc; + LOGBRUSH log_brush; + PROPSHEETPAGEA psp; + ULONG_PTR dlgproc; + WNDCLASSA cls; + HTHEME theme; + DWORD error; + BITMAP bmp; + HRESULT hr; + POINT org; + SIZE size; + BOOL ret; + + memset(&psp, 0, sizeof(psp)); + psp.dwSize = sizeof(psp); + psp.hInstance = GetModuleHandleA(NULL); + U(psp).pszTemplate = "prop_page1"; + psp.pfnDlgProc = test_WM_CTLCOLORSTATIC_proc; + hpsp[0] = pCreatePropertySheetPageA(&psp); + + memset(&psh, 0, sizeof(psh)); + psh.dwSize = PROPSHEETHEADERA_V1_SIZE; + psh.dwFlags = PSH_MODELESS; + psh.pszCaption = "caption"; + psh.nPages = 1; + psh.hwndParent = GetDesktopWindow(); + U3(psh).phpage = hpsp; + + hdlg = (HWND)pPropertySheetA(&psh); + ok(hdlg != INVALID_HANDLE_VALUE, "Got invalid handle value %p.\n", hdlg); + flush_events(); + + child = GetDlgItem(sheethwnd, 100); + ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); + parent = GetParent(child); + ok(parent == sheethwnd, "Expected parent %p, got %p.\n", sheethwnd, parent); + ok(sheethwnd != hdlg, "Expected handles not equal.\n"); + + /* Test that page dialog procedure is unchanged */ + dlgproc = GetWindowLongPtrA(sheethwnd, DWLP_DLGPROC); + ok(dlgproc == (ULONG_PTR)test_WM_CTLCOLORSTATIC_proc, "Unexpected dlgproc %#lx.\n", dlgproc); + + child_hdc = GetDC(child); + old_mode = SetBkMode(child_hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + old_color = SetBkColor(child_hdc, 0xaa5511); + ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + + /* Test that brush origin is at (0,0) */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + + /* Test that theme dialog texture is enabled for comctl32 v6, even when theming is off */ + ret = pIsThemeDialogTextureEnabled(sheethwnd); + todo_wine_if(!is_v6) + ok(ret == is_v6, "Wrong theme dialog texture status.\n"); + + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + if (is_v6 && is_theme_active) + { + /* Test that brush origin is changed after WM_CTLCOLORSTATIC */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + todo_wine + ok(org.x == -1 && org.y == -2, "Expected (-1,-2), got %s.\n", wine_dbgstr_point(&org)); + + /* Test that device context is set to transparent after WM_CTLCOLORSTATIC */ + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) + ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); + + /* Test that the brush is a pattern brush created from the tab body bitmap in the theme */ + todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) + ok(hbrush != GetSysColorBrush(COLOR_BTNFACE), "Expected a different brush.\n"); + todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + ok(hbrush != GetStockObject(NULL_BRUSH), "Expected a different brush.\n"); + hbrush2 = SelectObject(child_hdc, GetSysColorBrush(COLOR_BTNFACE)); + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + + memset(&log_brush, 0, sizeof(log_brush)); + count = GetObjectA(hbrush, sizeof(log_brush), &log_brush); + ok(count == sizeof(log_brush), "GetObjectA failed, error %u.\n", GetLastError()); + todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) + ok(log_brush.lbColor == 0, "Expected brush color %#x, got %#x.\n", 0, log_brush.lbColor); + todo_wine + ok(log_brush.lbStyle == BS_PATTERN, "Expected brush style %#x, got %#x.\n", BS_PATTERN, + log_brush.lbStyle); + + memset(&bmp, 0, sizeof(bmp)); + count = GetObjectA((HBITMAP)log_brush.lbHatch, sizeof(bmp), &bmp); + todo_wine + ok(count == sizeof(bmp), "GetObjectA failed, error %u.\n", GetLastError()); + + todo_wine_if(pGetWindowTheme(hdlg) != NULL) + ok(pGetWindowTheme(hdlg) == NULL, "Expected NULL theme handle.\n"); + todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + ok(pGetWindowTheme(sheethwnd) == NULL, "Expected NULL theme handle.\n"); + + memset(&cls, 0, sizeof(cls)); + cls.lpfnWndProc = DefWindowProcA; + cls.hInstance = GetModuleHandleA(NULL); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpszClassName = "TestClass"; + RegisterClassA(&cls); + + hwnd = CreateWindowA("TestClass", "test", WS_POPUP | WS_VISIBLE, 0, 0, 4, 4, 0, 0, 0, NULL); + ok(hwnd != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + theme = pOpenThemeData(hwnd, L"Tab"); + /* Light theme triggers a double free bug in uxtheme */ + todo_wine_if(!theme) + ok(theme != NULL, "OpenThemeData failed.\n"); + + size.cx = 0; + size.cy = 0; + hr = pGetThemePartSize(theme, NULL, TABP_BODY, 0, NULL, TS_TRUE, &size); + todo_wine_if(!theme) + ok(hr == S_OK, "GetThemePartSize failed, hr %#x.\n", hr); + todo_wine_if(theme) + ok(bmp.bmWidth == size.cx, "Expected width %d, got %d.\n", size.cx, bmp.bmWidth); + todo_wine_if(theme) + ok(bmp.bmHeight == size.cy, "Expected height %d, got %d.\n", size.cy, bmp.bmHeight); + + pCloseThemeData(theme); + + /* Test that other controls besides static controls also get the same brush */ + hdc = GetDC(hwnd); + old_mode = SetBkMode(hdc, OPAQUE); + ok(old_mode != 0, "SetBkMode failed.\n"); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)hdc, (LPARAM)hwnd); + todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + mode = SetBkMode(hdc, old_mode); + todo_wine + ok(mode == TRANSPARENT, "Expected mode %#x, got %#x.\n", TRANSPARENT, mode); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); + UnregisterClassA("TestClass", GetModuleHandleA(NULL)); + + /* Test disabling theme dialog texture should change the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(pGetWindowTheme(sheethwnd) == NULL) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + ok(hbrush2 == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), hbrush2); + + /* Test re-enabling theme dialog texture with ETDT_ENABLE doesn't change the brush*/ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(hbrush2 != hbrush) + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + + /* Test ETDT_ENABLE | ETDT_USETABTEXTURE should change the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(hbrush2 == hbrush) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + + /* Test ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE should change the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USEAEROWIZARDTABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + /* ETDT_USEAEROWIZARDTABTEXTURE is supported only on Vista+ */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + else + todo_wine_if(hbrush2 == hbrush) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + hr = pEnableThemeDialogTexture(sheethwnd, ETDT_ENABLE | ETDT_USETABTEXTURE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + + /* Test that the page procedure should take precedence if WM_CTLCOLORSTATIC is handled */ + handle_WM_CTLCOLORSTATIC = TRUE; + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(hbrush == GetSysColorBrush(COLOR_MENU), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_MENU), hbrush); + handle_WM_CTLCOLORSTATIC = FALSE; + + /* Test that the brush is not a system object and has only one reference and shouldn't be freed */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ret = DeleteObject(hbrush); + ok(ret, "DeleteObject failed, error %u.\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); + error = GetLastError(); + todo_wine + ok(!ret, "GetObjectA succeeded.\n"); + todo_wine + ok(error == ERROR_INVALID_PARAMETER, "Expected error %u, got %u.\n", + ERROR_INVALID_PARAMETER, error); + ret = DeleteObject(hbrush); + todo_wine + ok(!ret, "DeleteObject succeeded.\n"); + + /* Should still report the same brush handle after the brush handle was freed */ + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + ok(hbrush2 == hbrush, "Expected the same brush.\n"); + + /* Test that WM_THEMECHANGED should recreate the brush */ + hbrush = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + SendMessageW(sheethwnd, WM_THEMECHANGED, 0, 0); + hbrush2 = (HBRUSH)SendMessageW(sheethwnd, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(is_theme_active) + ok(hbrush2 != hbrush, "Expected a different brush.\n"); + ret = GetObjectA(hbrush, sizeof(log_brush), &log_brush); + todo_wine + ok(!ret, "GetObjectA succeeded.\n"); + } + else + { + /* Test that brush origin is at (0,0) */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + + todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + ok(hbrush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), hbrush); + mode = SetBkMode(child_hdc, old_mode); + todo_wine_if(pGetWindowTheme(sheethwnd) != NULL) + ok(mode == OPAQUE, "Expected mode %#x, got %#x.\n", OPAQUE, mode); + } + color = SetBkColor(child_hdc, old_color); + ok(color == GetSysColor(COLOR_BTNFACE), "Expected background color %#x, got %#x.\n", + GetSysColor(COLOR_BTNFACE), color); + + ReleaseDC(child, child_hdc); + DestroyWindow(hdlg); +} + +static void init_comctl32_functions(void) { HMODULE hComCtl32 = LoadLibraryA("comctl32.dll"); @@ -1192,8 +1483,26 @@ static void init_functions(void) #undef X } +static void init_uxtheme_functions(void) +{ + HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); + X(CloseThemeData) + X(EnableThemeDialogTexture) + X(GetThemePartSize) + X(GetWindowTheme) + X(IsThemeActive) + X(IsThemeDialogTextureEnabled) + X(OpenThemeData) +#undef X +} + START_TEST(propsheet) { + ULONG_PTR ctx_cookie; + HANDLE ctx; + detect_locale(); if (rtl) { @@ -1203,7 +1512,9 @@ START_TEST(propsheet) SetProcessDefaultLayout(LAYOUT_RTL); } - init_functions(); + init_comctl32_functions(); + init_uxtheme_functions(); + is_theme_active = pIsThemeActive(); test_bad_control_class(); test_title(); @@ -1216,4 +1527,15 @@ START_TEST(propsheet) test_PSM_ADDPAGE(); test_PSM_INSERTPAGE(); test_CreatePropertySheetPage(); + test_WM_CTLCOLORSTATIC(); + + if (!load_v6_module(&ctx_cookie, &ctx)) + return; + + init_comctl32_functions(); + is_v6 = TRUE; + + test_WM_CTLCOLORSTATIC(); + + unload_v6_module(ctx_cookie, ctx); } -- 2.32.0

1 0

[PATCH 4/9] include: Add more EnableThemeDialogTexture() option flags.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- include/uxtheme.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/uxtheme.h b/include/uxtheme.h index 384c3655b41..b44e06de611 100644 --- a/include/uxtheme.h +++ b/include/uxtheme.h @@ -96,7 +96,10 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME,HDC,int,int,LPCWSTR,int,DWORD,RECT*, #define ETDT_DISABLE 0x00000001 #define ETDT_ENABLE 0x00000002 #define ETDT_USETABTEXTURE 0x00000004 +#define ETDT_USEAEROWIZARDTABTEXTURE 0x00000008 #define ETDT_ENABLETAB (ETDT_ENABLE|ETDT_USETABTEXTURE) +#define ETDT_ENABLEAEROWIZARDTAB (ETDT_ENABLE|ETDT_USEAEROWIZARDTABTEXTURE) +#define ETDT_VALIDBITS (ETDT_DISABLE|ETDT_ENABLE|ETDT_USETABTEXTURE|ETDT_USEAEROWIZARDTABTEXTURE) HRESULT WINAPI EnableThemeDialogTexture(HWND,DWORD); HRESULT WINAPI EnableTheming(BOOL); -- 2.32.0

1 0

[PATCH 3/9] comctl32/tests: Add more WM_CTLCOLORSTATIC tests for static controls in a dialog.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Mostly to test that even when theme texture is enabled for a dialog, the default dialog procedure still returns the stock COLOR_BTNFACE brush in response to WM_CTLCOLORSTATIC. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/tests/static.c | 61 +++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/tests/static.c b/dlls/comctl32/tests/static.c index 99738f7b513..ce21e03df3c 100644 --- a/dlls/comctl32/tests/static.c +++ b/dlls/comctl32/tests/static.c @@ -40,6 +40,11 @@ static HWND hMainWnd; static int g_nReceivedColorStatic; +static HRESULT (WINAPI *pEnableThemeDialogTexture)(HWND, DWORD); +static HTHEME (WINAPI *pGetWindowTheme)(HWND); +static BOOL (WINAPI *pIsThemeActive)(void); +static BOOL (WINAPI *pIsThemeDialogTextureEnabled)(HWND); + /* try to make sure pending X events have been processed before continuing */ static void flush_events(void) { @@ -385,7 +390,7 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM switch (msg) { case WM_INITDIALOG: - child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 0, 0, 50, 50, hwnd, + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, hwnd, (HMENU)100, 0, NULL); ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); return FALSE; @@ -401,14 +406,14 @@ static INT_PTR CALLBACK test_WM_CTLCOLORSTATIC_proc(HWND hwnd, UINT msg, WPARAM static void test_WM_CTLCOLORSTATIC(void) { - HTHEME (WINAPI *pGetWindowTheme)(HTHEME) = NULL; HWND parent, dialog, child; COLORREF color, old_color; HDC child_hdc, dialog_hdc; + BOOL ret, todo = FALSE; int mode, old_mode; - BOOL todo = FALSE; - HMODULE uxtheme; HBRUSH brush; + HRESULT hr; + POINT org; struct { @@ -430,13 +435,7 @@ static void test_WM_CTLCOLORSTATIC(void) child = GetDlgItem(dialog, 100); ok(child != NULL, "Failed to get child static control, error %d.\n", GetLastError()); - uxtheme = LoadLibraryA("uxtheme.dll"); - if (uxtheme) - { - pGetWindowTheme = (void*)GetProcAddress(uxtheme, "GetWindowTheme"); - if (pGetWindowTheme) - todo = !!pGetWindowTheme(dialog); - } + todo = !!pGetWindowTheme(dialog); dialog_hdc = GetDC(dialog); child_hdc = GetDC(child); @@ -447,6 +446,11 @@ static void test_WM_CTLCOLORSTATIC(void) old_color = SetBkColor(child_hdc, 0xaa5511); ok(old_color != CLR_INVALID, "SetBkColor failed.\n"); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture supported.\n"); + todo_wine_if(todo) + ok(pGetWindowTheme(dialog) == NULL, "Expected NULL theme handle.\n"); + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); todo_wine_if(todo) ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", @@ -460,11 +464,42 @@ static void test_WM_CTLCOLORSTATIC(void) color = GetPixel(dialog_hdc, 40, 40); ok(color == 0, "Expected pixel %#x, got %#x.\n", 0, color); + /* Test that EnableThemeDialogTexture() doesn't make WM_CTLCOLORSTATIC return a different brush */ + hr = pEnableThemeDialogTexture(dialog, ETDT_DISABLE); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(!ret, "Expected theme dialog texture disabled.\n"); + hr = pEnableThemeDialogTexture(dialog, ETDT_ENABLETAB); + ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); + ret = pIsThemeDialogTextureEnabled(dialog); + ok(ret, "Expected theme dialog texture enabled.\n"); + + brush = (HBRUSH)SendMessageW(dialog, WM_CTLCOLORSTATIC, (WPARAM)child_hdc, (LPARAM)child); + todo_wine_if(pIsThemeActive()) + ok(brush == GetSysColorBrush(COLOR_BTNFACE), "Expected brush %p, got %p.\n", + GetSysColorBrush(COLOR_BTNFACE), brush); + + /* Test that WM_CTLCOLORSTATIC doesn't change brush origin */ + ret = GetBrushOrgEx(child_hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %u.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + ReleaseDC(child, child_hdc); ReleaseDC(dialog, dialog_hdc); EndDialog(dialog, 0); DestroyWindow(parent); - FreeLibrary(uxtheme); +} + +static void init_functions(void) +{ + HMODULE uxtheme = LoadLibraryA("uxtheme.dll"); + +#define X(f) p##f = (void *)GetProcAddress(uxtheme, #f); + X(EnableThemeDialogTexture) + X(GetWindowTheme) + X(IsThemeActive) + X(IsThemeDialogTextureEnabled) +#undef X } START_TEST(static) @@ -477,6 +512,8 @@ START_TEST(static) if (!load_v6_module(&ctx_cookie, &hCtx)) return; + init_functions(); + wndclass.cbSize = sizeof(wndclass); wndclass.style = CS_HREDRAW | CS_VREDRAW; wndclass.lpfnWndProc = WndProc; -- 2.32.0

1 0

[PATCH 2/9] uxtheme/tests: Add DrawThemeParentBackground() tests.
by Zhiyi Zhang 07 Dec '21

07 Dec '21

Test that DrawThemeParentBackground() always send WM_ERASEBKGND and WM_PRINTCLIENT on success, which can be used to indicate if DrawThemeParentBackground() is called. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/uxtheme/tests/system.c | 95 +++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 10857115061..b085e639784 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -1438,6 +1438,100 @@ done: DestroyWindow(hwnd); } +static const struct message DrawThemeParentBackground_seq[] = +{ + {WM_ERASEBKGND, sent}, + {WM_PRINTCLIENT, sent | lparam, 0, PRF_CLIENT}, + {0} +}; + +static LRESULT WINAPI test_DrawThemeParentBackground_proc(HWND hwnd, UINT message, WPARAM wp, + LPARAM lp) +{ + static LONG defwndproc_counter; + struct message msg = {0}; + LRESULT lr; + POINT org; + BOOL ret; + + switch (message) + { + /* Test that DrawThemeParentBackground() doesn't change brush origins */ + case WM_ERASEBKGND: + case WM_PRINTCLIENT: + ret = GetBrushOrgEx((HDC)wp, &org); + ok(ret, "GetBrushOrgEx failed, error %d.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + break; + + default: + break; + } + + msg.message = message; + msg.flags = sent | wparam | lparam; + if (defwndproc_counter) + msg.flags |= defwinproc; + msg.wParam = wp; + msg.lParam = lp; + add_message(sequences, PARENT_SEQ_INDEX, &msg); + + InterlockedIncrement(&defwndproc_counter); + lr = DefWindowProcA(hwnd, message, wp, lp); + InterlockedDecrement(&defwndproc_counter); + return lr; +} + +static void test_DrawThemeParentBackground(void) +{ + HWND child, parent; + WNDCLASSA cls; + HRESULT hr; + POINT org; + RECT rect; + BOOL ret; + HDC hdc; + + memset(&cls, 0, sizeof(cls)); + cls.hInstance = GetModuleHandleA(0); + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = GetStockObject(WHITE_BRUSH); + cls.lpfnWndProc = test_DrawThemeParentBackground_proc; + cls.lpszClassName = "TestDrawThemeParentBackgroundClass"; + RegisterClassA(&cls); + + parent = CreateWindowA("TestDrawThemeParentBackgroundClass", "parent", WS_POPUP | WS_VISIBLE, 0, + 0, 100, 100, 0, 0, 0, 0); + ok(parent != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + child = CreateWindowA(WC_STATICA, "child", WS_CHILD | WS_VISIBLE, 1, 2, 50, 50, parent, 0, 0, + NULL); + ok(child != NULL, "CreateWindowA failed, error %d.\n", GetLastError()); + flush_events(); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + hdc = GetDC(child); + ret = GetBrushOrgEx(hdc, &org); + ok(ret, "GetBrushOrgEx failed, error %d.\n", GetLastError()); + ok(org.x == 0 && org.y == 0, "Expected (0,0), got %s.\n", wine_dbgstr_point(&org)); + + hr = DrawThemeParentBackground(child, hdc, NULL); + ok(SUCCEEDED(hr), "DrawThemeParentBackground failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, DrawThemeParentBackground_seq, + "DrawThemeParentBackground parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + GetClientRect(child, &rect); + hr = DrawThemeParentBackground(child, hdc, &rect); + ok(SUCCEEDED(hr), "DrawThemeParentBackground failed, hr %#x.\n", hr); + ok_sequence(sequences, PARENT_SEQ_INDEX, DrawThemeParentBackground_seq, + "DrawThemeParentBackground parent", FALSE); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + ReleaseDC(child, hdc); + DestroyWindow(parent); + UnregisterClassA("TestDrawThemeParentBackgroundClass", GetModuleHandleA(0)); +} + START_TEST(system) { init_funcs(); @@ -1459,6 +1553,7 @@ START_TEST(system) test_buffered_paint(); test_GetThemeIntList(); test_GetThemeTransitionDuration(); + test_DrawThemeParentBackground(); /* Test EnableTheming() in the end because it may disable theming */ test_EnableTheming(); -- 2.32.0

1 0

[PATCH 1/2] include: Add namespaceapi.h file.
by Mohamad Al-Jaf 07 Dec '21

07 Dec '21

Required by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- include/Makefile.in | 1 + include/namespaceapi.h | 43 ++++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 include/namespaceapi.h diff --git a/include/Makefile.in b/include/Makefile.in index de40421edcb..302e0bb2a73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -526,6 +526,7 @@ SOURCES = \ mtxdm.h \ mulres.idl \ multimon.h \ + namespaceapi.h \ natupnp.idl \ nb30.h \ ncrypt.h \ diff --git a/include/namespaceapi.h b/include/namespaceapi.h new file mode 100644 index 00000000000..9447ee26a53 --- /dev/null +++ b/include/namespaceapi.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2021 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NAMESPACEAPI_H_ +#define _NAMESPACEAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* ClosePrivateNamespace flags */ +#define PRIVATE_NAMESPACE_FLAG_DESTROY 0x00000001 + +/* CreateBoundaryDescriptorW flags */ +#define CREATE_BOUNDARY_DESCRIPTOR_ADD_APPCONTAINER_SID 0x01 + +BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); +BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); +void WINAPI DeleteBoundaryDescriptor(HANDLE); +HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _NAMESPACEAPI_H_ */ \ No newline at end of file diff --git a/include/winbase.h b/include/winbase.h index 2f7287f12b6..0a0bfde9d10 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -241,6 +241,8 @@ typedef struct _SECURITY_ATTRIBUTES BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#include <namespaceapi.h> + #ifndef _FILETIME_ #define _FILETIME_ /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ -- 2.34.1

2 4

[PATCH v2] include: Add namespaceapi.h file.
by Mohamad Al-Jaf 07 Dec '21

07 Dec '21

Required by IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Move CreateBoundaryDescriptorW flag to winnt.h (Thanks Jactry Zeng). - Add missing WINBASEAPI function type. --- include/Makefile.in | 1 + include/namespaceapi.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/winbase.h | 2 ++ include/winnt.h | 3 +++ 4 files changed, 46 insertions(+) create mode 100644 include/namespaceapi.h diff --git a/include/Makefile.in b/include/Makefile.in index de40421edcb..302e0bb2a73 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -526,6 +526,7 @@ SOURCES = \ mtxdm.h \ mulres.idl \ multimon.h \ + namespaceapi.h \ natupnp.idl \ nb30.h \ ncrypt.h \ diff --git a/include/namespaceapi.h b/include/namespaceapi.h new file mode 100644 index 00000000000..512e8d1d278 --- /dev/null +++ b/include/namespaceapi.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2021 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _NAMESPACEAPI_H_ +#define _NAMESPACEAPI_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +/* ClosePrivateNamespace flags */ +#define PRIVATE_NAMESPACE_FLAG_DESTROY 0x00000001 + +WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); +WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); +WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); +WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); + +#ifdef __cplusplus +} +#endif + +#endif /* _NAMESPACEAPI_H_ */ \ No newline at end of file diff --git a/include/winbase.h b/include/winbase.h index 2f7287f12b6..0a0bfde9d10 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -241,6 +241,8 @@ typedef struct _SECURITY_ATTRIBUTES BOOL bInheritHandle; } SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; +#include <namespaceapi.h> + #ifndef _FILETIME_ #define _FILETIME_ /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */ diff --git a/include/winnt.h b/include/winnt.h index 2ab74ab123c..0e5aebe8be3 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -3748,6 +3748,9 @@ typedef struct _SID { } SID,*PISID; #endif /* !defined(SID_DEFINED) */ +/* CreateBoundaryDescriptorW flag */ +#define CREATE_BOUNDARY_DESCRIPTOR_ADD_APPCONTAINER_SID 0x01 + #define SID_REVISION (1) /* Current revision */ #define SID_MAX_SUB_AUTHORITIES (15) /* current max subauths */ #define SID_RECOMMENDED_SUB_AUTHORITIES (1) /* recommended subauths */ -- 2.34.1

1 0

[PATCH v2 2/2] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov 07 Dec '21

07 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 74d82b85be4..024d9026785 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -457,6 +457,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -631,13 +639,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index 00b8e47be03..d87bb4d2dae 100644 --- a/server/registry.c +++ b/server/registry.c @@ -479,6 +479,8 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); -- 2.34.1

1 0

[PATCH v2 1/2] server: Terminating '\' in the registry root name is optional.
by Dmitry Timoshkov 07 Dec '21

07 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 2 -- server/registry.c | 26 +++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..74d82b85be4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -417,7 +417,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +568,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..00b8e47be03 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = sizeof(root_name); char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); + memcpy( ret, root_name, sizeof(root_name) ); return (WCHAR *)ret; } @@ -483,6 +483,11 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) { str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); + if (str->len && str->str[0] == '\\') + { + str->str++; + str->len -= sizeof(WCHAR); + } } } @@ -734,6 +739,11 @@ static struct key *follow_symlink( struct key *key, int iteration ) if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); + if (path.len && path.str[0] == '\\') + { + path.str++; + path.len -= sizeof(WCHAR); + } key = root_key; token.str = NULL; @@ -2156,6 +2166,11 @@ DECL_HANDLER(create_key) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len && name.str[0] == '\\') + { + name.str++; + name.len -= sizeof(WCHAR); + } } /* NOTE: no access rights are required from the parent handle to create a key */ @@ -2314,6 +2329,11 @@ DECL_HANDLER(load_registry) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.len && name.str[0] == '\\') + { + name.str++; + name.len -= sizeof(WCHAR); + } } if ((parent = get_parent_hkey_obj( objattr->rootdir ))) -- 2.34.1

1 0

[PATCH 1/2] server: Terminating '\' in the registry root name is optional.
by Dmitry Timoshkov 07 Dec '21

07 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 2 -- server/registry.c | 26 +++++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 91b752ac069..74d82b85be4 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -417,7 +417,6 @@ todo_wine pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtOpenKey(&key, KEY_READ, &attr); - todo_wine ok( status == STATUS_SUCCESS, "NtOpenKey failed: 0x%08x\n", status ); pNtClose( key ); pRtlFreeUnicodeString( &str ); @@ -569,7 +568,6 @@ static void test_NtCreateKey(void) pRtlCreateUnicodeStringFromAsciiz( &str, "\\Registry" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); - todo_wine ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); diff --git a/server/registry.c b/server/registry.c index b00abdbc004..ebe11db1039 100644 --- a/server/registry.c +++ b/server/registry.c @@ -127,7 +127,7 @@ static const timeout_t save_period = 30 * -TICKS_PER_SEC; /* delay between peri static struct timeout_user *save_timeout_user; /* saving timer */ static enum prefix_type { PREFIX_UNKNOWN, PREFIX_32BIT, PREFIX_64BIT } prefix_type; -static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y','\\' }; +static const WCHAR root_name[] = { '\\','R','e','g','i','s','t','r','y' }; static const WCHAR wow6432node[] = {'W','o','w','6','4','3','2','N','o','d','e'}; static const WCHAR symlink_value[] = {'S','y','m','b','o','l','i','c','L','i','n','k','V','a','l','u','e'}; static const struct unicode_str symlink_str = { symlink_value, sizeof(symlink_value) }; @@ -411,7 +411,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) { static const WCHAR backslash = '\\'; struct key *key = (struct key *) obj; - data_size_t len = sizeof(root_name) - sizeof(WCHAR); + data_size_t len = sizeof(root_name); char *ret; if (key->flags & KEY_DELETED) @@ -431,7 +431,7 @@ static WCHAR *key_get_full_name( struct object *obj, data_size_t *ret_len ) len -= key->namelen + sizeof(WCHAR); memcpy( ret + len, &backslash, sizeof(WCHAR) ); } - memcpy( ret, root_name, sizeof(root_name) - sizeof(WCHAR) ); + memcpy( ret, root_name, sizeof(root_name) ); return (WCHAR *)ret; } @@ -483,6 +483,11 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) { str->str += ARRAY_SIZE( root_name ); str->len -= sizeof(root_name); + if (str->str[0] == '\\') + { + str->str++; + str->len -= sizeof(WCHAR); + } } } @@ -734,6 +739,11 @@ static struct key *follow_symlink( struct key *key, int iteration ) if (memicmp_strW( path.str, root_name, sizeof(root_name) )) return NULL; path.str += ARRAY_SIZE( root_name ); path.len -= sizeof(root_name); + if (path.str[0] == '\\') + { + path.str++; + path.len -= sizeof(WCHAR); + } key = root_key; token.str = NULL; @@ -2156,6 +2166,11 @@ DECL_HANDLER(create_key) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.str[0] == '\\') + { + name.str++; + name.len -= sizeof(WCHAR); + } } /* NOTE: no access rights are required from the parent handle to create a key */ @@ -2314,6 +2329,11 @@ DECL_HANDLER(load_registry) { name.str += ARRAY_SIZE( root_name ); name.len -= sizeof(root_name); + if (name.str[0] == '\\') + { + name.str++; + name.len -= sizeof(WCHAR); + } } if ((parent = get_parent_hkey_obj( objattr->rootdir ))) -- 2.34.1

2 2

[PATCH vkd3d 1/4] vkd3d: Simplify checking if a descriptor has a view.
by Conor McCarthy 07 Dec '21

07 Dec '21

Saves a few CPU cycles on a potentially very hot code path. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 10 ++-------- libs/vkd3d/vkd3d_private.h | 16 ++++++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 28877793..19912231 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2130,9 +2130,7 @@ void d3d12_desc_write_atomic(struct d3d12_desc *dst, const struct d3d12_desc *sr pthread_mutex_lock(mutex); /* Nothing to do for VKD3D_DESCRIPTOR_MAGIC_CBV. */ - if ((dst->magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || dst->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - || dst->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) + if ((dst->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) && !InterlockedDecrement(&dst->u.view->refcount)) destroy_desc = *dst; @@ -2165,12 +2163,8 @@ void d3d12_desc_copy(struct d3d12_desc *dst, const struct d3d12_desc *src, mutex = d3d12_device_get_descriptor_mutex(device, src); pthread_mutex_lock(mutex); - if (src->magic == VKD3D_DESCRIPTOR_MAGIC_SRV - || src->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - || src->magic == VKD3D_DESCRIPTOR_MAGIC_SAMPLER) - { + if (src->magic & VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) vkd3d_view_incref(src->u.view); - } tmp = *src; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index e9631313..f83fd1aa 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -41,13 +41,17 @@ #define VK_CALL(f) (vk_procs->f) +#define MAKE_MAGIC(a,b,c,f) (((uint32_t)a) | (((uint32_t)b) << 8) | (((uint32_t)c) << 16) | f) + +#define VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW 0x01000000u + #define VKD3D_DESCRIPTOR_MAGIC_FREE 0x00000000u -#define VKD3D_DESCRIPTOR_MAGIC_CBV 0x00564243u -#define VKD3D_DESCRIPTOR_MAGIC_SRV 0x00565253u -#define VKD3D_DESCRIPTOR_MAGIC_UAV 0x00564155u -#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER 0x504d4153u -#define VKD3D_DESCRIPTOR_MAGIC_DSV 0x00565344u -#define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u +#define VKD3D_DESCRIPTOR_MAGIC_CBV MAKE_MAGIC('C', 'B', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_SRV MAKE_MAGIC('S', 'R', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) +#define VKD3D_DESCRIPTOR_MAGIC_UAV MAKE_MAGIC('U', 'A', 'V', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) +#define VKD3D_DESCRIPTOR_MAGIC_SAMPLER MAKE_MAGIC('S', 'M', 'P', VKD3D_DESCRIPTOR_MAGIC_HAS_VIEW) +#define VKD3D_DESCRIPTOR_MAGIC_DSV MAKE_MAGIC('D', 'S', 'V', 0) +#define VKD3D_DESCRIPTOR_MAGIC_RTV MAKE_MAGIC('R', 'T', 'V', 0) #define VKD3D_MAX_COMPATIBLE_FORMAT_COUNT 6u #define VKD3D_MAX_QUEUE_FAMILY_COUNT 3u -- 2.33.0

1 3

[PATCH 2/2] kernelbase: Add CreateBoundaryDescriptorW stub.
by Mohamad Al-Jaf 07 Dec '21

07 Dec '21

Needed for IE11 iertutil.dll. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../api-ms-win-core-namespace-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec index ebb41489dc7..a47682fc9b9 100644 --- a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec +++ b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub AddSIDToBoundaryDescriptor @ stub ClosePrivateNamespace -@ stub CreateBoundaryDescriptorW +@ stdcall CreateBoundaryDescriptorW(wstr long) kernelbase.CreateBoundaryDescriptorW @ stub CreatePrivateNamespaceW @ stub DeleteBoundaryDescriptor @ stub OpenPrivateNamespaceW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0e5f953aa50..6c487c86bd2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -267,7 +267,7 @@ @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) # @ stub CreateBoundaryDescriptorA -# @ stub CreateBoundaryDescriptorW +@ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExA(str str ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index da3d5e4035b..a118ab84ef8 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -174,7 +174,7 @@ # @ stub CouldMultiUserAppsBehaviorBePossibleForPackage @ stdcall CreateActCtxW(ptr) # @ stub CreateAppContainerToken -# @ stub CreateBoundaryDescriptorW +@ stdcall CreateBoundaryDescriptorW(wstr long) @ stdcall CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall CreateDirectoryA(str ptr) @ stdcall CreateDirectoryExW(wstr wstr ptr) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 71e09bdefb5..d5f5280e979 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -922,6 +922,15 @@ BOOL WINAPI ConvertToAutoInheritPrivateObjectSecurity( PSECURITY_DESCRIPTOR pare return set_ntstatus( RtlConvertToAutoInheritSecurityObject( parent, current, descr, type, is_dir, mapping )); } +/****************************************************************************** + * CreateBoundaryDescriptorW (kernelbase.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorW( LPCWSTR name, ULONG flags ) +{ + FIXME("%s %u - stub\n", debugstr_w(name), flags); + return NULL; +} + /****************************************************************************** * CreatePrivateObjectSecurity (kernelbase.@) */ -- 2.34.1

1 0

[PATCH] server: Allow skipping debug handle retrieval in get_process_debug_info.
by Jinoh Kang 07 Dec '21

07 Dec '21

Today, Wine uses NtQueryInformationProcess/ProcessDebugPort to detect whether the current process is being debugged. If it is, the process issues a breakpoint to yield control to the debugger. Some debuggers (e.g. latest CDB) appear to create debug handles with restricted DACL, which causes querying debug port to fail with STATUS_ACCESS_DENIED. This results in the debuggee erroneously skipping the initial breakpoint. Fix this by making retrieval of debug port object handle optional. Also, skip debug port object handle retrieval if serving requests that don't need it (i.e. ProcessDebugPort and ProcessDebugFlags). This also eliminates the extra round trip to the server for closing the unneeded debug port object handle. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/process.c | 13 ++++--------- include/wine/server_protocol.h | 4 +++- server/process.c | 2 +- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 1 + 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index c834ef85c79..dfe040eeb25 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1259,19 +1259,16 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (!info) ret = STATUS_ACCESS_VIOLATION; else { - HANDLE debug; - SERVER_START_REQ(get_process_debug_info) { req->handle = wine_server_obj_handle( handle ); + req->want_debug_obj = 0; ret = wine_server_call( req ); - debug = wine_server_ptr_handle( reply->debug ); } SERVER_END_REQ; if (ret == STATUS_SUCCESS) { *(DWORD_PTR *)info = ~0ul; - NtClose( debug ); } else if (ret == STATUS_PORT_NOT_SET) { @@ -1290,18 +1287,15 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class if (!info) ret = STATUS_ACCESS_VIOLATION; else { - HANDLE debug; - SERVER_START_REQ(get_process_debug_info) { req->handle = wine_server_obj_handle( handle ); + req->want_debug_obj = 0; ret = wine_server_call( req ); - debug = wine_server_ptr_handle( reply->debug ); *(DWORD *)info = reply->debug_children; } SERVER_END_REQ; - if (ret == STATUS_SUCCESS) NtClose( debug ); - else if (ret == STATUS_PORT_NOT_SET) ret = STATUS_SUCCESS; + if (ret == STATUS_PORT_NOT_SET) ret = STATUS_SUCCESS; } } else ret = STATUS_INFO_LENGTH_MISMATCH; @@ -1323,6 +1317,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class SERVER_START_REQ(get_process_debug_info) { req->handle = wine_server_obj_handle( handle ); + req->want_debug_obj = 1; ret = wine_server_call( req ); *(HANDLE *)info = wine_server_ptr_handle( reply->debug ); } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index b37a8e8e056..eb880b98f46 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1018,6 +1018,8 @@ struct get_process_debug_info_request { struct request_header __header; obj_handle_t handle; + int want_debug_obj; + char __pad_20[4]; }; struct get_process_debug_info_reply { @@ -6279,7 +6281,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 737 +#define SERVER_PROTOCOL_VERSION 738 /* ### protocol_version end ### */ diff --git a/server/process.c b/server/process.c index 6d794ba5ead..635ab9b6450 100644 --- a/server/process.c +++ b/server/process.c @@ -1528,7 +1528,7 @@ DECL_HANDLER(get_process_debug_info) reply->debug_children = process->debug_children; if (!process->debug_obj) set_error( STATUS_PORT_NOT_SET ); - else reply->debug = alloc_handle( current->process, process->debug_obj, DEBUG_ALL_ACCESS, 0 ); + else if (req->want_debug_obj) reply->debug = alloc_handle( current->process, process->debug_obj, DEBUG_ALL_ACCESS, 0 ); release_object( process ); } diff --git a/server/protocol.def b/server/protocol.def index c83e6a2ef7c..1e73e2783f8 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -968,6 +968,7 @@ typedef struct /* Retrieve debug information about a process */ @REQ(get_process_debug_info) obj_handle_t handle; /* process handle */ + int want_debug_obj; /* want debug port object? */ @REPLY obj_handle_t debug; /* handle to debug port */ int debug_children; /* inherit debugger to child processes */ diff --git a/server/request.h b/server/request.h index 6a63e842357..95473ae762f 100644 --- a/server/request.h +++ b/server/request.h @@ -789,7 +789,8 @@ C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, priority) == 56 ); C_ASSERT( FIELD_OFFSET(struct get_process_info_reply, machine) == 60 ); C_ASSERT( sizeof(struct get_process_info_reply) == 64 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, handle) == 12 ); -C_ASSERT( sizeof(struct get_process_debug_info_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_request, want_debug_obj) == 16 ); +C_ASSERT( sizeof(struct get_process_debug_info_request) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_reply, debug) == 8 ); C_ASSERT( FIELD_OFFSET(struct get_process_debug_info_reply, debug_children) == 12 ); C_ASSERT( sizeof(struct get_process_debug_info_reply) == 16 ); diff --git a/server/trace.c b/server/trace.c index 99c5d3996ab..d708c361602 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1585,6 +1585,7 @@ static void dump_get_process_info_reply( const struct get_process_info_reply *re static void dump_get_process_debug_info_request( const struct get_process_debug_info_request *req ) { fprintf( stderr, " handle=%04x", req->handle ); + fprintf( stderr, ", want_debug_obj=%d", req->want_debug_obj ); } static void dump_get_process_debug_info_reply( const struct get_process_debug_info_reply *req ) -- 2.31.1

2 2

[PATCH v2 2/2] ntdll: Replace fstat and lstat with fstatat in get_file_info.
by Erich E. Hoover 06 Dec '21

06 Dec '21

Further simplify get_file_info by using fstatat for both path-based (lstat) and fd-based (fstat) modes of operation. v2: is_mount_point change is no longer in this patch Best, Erich

1 0

[PATCH v2 1/2] ntdll: Unify get_file_info and fd_get_file_info.
by Erich E. Hoover 06 Dec '21

06 Dec '21

get_file_info and fd_get_file_info duplicate the same logic except that they either work on paths or file descriptors (respectively). This patch consolidates these two routines and moves some of the path-specific behavior to an updated [fd_]is_mount_point. Besides consolidation, this patch simplifies the reparse point patches (updates in progress) since there's now only one routine that handles both path-based and fd-based requests for file information. Note: fstatat (used by is_mount_point) is not compatible with Mac OS X prior to 10.10; however, this is already used by the current fd_is_mount_point and if such compatibility is required at some point then there are libraries available that provide this functionality ( https://www.winehq.org/pipermail/wine-devel/2021-August/194021.html ). v2: is_mount_point now uses fstatat for both code paths in patch 1 instead of adding churn by waiting until patch 2 Best, Erich

1 0

[PATCH] dsound: Skip resampling/mixing inaudible buffers.
by Andrew Eikum 06 Dec '21

06 Dec '21

From: Florian Will <florian.will(a)gmail.com> In some situations, "ZUSI 3" has a lot of secondary buffers in the PLAYING state, but most of these buffers have a really low volume, so these buffers are multiplied by 0 before mixing (and possibly after resampling). There can be hundreds of inaudible buffers at the same time. In these situations, the dsound mixthread is unable to mix fast enough, resulting in sound stuttering and generally poor performance. To resolve this performance issue, skip the mixing (and possibly resampling) step for all inaudible secondary buffers. Signed-off-by: Florian Will <florian.will(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/dsound/buffer.c | 11 +++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 18 +++++++++++++----- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index c595b19dd63..9084ccd9928 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -1197,6 +1197,17 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) TRACE("(%p) released\n", This); } +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) +{ + UINT i; + for (i = 0; i < This->device->pwfx->nChannels; i++) { + if (This->volpan.dwTotalAmpFactor[i] != 0) + return TRUE; + } + + return FALSE; +} + HRESULT IDirectSoundBufferImpl_Duplicate( DirectSoundDevice *device, IDirectSoundBufferImpl **ppdsb, diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 9ec96504a50..18dc369db5c 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -193,6 +193,7 @@ HRESULT IDirectSoundBufferImpl_Duplicate( IDirectSoundBufferImpl **ppdsb, IDirectSoundBufferImpl *pdsb) DECLSPEC_HIDDEN; void secondarybuffer_destroy(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; +BOOL secondarybuffer_is_audible(IDirectSoundBufferImpl *This) DECLSPEC_HIDDEN; extern const IDirectSound3DListenerVtbl ds3dlvt DECLSPEC_HIDDEN; extern const IDirectSound3DBufferVtbl ds3dbvt DECLSPEC_HIDDEN; extern const IKsPropertySetVtbl iksbvt DECLSPEC_HIDDEN; diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index e9d8a6e3cdd..d28cc8dc5aa 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -290,6 +290,9 @@ static UINT cp_fields_noresample(IDirectSoundBufferImpl *dsb, UINT count) UINT committed_samples = 0; DWORD channel, i; + if (!secondarybuffer_is_audible(dsb)) + return count; + if(dsb->use_committed) { committed_samples = (dsb->writelead - dsb->committed_mixpos) / istride; committed_samples = committed_samples <= count ? committed_samples : count; @@ -329,6 +332,11 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * len += fir_cachesize; len *= sizeof(float); + *freqAccNum = freqAcc_end % dsb->freqAdjustDen; + + if (!secondarybuffer_is_audible(dsb)) + return max_ipos; + if (!dsb->device->cp_buffer) { dsb->device->cp_buffer = HeapAlloc(GetProcessHeap(), 0, len); dsb->device->cp_buffer_len = len; @@ -386,8 +394,6 @@ static UINT cp_fields_resample(IDirectSoundBufferImpl *dsb, UINT count, LONG64 * } } - *freqAccNum = freqAcc_end % dsb->freqAdjustDen; - return max_ipos; } @@ -535,10 +541,12 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer; - /* Apply volume if needed */ - DSOUND_MixerVol(dsb, frames); + if (secondarybuffer_is_audible(dsb)) { + /* Apply volume if needed */ + DSOUND_MixerVol(dsb, frames); - mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); + mixieee32(ibuf, mix_buffer, frames * dsb->device->pwfx->nChannels); + } /* check for notification positions */ if (dsb->dsbd.dwFlags & DSBCAPS_CTRLPOSITIONNOTIFY && -- 2.34.1

1 0

[PATCH] ntdll: Fix compilation for Apple platform.
by Jinoh Kang 06 Dec '21

06 Dec '21

From: Jactry Zeng <jactry92(a)gmail.com> Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm64.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..f2612412366 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -365,7 +365,7 @@ static void restore_fpu( const CONTEXT *context, ucontext_t *sigcontext ) #elif defined(__APPLE__) sigcontext->uc_mcontext->__ns.__fpcr = context->Fpcr; sigcontext->uc_mcontext->__ns.__fpsr = context->Fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->v) ); + memcpy( sigcontext->uc_mcontext->__ns.__v, context->V, sizeof(context->V) ); #endif } @@ -1068,9 +1068,9 @@ static void usr2_handler( int signal, siginfo_t *siginfo, void *sigcontext ) } } #elif defined(__APPLE__) - sigcontext->uc_mcontext->__ns.__fpcr = frame->fpcr; - sigcontext->uc_mcontext->__ns.__fpsr = frame->fpsr; - memcpy( sigcontext->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); + context->uc_mcontext->__ns.__fpcr = frame->fpcr; + context->uc_mcontext->__ns.__fpsr = frame->fpsr; + memcpy( context->uc_mcontext->__ns.__v, frame->v, sizeof(frame->v) ); #endif } -- 2.31.1

2 1

[PATCH v2 2/2] win32u: Use the replacement name in otmpFamilyName and GetTextFace().
by Akihiro Sagawa 06 Dec '21

06 Dec '21

Houkago Cinderella verifys that otmpFamilyName matches the desired font name. That prevents us from using replacement fonts. This commit allows to make otmpFamilyName from the replacement name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52176 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdi32/tests/font.c | 2 -- dlls/win32u/font.c | 22 ++++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-)

1 0

[PATCH v2 1/3] ntdll: Allow raising second chance exceptions from signal handlers.
by Jinoh Kang 06 Dec '21

06 Dec '21

This is required to implement some instructions that raise second chance exceptions directly, such as those emitted from the __fastfail() intrinsic function. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- Notes: v1 -> v2: proper patch splitting dlls/ntdll/unix/signal_arm.c | 18 ++++++++++++------ dlls/ntdll/unix/signal_arm64.c | 22 ++++++++++++++-------- dlls/ntdll/unix/signal_i386.c | 21 ++++++++++++++------- dlls/ntdll/unix/signal_x86_64.c | 18 ++++++++++++------ dlls/ntdll/unix/thread.c | 28 +++++++++++++++++++--------- dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 72 insertions(+), 36 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..dbc2770f72e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -576,7 +576,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -591,13 +591,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; stack->context = context; @@ -834,7 +840,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -858,7 +864,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -915,7 +921,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -944,7 +950,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..ef70d4df44b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -618,7 +618,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -634,13 +634,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); stack->rec = *rec; stack->context = context; @@ -861,7 +867,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (void *)SP_sig(context) ); if (!rec.ExceptionCode) return; if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -874,7 +880,7 @@ static void ill_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_ILLEGAL_INSTRUCTION }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -887,7 +893,7 @@ static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_DATATYPE_MISALIGNMENT }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -911,7 +917,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -968,7 +974,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -997,7 +1003,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..e18aed2c222 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1400,7 +1400,8 @@ static void *setup_exception_record( ucontext_t *sigcontext, EXCEPTION_RECORD *r * Change context to setup a call to a raise exception function. */ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, - EXCEPTION_RECORD *rec, struct xcontext *xcontext ) + EXCEPTION_RECORD *rec, struct xcontext *xcontext, + BOOL first_chance ) { CONTEXT *context = &xcontext->c; size_t stack_size; @@ -1420,7 +1421,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) ); - NTSTATUS status = send_debug_event( rec, context, TRUE ); + NTSTATUS status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { @@ -1428,6 +1429,12 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; @@ -1482,7 +1489,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) struct xcontext xcontext; void *stack = setup_exception_record( sigcontext, rec, &xcontext ); - setup_raise_exception( sigcontext, stack, rec, &xcontext ); + setup_raise_exception( sigcontext, stack, rec, &xcontext, TRUE ); } /* stack layout when calling an user apc function. @@ -1675,7 +1682,7 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo rec->ExceptionInformation[0] = context->Eax; rec->ExceptionInformation[1] = context->Ecx; rec->ExceptionInformation[2] = context->Edx; - setup_raise_exception( sigcontext, stack, rec, xcontext ); + setup_raise_exception( sigcontext, stack, rec, xcontext, TRUE ); return TRUE; default: return FALSE; @@ -1848,7 +1855,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( ucontext, stack, &rec, &xcontext.c )) return; - setup_raise_exception( ucontext, stack, &rec, &xcontext ); + setup_raise_exception( ucontext, stack, &rec, &xcontext, TRUE ); } @@ -1894,7 +1901,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[2] = 0; /* FIXME */ break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } @@ -1939,7 +1946,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9e9a96db832..ff4a40c7933 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2110,7 +2110,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** * setup_raise_exception */ -static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext, BOOL first_chance ) { void *stack_ptr = (void *)(RSP_sig(sigcontext) & ~15); CONTEXT *context = &xcontext->c; @@ -2136,13 +2136,19 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec context->EFlags &= ~0x100; /* clear single-step flag */ } - status = send_debug_event( rec, context, TRUE ); + status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( xcontext, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; @@ -2193,7 +2199,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)RIP_sig(sigcontext); save_context( &context, sigcontext ); - setup_raise_exception( sigcontext, rec, &context ); + setup_raise_exception( sigcontext, rec, &context, TRUE ); } @@ -2461,7 +2467,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r default: return FALSE; } - setup_raise_exception( sigcontext, rec, xcontext ); + setup_raise_exception( sigcontext, rec, xcontext, TRUE ); return TRUE; } @@ -2614,7 +2620,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( sigcontext, &rec, &context.c )) return; - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } @@ -2658,7 +2664,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[0] = 0; break; } - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 455272e07e0..d7204b2fd3b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -87,6 +87,24 @@ static inline int get_unix_exit_code( NTSTATUS status ) } +/*********************************************************************** + * handle_second_chance_exception + * + * Handle a second chance exception. + */ +void handle_second_chance_exception( EXCEPTION_RECORD *rec ) +{ + if (rec->ExceptionFlags & EH_STACK_INVALID) + ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); + else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) + ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); + else + ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); + + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); +} + /*********************************************************************** * fpux_to_fpu * @@ -1509,15 +1527,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (first_chance) return call_user_exception_dispatcher( rec, context ); - if (rec->ExceptionFlags & EH_STACK_INVALID) - ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); - else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) - ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); - else - ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - - NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); + handle_second_chance_exception( rec ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0dcb09ad641..d5414474d2e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,6 +172,7 @@ extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; +void handle_second_chance_exception( EXCEPTION_RECORD *rec ); extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; -- 2.31.1

3 8

[PATCH] dlls/kernelbase, programs/conhost: don't delay the TTY input thread for PE executables
by Eric Pouech 06 Dec '21

06 Dec '21

currently, conhost delays the start of the input thread until the first console read operation some PE executables (like mingw's gdb port) just do something like: - WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), INFINITE) and hang for ever (the read operations are done *after* the wait operation succeeds) (of course, the real wait operation is more complex, but the problematic part boils down to that) I understand that the delay has been introduced so that executables still reading directly from the unix fd will continue to work. But I could miss some other use cases. This patch forces the start the tty input thread in conhost if current executable is a PE executable. This lets mingw's gdb work a bit further (at least allowing some user input <g>) under wine. (x86_64 seems to be quite ok, i686 still needs come cudling) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/console.c | 8 ++++++-- programs/conhost/conhost.c | 9 +++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index a7eeb439232..b6f2c4fb394 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1694,8 +1694,12 @@ static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HA } else { - swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --unix --width %u --height %u --server 0x%x", - conhost_path, size.X, size.Y, server ); + LDR_DATA_TABLE_ENTRY *ldr; + const WCHAR* start_thread = L""; + if (LdrFindEntryForAddress( GetModuleHandleW( NULL) , &ldr ) == STATUS_SUCCESS && + !(ldr->Flags & LDR_WINE_INTERNAL)) start_thread = L"--thread "; + swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --unix %s--width %u --height %u --server 0x%x", + conhost_path, start_thread, size.X, size.Y, server ); } Wow64DisableWow64FsRedirection( &redir ); res = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS, NULL, NULL, diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 05447d52dd5..27788fbd6a8 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2736,7 +2736,7 @@ static int main_loop( struct console *console, HANDLE signal ) int __cdecl wmain(int argc, WCHAR *argv[]) { - int headless = 0, i, width = 0, height = 0; + int headless = 0, i, width = 0, height = 0, start_thread = 0; HANDLE signal = NULL; WCHAR *end; @@ -2765,6 +2765,11 @@ int __cdecl wmain(int argc, WCHAR *argv[]) headless = 1; continue; } + if (!wcscmp( argv[i], L"--thread")) + { + start_thread = 1; + continue; + } if (!wcscmp( argv[i], L"--width" )) { if (++i == argc) return 1; @@ -2812,7 +2817,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) console.tty_input = GetStdHandle( STD_INPUT_HANDLE ); console.tty_output = GetStdHandle( STD_OUTPUT_HANDLE ); init_tty_output( &console ); - if (!console.is_unix && !ensure_tty_input_thread( &console )) return 1; + if ((!console.is_unix || start_thread) && !ensure_tty_input_thread( &console )) return 1; } else {

2 1

[PATCH] tools/examine-relay: DLLs can have underscore in their names (like ws2_32)
by Eric Pouech 06 Dec '21

06 Dec '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/examine-relay | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/examine-relay b/tools/examine-relay index d82110c570a..48782e4728d 100755 --- a/tools/examine-relay +++ b/tools/examine-relay @@ -44,7 +44,7 @@ LINE: while (<IN>) { - if (/^([0-9a-f]+):Call ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { + if (/^([0-9a-f]+):Call ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$(.*$) .*/) { my $tid = $1; my $func = $2; if (defined $fullformat) { @@ -96,10 +96,10 @@ while (<IN>) { push @{$tid_callstack{$tid}}, [$func, $retaddr, $segreg]; } - elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || - /^([0-9a-f]+):Ret ([A-Za-z0-9]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || - /^([0-9a-f]+):RET ([A-Za-z0-9]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || + elsif (/^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(....:....) (ds=....)$/ || + /^([0-9a-f]+):Ret ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+)$.*$ .* ret=(........) fs=....$/ || + /^([0-9a-f]+):RET ([A-Za-z0-9_]+\.[A-Za-z0-9_.]+: [A-Za-z0-9]+)$.*$ .* ret=(........)$/ || /^([0-9a-f]+):Ret (window proc) ([0-9a-fx]+) .*/) { my $tid = $1; my $func = $2;

1 0

[PATCH 1/3] ntdll: Allow raising second chance exceptions from signal handlers.
by Jinoh Kang 06 Dec '21

06 Dec '21

This is required to implement some instructions that raise second chance exceptions directly, such as those emitted from the __fastfail() intrinsic function. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_arm.c | 18 ++++++++++++------ dlls/ntdll/unix/signal_arm64.c | 22 ++++++++++++++-------- dlls/ntdll/unix/signal_i386.c | 19 +++++++++++++------ dlls/ntdll/unix/signal_x86_64.c | 18 ++++++++++++------ dlls/ntdll/unix/thread.c | 28 +++++++++++++++++++--------- dlls/ntdll/unix/unix_private.h | 1 + 6 files changed, 71 insertions(+), 35 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index ebc08984adf..dbc2770f72e 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -576,7 +576,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -591,13 +591,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, sizeof(*stack), rec ); stack->rec = *rec; stack->context = context; @@ -834,7 +840,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -858,7 +864,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -915,7 +921,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -944,7 +950,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index 680a14223c6..ef70d4df44b 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -618,7 +618,7 @@ __ASM_GLOBAL_FUNC( raise_func_trampoline, * * Modify the signal context to call the exception raise function. */ -static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) +static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, BOOL first_chance ) { struct { @@ -634,13 +634,19 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)PC_sig(sigcontext); save_context( &context, sigcontext ); - status = send_debug_event( rec, &context, TRUE ); + status = send_debug_event( rec, &context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( &context, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + stack = virtual_setup_exception( stack_ptr, (sizeof(*stack) + 15) & ~15, rec ); stack->rec = *rec; stack->context = context; @@ -861,7 +867,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) (void *)SP_sig(context) ); if (!rec.ExceptionCode) return; if (handle_syscall_fault( context, &rec )) return; - setup_exception( context, &rec ); + setup_exception( context, &rec, TRUE ); } @@ -874,7 +880,7 @@ static void ill_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_ILLEGAL_INSTRUCTION }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -887,7 +893,7 @@ static void bus_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_DATATYPE_MISALIGNMENT }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -911,7 +917,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.NumberParameters = 1; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -968,7 +974,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } @@ -997,7 +1003,7 @@ static void abrt_handler( int signal, siginfo_t *siginfo, void *sigcontext ) { EXCEPTION_RECORD rec = { EXCEPTION_WINE_ASSERTION, EH_NONCONTINUABLE }; - setup_exception( sigcontext, &rec ); + setup_exception( sigcontext, &rec, TRUE ); } diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index bf3abc1a587..1986c4728bf 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -1400,7 +1400,8 @@ static void *setup_exception_record( ucontext_t *sigcontext, EXCEPTION_RECORD *r * Change context to setup a call to a raise exception function. */ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, - EXCEPTION_RECORD *rec, struct xcontext *xcontext ) + EXCEPTION_RECORD *rec, struct xcontext *xcontext, + BOOL first_chance ) { CONTEXT *context = &xcontext->c; size_t stack_size; @@ -1420,7 +1421,7 @@ static void setup_raise_exception( ucontext_t *sigcontext, void *stack_ptr, C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) ); - NTSTATUS status = send_debug_event( rec, context, TRUE ); + NTSTATUS status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { @@ -1428,6 +1429,12 @@ C_ASSERT( (offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout)) return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Eip--; @@ -1675,7 +1682,7 @@ static BOOL handle_interrupt( unsigned int interrupt, ucontext_t *sigcontext, vo rec->ExceptionInformation[0] = context->Eax; rec->ExceptionInformation[1] = context->Ecx; rec->ExceptionInformation[2] = context->Edx; - setup_raise_exception( sigcontext, stack, rec, xcontext ); + setup_raise_exception( sigcontext, stack, rec, xcontext, TRUE ); return TRUE; default: return FALSE; @@ -1848,7 +1855,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( ucontext, stack, &rec, &xcontext.c )) return; - setup_raise_exception( ucontext, stack, &rec, &xcontext ); + setup_raise_exception( ucontext, stack, &rec, &xcontext, TRUE ); } @@ -1894,7 +1901,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[2] = 0; /* FIXME */ break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } @@ -1939,7 +1946,7 @@ static void fpe_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionCode = EXCEPTION_FLT_INVALID_OPERATION; break; } - setup_raise_exception( sigcontext, stack, &rec, &xcontext ); + setup_raise_exception( sigcontext, stack, &rec, &xcontext, TRUE ); } diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 9e9a96db832..ff4a40c7933 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -2110,7 +2110,7 @@ NTSTATUS get_thread_wow64_context( HANDLE handle, void *ctx, ULONG size ) /*********************************************************************** * setup_raise_exception */ -static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext ) +static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec, struct xcontext *xcontext, BOOL first_chance ) { void *stack_ptr = (void *)(RSP_sig(sigcontext) & ~15); CONTEXT *context = &xcontext->c; @@ -2136,13 +2136,19 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec context->EFlags &= ~0x100; /* clear single-step flag */ } - status = send_debug_event( rec, context, TRUE ); + status = send_debug_event( rec, context, first_chance ); if (status == DBG_CONTINUE || status == DBG_EXCEPTION_HANDLED) { restore_context( xcontext, sigcontext ); return; } + if (!first_chance) + { + handle_second_chance_exception( rec ); + return; + } + /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; @@ -2193,7 +2199,7 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) rec->ExceptionAddress = (void *)RIP_sig(sigcontext); save_context( &context, sigcontext ); - setup_raise_exception( sigcontext, rec, &context ); + setup_raise_exception( sigcontext, rec, &context, TRUE ); } @@ -2461,7 +2467,7 @@ static inline BOOL handle_interrupt( ucontext_t *sigcontext, EXCEPTION_RECORD *r default: return FALSE; } - setup_raise_exception( sigcontext, rec, xcontext ); + setup_raise_exception( sigcontext, rec, xcontext, TRUE ); return TRUE; } @@ -2614,7 +2620,7 @@ static void segv_handler( int signal, siginfo_t *siginfo, void *sigcontext ) break; } if (handle_syscall_fault( sigcontext, &rec, &context.c )) return; - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } @@ -2658,7 +2664,7 @@ static void trap_handler( int signal, siginfo_t *siginfo, void *sigcontext ) rec.ExceptionInformation[0] = 0; break; } - setup_raise_exception( sigcontext, &rec, &context ); + setup_raise_exception( sigcontext, &rec, &context, TRUE ); } diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index 455272e07e0..d7204b2fd3b 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -87,6 +87,24 @@ static inline int get_unix_exit_code( NTSTATUS status ) } +/*********************************************************************** + * handle_second_chance_exception + * + * Handle a second chance exception. + */ +void handle_second_chance_exception( EXCEPTION_RECORD *rec ) +{ + if (rec->ExceptionFlags & EH_STACK_INVALID) + ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); + else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) + ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); + else + ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", + rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); + + NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); +} + /*********************************************************************** * fpux_to_fpu * @@ -1509,15 +1527,7 @@ NTSTATUS WINAPI NtRaiseException( EXCEPTION_RECORD *rec, CONTEXT *context, BOOL if (first_chance) return call_user_exception_dispatcher( rec, context ); - if (rec->ExceptionFlags & EH_STACK_INVALID) - ERR_(seh)("Exception frame is not in stack limits => unable to dispatch exception.\n"); - else if (rec->ExceptionCode == STATUS_NONCONTINUABLE_EXCEPTION) - ERR_(seh)("Process attempted to continue execution after noncontinuable exception.\n"); - else - ERR_(seh)("Unhandled exception code %x flags %x addr %p\n", - rec->ExceptionCode, rec->ExceptionFlags, rec->ExceptionAddress ); - - NtTerminateProcess( NtCurrentProcess(), rec->ExceptionCode ); + handle_second_chance_exception( rec ); return STATUS_SUCCESS; } diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 0dcb09ad641..d5414474d2e 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -172,6 +172,7 @@ extern void server_init_process_done(void) DECLSPEC_HIDDEN; extern void server_init_thread( void *entry_point, BOOL *suspend ) DECLSPEC_HIDDEN; extern int server_pipe( int fd[2] ) DECLSPEC_HIDDEN; +void handle_second_chance_exception( EXCEPTION_RECORD *rec ); extern void fpux_to_fpu( I386_FLOATING_SAVE_AREA *fpu, const XSAVE_FORMAT *fpux ) DECLSPEC_HIDDEN; extern void fpu_to_fpux( XSAVE_FORMAT *fpux, const I386_FLOATING_SAVE_AREA *fpu ) DECLSPEC_HIDDEN; extern void *get_cpu_area( USHORT machine ) DECLSPEC_HIDDEN; -- 2.31.1

2 3

[PATCH] d3d11: Add stub for ID3D11Device2::CheckFeatureSupport(D3D11_FEATURE_D3D9_OPTIONS).
by Dmitry Timoshkov 06 Dec '21

06 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/d3d11/device.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 417638bf314..a081352f61f 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3941,6 +3941,20 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFeatureSupport(ID3D11Device2 return S_OK; } + case D3D11_FEATURE_D3D9_OPTIONS: + { + D3D11_FEATURE_DATA_D3D9_OPTIONS *options = feature_support_data; + if (feature_support_data_size != sizeof(*options)) + { + WARN("Invalid data size.\n"); + return E_INVALIDARG; + } + + FIXME("D3D11_FEATURE_D3D9_OPTIONS: stub.\n"); + options->FullNonPow2TextureSupport = FALSE; + return S_OK; + } + case D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS: { D3D11_FEATURE_DATA_D3D10_X_HARDWARE_OPTIONS *options = feature_support_data; -- 2.34.1

1 0

[PATCH 2/2] server: Strip terminating '\0' from the registry key name.
by Dmitry Timoshkov 06 Dec '21

06 Dec '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ntdll/tests/reg.c | 18 +++++++++++++++++- server/registry.c | 2 ++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 74d82b85be4..024d9026785 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -457,6 +457,14 @@ todo_wine ok( status == STATUS_OBJECT_TYPE_MISMATCH, "NtOpenKey failed: 0x%08x\n", status ); pRtlFreeUnicodeString( &str ); + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtOpenKey( &key, KEY_READ, &attr ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_NAME_NOT_FOUND) /* win8 */, + "NtOpenKey failed: 0x%08x\n", status ); + if (!status) pNtClose( key ); + pRtlFreeUnicodeString( &str ); + if (!pNtOpenKeyEx) { win_skip("NtOpenKeyEx not available\n"); @@ -631,13 +639,21 @@ static void test_NtCreateKey(void) status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); - if (!status) pNtClose( subkey ); + pNtClose( subkey ); pRtlFreeUnicodeString( &str ); pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\MACHINE\\SOFTWARE\\CLASSES" ); status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); + pNtClose( subkey ); + pRtlFreeUnicodeString( &str ); + + pRtlCreateUnicodeStringFromAsciiz( &str, "\\REGISTRY\\Machine\\Software\\Classes" ); + str.Length += sizeof(WCHAR); /* include terminating \0 in the length */ + status = pNtCreateKey( &subkey, am, &attr, 0, 0, 0, 0 ); + ok( status == STATUS_SUCCESS || broken(status == STATUS_OBJECT_PATH_NOT_FOUND) /* win8 */, + "NtCreateKey failed: 0x%08x\n", status ); if (!status) pNtClose( subkey ); pRtlFreeUnicodeString( &str ); diff --git a/server/registry.c b/server/registry.c index ebe11db1039..656dd08e557 100644 --- a/server/registry.c +++ b/server/registry.c @@ -479,6 +479,8 @@ static inline void get_req_path( struct unicode_str *str, int skip_root ) str->str = get_req_data(); str->len = (get_req_data_size() / sizeof(WCHAR)) * sizeof(WCHAR); + while (str->len && !str->str[str->len / sizeof(WCHAR) - 1]) str->len -= sizeof(WCHAR); + if (skip_root && str->len >= sizeof(root_name) && !memicmp_strW( str->str, root_name, sizeof(root_name) )) { str->str += ARRAY_SIZE( root_name ); -- 2.34.1

1 0

[PATCH] dwrite: Move glyph advances cache to PE side.
by Nikolay Sivov 06 Dec '21

06 Dec '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/dwrite_private.h | 12 +++- dlls/dwrite/font.c | 132 ++++++++++++++++++++++++++++++++--- dlls/dwrite/freetype.c | 37 +++++----- 3 files changed, 150 insertions(+), 31 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 10617983b69..e0373dc2891 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -22,6 +22,7 @@ #include "wine/debug.h" #include "wine/list.h" +#include "wine/rbtree.h" #define MS_GSUB_TAG DWRITE_MAKE_OPENTYPE_TAG('G','S','U','B') #define MS_GPOS_TAG DWRITE_MAKE_OPENTYPE_TAG('G','P','O','S') @@ -240,6 +241,13 @@ struct dwrite_fontface font_object_handle font_object; void *data_context; p_dwrite_fontface_get_font_object get_font_object; + struct + { + struct wine_rb_tree tree; + struct list mru; + size_t max_size; + size_t size; + } cache; CRITICAL_SECTION cs; USHORT simulations; @@ -725,8 +733,8 @@ struct font_backend_funcs int (CDECL *get_glyph_outline)(font_object_handle object, float emsize, unsigned int simulations, UINT16 glyph, struct dwrite_outline *outline); UINT16 (CDECL *get_glyph_count)(font_object_handle object); - INT32 (CDECL *get_glyph_advance)(void *key, float em_size, UINT16 index, DWRITE_MEASURING_MODE measuring_mode, - BOOL *has_contours); + INT32 (CDECL *get_glyph_advance)(font_object_handle object, float em_size, UINT16 glyph, + DWRITE_MEASURING_MODE measuring_mode, BOOL *has_contours); void (CDECL *get_glyph_bbox)(struct dwrite_glyphbitmap *bitmap_desc); BOOL (CDECL *get_glyph_bitmap)(struct dwrite_glyphbitmap *bitmap_desc); void (CDECL *get_design_glyph_metrics)(font_object_handle object, UINT16 upem, UINT16 ascent, unsigned int simulations, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 174ab7a3ded..f6ac43e65ac 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -52,6 +52,111 @@ void dwrite_fontface_get_glyph_bbox(struct dwrite_glyphbitmap *bitmap) font_funcs->get_glyph_bbox(bitmap); } +struct cache_key +{ + float size; + unsigned short glyph; + unsigned short mode; +}; + +struct cache_entry +{ + struct wine_rb_entry entry; + struct list mru; + struct cache_key key; + float advance; + unsigned int has_contours : 1; +}; + +static struct cache_entry * fontface_get_cache_entry(struct dwrite_fontface *fontface, const struct cache_key *key) +{ + struct cache_entry *entry; + struct wine_rb_entry *e; + + if (!(e = wine_rb_get(&fontface->cache.tree, key))) return NULL; + entry = WINE_RB_ENTRY_VALUE(e, struct cache_entry, entry); + list_remove(&entry->mru); + list_add_head(&fontface->cache.mru, &entry->mru); + return WINE_RB_ENTRY_VALUE(entry, struct cache_entry, entry); +} + +static size_t fontface_get_cache_entry_size(const struct cache_entry *entry) +{ + return sizeof(*entry); +} + +static float fontface_get_glyph_advance(struct dwrite_fontface *fontface, float fontsize, unsigned short glyph, + unsigned short mode, BOOL *has_contours) +{ + struct cache_key key = { .size = fontsize, .glyph = glyph, .mode = mode }; + struct cache_entry *entry, *old_entry; + size_t size; + BOOL value; + + if (!(entry = fontface_get_cache_entry(fontface, &key))) + { + 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); + if ((fontface->cache.size + size > fontface->cache.max_size) && !list_empty(&fontface->cache.mru)) + { + old_entry = LIST_ENTRY(list_tail(&fontface->cache.mru), struct cache_entry, mru); + fontface->cache.size -= fontface_get_cache_entry_size(old_entry); + wine_rb_remove(&fontface->cache.tree, &old_entry->entry); + list_remove(&old_entry->mru); + free(old_entry); + } + + list_add_head(&fontface->cache.mru, &entry->mru); + + if (wine_rb_put(&fontface->cache.tree, &key, &entry->entry) == -1) + { + WARN("Failed to add cache entry.\n"); + return 0.0f; + } + + fontface->cache.size += size; + } + + *has_contours = entry->has_contours; + return entry->advance; +} + +static int fontface_cache_compare(const void *k, const struct wine_rb_entry *e) +{ + const struct cache_entry *entry = WINE_RB_ENTRY_VALUE(e, const struct cache_entry, entry); + const struct cache_key *key = k, *key2 = &entry->key; + + if (key->size != key2->size) return key->size < key2->size ? -1 : 1; + if (key->glyph != key2->glyph) return (int)key->glyph - (int)key2->glyph; + if (key->mode != key2->mode) return (int)key->mode - (int)key2->mode; + return 0; +} + +static void fontface_cache_init(struct dwrite_fontface *fontface) +{ + wine_rb_init(&fontface->cache.tree, fontface_cache_compare); + list_init(&fontface->cache.mru); + fontface->cache.max_size = 0x8000; +} + +static void fontface_cache_clear(struct dwrite_fontface *fontface) +{ + struct cache_entry *entry, *entry2; + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &fontface->cache.mru, struct cache_entry, mru) + { + list_remove(&entry->mru); + free(entry); + } + memset(&fontface->cache, 0, sizeof(fontface->cache)); +} + struct dwrite_font_propvec { FLOAT stretch; FLOAT style; @@ -656,6 +761,7 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace5 *iface) IDWriteFontFileStream_ReleaseFileFragment(fontface->stream, fontface->data_context); IDWriteFontFileStream_Release(fontface->stream); } + fontface_cache_clear(fontface); dwrite_cmap_release(&fontface->cmap); IDWriteFactory7_Release(fontface->factory); @@ -1019,7 +1125,7 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac UINT32 adjustment = fontface_get_horz_metric_adjustment(fontface); DWRITE_MEASURING_MODE mode; FLOAT scale, size; - HRESULT hr; + HRESULT hr = S_OK; UINT32 i; TRACE("%p, %.8e, %.8e, %p, %d, %p, %u, %p, %d.\n", iface, emSize, ppdip, m, use_gdi_natural, glyphs, @@ -1032,16 +1138,18 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac scale = size / fontface->metrics.designUnitsPerEm; mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; - for (i = 0; i < glyph_count; i++) { + EnterCriticalSection(&fontface->cs); + for (i = 0; i < glyph_count; ++i) + { DWRITE_GLYPH_METRICS *ret = metrics + i; DWRITE_GLYPH_METRICS design; BOOL has_contours; hr = IDWriteFontFace5_GetDesignGlyphMetrics(iface, glyphs + i, 1, &design, is_sideways); if (FAILED(hr)) - return hr; + break; - ret->advanceWidth = font_funcs->get_glyph_advance(iface, size, glyphs[i], mode, &has_contours); + ret->advanceWidth = fontface_get_glyph_advance(fontface, size, glyphs[i], mode, &has_contours); if (has_contours) ret->advanceWidth = round_metric(ret->advanceWidth * fontface->metrics.designUnitsPerEm / size + adjustment); else @@ -1056,6 +1164,7 @@ static HRESULT WINAPI dwritefontface_GetGdiCompatibleGlyphMetrics(IDWriteFontFac SCALE_METRIC(verticalOriginY); #undef SCALE_METRIC } + LeaveCriticalSection(&fontface->cs); return S_OK; } @@ -1172,8 +1281,8 @@ static int fontface_get_design_advance(struct dwrite_fontface *fontface, DWRITE_ switch (measuring_mode) { case DWRITE_MEASURING_MODE_NATURAL: - advance = font_funcs->get_glyph_advance(&fontface->IDWriteFontFace5_iface, fontface->metrics.designUnitsPerEm, - glyph, measuring_mode, &has_contours); + advance = fontface_get_glyph_advance(fontface, fontface->metrics.designUnitsPerEm, glyph, + measuring_mode, &has_contours); if (has_contours) advance += adjustment; @@ -1187,8 +1296,7 @@ static int fontface_get_design_advance(struct dwrite_fontface *fontface, DWRITE_ if (transform && memcmp(transform, &identity, sizeof(*transform))) FIXME("Transform is not supported.\n"); - advance = font_funcs->get_glyph_advance(&fontface->IDWriteFontFace5_iface, emsize, glyph, measuring_mode, - &has_contours); + advance = fontface_get_glyph_advance(fontface, emsize, glyph, measuring_mode, &has_contours); if (has_contours) advance = round_metric(advance * fontface->metrics.designUnitsPerEm / emsize + adjustment); else @@ -1212,11 +1320,13 @@ static HRESULT WINAPI dwritefontface1_GetDesignGlyphAdvances(IDWriteFontFace5 *i if (is_sideways) FIXME("sideways mode not supported\n"); + EnterCriticalSection(&fontface->cs); for (i = 0; i < glyph_count; ++i) { advances[i] = fontface_get_design_advance(fontface, DWRITE_MEASURING_MODE_NATURAL, fontface->metrics.designUnitsPerEm, 1.0f, NULL, glyphs[i], is_sideways); } + LeaveCriticalSection(&fontface->cs); return S_OK; } @@ -1243,11 +1353,14 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF } measuring_mode = use_gdi_natural ? DWRITE_MEASURING_MODE_GDI_NATURAL : DWRITE_MEASURING_MODE_GDI_CLASSIC; + + EnterCriticalSection(&fontface->cs); for (i = 0; i < glyph_count; ++i) { advances[i] = fontface_get_design_advance(fontface, measuring_mode, em_size, ppdip, transform, glyphs[i], is_sideways); } + LeaveCriticalSection(&fontface->cs); return S_OK; } @@ -5101,6 +5214,7 @@ HRESULT create_fontface(const struct fontface_desc *desc, struct list *cached_li fontface->stream = desc->stream; IDWriteFontFileStream_AddRef(fontface->stream); InitializeCriticalSection(&fontface->cs); + fontface_cache_init(fontface); stream_desc.stream = fontface->stream; stream_desc.face_type = desc->face_type; @@ -6027,7 +6141,9 @@ float fontface_get_scaled_design_advance(struct dwrite_fontface *fontface, DWRIT if (is_sideways) FIXME("Sideways mode is not supported.\n"); + EnterCriticalSection(&fontface->cs); advance = fontface_get_design_advance(fontface, measuring_mode, emsize, ppdip, transform, glyph, is_sideways); + LeaveCriticalSection(&fontface->cs); switch (measuring_mode) { diff --git a/dlls/dwrite/freetype.c b/dlls/dwrite/freetype.c index 503f8b04496..a2304f264d5 100644 --- a/dlls/dwrite/freetype.c +++ b/dlls/dwrite/freetype.c @@ -781,30 +781,25 @@ static BOOL CDECL freetype_get_glyph_bitmap(struct dwrite_glyphbitmap *bitmap) return ret; } -static INT32 CDECL freetype_get_glyph_advance(void *key, float emSize, UINT16 index, +static INT32 CDECL freetype_get_glyph_advance(font_object_handle object, float emsize, UINT16 glyph, DWRITE_MEASURING_MODE mode, BOOL *has_contours) { - FTC_ImageTypeRec imagetype; - FT_Glyph glyph; - INT32 advance; + FT_Face face = object; + INT32 advance = 0; + FT_Size size; - imagetype.face_id = key; - imagetype.width = 0; - imagetype.height = emSize; - imagetype.flags = FT_LOAD_DEFAULT; - if (mode == DWRITE_MEASURING_MODE_NATURAL) - imagetype.flags |= FT_LOAD_NO_HINTING; + *has_contours = FALSE; - RtlEnterCriticalSection(&freetype_cs); - if (pFTC_ImageCache_Lookup(image_cache, &imagetype, index, &glyph, NULL) == 0) { - *has_contours = glyph->format == FT_GLYPH_FORMAT_OUTLINE && ((FT_OutlineGlyph)glyph)->outline.n_contours; - advance = glyph->advance.x >> 16; - } - else { - *has_contours = FALSE; - advance = 0; + if (!(size = freetype_set_face_size(face, emsize))) + return 0; + + if (!pFT_Load_Glyph(face, glyph, mode == DWRITE_MEASURING_MODE_NATURAL ? FT_LOAD_NO_HINTING : 0)) + { + advance = face->glyph->advance.x >> 6; + *has_contours = freetype_glyph_has_contours(face); } - RtlLeaveCriticalSection(&freetype_cs); + + pFT_Done_Size(size); return advance; } @@ -863,8 +858,8 @@ static UINT16 CDECL null_get_glyph_count(font_object_handle object) return 0; } -static INT32 CDECL null_get_glyph_advance(void *key, float emSize, UINT16 index, DWRITE_MEASURING_MODE mode, - BOOL *has_contours) +static INT32 CDECL null_get_glyph_advance(font_object_handle object, float emsize, UINT16 glyph, + DWRITE_MEASURING_MODE mode, BOOL *has_contours) { *has_contours = FALSE; return 0; -- 2.33.0

1 0

[PATCH vkd3d 1/2] vkd3d-shader/hlsl: Separate texture_dim and sampler_dim, add support for texture arrays.
by Francisco Casas 06 Dec '21

06 Dec '21

This patch is a proposal for considering separating texture_dim and sampler_dim, it probably will be resent after Matteo's batch is reviewed. Opinions are appreciated. So far, the enum hlsl_sampler_dim sampler_dim; member of struct hlsl_type has been used to store the dimension type of both HLSL_TYPE_SAMPLER and HLSL_TYPE_TEXTURE types. However, textures have more possible options, e.g. Texture1DArray and Texture2DArray, which are ld and sampled with vectors of 2 and 3 dimensions respectively. Support for these is added in this patch. The new enum hlsl_texture_dim is added to include these cases and the enum hlsl_texture_dim texture_dim; member is added to struct hlsl_type to store the dimension type of HLSL_TYPE_TEXTURE types. Nevertheless, sampler_dim is still used on HLSL_TYPE_TEXTURE types to know the compatible types for sampling (albeit this could be deducted from texture_dim). Future support for Texture2DMS and Texture2DMSArray would be affected if this strategy is chosen. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 48 +++++++++++++++++++++++++----------- libs/vkd3d-shader/hlsl.h | 14 ++++++++++- libs/vkd3d-shader/hlsl.y | 24 ++++++++++++------ libs/vkd3d-shader/hlsl_sm4.c | 48 ++++++++++++++++++++++++------------ 4 files changed, 95 insertions(+), 39 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 9824c56d..ed061d42 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -261,7 +261,7 @@ struct hlsl_type *hlsl_new_struct_type(struct hlsl_ctx *ctx, const char *name, s return type; } -struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format) +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_texture_dim dim, struct hlsl_type *format) { struct hlsl_type *type; @@ -271,7 +271,14 @@ struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_ type->base_type = HLSL_TYPE_TEXTURE; type->dimx = 4; type->dimy = 1; - type->sampler_dim = dim; + type->texture_dim = dim; + if (dim == HLSL_TEXTURE_DIM_1DARRAY) + type->sampler_dim = HLSL_SAMPLER_DIM_2D; + else if (dim == HLSL_TEXTURE_DIM_2DARRAY) + type->sampler_dim = HLSL_SAMPLER_DIM_3D; + else + type->sampler_dim = (enum hlsl_sampler_dim) dim; + type->e.resource_format = format; list_add_tail(&ctx->types, &type->entry); return type; @@ -345,11 +352,16 @@ bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2 return false; if (t1->base_type != t2->base_type) return false; - if (t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) + if (t1->base_type == HLSL_TYPE_SAMPLER) { if (t1->sampler_dim != t2->sampler_dim) return false; - if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + } + if (t1->base_type == HLSL_TYPE_TEXTURE) + { + if (t1->texture_dim != t2->texture_dim) + return false; + if (t1->texture_dim != HLSL_TEXTURE_DIM_GENERIC && !hlsl_types_are_equal(t1->e.resource_format, t2->e.resource_format)) return false; } @@ -414,6 +426,7 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, if (!(type->modifiers & HLSL_MODIFIERS_MAJORITY_MASK)) type->modifiers |= default_majority; type->sampler_dim = old->sampler_dim; + type->texture_dim = old->texture_dim; switch (old->type) { case HLSL_CLASS_ARRAY: @@ -778,12 +791,17 @@ static int compare_param_hlsl_types(const struct hlsl_type *t1, const struct hls } if (t1->base_type != t2->base_type) return t1->base_type - t2->base_type; - if ((t1->base_type == HLSL_TYPE_SAMPLER || t1->base_type == HLSL_TYPE_TEXTURE) - && t1->sampler_dim != t2->sampler_dim) + if (t1->base_type == HLSL_TYPE_SAMPLER) { if (t1->sampler_dim != t2->sampler_dim) return t1->sampler_dim - t2->sampler_dim; - if (t1->base_type == HLSL_TYPE_TEXTURE && t1->sampler_dim != HLSL_SAMPLER_DIM_GENERIC + + } + if (t1->base_type == HLSL_TYPE_TEXTURE) + { + if (t1->texture_dim != t2->texture_dim) + return t1->texture_dim - t2->texture_dim; + if (t1->texture_dim != HLSL_TEXTURE_DIM_GENERIC && (r = compare_param_hlsl_types(t1->e.resource_format, t2->e.resource_format))) return r; } @@ -917,24 +935,26 @@ struct vkd3d_string_buffer *hlsl_type_to_string(struct hlsl_ctx *ctx, const stru { static const char *const dimensions[] = { - [HLSL_SAMPLER_DIM_1D] = "1D", - [HLSL_SAMPLER_DIM_2D] = "2D", - [HLSL_SAMPLER_DIM_3D] = "3D", - [HLSL_SAMPLER_DIM_CUBE] = "Cube" + [HLSL_TEXTURE_DIM_1D] = "1D", + [HLSL_TEXTURE_DIM_1DARRAY] = "1DArray", + [HLSL_TEXTURE_DIM_2D] = "2D", + [HLSL_TEXTURE_DIM_2DARRAY] = "2DArray", + [HLSL_TEXTURE_DIM_3D] = "3D", + [HLSL_TEXTURE_DIM_CUBE] = "Cube" }; switch (type->base_type) { case HLSL_TYPE_TEXTURE: - if (type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + if (type->texture_dim == HLSL_TEXTURE_DIM_GENERIC) { vkd3d_string_buffer_printf(string, "Texture"); return string; } - assert(type->sampler_dim < ARRAY_SIZE(dimensions)); + assert(type->texture_dim < ARRAY_SIZE(dimensions)); assert(type->e.resource_format->base_type < ARRAY_SIZE(base_types)); - vkd3d_string_buffer_printf(string, "Texture%s<%s%u>", dimensions[type->sampler_dim], + vkd3d_string_buffer_printf(string, "Texture%s<%s%u>", dimensions[type->texture_dim], base_types[type->e.resource_format->base_type], type->e.resource_format->dimx); return string; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index e7bdb45e..9d73d979 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -101,6 +101,17 @@ enum hlsl_sampler_dim HLSL_SAMPLER_DIM_MAX = HLSL_SAMPLER_DIM_CUBE }; +enum hlsl_texture_dim +{ + HLSL_TEXTURE_DIM_GENERIC = HLSL_SAMPLER_DIM_GENERIC, + HLSL_TEXTURE_DIM_1D = HLSL_SAMPLER_DIM_1D, + HLSL_TEXTURE_DIM_2D = HLSL_SAMPLER_DIM_2D, + HLSL_TEXTURE_DIM_3D = HLSL_SAMPLER_DIM_3D, + HLSL_TEXTURE_DIM_CUBE = HLSL_SAMPLER_DIM_CUBE, + HLSL_TEXTURE_DIM_1DARRAY, + HLSL_TEXTURE_DIM_2DARRAY, +}; + enum hlsl_matrix_majority { HLSL_COLUMN_MAJOR, @@ -114,6 +125,7 @@ struct hlsl_type enum hlsl_type_class type; enum hlsl_base_type base_type; enum hlsl_sampler_dim sampler_dim; + enum hlsl_texture_dim texture_dim; const char *name; unsigned int modifiers; unsigned int dimx; @@ -716,7 +728,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, struct vkd3d_shader_location *loc); struct hlsl_ir_var *hlsl_new_synthetic_var(struct hlsl_ctx *ctx, const char *name, struct hlsl_type *type, const struct vkd3d_shader_location loc); -struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_sampler_dim dim, struct hlsl_type *format); +struct hlsl_type *hlsl_new_texture_type(struct hlsl_ctx *ctx, enum hlsl_texture_dim dim, struct hlsl_type *format); struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned int n, const struct vkd3d_shader_location loc); struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index ff35c09e..13853127 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1831,7 +1831,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl struct hlsl_ir_load *object_load; if (object_type->type != HLSL_CLASS_OBJECT || object_type->base_type != HLSL_TYPE_TEXTURE - || object_type->sampler_dim == HLSL_SAMPLER_DIM_GENERIC) + || object_type->texture_dim == HLSL_TEXTURE_DIM_GENERIC) { struct vkd3d_string_buffer *string; @@ -1959,7 +1959,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl struct parse_colon_attribute colon_attribute; struct hlsl_semantic semantic; enum hlsl_buffer_type buffer_type; - enum hlsl_sampler_dim sampler_dim; + enum hlsl_texture_dim texture_dim; } %token KW_BLENDSTATE @@ -2134,7 +2134,7 @@ static bool add_method_call(struct hlsl_ctx *ctx, struct list *instrs, struct hl %type <reg_reservation> register_opt -%type <sampler_dim> texture_type +%type <texture_dim> texture_type %type <semantic> semantic @@ -2554,19 +2554,27 @@ input_mod: texture_type: KW_TEXTURE1D { - $$ = HLSL_SAMPLER_DIM_1D; + $$ = HLSL_TEXTURE_DIM_1D; } | KW_TEXTURE2D { - $$ = HLSL_SAMPLER_DIM_2D; + $$ = HLSL_TEXTURE_DIM_2D; } | KW_TEXTURE3D { - $$ = HLSL_SAMPLER_DIM_3D; + $$ = HLSL_TEXTURE_DIM_3D; } | KW_TEXTURECUBE { - $$ = HLSL_SAMPLER_DIM_CUBE; + $$ = HLSL_TEXTURE_DIM_CUBE; + } + | KW_TEXTURE1DARRAY + { + $$ = HLSL_TEXTURE_DIM_1DARRAY; + } + | KW_TEXTURE2DARRAY + { + $$ = HLSL_TEXTURE_DIM_2DARRAY; } type: @@ -2654,7 +2662,7 @@ type: } | KW_TEXTURE { - $$ = hlsl_new_texture_type(ctx, HLSL_SAMPLER_DIM_GENERIC, NULL); + $$ = hlsl_new_texture_type(ctx, HLSL_TEXTURE_DIM_GENERIC, NULL); } | texture_type { diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index c0c26f80..5275be53 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -302,18 +302,22 @@ static D3D_SHADER_VARIABLE_TYPE sm4_base_type(const struct hlsl_type *type) case HLSL_TYPE_STRING: return D3D_SVT_STRING; case HLSL_TYPE_TEXTURE: - switch (type->sampler_dim) + switch (type->texture_dim) { - case HLSL_SAMPLER_DIM_1D: + case HLSL_TEXTURE_DIM_1D: return D3D_SVT_TEXTURE1D; - case HLSL_SAMPLER_DIM_2D: + case HLSL_TEXTURE_DIM_2D: return D3D_SVT_TEXTURE2D; - case HLSL_SAMPLER_DIM_3D: + case HLSL_TEXTURE_DIM_3D: return D3D_SVT_TEXTURE3D; - case HLSL_SAMPLER_DIM_CUBE: + case HLSL_TEXTURE_DIM_CUBE: return D3D_SVT_TEXTURECUBE; - case HLSL_SAMPLER_DIM_GENERIC: + case HLSL_TEXTURE_DIM_GENERIC: return D3D_SVT_TEXTURE; + case HLSL_TEXTURE_DIM_1DARRAY: + return D3D_SVT_TEXTURE1DARRAY; + case HLSL_TEXTURE_DIM_2DARRAY: + return D3D_SVT_TEXTURE2DARRAY; default: assert(0); } @@ -424,16 +428,22 @@ static D3D_RESOURCE_RETURN_TYPE sm4_resource_format(const struct hlsl_type *type static D3D_SRV_DIMENSION sm4_rdef_resource_dimension(const struct hlsl_type *type) { - switch (type->sampler_dim) + enum hlsl_texture_dim tex_dim = (type->base_type == HLSL_TYPE_TEXTURE)? + type->texture_dim : (enum hlsl_texture_dim) type->sampler_dim; + switch (tex_dim) { - case HLSL_SAMPLER_DIM_1D: + case HLSL_TEXTURE_DIM_1D: return D3D_SRV_DIMENSION_TEXTURE1D; - case HLSL_SAMPLER_DIM_2D: + case HLSL_TEXTURE_DIM_2D: return D3D_SRV_DIMENSION_TEXTURE2D; - case HLSL_SAMPLER_DIM_3D: + case HLSL_TEXTURE_DIM_3D: return D3D_SRV_DIMENSION_TEXTURE3D; - case HLSL_SAMPLER_DIM_CUBE: + case HLSL_TEXTURE_DIM_CUBE: return D3D_SRV_DIMENSION_TEXTURECUBE; + case HLSL_TEXTURE_DIM_1DARRAY: + return D3D_SRV_DIMENSION_TEXTURE1DARRAY; + case HLSL_TEXTURE_DIM_2DARRAY: + return D3D_SRV_DIMENSION_TEXTURE2DARRAY; default: assert(0); return D3D_SRV_DIMENSION_UNKNOWN; @@ -711,16 +721,22 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) static enum vkd3d_sm4_resource_type sm4_resource_dimension(const struct hlsl_type *type) { - switch (type->sampler_dim) + enum hlsl_texture_dim tex_dim = (type->base_type == HLSL_TYPE_TEXTURE)? + type->texture_dim : (enum hlsl_texture_dim) type->sampler_dim; + switch (tex_dim) { - case HLSL_SAMPLER_DIM_1D: + case HLSL_TEXTURE_DIM_1D: return VKD3D_SM4_RESOURCE_TEXTURE_1D; - case HLSL_SAMPLER_DIM_2D: + case HLSL_TEXTURE_DIM_2D: return VKD3D_SM4_RESOURCE_TEXTURE_2D; - case HLSL_SAMPLER_DIM_3D: + case HLSL_TEXTURE_DIM_3D: return VKD3D_SM4_RESOURCE_TEXTURE_3D; - case HLSL_SAMPLER_DIM_CUBE: + case HLSL_TEXTURE_DIM_CUBE: return VKD3D_SM4_RESOURCE_TEXTURE_CUBE; + case HLSL_TEXTURE_DIM_1DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_1DARRAY; + case HLSL_TEXTURE_DIM_2DARRAY: + return VKD3D_SM4_RESOURCE_TEXTURE_2DARRAY; default: assert(0); return 0; -- 2.25.1

2 2

[PATCH 01/18] programs/winedbg: don't pretend all dbg_internal_var instances will hold DWORD_PTR
by Eric Pouech 06 Dec '21

06 Dec '21

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/winedbg/be_arm.c | 34 +++++----- programs/winedbg/be_arm64.c | 70 ++++++++++---------- programs/winedbg/be_i386.c | 102 ++++++++++++++--------------- programs/winedbg/be_x86_64.c | 148 +++++++++++++++++++++--------------------- programs/winedbg/debugger.h | 6 +- programs/winedbg/winedbg.c | 2 - 6 files changed, 181 insertions(+), 181 deletions(-) diff --git a/programs/winedbg/be_arm.c b/programs/winedbg/be_arm.c index 451eb50e772..435dad2e3cc 100644 --- a/programs/winedbg/be_arm.c +++ b/programs/winedbg/be_arm.c @@ -1722,23 +1722,23 @@ static void be_arm_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) static struct dbg_internal_var be_arm_ctx[] = { - {CV_ARM_R0 + 0, "r0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R0), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 1, "r1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R1), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 2, "r2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R2), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 3, "r3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R3), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 4, "r4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R4), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 5, "r5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R5), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 6, "r6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R6), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 7, "r7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R7), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 8, "r8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R8), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 9, "r9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R9), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 10, "r10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R10), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 11, "r11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R11), dbg_itype_unsigned_int}, - {CV_ARM_R0 + 12, "r12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R12), dbg_itype_unsigned_int}, - {CV_ARM_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_int}, - {CV_ARM_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_int}, - {CV_ARM_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_int}, - {CV_ARM_CPSR, "cpsr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 0, "r0", (void*)FIELD_OFFSET(CONTEXT, R0), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 1, "r1", (void*)FIELD_OFFSET(CONTEXT, R1), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 2, "r2", (void*)FIELD_OFFSET(CONTEXT, R2), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 3, "r3", (void*)FIELD_OFFSET(CONTEXT, R3), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 4, "r4", (void*)FIELD_OFFSET(CONTEXT, R4), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 5, "r5", (void*)FIELD_OFFSET(CONTEXT, R5), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 6, "r6", (void*)FIELD_OFFSET(CONTEXT, R6), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 7, "r7", (void*)FIELD_OFFSET(CONTEXT, R7), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 8, "r8", (void*)FIELD_OFFSET(CONTEXT, R8), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 9, "r9", (void*)FIELD_OFFSET(CONTEXT, R9), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 10, "r10", (void*)FIELD_OFFSET(CONTEXT, R10), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 11, "r11", (void*)FIELD_OFFSET(CONTEXT, R11), dbg_itype_unsigned_int}, + {CV_ARM_R0 + 12, "r12", (void*)FIELD_OFFSET(CONTEXT, R12), dbg_itype_unsigned_int}, + {CV_ARM_SP, "sp", (void*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_int}, + {CV_ARM_LR, "lr", (void*)FIELD_OFFSET(CONTEXT, Lr), dbg_itype_unsigned_int}, + {CV_ARM_PC, "pc", (void*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_int}, + {CV_ARM_CPSR, "cpsr", (void*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, {0, NULL, 0, dbg_itype_none} }; diff --git a/programs/winedbg/be_arm64.c b/programs/winedbg/be_arm64.c index aaf6ecf0bb6..39f17c7d67d 100644 --- a/programs/winedbg/be_arm64.c +++ b/programs/winedbg/be_arm64.c @@ -104,41 +104,41 @@ static void be_arm64_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) static struct dbg_internal_var be_arm64_ctx[] = { - {CV_ARM64_PSTATE, "cpsr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, - {CV_ARM64_X0 + 0, "x0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X0), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 1, "x1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X1), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 2, "x2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X2), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 3, "x3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X3), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 4, "x4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X4), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 5, "x5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X5), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 6, "x6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X6), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 7, "x7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X7), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 8, "x8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X8), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 9, "x9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X9), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 10, "x10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X10), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 11, "x11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X11), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 12, "x12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X12), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 13, "x13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X13), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 14, "x14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X14), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 15, "x15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X15), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 16, "x16", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X16), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 17, "x17", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X17), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 18, "x18", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X18), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 19, "x19", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X19), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 20, "x20", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X20), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 21, "x21", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X21), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 22, "x22", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X22), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 23, "x23", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X23), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 24, "x24", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X24), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 25, "x25", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X25), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 26, "x26", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X26), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 27, "x27", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X27), dbg_itype_unsigned_long_int}, - {CV_ARM64_X0 + 28, "x28", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.X28), dbg_itype_unsigned_long_int}, - {CV_ARM64_FP, "fp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Fp), dbg_itype_unsigned_long_int}, - {CV_ARM64_LR, "lr", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Lr), dbg_itype_unsigned_long_int}, - {CV_ARM64_SP, "sp", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_long_int}, - {CV_ARM64_PC, "pc", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_long_int}, - {0, NULL, 0, dbg_itype_none} + {CV_ARM64_PSTATE, "cpsr", (void*)FIELD_OFFSET(CONTEXT, Cpsr), dbg_itype_unsigned_int}, + {CV_ARM64_X0 + 0, "x0", (void*)FIELD_OFFSET(CONTEXT, u.s.X0), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 1, "x1", (void*)FIELD_OFFSET(CONTEXT, u.s.X1), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 2, "x2", (void*)FIELD_OFFSET(CONTEXT, u.s.X2), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 3, "x3", (void*)FIELD_OFFSET(CONTEXT, u.s.X3), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 4, "x4", (void*)FIELD_OFFSET(CONTEXT, u.s.X4), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 5, "x5", (void*)FIELD_OFFSET(CONTEXT, u.s.X5), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 6, "x6", (void*)FIELD_OFFSET(CONTEXT, u.s.X6), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 7, "x7", (void*)FIELD_OFFSET(CONTEXT, u.s.X7), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 8, "x8", (void*)FIELD_OFFSET(CONTEXT, u.s.X8), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 9, "x9", (void*)FIELD_OFFSET(CONTEXT, u.s.X9), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 10, "x10", (void*)FIELD_OFFSET(CONTEXT, u.s.X10), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 11, "x11", (void*)FIELD_OFFSET(CONTEXT, u.s.X11), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 12, "x12", (void*)FIELD_OFFSET(CONTEXT, u.s.X12), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 13, "x13", (void*)FIELD_OFFSET(CONTEXT, u.s.X13), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 14, "x14", (void*)FIELD_OFFSET(CONTEXT, u.s.X14), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 15, "x15", (void*)FIELD_OFFSET(CONTEXT, u.s.X15), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 16, "x16", (void*)FIELD_OFFSET(CONTEXT, u.s.X16), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 17, "x17", (void*)FIELD_OFFSET(CONTEXT, u.s.X17), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 18, "x18", (void*)FIELD_OFFSET(CONTEXT, u.s.X18), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 19, "x19", (void*)FIELD_OFFSET(CONTEXT, u.s.X19), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 20, "x20", (void*)FIELD_OFFSET(CONTEXT, u.s.X20), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 21, "x21", (void*)FIELD_OFFSET(CONTEXT, u.s.X21), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 22, "x22", (void*)FIELD_OFFSET(CONTEXT, u.s.X22), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 23, "x23", (void*)FIELD_OFFSET(CONTEXT, u.s.X23), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 24, "x24", (void*)FIELD_OFFSET(CONTEXT, u.s.X24), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 25, "x25", (void*)FIELD_OFFSET(CONTEXT, u.s.X25), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 26, "x26", (void*)FIELD_OFFSET(CONTEXT, u.s.X26), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 27, "x27", (void*)FIELD_OFFSET(CONTEXT, u.s.X27), dbg_itype_unsigned_long_int}, + {CV_ARM64_X0 + 28, "x28", (void*)FIELD_OFFSET(CONTEXT, u.s.X28), dbg_itype_unsigned_long_int}, + {CV_ARM64_FP, "fp", (void*)FIELD_OFFSET(CONTEXT, u.s.Fp), dbg_itype_unsigned_long_int}, + {CV_ARM64_LR, "lr", (void*)FIELD_OFFSET(CONTEXT, u.s.Lr), dbg_itype_unsigned_long_int}, + {CV_ARM64_SP, "sp", (void*)FIELD_OFFSET(CONTEXT, Sp), dbg_itype_unsigned_long_int}, + {CV_ARM64_PC, "pc", (void*)FIELD_OFFSET(CONTEXT, Pc), dbg_itype_unsigned_long_int}, + {0, NULL, 0, dbg_itype_none} }; static BOOL be_arm64_is_step_over_insn(const void* insn) diff --git a/programs/winedbg/be_i386.c b/programs/winedbg/be_i386.c index 3bb7b9b4240..8902185d0b0 100644 --- a/programs/winedbg/be_i386.c +++ b/programs/winedbg/be_i386.c @@ -277,57 +277,57 @@ static void be_i386_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) static struct dbg_internal_var be_i386_ctx[] = { - {CV_REG_AL, "AL", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Eax), dbg_itype_unsigned_char_int}, - {CV_REG_CL, "CL", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ecx), dbg_itype_unsigned_char_int}, - {CV_REG_DL, "DL", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Edx), dbg_itype_unsigned_char_int}, - {CV_REG_BL, "BL", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ebx), dbg_itype_unsigned_char_int}, - {CV_REG_AH, "AH", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, Eax)+1), dbg_itype_unsigned_char_int}, - {CV_REG_CH, "CH", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, Ecx)+1), dbg_itype_unsigned_char_int}, - {CV_REG_DH, "DH", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, Edx)+1), dbg_itype_unsigned_char_int}, - {CV_REG_BH, "BH", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, Ebx)+1), dbg_itype_unsigned_char_int}, - {CV_REG_AX, "AX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Eax), dbg_itype_unsigned_short_int}, - {CV_REG_CX, "CX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ecx), dbg_itype_unsigned_short_int}, - {CV_REG_DX, "DX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Edx), dbg_itype_unsigned_short_int}, - {CV_REG_BX, "BX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ebx), dbg_itype_unsigned_short_int}, - {CV_REG_SP, "SP", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Esp), dbg_itype_unsigned_short_int}, - {CV_REG_BP, "BP", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ebp), dbg_itype_unsigned_short_int}, - {CV_REG_SI, "SI", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Esi), dbg_itype_unsigned_short_int}, - {CV_REG_DI, "DI", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Edi), dbg_itype_unsigned_short_int}, - {CV_REG_EAX, "EAX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Eax), dbg_itype_unsigned_int}, - {CV_REG_ECX, "ECX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ecx), dbg_itype_unsigned_int}, - {CV_REG_EDX, "EDX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Edx), dbg_itype_unsigned_int}, - {CV_REG_EBX, "EBX", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ebx), dbg_itype_unsigned_int}, - {CV_REG_ESP, "ESP", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Esp), dbg_itype_unsigned_int}, - {CV_REG_EBP, "EBP", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Ebp), dbg_itype_unsigned_int}, - {CV_REG_ESI, "ESI", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Esi), dbg_itype_unsigned_int}, - {CV_REG_EDI, "EDI", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Edi), dbg_itype_unsigned_int}, - {CV_REG_ES, "ES", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, SegEs), dbg_itype_unsigned_short_int}, - {CV_REG_CS, "CS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, SegCs), dbg_itype_unsigned_short_int}, - {CV_REG_SS, "SS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, SegSs), dbg_itype_unsigned_short_int}, - {CV_REG_DS, "DS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, SegDs), dbg_itype_unsigned_short_int}, - {CV_REG_FS, "FS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, SegFs), dbg_itype_unsigned_short_int}, - {CV_REG_GS, "GS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, SegGs), dbg_itype_unsigned_short_int}, - {CV_REG_IP, "IP", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Eip), dbg_itype_unsigned_short_int}, - {CV_REG_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, EFlags), dbg_itype_unsigned_short_int}, - {CV_REG_EIP, "EIP", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, Eip), dbg_itype_unsigned_int}, - {CV_REG_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, EFlags), dbg_itype_unsigned_int}, - {CV_REG_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[ 0]), dbg_itype_long_real}, - {CV_REG_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[10]), dbg_itype_long_real}, - {CV_REG_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[20]), dbg_itype_long_real}, - {CV_REG_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[30]), dbg_itype_long_real}, - {CV_REG_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[40]), dbg_itype_long_real}, - {CV_REG_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, - {CV_REG_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, - {CV_REG_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, - {CV_AMD64_XMM0, "XMM0", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[0])), dbg_itype_m128a}, - {CV_AMD64_XMM0+1, "XMM1", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[1])), dbg_itype_m128a}, - {CV_AMD64_XMM0+2, "XMM2", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[2])), dbg_itype_m128a}, - {CV_AMD64_XMM0+3, "XMM3", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[3])), dbg_itype_m128a}, - {CV_AMD64_XMM0+4, "XMM4", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[4])), dbg_itype_m128a}, - {CV_AMD64_XMM0+5, "XMM5", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[5])), dbg_itype_m128a}, - {CV_AMD64_XMM0+6, "XMM6", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[6])), dbg_itype_m128a}, - {CV_AMD64_XMM0+7, "XMM7", (DWORD_PTR*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[7])), dbg_itype_m128a}, - {0, NULL, 0, dbg_itype_none} + {CV_REG_AL, "AL", (void*)FIELD_OFFSET(WOW64_CONTEXT, Eax), dbg_itype_unsigned_char_int}, + {CV_REG_CL, "CL", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ecx), dbg_itype_unsigned_char_int}, + {CV_REG_DL, "DL", (void*)FIELD_OFFSET(WOW64_CONTEXT, Edx), dbg_itype_unsigned_char_int}, + {CV_REG_BL, "BL", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ebx), dbg_itype_unsigned_char_int}, + {CV_REG_AH, "AH", (void*)(FIELD_OFFSET(WOW64_CONTEXT, Eax)+1), dbg_itype_unsigned_char_int}, + {CV_REG_CH, "CH", (void*)(FIELD_OFFSET(WOW64_CONTEXT, Ecx)+1), dbg_itype_unsigned_char_int}, + {CV_REG_DH, "DH", (void*)(FIELD_OFFSET(WOW64_CONTEXT, Edx)+1), dbg_itype_unsigned_char_int}, + {CV_REG_BH, "BH", (void*)(FIELD_OFFSET(WOW64_CONTEXT, Ebx)+1), dbg_itype_unsigned_char_int}, + {CV_REG_AX, "AX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Eax), dbg_itype_unsigned_short_int}, + {CV_REG_CX, "CX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ecx), dbg_itype_unsigned_short_int}, + {CV_REG_DX, "DX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Edx), dbg_itype_unsigned_short_int}, + {CV_REG_BX, "BX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ebx), dbg_itype_unsigned_short_int}, + {CV_REG_SP, "SP", (void*)FIELD_OFFSET(WOW64_CONTEXT, Esp), dbg_itype_unsigned_short_int}, + {CV_REG_BP, "BP", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ebp), dbg_itype_unsigned_short_int}, + {CV_REG_SI, "SI", (void*)FIELD_OFFSET(WOW64_CONTEXT, Esi), dbg_itype_unsigned_short_int}, + {CV_REG_DI, "DI", (void*)FIELD_OFFSET(WOW64_CONTEXT, Edi), dbg_itype_unsigned_short_int}, + {CV_REG_EAX, "EAX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Eax), dbg_itype_unsigned_int}, + {CV_REG_ECX, "ECX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ecx), dbg_itype_unsigned_int}, + {CV_REG_EDX, "EDX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Edx), dbg_itype_unsigned_int}, + {CV_REG_EBX, "EBX", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ebx), dbg_itype_unsigned_int}, + {CV_REG_ESP, "ESP", (void*)FIELD_OFFSET(WOW64_CONTEXT, Esp), dbg_itype_unsigned_int}, + {CV_REG_EBP, "EBP", (void*)FIELD_OFFSET(WOW64_CONTEXT, Ebp), dbg_itype_unsigned_int}, + {CV_REG_ESI, "ESI", (void*)FIELD_OFFSET(WOW64_CONTEXT, Esi), dbg_itype_unsigned_int}, + {CV_REG_EDI, "EDI", (void*)FIELD_OFFSET(WOW64_CONTEXT, Edi), dbg_itype_unsigned_int}, + {CV_REG_ES, "ES", (void*)FIELD_OFFSET(WOW64_CONTEXT, SegEs), dbg_itype_unsigned_short_int}, + {CV_REG_CS, "CS", (void*)FIELD_OFFSET(WOW64_CONTEXT, SegCs), dbg_itype_unsigned_short_int}, + {CV_REG_SS, "SS", (void*)FIELD_OFFSET(WOW64_CONTEXT, SegSs), dbg_itype_unsigned_short_int}, + {CV_REG_DS, "DS", (void*)FIELD_OFFSET(WOW64_CONTEXT, SegDs), dbg_itype_unsigned_short_int}, + {CV_REG_FS, "FS", (void*)FIELD_OFFSET(WOW64_CONTEXT, SegFs), dbg_itype_unsigned_short_int}, + {CV_REG_GS, "GS", (void*)FIELD_OFFSET(WOW64_CONTEXT, SegGs), dbg_itype_unsigned_short_int}, + {CV_REG_IP, "IP", (void*)FIELD_OFFSET(WOW64_CONTEXT, Eip), dbg_itype_unsigned_short_int}, + {CV_REG_FLAGS, "FLAGS", (void*)FIELD_OFFSET(WOW64_CONTEXT, EFlags), dbg_itype_unsigned_short_int}, + {CV_REG_EIP, "EIP", (void*)FIELD_OFFSET(WOW64_CONTEXT, Eip), dbg_itype_unsigned_int}, + {CV_REG_EFLAGS, "EFLAGS", (void*)FIELD_OFFSET(WOW64_CONTEXT, EFlags), dbg_itype_unsigned_int}, + {CV_REG_ST0, "ST0", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[ 0]), dbg_itype_long_real}, + {CV_REG_ST0+1, "ST1", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[10]), dbg_itype_long_real}, + {CV_REG_ST0+2, "ST2", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[20]), dbg_itype_long_real}, + {CV_REG_ST0+3, "ST3", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[30]), dbg_itype_long_real}, + {CV_REG_ST0+4, "ST4", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[40]), dbg_itype_long_real}, + {CV_REG_ST0+5, "ST5", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[50]), dbg_itype_long_real}, + {CV_REG_ST0+6, "ST6", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[60]), dbg_itype_long_real}, + {CV_REG_ST0+7, "ST7", (void*)FIELD_OFFSET(WOW64_CONTEXT, FloatSave.RegisterArea[70]), dbg_itype_long_real}, + {CV_AMD64_XMM0, "XMM0", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[0])), dbg_itype_m128a}, + {CV_AMD64_XMM0+1, "XMM1", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[1])), dbg_itype_m128a}, + {CV_AMD64_XMM0+2, "XMM2", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[2])), dbg_itype_m128a}, + {CV_AMD64_XMM0+3, "XMM3", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[3])), dbg_itype_m128a}, + {CV_AMD64_XMM0+4, "XMM4", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[4])), dbg_itype_m128a}, + {CV_AMD64_XMM0+5, "XMM5", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[5])), dbg_itype_m128a}, + {CV_AMD64_XMM0+6, "XMM6", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[6])), dbg_itype_m128a}, + {CV_AMD64_XMM0+7, "XMM7", (void*)(FIELD_OFFSET(WOW64_CONTEXT, ExtendedRegisters) + FIELD_OFFSET(XSAVE_FORMAT, XmmRegisters[7])), dbg_itype_m128a}, + {0, NULL, 0, dbg_itype_none} }; static BOOL be_i386_is_step_over_insn(const void* insn) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index 45c01a70594..af9f7284685 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -179,80 +179,80 @@ static void be_x86_64_print_segment_info(HANDLE hThread, const dbg_ctx_t *ctx) static struct dbg_internal_var be_x86_64_ctx[] = { - {CV_AMD64_AL, "AL", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_char_int}, - {CV_AMD64_BL, "BL", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_char_int}, - {CV_AMD64_CL, "CL", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_char_int}, - {CV_AMD64_DL, "DL", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_char_int}, - {CV_AMD64_AH, "AH", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, Rax)+1), dbg_itype_unsigned_char_int}, - {CV_AMD64_BH, "BH", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, Rbx)+1), dbg_itype_unsigned_char_int}, - {CV_AMD64_CH, "CH", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, Rcx)+1), dbg_itype_unsigned_char_int}, - {CV_AMD64_DH, "DH", (DWORD_PTR*)(FIELD_OFFSET(CONTEXT, Rdx)+1), dbg_itype_unsigned_char_int}, - {CV_AMD64_AX, "AX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_short_int}, - {CV_AMD64_BX, "BX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_short_int}, - {CV_AMD64_CX, "CX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_short_int}, - {CV_AMD64_DX, "DX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_short_int}, - {CV_AMD64_SP, "SP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rsp), dbg_itype_unsigned_short_int}, - {CV_AMD64_BP, "BP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbp), dbg_itype_unsigned_short_int}, - {CV_AMD64_SI, "SI", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rsi), dbg_itype_unsigned_short_int}, - {CV_AMD64_DI, "DI", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdi), dbg_itype_unsigned_short_int}, - {CV_AMD64_EAX, "EAX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_int}, - {CV_AMD64_EBX, "EBX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_int}, - {CV_AMD64_ECX, "ECX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_int}, - {CV_AMD64_EDX, "EDX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_int}, - {CV_AMD64_ESP, "ESP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rsp), dbg_itype_unsigned_int}, - {CV_AMD64_EBP, "EBP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbp), dbg_itype_unsigned_int}, - {CV_AMD64_ESI, "ESI", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rsi), dbg_itype_unsigned_int}, - {CV_AMD64_EDI, "EDI", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdi), dbg_itype_unsigned_int}, - {CV_AMD64_ES, "ES", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegEs), dbg_itype_unsigned_short_int}, - {CV_AMD64_CS, "CS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegCs), dbg_itype_unsigned_short_int}, - {CV_AMD64_SS, "SS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegSs), dbg_itype_unsigned_short_int}, - {CV_AMD64_DS, "DS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegDs), dbg_itype_unsigned_short_int}, - {CV_AMD64_FS, "FS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegFs), dbg_itype_unsigned_short_int}, - {CV_AMD64_GS, "GS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, SegGs), dbg_itype_unsigned_short_int}, - {CV_AMD64_FLAGS, "FLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, - {CV_AMD64_EFLAGS, "EFLAGS", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, - {CV_AMD64_RIP, "RIP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rip), dbg_itype_unsigned_long_int}, - {CV_AMD64_RAX, "RAX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_long_int}, - {CV_AMD64_RBX, "RBX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_long_int}, - {CV_AMD64_RCX, "RCX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_long_int}, - {CV_AMD64_RDX, "RDX", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_long_int}, - {CV_AMD64_RSP, "RSP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rsp), dbg_itype_unsigned_long_int}, - {CV_AMD64_RBP, "RBP", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rbp), dbg_itype_unsigned_long_int}, - {CV_AMD64_RSI, "RSI", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rsi), dbg_itype_unsigned_long_int}, - {CV_AMD64_RDI, "RDI", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, Rdi), dbg_itype_unsigned_long_int}, - {CV_AMD64_R8, "R8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R8), dbg_itype_unsigned_long_int}, - {CV_AMD64_R9, "R9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R9), dbg_itype_unsigned_long_int}, - {CV_AMD64_R10, "R10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R10), dbg_itype_unsigned_long_int}, - {CV_AMD64_R11, "R11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R11), dbg_itype_unsigned_long_int}, - {CV_AMD64_R12, "R12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R12), dbg_itype_unsigned_long_int}, - {CV_AMD64_R13, "R13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, - {CV_AMD64_R14, "R14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, - {CV_AMD64_R15, "R15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, - {CV_AMD64_ST0, "ST0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[0]), dbg_itype_long_real}, - {CV_AMD64_ST0+1, "ST1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[1]), dbg_itype_long_real}, - {CV_AMD64_ST0+2, "ST2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[2]), dbg_itype_long_real}, - {CV_AMD64_ST0+3, "ST3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[3]), dbg_itype_long_real}, - {CV_AMD64_ST0+4, "ST4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[4]), dbg_itype_long_real}, - {CV_AMD64_ST0+5, "ST5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, - {CV_AMD64_ST0+6, "ST6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, - {CV_AMD64_ST0+7, "ST7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, - {CV_AMD64_XMM0, "XMM0", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm0), dbg_itype_m128a}, - {CV_AMD64_XMM0+1, "XMM1", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm1), dbg_itype_m128a}, - {CV_AMD64_XMM0+2, "XMM2", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm2), dbg_itype_m128a}, - {CV_AMD64_XMM0+3, "XMM3", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm3), dbg_itype_m128a}, - {CV_AMD64_XMM0+4, "XMM4", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm4), dbg_itype_m128a}, - {CV_AMD64_XMM0+5, "XMM5", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm5), dbg_itype_m128a}, - {CV_AMD64_XMM0+6, "XMM6", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm6), dbg_itype_m128a}, - {CV_AMD64_XMM0+7, "XMM7", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm7), dbg_itype_m128a}, - {CV_AMD64_XMM8, "XMM8", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm8), dbg_itype_m128a}, - {CV_AMD64_XMM8+1, "XMM9", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm9), dbg_itype_m128a}, - {CV_AMD64_XMM8+2, "XMM10", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm10), dbg_itype_m128a}, - {CV_AMD64_XMM8+3, "XMM11", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm11), dbg_itype_m128a}, - {CV_AMD64_XMM8+4, "XMM12", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm12), dbg_itype_m128a}, - {CV_AMD64_XMM8+5, "XMM13", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm13), dbg_itype_m128a}, - {CV_AMD64_XMM8+6, "XMM14", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm14), dbg_itype_m128a}, - {CV_AMD64_XMM8+7, "XMM15", (DWORD_PTR*)FIELD_OFFSET(CONTEXT, u.s.Xmm15), dbg_itype_m128a}, - {0, NULL, 0, dbg_itype_none} + {CV_AMD64_AL, "AL", (void*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_char_int}, + {CV_AMD64_BL, "BL", (void*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_char_int}, + {CV_AMD64_CL, "CL", (void*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_char_int}, + {CV_AMD64_DL, "DL", (void*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_char_int}, + {CV_AMD64_AH, "AH", (void*)(FIELD_OFFSET(CONTEXT, Rax)+1), dbg_itype_unsigned_char_int}, + {CV_AMD64_BH, "BH", (void*)(FIELD_OFFSET(CONTEXT, Rbx)+1), dbg_itype_unsigned_char_int}, + {CV_AMD64_CH, "CH", (void*)(FIELD_OFFSET(CONTEXT, Rcx)+1), dbg_itype_unsigned_char_int}, + {CV_AMD64_DH, "DH", (void*)(FIELD_OFFSET(CONTEXT, Rdx)+1), dbg_itype_unsigned_char_int}, + {CV_AMD64_AX, "AX", (void*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_short_int}, + {CV_AMD64_BX, "BX", (void*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_short_int}, + {CV_AMD64_CX, "CX", (void*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_short_int}, + {CV_AMD64_DX, "DX", (void*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_short_int}, + {CV_AMD64_SP, "SP", (void*)FIELD_OFFSET(CONTEXT, Rsp), dbg_itype_unsigned_short_int}, + {CV_AMD64_BP, "BP", (void*)FIELD_OFFSET(CONTEXT, Rbp), dbg_itype_unsigned_short_int}, + {CV_AMD64_SI, "SI", (void*)FIELD_OFFSET(CONTEXT, Rsi), dbg_itype_unsigned_short_int}, + {CV_AMD64_DI, "DI", (void*)FIELD_OFFSET(CONTEXT, Rdi), dbg_itype_unsigned_short_int}, + {CV_AMD64_EAX, "EAX", (void*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_int}, + {CV_AMD64_EBX, "EBX", (void*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_int}, + {CV_AMD64_ECX, "ECX", (void*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_int}, + {CV_AMD64_EDX, "EDX", (void*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_int}, + {CV_AMD64_ESP, "ESP", (void*)FIELD_OFFSET(CONTEXT, Rsp), dbg_itype_unsigned_int}, + {CV_AMD64_EBP, "EBP", (void*)FIELD_OFFSET(CONTEXT, Rbp), dbg_itype_unsigned_int}, + {CV_AMD64_ESI, "ESI", (void*)FIELD_OFFSET(CONTEXT, Rsi), dbg_itype_unsigned_int}, + {CV_AMD64_EDI, "EDI", (void*)FIELD_OFFSET(CONTEXT, Rdi), dbg_itype_unsigned_int}, + {CV_AMD64_ES, "ES", (void*)FIELD_OFFSET(CONTEXT, SegEs), dbg_itype_unsigned_short_int}, + {CV_AMD64_CS, "CS", (void*)FIELD_OFFSET(CONTEXT, SegCs), dbg_itype_unsigned_short_int}, + {CV_AMD64_SS, "SS", (void*)FIELD_OFFSET(CONTEXT, SegSs), dbg_itype_unsigned_short_int}, + {CV_AMD64_DS, "DS", (void*)FIELD_OFFSET(CONTEXT, SegDs), dbg_itype_unsigned_short_int}, + {CV_AMD64_FS, "FS", (void*)FIELD_OFFSET(CONTEXT, SegFs), dbg_itype_unsigned_short_int}, + {CV_AMD64_GS, "GS", (void*)FIELD_OFFSET(CONTEXT, SegGs), dbg_itype_unsigned_short_int}, + {CV_AMD64_FLAGS, "FLAGS", (void*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_short_int}, + {CV_AMD64_EFLAGS, "EFLAGS", (void*)FIELD_OFFSET(CONTEXT, EFlags), dbg_itype_unsigned_int}, + {CV_AMD64_RIP, "RIP", (void*)FIELD_OFFSET(CONTEXT, Rip), dbg_itype_unsigned_long_int}, + {CV_AMD64_RAX, "RAX", (void*)FIELD_OFFSET(CONTEXT, Rax), dbg_itype_unsigned_long_int}, + {CV_AMD64_RBX, "RBX", (void*)FIELD_OFFSET(CONTEXT, Rbx), dbg_itype_unsigned_long_int}, + {CV_AMD64_RCX, "RCX", (void*)FIELD_OFFSET(CONTEXT, Rcx), dbg_itype_unsigned_long_int}, + {CV_AMD64_RDX, "RDX", (void*)FIELD_OFFSET(CONTEXT, Rdx), dbg_itype_unsigned_long_int}, + {CV_AMD64_RSP, "RSP", (void*)FIELD_OFFSET(CONTEXT, Rsp), dbg_itype_unsigned_long_int}, + {CV_AMD64_RBP, "RBP", (void*)FIELD_OFFSET(CONTEXT, Rbp), dbg_itype_unsigned_long_int}, + {CV_AMD64_RSI, "RSI", (void*)FIELD_OFFSET(CONTEXT, Rsi), dbg_itype_unsigned_long_int}, + {CV_AMD64_RDI, "RDI", (void*)FIELD_OFFSET(CONTEXT, Rdi), dbg_itype_unsigned_long_int}, + {CV_AMD64_R8, "R8", (void*)FIELD_OFFSET(CONTEXT, R8), dbg_itype_unsigned_long_int}, + {CV_AMD64_R9, "R9", (void*)FIELD_OFFSET(CONTEXT, R9), dbg_itype_unsigned_long_int}, + {CV_AMD64_R10, "R10", (void*)FIELD_OFFSET(CONTEXT, R10), dbg_itype_unsigned_long_int}, + {CV_AMD64_R11, "R11", (void*)FIELD_OFFSET(CONTEXT, R11), dbg_itype_unsigned_long_int}, + {CV_AMD64_R12, "R12", (void*)FIELD_OFFSET(CONTEXT, R12), dbg_itype_unsigned_long_int}, + {CV_AMD64_R13, "R13", (void*)FIELD_OFFSET(CONTEXT, R13), dbg_itype_unsigned_long_int}, + {CV_AMD64_R14, "R14", (void*)FIELD_OFFSET(CONTEXT, R14), dbg_itype_unsigned_long_int}, + {CV_AMD64_R15, "R15", (void*)FIELD_OFFSET(CONTEXT, R15), dbg_itype_unsigned_long_int}, + {CV_AMD64_ST0, "ST0", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[0]), dbg_itype_long_real}, + {CV_AMD64_ST0+1, "ST1", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[1]), dbg_itype_long_real}, + {CV_AMD64_ST0+2, "ST2", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[2]), dbg_itype_long_real}, + {CV_AMD64_ST0+3, "ST3", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[3]), dbg_itype_long_real}, + {CV_AMD64_ST0+4, "ST4", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[4]), dbg_itype_long_real}, + {CV_AMD64_ST0+5, "ST5", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[5]), dbg_itype_long_real}, + {CV_AMD64_ST0+6, "ST6", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[6]), dbg_itype_long_real}, + {CV_AMD64_ST0+7, "ST7", (void*)FIELD_OFFSET(CONTEXT, u.FltSave.FloatRegisters[7]), dbg_itype_long_real}, + {CV_AMD64_XMM0, "XMM0", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm0), dbg_itype_m128a}, + {CV_AMD64_XMM0+1, "XMM1", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm1), dbg_itype_m128a}, + {CV_AMD64_XMM0+2, "XMM2", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm2), dbg_itype_m128a}, + {CV_AMD64_XMM0+3, "XMM3", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm3), dbg_itype_m128a}, + {CV_AMD64_XMM0+4, "XMM4", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm4), dbg_itype_m128a}, + {CV_AMD64_XMM0+5, "XMM5", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm5), dbg_itype_m128a}, + {CV_AMD64_XMM0+6, "XMM6", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm6), dbg_itype_m128a}, + {CV_AMD64_XMM0+7, "XMM7", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm7), dbg_itype_m128a}, + {CV_AMD64_XMM8, "XMM8", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm8), dbg_itype_m128a}, + {CV_AMD64_XMM8+1, "XMM9", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm9), dbg_itype_m128a}, + {CV_AMD64_XMM8+2, "XMM10", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm10), dbg_itype_m128a}, + {CV_AMD64_XMM8+3, "XMM11", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm11), dbg_itype_m128a}, + {CV_AMD64_XMM8+4, "XMM12", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm12), dbg_itype_m128a}, + {CV_AMD64_XMM8+5, "XMM13", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm13), dbg_itype_m128a}, + {CV_AMD64_XMM8+6, "XMM14", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm14), dbg_itype_m128a}, + {CV_AMD64_XMM8+7, "XMM15", (void*)FIELD_OFFSET(CONTEXT, u.s.Xmm15), dbg_itype_m128a}, + {0, NULL, 0, dbg_itype_none} }; #define f_mod(b) ((b)>>6) diff --git a/programs/winedbg/debugger.h b/programs/winedbg/debugger.h index 0e6d715a2d1..506a7d1797b 100644 --- a/programs/winedbg/debugger.h +++ b/programs/winedbg/debugger.h @@ -255,8 +255,8 @@ extern HANDLE dbg_houtput; struct dbg_internal_var { DWORD_PTR val; - const char* name; - DWORD_PTR *pval; + const char* name; + void* pval; ULONG typeid; /* always internal type */ }; @@ -509,7 +509,7 @@ extern struct dbg_internal_var dbg_internal_vars[]; #define DBG_IVARNAME(_var) dbg_internal_var_##_var #define DBG_IVARSTRUCT(_var) dbg_internal_vars[DBG_IVARNAME(_var)] -#define DBG_IVAR(_var) (*(DBG_IVARSTRUCT(_var).pval)) +#define DBG_IVAR(_var) (DBG_IVARSTRUCT(_var).val) #define INTERNAL_VAR(_var,_val,_ref,itype) DBG_IVARNAME(_var), enum debug_int_var { diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 659ca364544..803a26f1e55 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -240,7 +240,7 @@ const struct dbg_internal_var* dbg_get_internal_var(const char* name) struct dbg_internal_var* ret = (void*)lexeme_alloc_size(sizeof(*ret)); /* relocate register's field against current context */ *ret = *div; - ret->pval = (DWORD_PTR*)((char*)&dbg_context + (DWORD_PTR)div->pval); + ret->pval = (char*)&dbg_context + (DWORD_PTR)div->pval; return ret; } }

2 18

[PATCH] advapi32/tests: The preferred UI language check must be case insensitive.
by Francois Gouget 06 Dec '21

06 Dec '21

This avoid skipping the test for the French locale. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- It looks like langW was in lowercase back when w10pro64 was running Windows 10 2004; but it's uppercase in 21H1 which is why the advapi32:lsa failure disappeared for the French locale. dlls/advapi32/tests/lsa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index f8c822a7de2..58ab37c9aa9 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -403,7 +403,7 @@ static void test_LsaLookupSids(void) check_unicode_string(&names[0].Name, L"Everyone"); else if (wcscmp(langW, L"0407") == 0) /* German */ check_unicode_string(&names[0].Name, L"Jeder"); - else if (wcscmp(langW, L"040C") == 0) /* French */ + else if (wcsicmp(langW, L"040C") == 0) /* French */ check_unicode_string(&names[0].Name, L"Tout le monde"); else trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer)); -- 2.30.2

2 2

[PATCH] DeviceCapabilities fix DC_PAPERSIZE return type
by Konstantin Romanov 06 Dec '21

06 Dec '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52132 --- dlls/wineps.drv/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/driver.c b/dlls/wineps.drv/driver.c index 11de7bc3328..d1a2e6d6f2d 100644 --- a/dlls/wineps.drv/driver.c +++ b/dlls/wineps.drv/driver.c @@ -561,7 +561,7 @@ DWORD WINAPI DrvDeviceCapabilities(HANDLE printer, WCHAR *device_name, WORD capa case DC_PAPERSIZE: { PAGESIZE *ps; - POINT16 *pt = output; + POINT *pt = output; int i = 0; LIST_FOR_EACH_ENTRY(ps, &pi->ppd->PageSizes, PAGESIZE, entry) -- 2.33.0.windows.1

2 1

[PATCH] kernelbase: Fix parameter order of FindResourceExW call for non-localized path.
by Derek Lesho 06 Dec '21

06 Dec '21

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/kernelbase/version.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d670df27690..7ca3ecdc712 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -781,8 +781,8 @@ DWORD WINAPI GetFileVersionInfoSizeExW( DWORD flags, LPCWSTR filename, LPDWORD r if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), @@ -887,8 +887,8 @@ BOOL WINAPI GetFileVersionInfoExW( DWORD flags, LPCWSTR filename, DWORD ignored, if (!(flags & FILE_VER_GET_LOCALISED)) { LANGID english = MAKELANGID( LANG_ENGLISH, SUBLANG_DEFAULT ); - hRsrc = FindResourceExW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), - (LPWSTR)VS_FILE_INFO, english ); + hRsrc = FindResourceExW( hModule, (LPWSTR)VS_FILE_INFO, + MAKEINTRESOURCEW(VS_VERSION_INFO), english ); } if (!hRsrc) hRsrc = FindResourceW( hModule, MAKEINTRESOURCEW(VS_VERSION_INFO), -- 2.33.1

1 0

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-devel