April 2022 - Wine-Commits - list.winehq.org

Paul Gofman : msvcrt: Use newer ioinfo structure for _MSVC_VER >= 80.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 1c9e9ec360cef5cc8c004a54a9fccc1eb201de12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c9e9ec360cef5cc8c004a54… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 4 18:52:19 2022 +0300 msvcrt: Use newer ioinfo structure for _MSVC_VER >= 80. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr80/tests/msvcr80.c | 18 +++--- dlls/msvcrt/file.c | 140 +++++++++++++++++++++++++++++++++---------- 2 files changed, 118 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c9e9ec360cef5cc8c00…

1 0

Paul Gofman : msvcr80: Fix ioinfo structure definition.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 4c90f58bb5d8e85a973d8c38ae9590c3136b3549 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c90f58bb5d8e85a973d8c38… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Apr 4 18:52:18 2022 +0300 msvcr80: Fix ioinfo structure definition. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/msvcr80/tests/Makefile.in | 7 ++ dlls/msvcr80/tests/msvcr80.c | 148 ++++++++++++++++++++++++++++++++++++ dlls/msvcr80/tests/msvcr80.manifest | 22 ++++++ dlls/msvcr80/tests/msvcr80.rc | 22 ++++++ dlls/msvcrt/file.c | 6 +- 7 files changed, 203 insertions(+), 4 deletions(-) diff --git a/configure b/configure index ce248cc6e1d..53c5eb290c2 100755 --- a/configure +++ b/configure @@ -21550,6 +21550,7 @@ wine_fn_config_makefile dlls/msvcr120_app enable_msvcr120_app wine_fn_config_makefile dlls/msvcr70 enable_msvcr70 wine_fn_config_makefile dlls/msvcr71 enable_msvcr71 wine_fn_config_makefile dlls/msvcr80 enable_msvcr80 +wine_fn_config_makefile dlls/msvcr80/tests enable_tests wine_fn_config_makefile dlls/msvcr90 enable_msvcr90 wine_fn_config_makefile dlls/msvcr90/tests enable_tests wine_fn_config_makefile dlls/msvcrt enable_msvcrt diff --git a/configure.ac b/configure.ac index e509b232d11..6cbc0a61be1 100644 --- a/configure.ac +++ b/configure.ac @@ -2798,6 +2798,7 @@ WINE_CONFIG_MAKEFILE(dlls/msvcr120_app) WINE_CONFIG_MAKEFILE(dlls/msvcr70) WINE_CONFIG_MAKEFILE(dlls/msvcr71) WINE_CONFIG_MAKEFILE(dlls/msvcr80) +WINE_CONFIG_MAKEFILE(dlls/msvcr80/tests) WINE_CONFIG_MAKEFILE(dlls/msvcr90) WINE_CONFIG_MAKEFILE(dlls/msvcr90/tests) WINE_CONFIG_MAKEFILE(dlls/msvcrt) diff --git a/dlls/msvcr80/tests/Makefile.in b/dlls/msvcr80/tests/Makefile.in new file mode 100644 index 00000000000..1a17aea05ce --- /dev/null +++ b/dlls/msvcr80/tests/Makefile.in @@ -0,0 +1,7 @@ +TESTDLL = msvcr80.dll + +C_SRCS = \ + msvcr80.c + +RC_SRCS = \ + msvcr80.rc diff --git a/dlls/msvcr80/tests/msvcr80.c b/dlls/msvcr80/tests/msvcr80.c new file mode 100644 index 00000000000..a9c51654e5e --- /dev/null +++ b/dlls/msvcr80/tests/msvcr80.c @@ -0,0 +1,148 @@ +/* + * Copyright 2022 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <share.h> +#include <sys/stat.h> + +#include <windef.h> +#include <winbase.h> +#include <errno.h> +#include "wine/test.h" + +#define WX_OPEN 0x01 +#define WX_ATEOF 0x02 +#define WX_READNL 0x04 +#define WX_PIPE 0x08 +#define WX_DONTINHERIT 0x10 +#define WX_APPEND 0x20 +#define WX_TTY 0x40 +#define WX_TEXT 0x80 + +#define MSVCRT_FD_BLOCK_SIZE 32 + +typedef struct +{ + HANDLE handle; + unsigned char wxflag; + char lookahead[3]; + int exflag; + CRITICAL_SECTION crit; + char textmode : 7; + char unicode : 1; + char pipech2[2]; + __int64 startpos; + BOOL utf8translations; + char dbcsBuffer; + BOOL dbcsBufferUsed; +} ioinfo; + +static ioinfo **__pioinfo; + +static int (__cdecl *p__open)(const char *, int, ...); +static int (__cdecl *p__close)(int); +static intptr_t (__cdecl *p__get_osfhandle)(int); + +#define SETNOFAIL(x,y) x = (void*)GetProcAddress(hcrt,y) +#define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) +static BOOL init(void) +{ + HMODULE hcrt; + + SetLastError(0xdeadbeef); + hcrt = LoadLibraryA("msvcr80.dll"); + if (!hcrt) { + win_skip("msvcr80.dll not installed (got %ld)\n", GetLastError()); + return FALSE; + } + + SET(__pioinfo, "__pioinfo"); + SET(p__open,"_open"); + SET(p__close,"_close"); + SET(p__get_osfhandle, "_get_osfhandle"); + + return TRUE; +} + +static void test_ioinfo_flags(void) +{ + HANDLE handle; + ioinfo *info; + char *tempf; + int tempfd; + + tempf = _tempnam(".","wne"); + + tempfd = p__open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_WTEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + handle = (HANDLE)p__get_osfhandle(tempfd); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == handle, "Unexpected handle %p, expected %p.\n", info->handle, handle); + todo_wine ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + todo_wine ok(info->unicode, "Unicode is not set.\n"); + todo_wine ok(info->textmode == 2, "Unexpected textmode %d.\n", info->textmode); + p__close(tempfd); + + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + todo_wine ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + todo_wine ok(info->unicode, "Unicode is not set.\n"); + ok(!info->wxflag, "Unexpected wxflag %#x.\n", info->wxflag); + todo_wine ok(info->textmode == 2, "Unexpected textmode %d.\n", info->textmode); + + info = &__pioinfo[(tempfd + 4) / MSVCRT_FD_BLOCK_SIZE][(tempfd + 4) % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + ok(info->handle == INVALID_HANDLE_VALUE, "Unexpected handle %p.\n", info->handle); + ok(!info->exflag, "Unexpected exflag %#x.\n", info->exflag); + ok(!info->textmode, "Unexpected textmode %d.\n", info->textmode); + + tempfd = p__open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_TEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + todo_wine ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + ok(!info->unicode, "Unicode is not set.\n"); + ok(!info->textmode, "Unexpected textmode %d.\n", info->textmode); + p__close(tempfd); + + tempfd = p__open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_U8TEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + info = &__pioinfo[tempfd / MSVCRT_FD_BLOCK_SIZE][tempfd % MSVCRT_FD_BLOCK_SIZE]; + ok(!!info, "NULL info.\n"); + todo_wine ok(info->exflag == 1, "Unexpected exflag %#x.\n", info->exflag); + ok(info->wxflag == (WX_TEXT | WX_OPEN), "Unexpected wxflag %#x.\n", info->wxflag); + ok(!info->unicode, "Unicode is not set.\n"); + todo_wine ok(info->textmode == 1, "Unexpected textmode %d.\n", info->textmode); + p__close(tempfd); + + unlink(tempf); + free(tempf); +} + +START_TEST(msvcr80) +{ + if(!init()) + return; + + test_ioinfo_flags(); +} diff --git a/dlls/msvcr80/tests/msvcr80.manifest b/dlls/msvcr80/tests/msvcr80.manifest new file mode 100644 index 00000000000..038788d4c4f --- /dev/null +++ b/dlls/msvcr80/tests/msvcr80.manifest @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + type="win32" + name="Wine.msvcr80.Test" + version="1.0.0.0" + processorArchitecture="*" + /> +<description>Wine msvcr90 test suite</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="microsoft.vc80.crt" + version="8.0.50727.762" + processorArchitecture="*" + publicKeyToken="1fc8b3b9a1e18e3b" + language="*" + /> +</dependentAssembly> +</dependency> +</assembly> diff --git a/dlls/msvcr80/tests/msvcr80.rc b/dlls/msvcr80/tests/msvcr80.rc new file mode 100644 index 00000000000..69d3b1239b4 --- /dev/null +++ b/dlls/msvcr80/tests/msvcr80.rc @@ -0,0 +1,22 @@ +/* + * Copyright 2022 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "winuser.h" + +/* @makedep: msvcr80.manifest */ +1 RT_MANIFEST msvcr80.manifest diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 86c67868381..a9e532af3d2 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -113,8 +113,6 @@ typedef struct { char pipech2[2]; __int64 startpos; BOOL utf8translations; -#endif -#if _MSVCR_VER >= 90 char dbcsBuffer; BOOL dbcsBufferUsed; #endif @@ -3476,7 +3474,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) char conv[sizeof(lfbuf)]; size_t len = 0; -#if _MSVCR_VER >= 90 +#if _MSVCR_VER >= 80 if (info->dbcsBufferUsed) { conv[j++] = info->dbcsBuffer; @@ -3495,7 +3493,7 @@ int CDECL _write(int fd, const void* buf, unsigned int count) if (i == count) { -#if _MSVCR_VER >= 90 +#if _MSVCR_VER >= 80 info->dbcsBuffer = conv[j-1]; info->dbcsBufferUsed = TRUE; break;

1 0

Jacek Caban : user32: Use NtUserMessageCall for SendMessageA implementation.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: d42888f07c6e3e491c99bb5c8b62b568264e990c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d42888f07c6e3e491c99bb5c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:58:21 2022 +0200 user32: Use NtUserMessageCall for SendMessageA implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index e42ab74cf3f..a67032ef917 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2230,20 +2230,14 @@ LRESULT WINAPI SendMessageW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) */ LRESULT WINAPI SendMessageA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) { - DWORD_PTR res = 0; - struct send_message_info info; - - info.type = MSG_ASCII; - info.hwnd = hwnd; - info.msg = msg; - info.wparam = wparam; - info.lparam = lparam; - info.flags = SMTO_NORMAL; - info.timeout = 0; - info.wm_char = WMCHAR_MAP_SENDMESSAGE; + if (msg == WM_CHAR && !WIN_IsCurrentThread( hwnd )) + { + if (!map_wparam_AtoW( msg, &wparam, WMCHAR_MAP_SENDMESSAGE )) + return 0; + return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, FNID_SENDMESSAGE, FALSE ); + } - send_message( &info, &res, FALSE ); - return res; + return NtUserMessageCall( hwnd, msg, wparam, lparam, NULL, FNID_SENDMESSAGE, TRUE ); }

