- Wine-Commits - list.winehq.org

Nikolay Sivov : oleaut32/tests: Do not use VarCmp() to check results of other functions.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: bed12d8499ceebe03482596ad6c94cdf0fda9632 URL: https://gitlab.winehq.org/wine/wine/-/commit/bed12d8499ceebe03482596ad6c94c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 3 02:58:48 2023 +0100 oleaut32/tests: Do not use VarCmp() to check results of other functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 72 ++++++++++++------------------------------- 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index bf52d4b1363..05872739c9e 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -6383,7 +6383,7 @@ static void test_VarAdd(void) static void test_VarCat(void) { LCID lcid; - VARIANT left, right, result, expected, expected_broken; + VARIANT left, right, result; CHAR orig_date_format[128]; VARTYPE leftvt, rightvt, resultvt; HRESULT hres; @@ -6399,7 +6399,6 @@ static void test_VarCat(void) VariantInit(&left); VariantInit(&right); VariantInit(&result); - VariantInit(&expected); /* Check expected types for all combinations */ for (leftvt = 0; leftvt <= VT_BSTR_BLOB; leftvt++) @@ -6530,14 +6529,12 @@ static void test_VarCat(void) /* Test concat strings */ V_VT(&left) = VT_BSTR; V_VT(&right) = VT_BSTR; - V_VT(&expected) = VT_BSTR; V_BSTR(&left) = SysAllocString(L"12"); V_BSTR(&right) = SysAllocString(L"34"); - V_BSTR(&expected) = SysAllocString(L"1234"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with VT_BSTR failed to return correct result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6567,54 +6564,43 @@ static void test_VarCat(void) VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Test combining boolean with number */ V_VT(&left) = VT_INT; V_VT(&right) = VT_BOOL; - V_VT(&expected) = VT_BSTR; V_INT(&left) = 12; V_BOOL(&right) = TRUE; - V_BSTR(&expected) = SysAllocString(sz12_true); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - hres = VarCmp(&result, &expected, lcid, 0); - ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08lx for %s, %s\n", - hres, wine_dbgstr_variant(&result), wine_dbgstr_variant(&expected)); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), sz12_true), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); V_VT(&left) = VT_INT; V_VT(&right) = VT_BOOL; - V_VT(&expected) = VT_BSTR; V_INT(&left) = 12; V_BOOL(&right) = FALSE; - V_BSTR(&expected) = SysAllocString(sz12_false); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - hres = VarCmp(&result, &expected, lcid, 0); - ok(hres == VARCMP_EQ, "Expected VARCMP_EQ, got %08lx for %s, %s\n", - hres, wine_dbgstr_variant(&result), wine_dbgstr_variant(&expected)); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), sz12_false), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Test when both expressions are numeric */ V_VT(&left) = VT_INT; V_VT(&right) = VT_INT; - V_VT(&expected) = VT_BSTR; V_INT(&left) = 12; V_INT(&right) = 34; - V_BSTR(&expected) = SysAllocString(L"1234"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result, &expected, lcid, 0) == VARCMP_EQ, - "VarCat: NUMBER concat with NUMBER returned incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6627,8 +6613,8 @@ static void test_VarCat(void) V_BSTR(&right) = SysAllocString(L"34"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: NUMBER concat with VT_BSTR, incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); @@ -6640,66 +6626,49 @@ static void test_VarCat(void) V_INT(&right) = 34; hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ, - "VarCat: VT_BSTR concat with NUMBER, incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"1234"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Test concat dates with strings */ V_VT(&left) = VT_BSTR; V_VT(&right) = VT_DATE; - V_VT(&expected) = VT_BSTR; - V_VT(&expected_broken) = VT_BSTR; V_BSTR(&left) = SysAllocString(L"12"); V_DATE(&right) = 29494.0; - V_BSTR(&expected)= SysAllocString(L"129/30/1980"); - V_BSTR(&expected_broken)= SysAllocString(L"129/30/80"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || - broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ - "VarCat: VT_BSTR concat with VT_DATE returned incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"129/30/1980"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); - VariantClear(&expected_broken); V_VT(&left) = VT_DATE; V_VT(&right) = VT_BSTR; - V_VT(&expected) = VT_BSTR; - V_VT(&expected_broken) = VT_BSTR; V_DATE(&left) = 29494.0; V_BSTR(&right) = SysAllocString(L"12"); - V_BSTR(&expected) = SysAllocString(L"9/30/198012"); - V_BSTR(&expected_broken) = SysAllocString(L"9/30/8012"); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&expected,lcid,0) == VARCMP_EQ || - broken(VarCmp(&result,&expected_broken,lcid,0) == VARCMP_EQ), /* Some W98 and NT4 (intermittent) */ - "VarCat: VT_DATE concat with VT_BSTR returned incorrect result\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L"9/30/198012"), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); - VariantClear(&expected_broken); /* Test of both expressions are empty */ V_VT(&left) = VT_BSTR; V_VT(&right) = VT_BSTR; - V_VT(&expected) = VT_BSTR; V_BSTR(&left) = SysAllocString(L""); V_BSTR(&right) = SysAllocString(L""); - V_BSTR(&expected)= SysAllocString(L""); hres = VarCat(&left,&right,&result); ok(hres == S_OK, "VarCat failed with error 0x%08lx\n", hres); - ok(VarCmp(&result,&left,lcid,0) == VARCMP_EQ, - "VarCat: EMPTY concat with EMPTY did not return empty VT_BSTR\n"); + ok(V_VT(&result) == VT_BSTR, "Unexpected return type %d.\n", V_VT(&result)); + ok(!wcscmp(V_BSTR(&result), L""), "Unexpected return value %s.\n", wine_dbgstr_w(V_BSTR(&result))); /* Restore original date format settings */ SetLocaleInfoA(lcid,LOCALE_SSHORTDATE,orig_date_format); @@ -6707,7 +6676,6 @@ static void test_VarCat(void) VariantClear(&left); VariantClear(&right); VariantClear(&result); - VariantClear(&expected); /* Dispatch conversion */ init_test_dispatch(VT_NULL, &dispatch); @@ -9808,7 +9776,7 @@ START_TEST(vartest) test_VarEqv(); test_VarMul(); test_VarAdd(); - test_VarCmp(); /* Before test_VarCat() which needs VarCmp() */ + test_VarCmp(); test_VarCat(); test_VarAnd(); test_VarDiv();

