September 2022 - Wine-Commits

Kevin Puetz : vbscript/tests: Test throwException with Description but *not* Source.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: e19b8b635c791482dd5c399f2cb895cfb9932b85 URL: https://gitlab.winehq.org/wine/wine/-/commit/e19b8b635c791482dd5c399f2cb895… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Sat Sep 24 00:37:13 2022 +0000 vbscript/tests: Test throwException with Description but *not* Source. It occurred to me to wonder whether it was really Description, Source, or both that results in skipping the map_vbs_exception logic. It turns out we had it right (it's just description, and it's null-pointer and not empty string that makes the difference). But the fact that it's not obvious still makes it a good testcase --- dlls/vbscript/tests/run.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index ef26641d01d..31ac03ab8d7 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -1577,8 +1577,11 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, if(pdp->cArgs >= 2) { v = pdp->rgvarg + pdp->cArgs - 2; - ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); - pei->bstrSource = SysAllocString(V_BSTR(v)); + if(!(V_VT(v) == VT_ERROR && V_ERROR(v) == DISP_E_PARAMNOTFOUND)) /* != vtMissing */ + { + ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); + pei->bstrSource = SysAllocString(V_BSTR(v)); + } } if(pdp->cArgs >= 3) { @@ -2453,6 +2456,31 @@ static void test_callbacks(void) IActiveScriptError_Release(error1); + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&, , \"test desc\""); + ok(hres == E_NOINTERFACE, "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!ei.bstrSource, "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"test desc"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == E_NOINTERFACE, "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); + store_script_error = &error1; SET_EXPECT(OnScriptError); hres = parse_script_ar("throwException &h80004002&, \"test src\", \"test desc\"");

1 0

Kevin Puetz : vbscript: Only set EXCEPINFO strings for cases that map_hres translated.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: db94448d9785ac5b4425981fa3a043f79e64ee34 URL: https://gitlab.winehq.org/wine/wine/-/commit/db94448d9785ac5b4425981fa3a043… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 23 19:38:34 2022 +0000 vbscript: Only set EXCEPINFO strings for cases that map_hres translated. Add test for E_UNEXPECTED. --- dlls/vbscript/interp.c | 11 +++++++---- dlls/vbscript/tests/run.c | 26 ++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1d7482b5013..fae2c0fccbb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2498,10 +2498,13 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd } ctx->ei.scode = hres; - if(!ctx->ei.bstrSource) - ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); - if(!ctx->ei.bstrDescription) - ctx->ei.bstrDescription = get_vbscript_error_string(hres); + if(HRESULT_FACILITY(hres) == FACILITY_VBS) + { + if(!ctx->ei.bstrSource) + ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); + if(!ctx->ei.bstrDescription) + ctx->ei.bstrDescription = get_vbscript_error_string(hres); + } if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 8d7c15ba70b..ef26641d01d 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -2477,6 +2477,32 @@ static void test_callbacks(void) free_ei(&ei); IActiveScriptError_Release(error1); + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h8000FFFF&"); + ok(hres == E_UNEXPECTED, "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!ei.bstrSource, + "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!ei.bstrDescription, + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == E_UNEXPECTED, "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); } static void test_gc(void)

1 0

Jacek Caban : winevulkan: Merge body and body_conversion.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 8d1bdb5f20e7f559cc8095d9e593c23004aead0c URL: https://gitlab.winehq.org/wine/wine/-/commit/8d1bdb5f20e7f559cc8095d9e593c2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 19:30:12 2022 +0200 winevulkan: Merge body and body_conversion. --- dlls/winevulkan/make_vulkan | 60 +- dlls/winevulkan/vulkan_thunks.c | 2294 +++++++++++++++++++++++++++++++++++---- 2 files changed, 2092 insertions(+), 262 deletions(-)

1 0

Jacek Caban : winevulkan: Separate 32-bit and 64-bit thunks implementation.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: a5e39c42c8f5da421220391e44e11536a1c3b28f URL: https://gitlab.winehq.org/wine/wine/-/commit/a5e39c42c8f5da421220391e44e115… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 31 22:16:29 2022 +0200 winevulkan: Separate 32-bit and 64-bit thunks implementation. --- dlls/winevulkan/make_vulkan | 53 +- dlls/winevulkan/vulkan_thunks.c | 8618 ++++++++++++++++++++++++++++++++------- 2 files changed, 7158 insertions(+), 1513 deletions(-)

1 0