1 0

Jacek Caban : user32: Use NtUserMessageCall for SendMessageTimeoutA implementation.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: 52eac01237c5e77d7c720731bc1844b196034edd URL: https://source.winehq.org/git/wine.git/?a=commit;h=52eac01237c5e77d7c720731… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 16:58:00 2022 +0200 user32: Use NtUserMessageCall for SendMessageTimeoutA implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d54d5b55e50..e42ab74cf3f 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -2197,18 +2197,22 @@ LRESULT WINAPI SendMessageTimeoutW( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l LRESULT WINAPI SendMessageTimeoutA( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, UINT flags, UINT timeout, PDWORD_PTR res_ptr ) { - struct send_message_info info; + struct send_message_timeout_params params = { .flags = flags, .timeout = timeout }; + LRESULT res = 0; - info.type = MSG_ASCII; - info.hwnd = hwnd; - info.msg = msg; - info.wparam = wparam; - info.lparam = lparam; - info.flags = flags; - info.timeout = timeout; - info.wm_char = WMCHAR_MAP_SENDMESSAGETIMEOUT; + if (msg != WM_CHAR || WIN_IsCurrentThread( hwnd )) + { + res = NtUserMessageCall( hwnd, msg, wparam, lparam, &params, + FNID_SENDMESSAGEWTOOPTION, TRUE ); + } + else if (map_wparam_AtoW( msg, &wparam, WMCHAR_MAP_SENDMESSAGE )) + { + res = NtUserMessageCall( hwnd, msg, wparam, lparam, &params, + FNID_SENDMESSAGEWTOOPTION, FALSE ); + } - return send_message( &info, res_ptr, FALSE ); + if (res_ptr) *res_ptr = res; + return params.result; }

