- Wine-Commits - list.winehq.org

Nikolay Sivov : d3d10/effect: Add support for 'not' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 42a57b3e70846043f27a1ecf648dac26072ba887 URL: https://gitlab.winehq.org/wine/wine/-/commit/42a57b3e70846043f27a1ecf648dac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 20:49:16 2023 +0200 d3d10/effect: Add support for 'not' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 14 ++++ dlls/d3d10/tests/effect.c | 189 ++++++++++++++++++++++++++++------------------ 2 files changed, 131 insertions(+), 72 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'exp' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 2055f7e20b4b7605fb64f80dfb350946e0aa4553 URL: https://gitlab.winehq.org/wine/wine/-/commit/2055f7e20b4b7605fb64f80dfb3509… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 4 16:14:16 2023 +0200 d3d10/effect: Add support for 'exp' instruction. --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 176 ++++++++++++++++++++++++++++------------------ 2 files changed, 116 insertions(+), 70 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'log' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 347ed9a82bf4adbf6398da136aed9c76772f0900 URL: https://gitlab.winehq.org/wine/wine/-/commit/347ed9a82bf4adbf6398da136aed9c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 16:53:10 2023 +0200 d3d10/effect: Add support for 'log' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 174 ++++++++++++++++++++++++++++------------------ 2 files changed, 116 insertions(+), 68 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'or' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: fcfe2972111dc06af3c01b109111693ace9e084a URL: https://gitlab.winehq.org/wine/wine/-/commit/fcfe2972111dc06af3c01b10911169… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 21:47:57 2023 +0200 d3d10/effect: Add support for 'or' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++ dlls/d3d10/tests/effect.c | 197 +++++++++++++++++++++++++++++----------------- 2 files changed, 139 insertions(+), 73 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'rsq' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 03e17a357235f7c8be52e65032e11b271f1be64e URL: https://gitlab.winehq.org/wine/wine/-/commit/03e17a357235f7c8be52e65032e11b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 15:34:14 2023 +0200 d3d10/effect: Add support for 'rsq' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 169 ++++++++++++++++++++++++++++------------------ 2 files changed, 113 insertions(+), 66 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'sqrt' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: f72bb1f687eb4ce23c6f9e478503addeb34ae024 URL: https://gitlab.winehq.org/wine/wine/-/commit/f72bb1f687eb4ce23c6f9e478503ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 00:39:07 2023 +0200 d3d10/effect: Add support for 'sqrt' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 10 +++ dlls/d3d10/tests/effect.c | 161 ++++++++++++++++++++++++++++------------------ 2 files changed, 107 insertions(+), 64 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'imul' instruction.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 03c70387137765cefbb49bad423369d58fa25a39 URL: https://gitlab.winehq.org/wine/wine/-/commit/03c70387137765cefbb49bad423369… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 30 23:57:28 2023 +0200 d3d10/effect: Add support for 'imul' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 15 ++++ dlls/d3d10/tests/effect.c | 169 +++++++++++++++++++++++++++++----------------- 2 files changed, 121 insertions(+), 63 deletions(-)

1 0

Nikolay Sivov : d3d10/tests: Use vector helpers in more places.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: edbf2405fcbf40c9229bc8946d23eedb90a04af4 URL: https://gitlab.winehq.org/wine/wine/-/commit/edbf2405fcbf40c9229bc8946d23ee… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Oct 1 00:27:49 2023 +0200 d3d10/tests: Use vector helpers in more places. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 114 ++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 69 deletions(-)

1 0