Jacek Caban : winevulkan: Use generated thunks for basic debug traces.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: 79f67c524bd6a73c8a54dda4903c1db2eccbfb80 URL: https://gitlab.winehq.org/wine/wine/-/commit/79f67c524bd6a73c8a54dda4903c1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 25 16:29:08 2022 +0200 winevulkan: Use generated thunks for basic debug traces. --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan.c | 66 ----------------- dlls/winevulkan/vulkan_thunks.c | 156 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 157 insertions(+), 67 deletions(-)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: b3ec117b1d115d3d9958bd93665d2ad11bcc9c10 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3ec117b1d115d3d9958bd93665d2a… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Sep 23 23:24:54 2022 +0300 po: Update Lithuanian translation. --- po/lt.po | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index cb1401bb7cd..e8892f88cde 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2022-09-17 12:50+0300\n" +"PO-Revision-Date: 2022-09-23 23:24+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15075,10 +15075,8 @@ msgid "&Replace...\tCtrl+H" msgstr "Pa&keisti...\tVald+H" #: programs/notepad/notepad.rc:59 -#, fuzzy -#| msgid "&New...\tCtrl+N" msgid "&Go To...\tCtrl+G" -msgstr "&Naujas...\tVald+N" +msgstr "&Eiti į...\tVald+G" #: programs/notepad/notepad.rc:63 programs/oleview/oleview.rc:68 #: programs/oleview/oleview.rc:90 programs/winefile/winefile.rc:67 @@ -15121,17 +15119,15 @@ msgstr "&Viršutinė:" #: programs/notepad/notepad.rc:132 msgid "Go To Line" -msgstr "" +msgstr "Eiti į eilutę" #: programs/notepad/notepad.rc:134 -#, fuzzy -#| msgid "CRL Number" msgid "&Line Number:" -msgstr "ALS numeris" +msgstr "&Eilutės numeris:" #: programs/notepad/notepad.rc:137 msgid "Go To" -msgstr "" +msgstr "Eiti į" #: programs/notepad/notepad.rc:145 msgid "Encoding:" @@ -15197,7 +15193,7 @@ msgstr "Z" #: programs/notepad/notepad.rc:162 msgctxt "accelerator GoTo" msgid "G" -msgstr "" +msgstr "G" #: programs/notepad/notepad.rc:74 msgid "Page &p"

1 0