1 0

Alexandre Julliard : kernelbase: Reimplement GetCalendarInfoEx/W using the locale.nls data.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: wine Branch: master Commit: a074d0c3a8bd06bfbab4c98e4f8b244bfaef62ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=a074d0c3a8bd06bfbab4c98e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 5 16:59:09 2022 +0200 kernelbase: Reimplement GetCalendarInfoEx/W using the locale.nls data. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lcformat.c | 10 +- dlls/kernelbase/locale.c | 394 ++++++++++++++++++++++++++--------------------- include/winnls.h | 1 + 3 files changed, 226 insertions(+), 179 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a074d0c3a8bd06bfbab4…

1 0

Zebediah Figura : build: Do not make cross-compiled import libs an explicit dependency of the "crosstest" targets.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: vkd3d Branch: master Commit: 2f082de90411eb6b252352e05142e0e9d65921fe URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2f082de90411eb6b252352e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:12 2022 -0500 build: Do not make cross-compiled import libs an explicit dependency of the "crosstest" targets. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3549cce5..c93b2062 100644 --- a/Makefile.am +++ b/Makefile.am @@ -449,9 +449,9 @@ CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) if BUILD_DEMOS CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) endif -CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe +CROSS32_FILES = $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe -CLEANFILES += $(CROSS32_FILES) +CLEANFILES += $(CROSS32_IMPLIBS) $(CROSS32_FILES) crosstest32: $(CROSS32_FILES) -include tests/$(DEPDIR)/*.cross32.Po @@ -483,9 +483,9 @@ CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) if BUILD_DEMOS CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) endif -CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe +CROSS64_FILES = $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe -CLEANFILES += $(CROSS64_FILES) +CLEANFILES += $(CROSS64_IMPLIBS) $(CROSS64_FILES) crosstest64: $(CROSS64_FILES) -include tests/$(DEPDIR)/*.cross64.Po

1 0

Zebediah Figura : build: Do not cross-compile tests if tests are not enabled.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: vkd3d Branch: master Commit: 2e4367a470ab359b342c07b26a29bd60ebd55545 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2e4367a470ab359b342c07b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:13 2022 -0500 build: Do not cross-compile tests if tests are not enabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 22 ++++++++++++++++++---- configure.ac | 4 +++- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c93b2062..f49f9642 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,11 +445,18 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) +CROSS32_EXEFILES = +if BUILD_TESTS +CROSS32_EXEFILES += $(vkd3d_cross_tests:=.cross32.exe) +endif if BUILD_DEMOS CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) endif -CROSS32_FILES = $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe + +CROSS32_FILES = $(CROSS32_EXEFILES) +if BUILD_TESTS +CROSS32_FILES += tests/shader_runner.cross32.exe +endif CLEANFILES += $(CROSS32_IMPLIBS) $(CROSS32_FILES) crosstest32: $(CROSS32_FILES) @@ -479,11 +486,18 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) +CROSS64_EXEFILES = +if BUILD_TESTS +CROSS64_EXEFILES += $(vkd3d_cross_tests:=.cross64.exe) +endif if BUILD_DEMOS CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) endif -CROSS64_FILES = $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe + +CROSS64_FILES = $(CROSS64_EXEFILES) +if BUILD_TESTS +CROSS64_FILES += tests/shader_runner.cross64.exe +endif CLEANFILES += $(CROSS64_IMPLIBS) $(CROSS64_FILES) crosstest64: $(CROSS64_FILES) diff --git a/configure.ac b/configure.ac index 97551d89..a58e453f 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,8 @@ AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) +AS_IF([test "x$enable_demos" != "xyes" -a "x$enable_tests" = "xno"], [CROSSTARGET64=no CROSSTARGET32=no]) + AS_ECHO([" Configuration summary for $PACKAGE $VERSION @@ -180,7 +182,7 @@ AS_ECHO([" "]) AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO([" Cross-compiling demos: ${HAVE_CROSSTARGET}"])]) -AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"]) +AS_IF([test "x$enable_tests" != "xno"], [AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"])]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([])

1 0

Zebediah Figura : build: Do not cross-compile demos if demos are not enabled.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: vkd3d Branch: master Commit: 113303c7307681fa661ba5b508c2bdd38178a920 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=113303c7307681fa661ba5b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:11 2022 -0500 build: Do not cross-compile demos if demos are not enabled. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 12 ++++++++---- configure.ac | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e7737be..3549cce5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -445,8 +445,10 @@ if HAVE_CROSSTARGET32 CROSS32_CC = @CROSSCC32@ CROSS32_DLLTOOL = @CROSSTARGET32(a)-dlltool CROSS32_IMPLIBS = $(cross_implibs:=.cross32.a) -CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +CROSS32_EXEFILES = $(vkd3d_cross_tests:=.cross32.exe) +if BUILD_DEMOS +CROSS32_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross32.exe) +endif CROSS32_FILES = $(CROSS32_IMPLIBS) $(CROSS32_EXEFILES) tests/shader_runner.cross32.exe CLEANFILES += $(CROSS32_FILES) @@ -477,8 +479,10 @@ if HAVE_CROSSTARGET64 CROSS64_CC = @CROSSCC64@ CROSS64_DLLTOOL = @CROSSTARGET64(a)-dlltool CROSS64_IMPLIBS = $(cross_implibs:=.cross64.a) -CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) \ - $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +CROSS64_EXEFILES = $(vkd3d_cross_tests:=.cross64.exe) +if BUILD_DEMOS +CROSS64_EXEFILES += $(vkd3d_demos:demos/vkd3d-%=demos/%.cross64.exe) +endif CROSS64_FILES = $(CROSS64_IMPLIBS) $(CROSS64_EXEFILES) tests/shader_runner.cross64.exe CLEANFILES += $(CROSS64_FILES) diff --git a/configure.ac b/configure.ac index 77fa41c8..97551d89 100644 --- a/configure.ac +++ b/configure.ac @@ -162,7 +162,7 @@ AC_OUTPUT dnl Output configuration summary AS_IF([test "x$CROSSTARGET32" != "xno" -o "x$CROSSTARGET64" != "xno"], - [HAVE_CROSSTEST=yes], [HAVE_CROSSTEST=no]) + [HAVE_CROSSTARGET=yes], [HAVE_CROSSTARGET=no]) AS_IF([test $DX_FLAG_doc = 1], [HAVE_DOCS=yes], [HAVE_DOCS=no]) AS_ECHO([" @@ -177,8 +177,10 @@ AS_ECHO([" Building demos: ${enable_demos} Building tests: ${enable_tests} Building documentation: ${HAVE_DOCS} +"]) - Building crosstests: ${HAVE_CROSSTEST}"]) +AS_IF([test "x$enable_demos" = "xyes"], [AS_ECHO([" Cross-compiling demos: ${HAVE_CROSSTARGET}"])]) +AS_ECHO([" Cross-compiling tests: ${HAVE_CROSSTARGET}"]) AS_IF([test "x$CROSSTARGET32" != "xno"], [AS_ECHO([" Using 32-bit cross compiler: $CROSSCC32"])]) AS_IF([test "x$CROSSTARGET64" != "xno"], [AS_ECHO([" Using 64-bit cross compiler: $CROSSCC64"])]) AS_ECHO([])

1 0

Zebediah Figura : configure: Check for xcb-event and xcb-icccm.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: vkd3d Branch: master Commit: d3347554a2d1a44e94289e8470beabb66c4c8bd3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d3347554a2d1a44e94289e8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Apr 1 16:01:10 2022 -0500 configure: Check for xcb-event and xcb-icccm. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 308bdda1..77fa41c8 100644 --- a/configure.ac +++ b/configure.ac @@ -126,7 +126,7 @@ AS_IF([test "x$with_spirv_tools" = "xyes"], HAVE_XCB=no AS_IF([test "x$with_xcb" != "xno"], - [PKG_CHECK_MODULES([XCB], [xcb xcb-keysyms], + [PKG_CHECK_MODULES([XCB], [xcb xcb-event xcb-icccm xcb-keysyms], [AC_DEFINE([HAVE_XCB], [1], [Define to 1 if you have libxcb.]) HAVE_XCB=yes], [HAVE_XCB=no])])

1 0

Matteo Bruni : vkd3d-shader/hlsl: Report failure when encountering matrix instructions.
by Alexandre Julliard April 5, 2022

April 5, 2022

Module: vkd3d Branch: master Commit: 428a6b403384c401a4cd3104422bd2d95ed894c1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=428a6b403384c401a4cd310… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 5 12:33:03 2022 +0200 vkd3d-shader/hlsl: Report failure when encountering matrix instructions. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 94765f9e..9b6fa371 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -2067,7 +2067,7 @@ static void write_sm4_block(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer * { if (instr->data_type->type == HLSL_CLASS_MATRIX) { - FIXME("Matrix operations need to be lowered.\n"); + hlsl_fixme(ctx, &instr->loc, "Matrix operations need to be lowered."); break; } else if (instr->data_type->type == HLSL_CLASS_OBJECT)

1 0