1 0

Alex Henrie : d3dx9: Use CRT allocation functions.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 17da2665e2705e3ce73dd72c94e0b2236643e570 URL: https://gitlab.winehq.org/wine/wine/-/commit/17da2665e2705e3ce73dd72c94e0b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 4 01:04:32 2023 -0700 d3dx9: Use CRT allocation functions. --- dlls/d3dx9_36/animation.c | 17 ++- dlls/d3dx9_36/core.c | 10 +- dlls/d3dx9_36/d3dx9_private.h | 1 - dlls/d3dx9_36/effect.c | 268 +++++++++++++++++++----------------------- dlls/d3dx9_36/font.c | 68 +++++------ dlls/d3dx9_36/line.c | 4 +- dlls/d3dx9_36/math.c | 14 +-- dlls/d3dx9_36/mesh.c | 231 +++++++++++++++++------------------- dlls/d3dx9_36/preshader.c | 30 +++-- dlls/d3dx9_36/render.c | 17 ++- dlls/d3dx9_36/shader.c | 73 ++++++------ dlls/d3dx9_36/skin.c | 35 +++--- dlls/d3dx9_36/sprite.c | 24 ++-- dlls/d3dx9_36/surface.c | 49 ++++---- dlls/d3dx9_36/texture.c | 28 ++--- dlls/d3dx9_36/volume.c | 4 +- dlls/d3dx9_36/xfile.c | 56 +++------ 17 files changed, 423 insertions(+), 506 deletions(-)