Jacek Caban : vbscript: Fix handling missing description in EXCEPINFO.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: d8a03ae6308e1dacaa382a0bb6404c980ed565d7 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8a03ae6308e1dacaa382a0bb6404c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 21 23:17:02 2022 +0200 vbscript: Fix handling missing description in EXCEPINFO. Based on patch by Kevin Puetz. --- dlls/vbscript/interp.c | 13 +++-- dlls/vbscript/tests/run.c | 126 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 135 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index c43b5383dee..1d7482b5013 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -2490,14 +2490,19 @@ HRESULT exec_script(script_ctx_t *ctx, BOOL extern_caller, function_t *func, vbd if(FAILED(hres)) { if(hres != SCRIPT_E_RECORDED) { clear_ei(&ctx->ei); - - ctx->ei.scode = hres = map_hres(hres); - ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); - ctx->ei.bstrDescription = get_vbscript_error_string(hres); + hres = map_hres(hres); + }else if(!ctx->ei.bstrDescription) { + hres = map_hres(ctx->ei.scode); }else { hres = ctx->ei.scode; } + ctx->ei.scode = hres; + if(!ctx->ei.bstrSource) + ctx->ei.bstrSource = get_vbscript_string(VBS_RUNTIME_ERROR); + if(!ctx->ei.bstrDescription) + ctx->ei.bstrDescription = get_vbscript_error_string(hres); + if(exec.resume_next) { unsigned stack_off; diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 556772e1f37..8d7c15ba70b 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -145,6 +145,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_THROWWITHDESC 1024 #define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_GLOBAL_UNKOBJ 1026 +#define DISPID_GLOBAL_THROWEXCEPTION 1027 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -1157,6 +1158,7 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"counter", DISPID_GLOBAL_COUNTER }, { L"doubleAsString", DISPID_GLOBAL_DOUBLEASSTRING }, { L"testArray", DISPID_GLOBAL_TESTARRAY }, + { L"throwException", DISPID_GLOBAL_THROWEXCEPTION }, { L"throwInt", DISPID_GLOBAL_THROWINT }, { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, @@ -1540,6 +1542,54 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return hres; + case DISPID_GLOBAL_THROWEXCEPTION: { + VARIANT *v = pdp->rgvarg + pdp->cArgs - 1; + + ok((wFlags & ~INVOKE_PROPERTYGET) == INVOKE_FUNC, "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs >= 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pei != NULL, "pei == NULL\n"); + + if(pvarRes) { + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = VARIANT_FALSE; + } + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) + v = V_VARIANTREF(v); + + memset(pei, 0, sizeof(*pei)); + switch(V_VT(v)) { + case VT_I2: + pei->scode = V_I2(v); + break; + case VT_I4: + pei->scode = V_I4(v); + break; + default: + ok(0, "unexpected vt %d\n", V_VT(v)); + return E_INVALIDARG; + } + + if(pdp->cArgs >= 2) { + v = pdp->rgvarg + pdp->cArgs - 2; + ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); + pei->bstrSource = SysAllocString(V_BSTR(v)); + } + + if(pdp->cArgs >= 3) { + v = pdp->rgvarg + pdp->cArgs - 3; + ok(V_VT(v) == VT_BSTR, "v = %s\n", debugstr_variant(v)); + pei->bstrDescription = SysAllocString(V_BSTR(v)); + } + + return DISP_E_EXCEPTION; + } + case DISPID_GLOBAL_THROWWITHDESC: pei->scode = 0xdeadbeef; pei->bstrDescription = SysAllocString(L"test"); @@ -2351,6 +2401,82 @@ static void test_callbacks(void) IActiveScriptParse_Release(parser); close_script(script); strict_enter_script = FALSE; + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&"); + ok(hres == MAKE_VBSERROR(430), "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!wcscmp(ei.bstrSource, L"Microsoft VBScript runtime error"), + "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"Class doesn't support Automation"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == MAKE_VBSERROR(430), "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&, \"test src\""); + ok(hres == MAKE_VBSERROR(430), "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!wcscmp(ei.bstrSource, L"test src"), "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"Class doesn't support Automation"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == MAKE_VBSERROR(430), "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); + + store_script_error = &error1; + SET_EXPECT(OnScriptError); + hres = parse_script_ar("throwException &h80004002&, \"test src\", \"test desc\""); + ok(hres == E_NOINTERFACE, "got error: %08lx\n", hres); + CHECK_CALLED(OnScriptError); + + memset(&ei, 0xcc, sizeof(ei)); + hres = IActiveScriptError_GetExceptionInfo(error1, &ei); + ok(hres == S_OK, "GetExceptionInfo returned %08lx\n", hres); + ok(!ei.wCode, "wCode = %x\n", ei.wCode); + ok(!ei.wReserved, "wReserved = %x\n", ei.wReserved); + if(is_english) { + ok(!wcscmp(ei.bstrSource, L"test src"), "bstrSource = %s\n", wine_dbgstr_w(ei.bstrSource)); + ok(!wcscmp(ei.bstrDescription, L"test desc"), + "bstrDescription = %s\n", wine_dbgstr_w(ei.bstrDescription)); + } + ok(!ei.bstrHelpFile, "bstrHelpFile = %s\n", wine_dbgstr_w(ei.bstrHelpFile)); + ok(!ei.dwHelpContext, "dwHelpContext = %lx\n", ei.dwHelpContext); + ok(!ei.pvReserved, "pvReserved = %p\n", ei.pvReserved); + ok(!ei.pfnDeferredFillIn, "pfnDeferredFillIn = %p\n", ei.pfnDeferredFillIn); + ok(ei.scode == E_NOINTERFACE, "scode = %lx\n", ei.scode); + free_ei(&ei); + + IActiveScriptError_Release(error1); } static void test_gc(void)

1 0

Paul Gofman : ntdll: Fix processor package mask in SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX structure.
by Alexandre Julliard Sept. 26, 2022

Sept. 26, 2022

Module: wine Branch: master Commit: fd3574a162a5d2d9c07924b274a992844666d76e URL: https://gitlab.winehq.org/wine/wine/-/commit/fd3574a162a5d2d9c07924b274a992… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 23 14:09:33 2022 -0500 ntdll: Fix processor package mask in SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX structure. Fixes a regression introduced by commit 6aa437de6aa3549abd885c387ea79d18eb0eba56. --- dlls/ntdll/unix/system.c | 70 ++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 136fc80adf1..4ca07c2e34c 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -591,39 +591,10 @@ static DWORD count_bits( ULONG_PTR mask ) return count; } -/* Store package and core information for a logical processor. Parsing of processor - * data may happen in multiple passes; the 'id' parameter is then used to locate - * previously stored data. The type of data stored in 'id' depends on 'rel': - * - RelationProcessorPackage: package id ('CPU socket'). - * - RelationProcessorCore: physical core number. - */ -static BOOL logical_proc_info_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, ULONG_PTR mask ) +static BOOL logical_proc_info_ex_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, ULONG_PTR mask ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex; - unsigned int ofs = 0, i; - - for (i = 0; i < logical_proc_info_len; i++) - { - if (rel == RelationProcessorPackage && logical_proc_info[i].Relationship == rel - && logical_proc_info[i].u.Reserved[1] == id) - { - logical_proc_info[i].ProcessorMask |= mask; - return TRUE; - } - else if (rel == RelationProcessorCore && logical_proc_info[i].Relationship == rel - && logical_proc_info[i].u.Reserved[1] == id) - return TRUE; - } - - if (!grow_logical_proc_buf()) return FALSE; - - logical_proc_info[i].Relationship = rel; - logical_proc_info[i].ProcessorMask = mask; - if (rel == RelationProcessorCore) - logical_proc_info[i].u.ProcessorCore.Flags = count_bits( mask ) > 1 ? LTP_PC_SMT : 0; - logical_proc_info[i].u.Reserved[0] = 0; - logical_proc_info[i].u.Reserved[1] = id; - logical_proc_info_len = i + 1; + unsigned int ofs = 0; while (ofs < logical_proc_info_ex_size) { @@ -661,10 +632,45 @@ static BOOL logical_proc_info_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWO dataex->u.Processor.Reserved[1] = id; logical_proc_info_ex_size += dataex->Size; - return TRUE; } +/* Store package and core information for a logical processor. Parsing of processor + * data may happen in multiple passes; the 'id' parameter is then used to locate + * previously stored data. The type of data stored in 'id' depends on 'rel': + * - RelationProcessorPackage: package id ('CPU socket'). + * - RelationProcessorCore: physical core number. + */ +static BOOL logical_proc_info_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, DWORD id, ULONG_PTR mask ) +{ + unsigned int i; + + for (i = 0; i < logical_proc_info_len; i++) + { + if (rel == RelationProcessorPackage && logical_proc_info[i].Relationship == rel + && logical_proc_info[i].u.Reserved[1] == id) + { + logical_proc_info[i].ProcessorMask |= mask; + return logical_proc_info_ex_add_by_id( rel, id, mask ); + } + else if (rel == RelationProcessorCore && logical_proc_info[i].Relationship == rel + && logical_proc_info[i].u.Reserved[1] == id) + return logical_proc_info_ex_add_by_id( rel, id, mask ); + } + + if (!grow_logical_proc_buf()) return FALSE; + + logical_proc_info[i].Relationship = rel; + logical_proc_info[i].ProcessorMask = mask; + if (rel == RelationProcessorCore) + logical_proc_info[i].u.ProcessorCore.Flags = count_bits( mask ) > 1 ? LTP_PC_SMT : 0; + logical_proc_info[i].u.Reserved[0] = 0; + logical_proc_info[i].u.Reserved[1] = id; + logical_proc_info_len = i + 1; + + return logical_proc_info_ex_add_by_id( rel, id, mask ); +} + static BOOL logical_proc_info_add_cache( ULONG_PTR mask, CACHE_DESCRIPTOR *cache ) { SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *dataex;

1 0

Alexandre Julliard : Wine release 7.18
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: website Branch: master Commit: 6ad88e74fefcdc5ed1214d8aa45af4bf3471b842 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/6ad88e74fefcdc5ed1214d8aa4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 22:02:34 2022 +0200 Wine release 7.18 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022092301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2022092301.xml b/news/en/2022092301.xml new file mode 100644 index 00000000..2bf928a4 --- /dev/null +++ b/news/en/2022092301.xml @@ -0,0 +1,16 @@ +<news> +<date>September 23, 2022</date> +<title>Wine 7.18 Released</title> +<body> + The Wine development release 7.18 is now available. + <a href="{$root}/announce/7.18">What's new</a> in this release: +<ul> + <li>Character tables updated to Unicode 15.0.0.</li> + <li>Wow64 support in the macOS driver.</li> + <li>Async reader fixes in GStreamer support.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.18.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 7.18.
by Alexandre Julliard Sept. 23, 2022

Sept. 23, 2022

Module: wine Branch: master Commit: ad26f04f69a03c6299cd2d0f14fb03b2df2c1495 URL: https://gitlab.winehq.org/wine/wine/-/commit/ad26f04f69a03c6299cd2d0f14fb03… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 23 21:59:24 2022 +0200 Release 7.18. --- ANNOUNCE | 653 +++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 356 insertions(+), 319 deletions(-)

1 0