August 2023 - Wine-commits - list.winehq.org

Alexandre Julliard : d3dx10/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

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 : d3dx9/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

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 : ddraw/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

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 15 Aug '23

15 Aug '23

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 : windowscodecs/tests: Use nameless unions/structs.
by Alexandre Julliard 15 Aug '23

15 Aug '23

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 : include: Get rid of the NONAMELESS access macros in tests.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 1f9c6e83bd1c89cd3ca8691df9b0f08f141e2429 URL: https://gitlab.winehq.org/wine/wine/-/commit/1f9c6e83bd1c89cd3ca8691df9b0f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 16:47:51 2023 +0200 include: Get rid of the NONAMELESS access macros in tests. --- include/wine/test.h | 38 -------------------------------------- 1 file changed, 38 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index c28128d9f0c..73d6d164c46 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -135,44 +135,6 @@ extern void winetest_pop_context(void); # define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #endif -#ifdef NONAMELESSUNION -# define U(x) (x).u -# define U1(x) (x).u1 -# define U2(x) (x).u2 -# define U3(x) (x).u3 -# define U4(x) (x).u4 -# define U5(x) (x).u5 -# define U6(x) (x).u6 -# define U7(x) (x).u7 -# define U8(x) (x).u8 -#else -# define U(x) (x) -# define U1(x) (x) -# define U2(x) (x) -# define U3(x) (x) -# define U4(x) (x) -# define U5(x) (x) -# define U6(x) (x) -# define U7(x) (x) -# define U8(x) (x) -#endif - -#ifdef NONAMELESSSTRUCT -# define S(x) (x).s -# define S1(x) (x).s1 -# define S2(x) (x).s2 -# define S3(x) (x).s3 -# define S4(x) (x).s4 -# define S5(x) (x).s5 -#else -# define S(x) (x) -# define S1(x) (x) -# define S2(x) (x) -# define S3(x) (x) -# define S4(x) (x) -# define S5(x) (x) -#endif - /************************************************************************/ /* Below is the implementation of the various functions, to be included

1 0

Alexandre Julliard : Remove unused NONAMELESS defines.
by Alexandre Julliard 15 Aug '23

15 Aug '23

1 0

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

15 Aug '23

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

David McFarland : configure: Don't require pcsclite header for winscard.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: 4a4d35244120ce7d2abdd207a8a81a0b03c349c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/4a4d35244120ce7d2abdd207a8a81a… Author: David McFarland <corngood(a)gmail.com> Date: Tue Aug 15 10:13:50 2023 -0300 configure: Don't require pcsclite header for winscard. The header is unused, and the header check fails with: configure:7860: checking for PCSC/pcsclite.h configure:7860: gcc -m32 -c -g -O2 conftest.c >&5 In file included from conftest.c:50: [...]/include/PCSC/pcsclite.h:45:10: fatal error: wintypes.h: No such file or directory 45 | #include <wintypes.h> | ^~~~~~~~~~~~ Fixes: d405a688ba6b5042775d733f57d00ba6318e1d0f --- configure | 21 ++++++--------------- configure.ac | 15 +++++---------- include/config.h.in | 3 --- 3 files changed, 11 insertions(+), 28 deletions(-) diff --git a/configure b/configure index 181835823f2..8359c78f65b 100755 --- a/configure +++ b/configure @@ -7857,12 +7857,6 @@ if test "x$ac_cv_header_OpenCL_opencl_h" = xyes then : printf "%s\n" "#define HAVE_OPENCL_OPENCL_H 1" >>confdefs.h -fi -ac_fn_c_check_header_compile "$LINENO" "PCSC/pcsclite.h" "ac_cv_header_PCSC_pcsclite_h" "$ac_includes_default" -if test "x$ac_cv_header_PCSC_pcsclite_h" = xyes -then : - printf "%s\n" "#define HAVE_PCSC_PCSCLITE_H 1" >>confdefs.h - fi ac_fn_c_check_header_compile "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default" if test "x$ac_cv_header_arpa_inet_h" = xyes @@ -15849,18 +15843,15 @@ if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" = xyes then : PCSCLITE_LIBS="-lpcsclite" +else $as_nop + case $host_os in + darwin*|macosx*) PCSCLITE_LIBS="-framework PCSC" + ;; + esac fi - if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" - then - case $host_os in - darwin*|macosx*) - PCSCLITE_LIBS="-framework PCSC" - ;; - esac - fi fi -if test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes" +if test "x$PCSCLITE_LIBS" = x then : case "x$with_pcsclite" in x) as_fn_append wine_notices "|libpcsclite not found, smart cards won't be supported." ;; diff --git a/configure.ac b/configure.ac index 4f7ba4c61bc..4e25e5d7306 100644 --- a/configure.ac +++ b/configure.ac @@ -403,7 +403,6 @@ AC_CHECK_HEADERS(\ CL/cl.h \ EGL/egl.h \ OpenCL/opencl.h \ - PCSC/pcsclite.h \ arpa/inet.h \ arpa/nameser.h \ asm/types.h \ @@ -1395,16 +1394,12 @@ WINE_NOTICE_WITH(pcap,[test "x$ac_cv_lib_pcap_pcap_init" != xyes], dnl **** Check for libpcsclite **** if test "x$with_pcsclite" != "xno" then - AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])]) - if test "x$ac_cv_lib_pcsclite_SCardEstablishContext" != xyes && test "$ac_cv_header_PCSC_pcsclite_h" = "yes" - then - case $host_os in - darwin*|macosx*) - AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;; - esac - fi + AC_CHECK_LIB(pcsclite,SCardEstablishContext,[AC_SUBST(PCSCLITE_LIBS,["-lpcsclite"])], + [case $host_os in + darwin*|macosx*) AC_SUBST(PCSCLITE_LIBS,"-framework PCSC") ;; + esac]) fi -WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x || test "$ac_cv_header_PCSC_pcsclite_h" != "yes"], +WINE_NOTICE_WITH(pcsclite,[test "x$PCSCLITE_LIBS" = x], [libpcsclite not found, smart cards won't be supported.], [enable_winscard]) diff --git a/include/config.h.in b/include/config.h.in index 41011c3b0b8..9836ec64cf9 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,9 +297,6 @@ /* Define to 1 if you have the <pcap/pcap.h> header file. */ #undef HAVE_PCAP_PCAP_H -/* Define to 1 if you have the <PCSC/pcsclite.h> header file. */ -#undef HAVE_PCSC_PCSCLITE_H - /* Define to 1 if you have the `pipe2' function. */ #undef HAVE_PIPE2

1 0

Alexandre Julliard : configure: Use AC_CHECK_HEADER for headers that don't need to be in config.h.
by Alexandre Julliard 15 Aug '23

15 Aug '23

Module: wine Branch: master Commit: b5edd148145b93fcc3e8c76323837cc59326c70b URL: https://gitlab.winehq.org/wine/wine/-/commit/b5edd148145b93fcc3e8c76323837c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Aug 15 13:12:14 2023 +0200 configure: Use AC_CHECK_HEADER for headers that don't need to be in config.h. --- configure | 208 +++++++++++----------------------------------------- configure.ac | 58 +++++---------- include/config.h.in | 27 ------- 3 files changed, 63 insertions(+), 230 deletions(-)

1 0