- Wine-Commits - list.winehq.org

Yuxuan Shui : jscript: Fix Array.prototype.splice with omitted deleteCount in ES5+ mode.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 5cd11ade210ce4a7b5b7b500be664b3661d3e710 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cd11ade210ce4a7b5b7b500be664b… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Aug 14 18:36:15 2023 +0100 jscript: Fix Array.prototype.splice with omitted deleteCount in ES5+ mode. --- dlls/jscript/array.c | 2 ++ dlls/jscript/tests/api.js | 4 ++-- dlls/mshtml/tests/es5.js | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4e1af864a8e..48f665da576 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -870,6 +870,8 @@ static HRESULT Array_splice(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsign } add_args = argc-2; + } else if (argc && ctx->version >= SCRIPTLANGUAGEVERSION_ES5) { + delete_cnt = length-start; } if(r) { diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 0fc683c20cb..aea412347b9 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1310,8 +1310,8 @@ ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); arr = [1,2,3,4,5]; tmp = arr.splice(2); -ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); -ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); +ok(tmp.toString() == "", "arr.splice(2) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2) is " + arr.toString()); arr = [1,2,3,4,5]; tmp = arr.splice(); diff --git a/dlls/mshtml/tests/es5.js b/dlls/mshtml/tests/es5.js index 38a70740698..7e2f66daabf 100644 --- a/dlls/mshtml/tests/es5.js +++ b/dlls/mshtml/tests/es5.js @@ -374,6 +374,13 @@ sync_test("isArray", function() { expect_array(new C(), false); }); +sync_test("array_splice", function() { + var arr = [1,2,3,4,5] + var tmp = arr.splice(2); + ok(arr.toString() === "1,2", "arr = " + arr); + ok(tmp.toString() === "3,4,5", "tmp = " + tmp); +}); + sync_test("array_map", function() { var calls, m, arr, ctx;

1 0

Alexandre Julliard : Remove unused NONAMELESS defines.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

1 0

Alexandre Julliard : windowscodecs/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 232512660ba5f1e857d30f06ed75c169a4ef93a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/232512660ba5f1e857d30f06ed75c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 17:01:44 2023 +0200 windowscodecs/tests: Use nameless unions/structs. --- dlls/windowscodecs/tests/metadata.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index 5dac90a8e63..886e62833bf 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -721,13 +721,13 @@ static void test_metadata_hIST(void) PropVariantClear(&schema); ok(id.vt == VT_LPWSTR, "unexpected vt: %i\n", id.vt); - ok(!lstrcmpW(U(id).pwszVal, Frequencies), "unexpected value: %s\n", wine_dbgstr_w(U(id).pwszVal)); + ok(!lstrcmpW(id.pwszVal, Frequencies), "unexpected value: %s\n", wine_dbgstr_w(id.pwszVal)); PropVariantClear(&id); ok(value.vt == (VT_UI2|VT_VECTOR), "unexpected vt: %i\n", value.vt); - ok(20 == U(value).caui.cElems, "expected cElems %d, got %ld\n", 20, U(value).caub.cElems); - for (i = 0; i < U(value).caui.cElems; i++) - ok(i+1 == U(value).caui.pElems[i], "%u: expected value %u, got %u\n", i, i+1, U(value).caui.pElems[i]); + ok(20 == value.caui.cElems, "expected cElems %d, got %ld\n", 20, value.caub.cElems); + for (i = 0; i < value.caui.cElems; i++) + ok(i+1 == value.caui.pElems[i], "%u: expected value %u, got %u\n", i, i+1, value.caui.pElems[i]); PropVariantClear(&value); IWICMetadataReader_Release(reader);

1 0

Alexandre Julliard : ddraw/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 62cd08f3879c902d0568addbc268ce71681809bb URL: https://gitlab.winehq.org/wine/wine/-/commit/62cd08f3879c902d0568addbc268ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:47:29 2023 +0200 ddraw/tests: Use nameless unions/structs. --- dlls/ddraw/tests/d3d.c | 84 ++-- dlls/ddraw/tests/ddraw1.c | 584 +++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 648 ++++++++++++++--------------- dlls/ddraw/tests/ddraw4.c | 910 ++++++++++++++++++++--------------------- dlls/ddraw/tests/ddraw7.c | 922 +++++++++++++++++++++--------------------- dlls/ddraw/tests/ddrawmodes.c | 56 +-- dlls/ddraw/tests/dsurface.c | 284 ++++++------- dlls/ddraw/tests/refcount.c | 6 +- dlls/ddraw/tests/visual.c | 70 ++-- 9 files changed, 1782 insertions(+), 1782 deletions(-)

1 0

Alexandre Julliard : dxgi/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: df20791bdbf3f34814c66958d299b2b07907e33f URL: https://gitlab.winehq.org/wine/wine/-/commit/df20791bdbf3f34814c66958d299b2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:47:39 2023 +0200 dxgi/tests: Use nameless unions/structs. --- dlls/dxgi/tests/dxgi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 91e78c5a56c..020c6485d50 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -1211,8 +1211,8 @@ static void test_check_interface_support(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); trace("UMD version: %u.%u.%u.%u.\n", - HIWORD(U(driver_version).HighPart), LOWORD(U(driver_version).HighPart), - HIWORD(U(driver_version).LowPart), LOWORD(U(driver_version).LowPart)); + HIWORD(driver_version.HighPart), LOWORD(driver_version.HighPart), + HIWORD(driver_version.LowPart), LOWORD(driver_version.LowPart)); hr = IDXGIDevice_QueryInterface(device, &IID_ID3D10Device1, (void **)&iface); if (SUCCEEDED(hr))

1 0

Alexandre Julliard : d3dx9/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 47cd5b149943ccdd828e2ffae4306d07d4db320c URL: https://gitlab.winehq.org/wine/wine/-/commit/47cd5b149943ccdd828e2ffae4306d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:46:20 2023 +0200 d3dx9/tests: Use nameless unions/structs. --- dlls/d3dx9_36/tests/core.c | 26 +- dlls/d3dx9_36/tests/line.c | 20 +- dlls/d3dx9_36/tests/math.c | 764 +++++++++++++++++++++---------------------- dlls/d3dx9_36/tests/mesh.c | 24 +- dlls/d3dx9_36/tests/shader.c | 224 ++++++------- 5 files changed, 529 insertions(+), 529 deletions(-)

1 0

Alexandre Julliard : d3dx10/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 8bec6d399fa113fd6a42e2e6b97ec8c86dd1c7ee URL: https://gitlab.winehq.org/wine/wine/-/commit/8bec6d399fa113fd6a42e2e6b97ec8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:46:01 2023 +0200 d3dx10/tests: Use nameless unions/structs. --- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index e9c215d3c45..5853669d9c5 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1731,8 +1731,8 @@ float4 main(float4 color : COLOR) : SV_TARGET srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_BUFFER; - U(srv_desc).Buffer.ElementOffset = 0; - U(srv_desc).Buffer.ElementWidth = 64; + srv_desc.Buffer.ElementOffset = 0; + srv_desc.Buffer.ElementWidth = 64; for (i = 0; i < D3D10_COMMONSHADER_INPUT_RESOURCE_SLOT_COUNT; ++i) {

1 0

Alexandre Julliard : d3d8/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 8d86c6d9d9f4d159e6592158c1f615f09d78e1e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8d86c6d9d9f4d159e6592158c1f615… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:55 2023 +0200 d3d8/tests: Use nameless unions/structs. --- dlls/d3d8/tests/stateblock.c | 16 ++++++++-------- dlls/d3d8/tests/visual.c | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/d3d8/tests/stateblock.c b/dlls/d3d8/tests/stateblock.c index 4a27738d5d4..d9a610d5438 100644 --- a/dlls/d3d8/tests/stateblock.c +++ b/dlls/d3d8/tests/stateblock.c @@ -957,14 +957,14 @@ static void compare_matrix(const char *name, unsigned int chain_stage, "\t\t%.8e, %.8e, %.8e, %.8e,\n" "\t} received\n", chain_stage, name, - U(*expected).m[0][0], U(*expected).m[1][0], U(*expected).m[2][0], U(*expected).m[3][0], - U(*expected).m[0][1], U(*expected).m[1][1], U(*expected).m[2][1], U(*expected).m[3][1], - U(*expected).m[0][2], U(*expected).m[1][2], U(*expected).m[2][2], U(*expected).m[3][2], - U(*expected).m[0][3], U(*expected).m[1][3], U(*expected).m[2][3], U(*expected).m[3][3], - U(*received).m[0][0], U(*received).m[1][0], U(*received).m[2][0], U(*received).m[3][0], - U(*received).m[0][1], U(*received).m[1][1], U(*received).m[2][1], U(*received).m[3][1], - U(*received).m[0][2], U(*received).m[1][2], U(*received).m[2][2], U(*received).m[3][2], - U(*received).m[0][3], U(*received).m[1][3], U(*received).m[2][3], U(*received).m[3][3]); + expected->m[0][0], expected->m[1][0], expected->m[2][0], expected->m[3][0], + expected->m[0][1], expected->m[1][1], expected->m[2][1], expected->m[3][1], + expected->m[0][2], expected->m[1][2], expected->m[2][2], expected->m[3][2], + expected->m[0][3], expected->m[1][3], expected->m[2][3], expected->m[3][3], + received->m[0][0], received->m[1][0], received->m[2][0], received->m[3][0], + received->m[0][1], received->m[1][1], received->m[2][1], received->m[3][1], + received->m[0][2], received->m[1][2], received->m[2][2], received->m[3][2], + received->m[0][3], received->m[1][3], received->m[2][3], received->m[3][3]); } static void transform_check_data(IDirect3DDevice8 *device, const struct state_test *test, diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index f80ff86010e..b7688e9251a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7736,8 +7736,8 @@ static void test_pointsize(void) ok(color == 0x00ffff00, "pSprite: Pixel (64 + 4),(64 - 4) has color 0x%08x, expected 0x00ffff00\n", color); IDirect3DDevice8_Present(device, NULL, NULL, NULL, NULL); - U(matrix).m[0][0] = 1.0f / 64.0f; - U(matrix).m[1][1] = -1.0f / 64.0f; + matrix.m[0][0] = 1.0f / 64.0f; + matrix.m[1][1] = -1.0f / 64.0f; hr = IDirect3DDevice8_SetTransform(device, D3DTS_PROJECTION, &matrix); ok(SUCCEEDED(hr), "Failed to set projection matrix, hr %#lx.\n", hr); @@ -7756,7 +7756,7 @@ static void test_pointsize(void) ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); hr = IDirect3DDevice8_SetRenderState(device, D3DRS_POINTSCALE_C, *(DWORD *)&c); ok(SUCCEEDED(hr), "Failed setting point scale attenuation coefficient, hr %#lx.\n", hr); - hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &S(U(matrix))._11, 4); + hr = IDirect3DDevice8_SetVertexShaderConstant(device, 0, &matrix._11, 4); ok(SUCCEEDED(hr), "Failed to set vertex shader constants, hr %#lx.\n", hr); if (caps.MaxPointSize < 63.0f) @@ -12222,8 +12222,8 @@ START_TEST(visual) /* Only Windows XP's default VGA driver should have an empty description */ ok(identifier.Description[0] || broken(!strcmp(identifier.Driver, "vga.dll")), "Empty driver description.\n"); trace("Driver version %d.%d.%d.%d\n", - HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), - HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); + HIWORD(identifier.DriverVersion.HighPart), LOWORD(identifier.DriverVersion.HighPart), + HIWORD(identifier.DriverVersion.LowPart), LOWORD(identifier.DriverVersion.LowPart)); IDirect3D8_Release(d3d);

1 0

Alexandre Julliard : d3drm/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: 43add3496349e8d355bb03518eb2545c2af031d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/43add3496349e8d355bb03518eb254… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:45:34 2023 +0200 d3drm/tests: Use nameless unions/structs. --- dlls/d3drm/tests/d3drm.c | 42 +++++++++++----------- dlls/d3drm/tests/vector.c | 88 +++++++++++++++++++++++------------------------ 2 files changed, 65 insertions(+), 65 deletions(-)

1 0

Alexandre Julliard : d3d11/tests: Use nameless unions/structs.
by Alexandre Julliard Aug. 15, 2023

Aug. 15, 2023

Module: wine Branch: master Commit: e293a6c669bc5a85f0db9c2310f402fa67d0a9e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e293a6c669bc5a85f0db9c2310f402… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:44:26 2023 +0200 d3d11/tests: Use nameless unions/structs. --- dlls/d3d11/tests/d3d11.c | 578 +++++++++++++++++++++++------------------------ 1 file changed, 289 insertions(+), 289 deletions(-)

1 0