1 0

Daniel Lehman : msxml3: Handle default namespace in get_baseName.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 3b3a65ad377c545cc7dc8330b61ac5cb0d3d0c92 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b3a65ad377c545cc7dc8330b61ac5… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Nov 28 21:51:28 2023 -0800 msxml3: Handle default namespace in get_baseName. --- dlls/msxml3/node.c | 6 +++++- dlls/msxml3/tests/domdoc.c | 2 +- dlls/msxml4/tests/domdoc.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 4e4a9cfd1ef..f557aeaa2bf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1609,7 +1609,11 @@ HRESULT node_get_base_name(xmlnode *This, BSTR *name) { if (!name) return E_INVALIDARG; - *name = bstr_from_xmlChar(This->node->name); + if (xmldoc_version(This->node->doc) != MSXML6 && + xmlStrEqual(This->node->name, BAD_CAST "xmlns")) + *name = SysAllocString(L""); + else + *name = bstr_from_xmlChar(This->node->name); if (!*name) return E_OUTOFMEMORY; TRACE("returning %s\n", debugstr_w(*name)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 23a114db713..1eceeda65de 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -13778,6 +13778,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -13797,7 +13798,6 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 67f37b6966b..70bd4de58c3 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -261,6 +261,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + todo_wine_if(test->todo) ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); @@ -283,7 +284,6 @@ static void test_namespaces_as_attributes(void) hr = IXMLDOMNode_get_baseName(item, &str); /* MSXML4 can report different results with different service packs */ ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine_if(test->todo) ok(!lstrcmpW(str, test->basenames[i]) || broken(!lstrcmpW(str, L"xmlns")), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str);

1 0

Nikolay Sivov : oleaut32/tests: Use wide string literals in some tests.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: f83b41eed6aac3522f67f9ea8e5fa8fb64bb563e URL: https://gitlab.winehq.org/wine/wine/-/commit/f83b41eed6aac3522f67f9ea8e5fa8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Dec 3 02:33:41 2023 +0100 oleaut32/tests: Use wide string literals in some tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/oleaut32/tests/vartest.c | 119 ++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 73 deletions(-)

1 0

Piotr Caban : wineps.drv: Add paper source selection support in printer properties.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

1 0

Piotr Caban : wineps.drv: Fix printing images from iexplore.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: a294a6cbbfa02ce4f561224db7ccbf55e1a21938 URL: https://gitlab.winehq.org/wine/wine/-/commit/a294a6cbbfa02ce4f561224db7ccbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Nov 30 16:54:08 2023 +0100 wineps.drv: Fix printing images from iexplore. --- dlls/wineps.drv/printproc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 98de5badda7..db2979f0fbe 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -390,7 +390,7 @@ static int stretch_blt(print_ctx *ctx, const EMRSTRETCHBLT *blt, bits.is_copy = TRUE; bitmap = CreateDIBSection(hdc, dst_info, DIB_RGB_COLORS, &bits.ptr, NULL, 0); - SetDIBits(hdc, bitmap, 0, bi->bmiHeader.biHeight, src_bits, bi, blt->iUsageSrc); + SetDIBits(hdc, bitmap, 0, abs(bi->bmiHeader.biHeight), src_bits, bi, blt->iUsageSrc); err = PSDRV_PutImage(ctx, 0, dst_info, &bits, &src, &dst, blt->dwRop); DeleteObject(bitmap);

1 0

Zhiyi Zhang : win32u: Find the correct DIB driver in windrv_CreateDC().
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 36366f129b1e456f4530ae98015646af499e280a URL: https://gitlab.winehq.org/wine/wine/-/commit/36366f129b1e456f4530ae98015646… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Nov 6 16:13:22 2023 +0800 win32u: Find the correct DIB driver in windrv_CreateDC(). push_dc_driver() places drivers based on their priorities, so the newly created driver is not necessarily on top. Thus in windrv_CreateDC(), find_dc_driver() should be used to find the DIB driver instead of assuming the DIB driver is the top driver, which could be the path driver because it has a higher priority. The exact wrong code path was: 1. A path driver with priority 400 is created for a DC. 2. windrv_CreateDC() is called to create a window driver for the DC. 3. Then in dibdrv_CreateDC(), push_dc_driver() is called with 'dev' pointing to the top driver, which is the path driver. 4. push_dc_driver() updates 'dev' to point to the address of the next driver because DIB driver has a lower 300 priority. 5. The DIB driver is assigned to 'dev', which is not the original parameter passed into push_dc_driver(). 6. In windrv_CreateDC(), get_dibdrv_pdev(*dev) is called, assuming the top driver is the DIB driver. But actually the top driver that '*dev' points to is still the path driver. The added tests can demonstrate the memory corruption before this fix is applied. --- dlls/gdi32/tests/path.c | 18 ++++++++++++++++-- dlls/win32u/dibdrv/dc.c | 6 +++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index c653c22edeb..c34cb034d88 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -607,6 +607,7 @@ static void test_polydraw(void) BOOL retb; POINT pos; HDC hdc = GetDC(0); + HWND hwnd; MoveToEx( hdc, -20, -20, NULL ); @@ -620,7 +621,8 @@ static void test_polydraw(void) { /* PolyDraw is only available on Win2k and later */ win_skip("PolyDraw is not available\n"); - goto done; + ReleaseDC(0, hdc); + return; } expect(TRUE, retb); GetCurrentPositionEx( hdc, &pos ); @@ -684,8 +686,20 @@ static void test_polydraw(void) ok_path(hdc, "polydraw_path", polydraw_path, ARRAY_SIZE(polydraw_path)); GetCurrentPositionEx( hdc, &pos ); ok( pos.x == 80 && pos.y == 80, "wrong pos %ld,%ld\n", pos.x, pos.y ); -done: ReleaseDC(0, hdc); + + /* Test a special case that GDI path driver is created before window driver */ + hwnd = CreateWindowA("static", NULL, 0, 0, 0, 0, 0, 0, 0, 0, NULL); + hdc = GetDC(hwnd); + + BeginPath(hdc); + SetWindowPos(hwnd, 0, 0, 0, 100, 100, SWP_NOZORDER | SWP_NOMOVE | SWP_SHOWWINDOW); + retb = PolyDraw(hdc, polydraw_pts, polydraw_tps, 2); + ok(retb, "PolyDraw failed, error %#lx\n", GetLastError()); + EndPath(hdc); + + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); } static void test_closefigure(void) { diff --git a/dlls/win32u/dibdrv/dc.c b/dlls/win32u/dibdrv/dc.c index 87e637553da..7fe4b765a78 100644 --- a/dlls/win32u/dibdrv/dc.c +++ b/dlls/win32u/dibdrv/dc.c @@ -871,6 +871,8 @@ static BOOL windrv_Chord( PHYSDEV dev, INT left, INT top, INT right, INT bottom, static BOOL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, const DEVMODEW *devmode ) { struct windrv_physdev *physdev = calloc( 1, sizeof(*physdev) ); + PHYSDEV dibdrv; + DC *dc; if (!physdev) return FALSE; @@ -879,7 +881,9 @@ static BOOL windrv_CreateDC( PHYSDEV *dev, LPCWSTR device, LPCWSTR output, const free( physdev ); return FALSE; } - physdev->dibdrv = get_dibdrv_pdev( *dev ); + dc = get_physdev_dc( *dev ); + dibdrv = find_dc_driver( dc, &dib_driver ); + physdev->dibdrv = get_dibdrv_pdev( dibdrv ); push_dc_driver( dev, &physdev->dev, &window_driver ); return TRUE; }

1 0

Alexandre Julliard : faudio: Import upstream release 23.12.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 9aefdbb9d9c4e681b3bbb502015d9c4dcfc0b013 URL: https://gitlab.winehq.org/wine/wine/-/commit/9aefdbb9d9c4e681b3bbb502015d9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 4 17:24:13 2023 +0100 faudio: Import upstream release 23.12. --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FAudio.c | 7 ++++++- libs/faudio/src/FAudio_internal.c | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 0c75809f79d..1a873ca2064 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -494,7 +494,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 23 -#define FAUDIO_MINOR_VERSION 10 +#define FAUDIO_MINOR_VERSION 12 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c index b20097b02fc..9366ad58208 100644 --- a/libs/faudio/src/FAudio.c +++ b/libs/faudio/src/FAudio.c @@ -294,7 +294,8 @@ uint32_t FAudio_CreateSourceVoice( if ( pSourceFormat->wFormatTag == FAUDIO_FORMAT_PCM || pSourceFormat->wFormatTag == FAUDIO_FORMAT_IEEE_FLOAT || - pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO2 ) + pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO2 || + pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO3 ) { FAudioWaveFormatExtensible *fmtex = (FAudioWaveFormatExtensible*) audio->pMalloc( sizeof(FAudioWaveFormatExtensible) @@ -321,6 +322,10 @@ uint32_t FAudio_CreateSourceVoice( { FAudio_memcpy(&fmtex->SubFormat, &DATAFORMAT_SUBTYPE_WMAUDIO2, sizeof(FAudioGUID)); } + else if (pSourceFormat->wFormatTag == FAUDIO_FORMAT_WMAUDIO3) + { + FAudio_memcpy(&fmtex->SubFormat, &DATAFORMAT_SUBTYPE_WMAUDIO3, sizeof(FAudioGUID)); + } (*ppSourceVoice)->src.format = &fmtex->Format; } else if (pSourceFormat->wFormatTag == FAUDIO_FORMAT_MSADPCM) diff --git a/libs/faudio/src/FAudio_internal.c b/libs/faudio/src/FAudio_internal.c index 95322e7ab55..f0d46cfa4b6 100644 --- a/libs/faudio/src/FAudio_internal.c +++ b/libs/faudio/src/FAudio_internal.c @@ -105,6 +105,7 @@ static const char *get_wformattag_string(const FAudioWaveFormatEx *fmt) FMT_STRING(IEEE_FLOAT) FMT_STRING(XMAUDIO2) FMT_STRING(WMAUDIO2) + FMT_STRING(WMAUDIO3) FMT_STRING(EXTENSIBLE) #undef FMT_STRING return "UNKNOWN!";

1 0

Alexandre Julliard : winedump: Add a couple of ARM unwind codes.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: c0f500ba0006f3e5c31c7d79141fdca886e92ff7 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0f500ba0006f3e5c31c7d79141fdc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 14:26:05 2023 +0100 winedump: Add a couple of ARM unwind codes. --- tools/winedump/pe.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 3e466daca48..65ff347efe2 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -176,6 +176,7 @@ static const void *get_hybrid_metadata(void) if (!cfg) return 0; size = min( size, cfg->Size ); if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY64, CHPEMetadataPointer )) return 0; + if (!cfg->CHPEMetadataPointer) return 0; return RVA( cfg->CHPEMetadataPointer - ((const IMAGE_OPTIONAL_HEADER64 *)&PE_nt_headers->OptionalHeader)->ImageBase, 1 ); } else @@ -184,6 +185,7 @@ static const void *get_hybrid_metadata(void) if (!cfg) return 0; size = min( size, cfg->Size ); if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY32, CHPEMetadataPointer )) return 0; + if (!cfg->CHPEMetadataPointer) return 0; return RVA( cfg->CHPEMetadataPointer - PE_nt_headers->OptionalHeader.ImageBase, 1 ); } } @@ -1274,7 +1276,15 @@ static void dump_armnt_unwind_info( const struct runtime_function_armnt *fnc ) printf( "}\n" ); } else if (code == 0xee) - printf( "unknown 16\n" ); + { + BYTE excodes = bytes[++b]; + if (excodes == 0x01) + printf( "MSFT_OP_MACHINE_FRAME\n"); + else if (excodes == 0x02) + printf( "MSFT_OP_CONTEXT\n"); + else + printf( "MSFT opcode %u\n", excodes ); + } else if (code == 0xef) { WORD excode; @@ -1550,10 +1560,18 @@ static void dump_arm64_codes( const BYTE *ptr, unsigned int count ) { printf( "MSFT_OP_CONTEXT\n" ); } + else if (ptr[i] == 0xeb) /* MSFT_OP_EC_CONTEXT */ + { + printf( "MSFT_OP_EC_CONTEXT\n" ); + } else if (ptr[i] == 0xec) /* MSFT_OP_CLEAR_UNWOUND_TO_CALL */ { printf( "MSFT_OP_CLEAR_UNWOUND_TO_CALL\n" ); } + else if (ptr[i] == 0xfc) /* pac_sign_lr */ + { + printf( "pac_sign_lr\n" ); + } else printf( "??\n"); } }