Nikolay Sivov : propsys: Handle VT_I4 type in VariantToString().
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 001e0543bfd5aea060053af0c76233bb90fbb43b URL: https://gitlab.winehq.org/wine/wine/-/commit/001e0543bfd5aea060053af0c76233… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 4 14:22:34 2023 +0200 propsys: Handle VT_I4 type in VariantToString(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55708 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/propsys/propvar.c | 20 +++++++++++--------- dlls/propsys/tests/propsys.c | 7 +++++++ 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/propsys/propvar.c b/dlls/propsys/propvar.c index bf77e7d51e5..c6510f9f35d 100644 --- a/dlls/propsys/propvar.c +++ b/dlls/propsys/propvar.c @@ -436,7 +436,7 @@ PCWSTR WINAPI VariantToStringWithDefault(const VARIANT *pvar, const WCHAR *defau */ HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch) { - WCHAR *str = NULL; + WCHAR buffer[64], *str = buffer; TRACE("%p, %p, %u.\n", var, ret, cch); @@ -445,15 +445,17 @@ HRESULT WINAPI VariantToString(REFVARIANT var, PWSTR ret, UINT cch) if (!cch) return E_INVALIDARG; - if (V_VT(var) == VT_BSTR) + switch (V_VT(var)) { - str = V_BSTR(var); - } - else - { - FIXME("Unsupported type %d.\n", V_VT(var)); - - return E_NOTIMPL; + case VT_BSTR: + str = V_BSTR(var); + break; + case VT_I4: + swprintf(buffer, ARRAY_SIZE(buffer), L"%d", V_I4(var)); + break; + default: + FIXME("Unsupported type %d.\n", V_VT(var)); + return E_NOTIMPL; } if (wcslen(str) > cch - 1) diff --git a/dlls/propsys/tests/propsys.c b/dlls/propsys/tests/propsys.c index dab0537991b..a2fbb619ef2 100644 --- a/dlls/propsys/tests/propsys.c +++ b/dlls/propsys/tests/propsys.c @@ -2290,6 +2290,13 @@ static void test_VariantToString(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(!buff[0], "Unexpected buffer.\n"); + buff[0] = 0; + V_VT(&v) = VT_I4; + V_I4(&v) = 567; + hr = VariantToString(&v, buff, 64); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!wcscmp(buff, L"567"), "Unexpected buffer %s.\n", wine_dbgstr_w(buff)); + V_VT(&v) = VT_BSTR; V_BSTR(&v) = SysAllocString(L"test1");

1 0

Martin Storsjö : configure: Fix restoring CFLAGS after the test for -Wl,-z,defs.
by Alexandre Julliard Oct. 4, 2023

Oct. 4, 2023

Module: wine Branch: master Commit: 2c7524021ec862eba304c788274d6b49b7c1aca9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c7524021ec862eba304c788274d6b… Author: Martin Storsjö <martin(a)martin.st> Date: Wed Oct 4 15:03:21 2023 +0300 configure: Fix restoring CFLAGS after the test for -Wl,-z,defs. This fixes a regression from 450c358881dbc6dcfb2692b8f4debb7db8fdc54b; after testing for -Wl,-z,defs, CFLAGS was restored from an incorrect variable, leaving CFLAGS essentially empty. This would break builds for e.g. arm with Clang, where -mthumb would be essential for being able to build some inline assembly snippets correctly. This also had the effect of dropping the default "-g -O2" arguments from CFLAGS. Signed-off-by: Martin Storsjö <martin(a)martin.st> --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index cbcc88d6626..a8139a60b10 100755 --- a/configure +++ b/configure @@ -10123,7 +10123,7 @@ else $as_nop fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - CFLAGS=$ac_save_cflags + CFLAGS=$ac_save_CFLAGS fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_wl_z_defs" >&5 printf "%s\n" "$ac_cv_wl_z_defs" >&6; } diff --git a/configure.ac b/configure.ac index d288c544dfd..4803b7abea4 100644 --- a/configure.ac +++ b/configure.ac @@ -771,7 +771,7 @@ case $host_os in dnl On FreeBSD, shared libraries using environ fail to link with -Wl,-z,defs AC_LINK_IFELSE([AC_LANG_SOURCE([[extern char **environ; char **envp; void myfunc(void) { envp = environ; }]])], [ac_cv_wl_z_defs=yes],[ac_cv_wl_z_defs=no]) - CFLAGS=$ac_save_cflags]) + CFLAGS=$ac_save_CFLAGS]) test $ac_cv_wl_z_defs != yes || AS_VAR_APPEND([UNIXLDFLAGS],[" -Wl,-z,defs"]) WINE_TRY_CFLAGS([-Wl,--export-dynamic],[WINELOADER_LDFLAGS="-Wl,--export-dynamic"])

1 0