1 0

Alexandre Julliard : winedump: Add dumping of UWOP_EPILOG entries.
by Alexandre Julliard Dec. 4, 2023

Dec. 4, 2023

Module: wine Branch: master Commit: 17de5daa77c641ecb5e27f37ab0879741ef1bd5c URL: https://gitlab.winehq.org/wine/wine/-/commit/17de5daa77c641ecb5e27f37ab0879… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Dec 3 14:25:54 2023 +0100 winedump: Add dumping of UWOP_EPILOG entries. --- tools/winedump/pe.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index a49c4e83d52..3e466daca48 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -833,6 +833,7 @@ struct unwind_info_epilogue_armnt #define UWOP_SET_FPREG 3 #define UWOP_SAVE_NONVOL 4 #define UWOP_SAVE_NONVOL_FAR 5 +#define UWOP_EPILOG 6 #define UWOP_SAVE_XMM128 8 #define UWOP_SAVE_XMM128_FAR 9 #define UWOP_PUSH_MACHFRAME 10 @@ -861,7 +862,7 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct info = RVA( function->UnwindData, sizeof(*info) ); printf( " unwind info at %08x\n", function->UnwindData ); - if (info->version != 1) + if (info->version > 2) { printf( " *** unknown version %u\n", info->version ); return; @@ -878,6 +879,11 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct for (i = 0; i < info->count; i++) { + if (info->opcodes[i].code == UWOP_EPILOG) + { + i++; + continue; + } printf( " 0x%02x: ", info->opcodes[i].offset ); switch (info->opcodes[i].code) { @@ -934,6 +940,21 @@ static void dump_x86_64_unwind_info( const struct runtime_function_x86_64 *funct } } + if (info->version == 2 && info->opcodes[0].code == UWOP_EPILOG) /* print the epilogs */ + { + unsigned int end = function->EndAddress; + unsigned int size = info->opcodes[0].offset; + + printf( " epilog 0x%x bytes\n", size ); + if (info->opcodes[0].info) printf( " at %08x-%08x\n", end - size, end ); + for (i = 1; i < info->count && info->opcodes[i].code == UWOP_EPILOG; i++) + { + unsigned int offset = (info->opcodes[i].info << 8) + info->opcodes[i].offset; + if (!offset) break; + printf( " at %08x-%08x\n", end - offset, end - offset + size ); + } + } + handler_data = (const union handler_data *)&info->opcodes[(info->count + 1) & ~1]; if (info->flags & UNW_FLAG_CHAININFO) {

1 0