April 2018 - Wine-commits - list.winehq.org

Józef Kucia : build: Improve SPIR-V headers detection.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: vkd3d Branch: master Commit: b901d72877389f11ab8e2bea7f158174c9466b6b URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b901d72877389f11ab8e2be… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 16 12:16:23 2018 +0200 build: Improve SPIR-V headers detection. Allows building with Vulkan SDK. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure.ac | 12 +++++++++--- libs/vkd3d-shader/spirv.c | 19 +++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 820783a..2b8249e 100644 --- a/configure.ac +++ b/configure.ac @@ -48,11 +48,17 @@ VKD3D_CHECK_MINGW32_PROG([CROSSCC32], [CROSSTARGET32], [no]) VKD3D_CHECK_MINGW64_PROG([CROSSCC64], [CROSSTARGET64], [no]) dnl Check for headers -AC_CHECK_HEADERS([pthread.h vulkan/vulkan.h spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h]) +AC_CHECK_HEADERS([pthread.h vulkan/vulkan.h \ + vulkan/spirv.h vulkan/GLSL.std.450.h \ + spirv/unified1/spirv.h spirv/unified1/GLSL.std.450.h]) AS_IF([test "x$ac_cv_header_pthread_h" != "xyes"], [AC_MSG_ERROR([pthread.h not found.])]) AS_IF([test "x$ac_cv_header_vulkan_vulkan_h" != "xyes"], [AC_MSG_ERROR([vulkan.h not found.])]) -AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes"], [AC_MSG_ERROR([spirv.h not found.])]) -AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +AS_IF([test "x$ac_cv_header_spirv_unified1_spirv_h" != "xyes" \ + -a "x$ac_cv_header_vulkan_spirv_h" != "xyes"], + [AC_MSG_ERROR([spirv.h not found.])]) +AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ + -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], + [AC_MSG_ERROR([GLSL.std.450.h not found.])]) dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8a1fdf4..f646d54 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -21,13 +21,20 @@ #include <stdarg.h> #include <stdio.h> -#include "spirv/unified1/spirv.h" -#include "spirv/unified1/GLSL.std.450.h" -#ifdef HAVE_SPIRV_TOOLS -# include "spirv-tools/libspirv.h" -#endif /* HAVE_SPIRV_TOOLS */ + +#ifdef HAVE_SPIRV_UNIFIED1_SPIRV_H +# include "spirv/unified1/spirv.h" +#else +# include "vulkan/spirv.h" +#endif /* HAVE_SPIRV_UNIFIED1_SPIRV_H */ +#ifdef HAVE_SPIRV_UNIFIED1_GLSL_STD_450_H +# include "spirv/unified1/GLSL.std.450.h" +#else +# include "vulkan/GLSL.std.450.h" +#endif /* HAVE_SPIRV_UNIFIED1_GLSL_STD_450_H */ #ifdef HAVE_SPIRV_TOOLS +# include "spirv-tools/libspirv.h" static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) { @@ -85,7 +92,7 @@ static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) static void vkd3d_spirv_dump(const struct vkd3d_shader_code *spirv) {} static void vkd3d_spirv_validate(const struct vkd3d_shader_code *spirv) {} -#endif /* HAVE_SPIRV_TOOLS */ +#endif /* HAVE_SPIRV_TOOLS */ #define VKD3D_SPIRV_VERSION 0x00010000 #define VKD3D_SPIRV_GENERATOR_ID 18

1 0

Józef Kucia : build: Remove rpc.h and rpcndr.h includes from generated headers.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: vkd3d Branch: master Commit: ce9ec9a44a62eee4ddc8c3551e4fd41cf80f37f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ce9ec9a44a62eee4ddc8c35… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Apr 13 12:37:44 2018 +0200 build: Remove rpc.h and rpcndr.h includes from generated headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 3 +-- include/dummy/rpc.h | 30 ------------------------------ include/dummy/rpcndr.h | 25 ------------------------- include/vkd3d_windows.h | 1 + 4 files changed, 2 insertions(+), 57 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8f0fc5f..aa2e2f6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,8 +14,6 @@ widl_headers = \ include/vkd3d_dxgitype.h vkd3d_public_headers = \ - include/dummy/rpc.h \ - include/dummy/rpcndr.h \ include/vkd3d.h \ include/vkd3d_d3d12.h \ include/vkd3d_d3dcommon.h \ @@ -149,6 +147,7 @@ EXTRA_DIST += $(widl_headers) $(widl_headers:.h=.idl) $(widl_headers): %.h: %.idl if HAVE_WIDL $(VKD3D_V_WIDL)$(WIDL) -o $@ $< + sed -e '/#include <$rpc.h\|rpcndr.h$>/d' -i $@ else echo "widl is required to generate $<" endif diff --git a/include/dummy/rpc.h b/include/dummy/rpc.h deleted file mode 100644 index 259a37a..0000000 --- a/include/dummy/rpc.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2016 Józef Kucia 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 - */ - -/* XXX: This is a dummy header required by files generated by widl. */ -#ifndef __VKD3D_RPC_H__ -#define __VKD3D_RPC_H__ - -#define __RPC_STUB - -typedef struct IRpcStubBuffer IRpcStubBuffer; -typedef struct IRpcChannelBuffer IRpcChannelBuffer; - -typedef struct PRPC_MESSAGE PRPC_MESSAGE; - -#endif /* __VKD3D_RPC_H__ */ diff --git a/include/dummy/rpcndr.h b/include/dummy/rpcndr.h deleted file mode 100644 index 8d9b82c..0000000 --- a/include/dummy/rpcndr.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright 2016 Józef Kucia 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 - */ - -/* XXX: This is a dummy header required by files generated by widl. */ -#ifndef __VKD3D_RPCNDR_H -#define __VKD3D_RPCNDR_H - -#define MIDL_INTERFACE(x) struct - -#endif /* __VKD3D_RPCNDR_H */ diff --git a/include/vkd3d_windows.h b/include/vkd3d_windows.h index 425d139..9cea6b4 100644 --- a/include/vkd3d_windows.h +++ b/include/vkd3d_windows.h @@ -182,6 +182,7 @@ typedef struct SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES; # define interface struct # define BEGIN_INTERFACE # define END_INTERFACE +# define MIDL_INTERFACE(x) struct # ifdef __cplusplus # define EXTERN_C extern "C"

1 0

Józef Kucia : libs/vkd3d: Mark device as removed when command list in recording state is executed.
by Alexandre Julliard 16 Apr '18

16 Apr '18

Module: vkd3d Branch: master Commit: f0a1e1411363da4c139fc75bcb9fcc0171cb5d32 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0a1e1411363da4c139fc75… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 16 12:16:21 2018 +0200 libs/vkd3d: Mark device as removed when command list in recording state is executed. Fixes a GPU hang in test_device_removed_reason() on RADV. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/private/vkd3d_debug.h | 3 +++ libs/vkd3d-common/debug.c | 17 ++++++++++++----- libs/vkd3d/command.c | 13 ++++++++++++- libs/vkd3d/device.c | 21 +++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 4 ++++ tests/d3d12.c | 4 ++-- 6 files changed, 52 insertions(+), 10 deletions(-) diff --git a/include/private/vkd3d_debug.h b/include/private/vkd3d_debug.h index b9d4bcd..e5e938d 100644 --- a/include/private/vkd3d_debug.h +++ b/include/private/vkd3d_debug.h @@ -21,6 +21,8 @@ #include "vkd3d_common.h" +#include <stdarg.h> + enum vkd3d_dbg_level { VKD3D_DBG_LEVEL_NONE, @@ -36,6 +38,7 @@ void vkd3d_dbg_printf(enum vkd3d_dbg_level level, const char *function, const char *fmt, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; const char *vkd3d_dbg_sprintf(const char *fmt, ...) VKD3D_PRINTF_FUNC(1, 2) DECLSPEC_HIDDEN; +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) DECLSPEC_HIDDEN; const char *debugstr_a(const char *str) DECLSPEC_HIDDEN; const char *debugstr_w(const WCHAR *wstr, size_t wchar_size) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-common/debug.c b/libs/vkd3d-common/debug.c index 9cdf2a9..b838045 100644 --- a/libs/vkd3d-common/debug.c +++ b/libs/vkd3d-common/debug.c @@ -20,7 +20,6 @@ #include <assert.h> #include <ctype.h> -#include <stdarg.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -89,19 +88,27 @@ static char *get_buffer(void) return buffers[current_index]; } -const char *vkd3d_dbg_sprintf(const char *fmt, ...) +const char *vkd3d_dbg_vsprintf(const char *fmt, va_list args) { char *buffer; - va_list args; buffer = get_buffer(); - va_start(args, fmt); vsnprintf(buffer, VKD3D_DEBUG_BUFFER_SIZE, fmt, args); - va_end(args); buffer[VKD3D_DEBUG_BUFFER_SIZE - 1] = '\0'; return buffer; } +const char *vkd3d_dbg_sprintf(const char *fmt, ...) +{ + const char *buffer; + va_list args; + + va_start(args, fmt); + buffer = vkd3d_dbg_vsprintf(fmt, args); + va_end(args); + return buffer; +} + const char *debugstr_a(const char *str) { char *buffer, *ptr; diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b7b774b..82a99fd 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4191,6 +4191,7 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_command_list *cmd_list; struct VkSubmitInfo submit_desc; VkCommandBuffer *buffers; VkQueue vk_queue; @@ -4210,7 +4211,17 @@ static void STDMETHODCALLTYPE d3d12_command_queue_ExecuteCommandLists(ID3D12Comm for (i = 0; i < command_list_count; ++i) { - buffers[i] = unsafe_impl_from_ID3D12CommandList(command_lists[i])->vk_command_buffer; + cmd_list = unsafe_impl_from_ID3D12CommandList(command_lists[i]); + + if (cmd_list->is_recording) + { + d3d12_device_mark_as_removed(command_queue->device, DXGI_ERROR_INVALID_CALL, + "Command list %p is in recording state.\n", command_lists[i]); + vkd3d_free(buffers); + return; + } + + buffers[i] = cmd_list->vk_command_buffer; } submit_desc.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 805d477..48ad7c5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1943,9 +1943,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CreateFence(ID3D12Device *iface, static HRESULT STDMETHODCALLTYPE d3d12_device_GetDeviceRemovedReason(ID3D12Device *iface) { - FIXME("iface %p stub!\n", iface); + struct d3d12_device *device = impl_from_ID3D12Device(iface); - return S_OK; + TRACE("iface %p.\n", iface); + + return device->removed_reason; } static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *iface, @@ -2245,6 +2247,8 @@ static HRESULT d3d12_device_init(struct d3d12_device *device, if ((device->parent = create_info->parent)) IUnknown_AddRef(device->parent); + device->removed_reason = S_OK; + return S_OK; } @@ -2270,6 +2274,19 @@ HRESULT d3d12_device_create(struct vkd3d_instance *instance, return S_OK; } +void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, + const char *message, ...) +{ + va_list args; + + va_start(args, message); + WARN("Device %p is lost (reason %#x, message \"%s\").\n", + device, reason, vkd3d_dbg_vsprintf(message, args)); + va_end(args); + + device->removed_reason = reason; +} + IUnknown *vkd3d_get_device_parent(ID3D12Device *device) { struct d3d12_device *d3d12_device = impl_from_ID3D12Device(device); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 246c42b..4a359db 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -683,10 +683,14 @@ struct d3d12_device IUnknown *parent; LUID adapter_luid; + + HRESULT removed_reason; }; HRESULT d3d12_device_create(struct vkd3d_instance *instance, const struct vkd3d_device_create_info *create_info, struct d3d12_device **device) DECLSPEC_HIDDEN; +void d3d12_device_mark_as_removed(struct d3d12_device *device, HRESULT reason, + const char *message, ...) VKD3D_PRINTF_FUNC(3, 4) DECLSPEC_HIDDEN; struct d3d12_device *unsafe_impl_from_ID3D12Device(ID3D12Device *iface) DECLSPEC_HIDDEN; HRESULT vkd3d_create_buffer(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 7dfee87..ea7d24d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4598,7 +4598,7 @@ static void test_device_removed_reason(void) exec_command_list(queue, command_list); hr = ID3D12Device_GetDeviceRemovedReason(device); - todo(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, &IID_ID3D12CommandQueue, (void **)&tmp_queue); @@ -4607,7 +4607,7 @@ static void test_device_removed_reason(void) ID3D12CommandQueue_Release(tmp_queue); hr = ID3D12Device_GetDeviceRemovedReason(device); - todo(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); ID3D12GraphicsCommandList_Release(command_list); ID3D12CommandAllocator_Release(command_allocator);

1 0

Alexandre Julliard : Wine release 3.6
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: website Branch: master Commit: 6d083cc25f7690741e4a8bb273a2488f8d57a6b2 URL: https://source.winehq.org/git/website.git/?a=commit;h=6d083cc25f7690741e4a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 22:55:07 2018 +0200 Wine release 3.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2018041301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018041301.xml b/news/en/2018041301.xml new file mode 100644 index 0000000..70cd49e --- /dev/null +++ b/news/en/2018041301.xml @@ -0,0 +1,16 @@ +<news> +<date>April 13, 2018</date> +<title>Wine 3.6 Released</title> +<body> + The Wine development release 3.6 is now available. + <a href="{$root}/announce/3.6">What's new</a> in this release: +<ul> + <li>Support for PNG format icons.</li> + <li>Support for 1D textures.</li> + <li>More infrastructure for high DPI support.</li> + <li>OLE data cache improvements.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/3.x/wine-3.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Alexandre Julliard : Release 3.6.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 3f281a3baad9f5f8f875da902718a1d5d3dc0d9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f281a3baad9f5f8f875da90… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 22:52:23 2018 +0200 Release 3.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 754 ++++++++++++++++++++++++++++---------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 349 insertions(+), 429 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f281a3baad9f5f8f875…

1 0

Tag wine-3.6 : Alexandre Julliard : Release 3.6
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: refs/tags/wine-3.6 Tag: ca045dc2098ec9516a5909a733504bebdf226943 URL: https://source.winehq.org/git/wine.git/?a=tag;h=ca045dc2098ec9516a5909a7335… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 22:52:23 2018 +0200 Release 3.6

1 0

Alexandre Julliard : user32/tests: Cleanup helper macros.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 132c00fc9f4d464be1f5ea5d6309d83874e9ec8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=132c00fc9f4d464be1f5ea5d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 08:38:06 2018 +0200 user32/tests: Cleanup helper macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 780cfbb..2902913 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -54,7 +54,6 @@ static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; static BOOL iswin9x; -static HDC hdc; #define eq(received, expected, label, type) \ ok((received) == (expected), "%s: got " type " instead of " type "\n", (label),(received),(expected)) @@ -1443,21 +1442,21 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ ok(rc, "***warning*** failed to restore the original value: rc=%d err=%d\n", rc, GetLastError()); } -#define test_reg_metric( KEY, VAL, val) \ -{ INT regval;\ +#define test_reg_metric( KEY, VAL, val) do { \ + INT regval;\ regval = metricfromreg( KEY, VAL, dpi);\ ok( regval==val, "wrong value \"%s\" in registry %d, expected %d\n", VAL, regval, val);\ -} - -#define test_reg_metric2( KEY1, KEY2, VAL, val) \ -{ INT regval;\ +} while(0) + +#define test_reg_metric2( KEY1, KEY2, VAL, val) do { \ + INT regval;\ regval = metricfromreg( KEY1, VAL, dpi);\ if( regval != val) regval = metricfromreg( KEY2, VAL, dpi);\ ok( regval==val, "wrong value \"%s\" in registry %d, expected %d\n", VAL, regval, val);\ -} +} while(0) -#define test_reg_font( KEY, VAL, LF) \ -{ LOGFONTA lfreg;\ +#define test_reg_font( KEY, VAL, LF) do { \ + LOGFONTA lfreg;\ lffromreg( KEY, VAL, &lfreg);\ ok( (lfreg.lfHeight < 0 ? (LF).lfHeight == MulDiv( lfreg.lfHeight, dpi, real_dpi ) : \ MulDiv( -(LF).lfHeight , 72, dpi) == lfreg.lfHeight )&&\ @@ -1465,9 +1464,9 @@ static void test_SPI_SETDRAGFULLWINDOWS( void ) /* 37 */ (LF).lfWeight == lfreg.lfWeight &&\ !strcmp( (LF).lfFaceName, lfreg.lfFaceName)\ , "wrong value \"%s\" in registry %d, %d\n", VAL, (LF).lfHeight, lfreg.lfHeight);\ -} +} while(0) -#define TEST_NONCLIENTMETRICS_REG( ncm) \ +#define TEST_NONCLIENTMETRICS_REG( ncm) do { \ /*FIXME: test_reg_metric2( SPI_SETBORDER_REGKEY2, SPI_SETBORDER_REGKEY, SPI_SETBORDER_VALNAME, (ncm).iBorderWidth);*/\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLWIDTH_VALNAME, (ncm).iScrollWidth);\ test_reg_metric( SPI_METRIC_REGKEY, SPI_SCROLLHEIGHT_VALNAME, (ncm).iScrollHeight);\ @@ -1481,16 +1480,18 @@ test_reg_font( SPI_METRIC_REGKEY, SPI_MENUFONT_VALNAME, (ncm).lfMenuFont);\ test_reg_font( SPI_METRIC_REGKEY, SPI_CAPTIONFONT_VALNAME, (ncm).lfCaptionFont);\ test_reg_font( SPI_METRIC_REGKEY, SPI_SMCAPTIONFONT_VALNAME, (ncm).lfSmCaptionFont);\ test_reg_font( SPI_METRIC_REGKEY, SPI_STATUSFONT_VALNAME, (ncm).lfStatusFont);\ -test_reg_font( SPI_METRIC_REGKEY, SPI_MESSAGEFONT_VALNAME, (ncm).lfMessageFont); +test_reg_font( SPI_METRIC_REGKEY, SPI_MESSAGEFONT_VALNAME, (ncm).lfMessageFont); } while(0) /* get text metric height value for the specified logfont */ static int get_tmheight( LOGFONTA *plf, int flag) { TEXTMETRICA tm; + HDC hdc = GetDC(0); HFONT hfont = CreateFontIndirectA( plf); hfont = SelectObject( hdc, hfont); GetTextMetricsA( hdc, &tm); hfont = SelectObject( hdc, hfont); + ReleaseDC( 0, hdc ); return tm.tmHeight + (flag ? tm.tmExternalLeading : 0); } @@ -1528,7 +1529,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ Ncmorig.iSmCaptionHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_SMCAPTIONHEIGHT_VALNAME, dpi); Ncmorig.iMenuHeight = metricfromreg( SPI_METRIC_REGKEY, SPI_MENUHEIGHT_VALNAME, dpi); /* test registry entries */ - TEST_NONCLIENTMETRICS_REG( Ncmorig) + TEST_NONCLIENTMETRICS_REG( Ncmorig); Ncmorig.lfCaptionFont.lfHeight = MulDiv( Ncmorig.lfCaptionFont.lfHeight, real_dpi, dpi ); /* make small changes */ @@ -1567,7 +1568,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); /* test registry entries */ - TEST_NONCLIENTMETRICS_REG( Ncmcur) + TEST_NONCLIENTMETRICS_REG( Ncmcur ); /* test the system metrics with these settings */ test_GetSystemMetrics(); /* now for something invalid: increase the {menu|caption|smcaption} fonts @@ -1587,7 +1588,7 @@ static void test_SPI_SETNONCLIENTMETRICS( void ) /* 44 */ ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); test_change_message( SPI_SETNONCLIENTMETRICS, 1 ); /* raw values are in registry */ - TEST_NONCLIENTMETRICS_REG( Ncmnew) + TEST_NONCLIENTMETRICS_REG( Ncmnew ); /* get them back */ rc=SystemParametersInfoA( SPI_GETNONCLIENTMETRICS, sizeof(NONCLIENTMETRICSA), &Ncmcur, FALSE ); ok(rc, "SystemParametersInfoA: rc=%d err=%d\n", rc, GetLastError()); @@ -3304,6 +3305,7 @@ START_TEST(sysparams) char** argv; WNDCLASSA wc; MSG msg; + HDC hdc; HANDLE hThread; DWORD dwThreadId; HANDLE hInstance, hdll; @@ -3327,6 +3329,7 @@ START_TEST(sysparams) dpi = GetDeviceCaps( hdc, LOGPIXELSY); real_dpi = get_real_dpi(); trace("dpi %d real_dpi %d\n", dpi, real_dpi); + ReleaseDC( 0, hdc); iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */ @@ -3369,7 +3372,6 @@ START_TEST(sysparams) TranslateMessage( &msg ); DispatchMessageA( &msg ); } - ReleaseDC( 0, hdc); test_dpi_aware(); test_window_dpi();

1 0

Alexandre Julliard : user32/tests: Remove Win9x workarounds.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 6b42665b957c8c0b1c84f675f757a6496b67cf51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b42665b957c8c0b1c84f675… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 08:44:06 2018 +0200 user32/tests: Remove Win9x workarounds. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/sysparams.c | 88 +++++++++++-------------------------------- 1 file changed, 22 insertions(+), 66 deletions(-) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 2902913..3fa6fe2 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -53,7 +53,6 @@ static BOOL (WINAPI *pIsValidDpiAwarenessContext)(DPI_AWARENESS_CONTEXT); static BOOL strict; static int dpi, real_dpi; -static BOOL iswin9x; #define eq(received, expected, label, type) \ ok((received) == (expected), "%s: got " type " instead of " type "\n", (label),(received),(expected)) @@ -634,30 +633,17 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro BOOL rc; INT mi[3]; static int aw_turn = 0; - static BOOL w_implemented = TRUE; char buf[20]; int i; aw_turn++; rc = FALSE; - if ((aw_turn % 2!=0) && (w_implemented)) - { - /* call unicode on odd (non even) calls */ - SetLastError(0xdeadbeef); + SetLastError(0xdeadbeef); + if (aw_turn % 2) /* call unicode on odd (non even) calls */ rc=SystemParametersInfoW( SPI_SETMOUSE, 0, curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); - if (rc == FALSE && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) - { - w_implemented = FALSE; - trace("SystemParametersInfoW not supported on this platform\n"); - } - } - - if ((aw_turn % 2==0) || (!w_implemented)) - { - /* call ascii version on even calls or if unicode is not available */ + else rc=SystemParametersInfoA( SPI_SETMOUSE, 0, curr_val, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ); - } if (!test_error_msg(rc,"SPI_SETMOUSE")) return FALSE; ok(rc, "SystemParametersInfo: rc=%d err=%d\n", rc, GetLastError()); @@ -676,15 +662,12 @@ static BOOL run_spi_setmouse_test( int curr_val[], POINT *req_change, POINT *pro "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); } - if (w_implemented) - { - rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); - ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); - for (i = 0; i < 3; i++) - { - ok(mi[i] == curr_val[i], - "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); - } + rc=SystemParametersInfoW( SPI_GETMOUSE, 0, mi, 0 ); + ok(rc, "SystemParametersInfoW: rc=%d err=%d\n", rc, GetLastError()); + for (i = 0; i < 3; i++) + { + ok(mi[i] == curr_val[i], + "incorrect value for %d: %d != %d\n", i, mi[i], curr_val[i]); } if (0) @@ -860,15 +843,10 @@ static void test_SPI_SETBORDER( void ) /* 6 */ if ( old_border == 7 || old_border == 20 ) old_border = 1; - /* The SPI_SETBORDER seems to be buggy on Win9x/ME (looks like you need to - * do it twice to make the intended change). So skip parts of the tests on - * those platforms */ - if( !iswin9x) { - /* win2k3 fails if you set the same border twice, or if size is 0 */ - if (!test_setborder(2, 1, dpi)) return; - test_setborder(1, 1, dpi); - test_setborder(3, 1, dpi); - } + /* win2k3 fails if you set the same border twice, or if size is 0 */ + if (!test_setborder(2, 1, dpi)) return; + test_setborder(1, 1, dpi); + test_setborder(3, 1, dpi); if (!test_setborder(1, 0, dpi)) return; test_setborder(0, 0, dpi); test_setborder(3, 0, dpi); @@ -1175,8 +1153,7 @@ static void test_SPI_SETICONTITLEWRAP( void ) /* 26 */ if( regval != vals[i]) regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY1, SPI_SETICONTITLEWRAP_VALNAME, dpi); - ok( regval == vals[i] || broken(regval == -1), /* win9x */ - "wrong value in registry %d, expected %d\n", regval, vals[i] ); + ok( regval == vals[i], "wrong value in registry %d, expected %d\n", regval, vals[i] ); rc=SystemParametersInfoA( SPI_GETICONTITLEWRAP, 0, &v, 0 ); ok(rc, "%d: rc=%d err=%d\n", i, rc, GetLastError()); @@ -1768,10 +1745,10 @@ static void test_SPI_SETICONMETRICS( void ) /* 46 */ return; /* check some registry values */ regval = metricfromreg( SPI_ICONHORIZONTALSPACING_REGKEY, SPI_ICONHORIZONTALSPACING_VALNAME, dpi); - ok( regval==im_orig.iHorzSpacing || broken(regval == -1), /* nt4 */ + ok( regval==im_orig.iHorzSpacing, "wrong value in registry %d, expected %d\n", regval, im_orig.iHorzSpacing); regval = metricfromreg( SPI_ICONVERTICALSPACING_REGKEY, SPI_ICONVERTICALSPACING_VALNAME, dpi); - ok( regval==im_orig.iVertSpacing || broken(regval == -1), /* nt4 */ + ok( regval==im_orig.iVertSpacing, "wrong value in registry %d, expected %d\n", regval, im_orig.iVertSpacing); regval = metricfromreg( SPI_SETICONTITLEWRAP_REGKEY2, SPI_SETICONTITLEWRAP_VALNAME, dpi); if( regval != im_orig.iTitleWrap) @@ -1929,7 +1906,6 @@ static void test_SPI_SETSHOWSOUNDS( void ) /* 57 */ trace("testing SPI_{GET,SET}SHOWSOUNDS\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETSHOWSOUNDS, 0, &old_b, 0 ); - /* SPI_{GET,SET}SHOWSOUNDS is completely broken on Win9x */ if (!test_error_msg(rc,"SPI_{GET,SET}SHOWSOUNDS")) return; @@ -2036,7 +2012,6 @@ static void test_SPI_SETFONTSMOOTHING( void ) /* 75 */ unsigned int i; trace("testing SPI_{GET,SET}FONTSMOOTHING\n"); - if( iswin9x) return; /* 95/98/ME don't seem to implement this fully */ SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETFONTSMOOTHING, 0, &old_b, 0 ); if (!test_error_msg(rc,"SPI_{GET,SET}FONTSMOOTHING")) @@ -2139,9 +2114,7 @@ static void test_SPI_SETLOWPOWERACTIVE( void ) /* 85 */ v = 0xdeadbeef; rc=SystemParametersInfoA( SPI_GETLOWPOWERACTIVE, 0, &v, 0 ); ok(rc, "%d: rc=%d err=%d\n", i, rc, GetLastError()); - ok(v == vals[i] || - broken(v == (0xdead0000 | vals[i])) || /* win98 only sets the low word */ - v == 0, /* win2k3 */ + ok(v == vals[i] || v == 0, /* win2k3 */ "SPI_GETLOWPOWERACTIVE: got %d instead of 0 or %d\n", v, vals[i]); } @@ -2179,9 +2152,7 @@ static void test_SPI_SETPOWEROFFACTIVE( void ) /* 86 */ v = 0xdeadbeef; rc=SystemParametersInfoA( SPI_GETPOWEROFFACTIVE, 0, &v, 0 ); ok(rc, "%d: rc=%d err=%d\n", i, rc, GetLastError()); - ok(v == vals[i] || - broken(v == (0xdead0000 | vals[i])) || /* win98 only sets the low word */ - v == 0, /* win2k3 */ + ok(v == vals[i] || v == 0, /* win2k3 */ "SPI_GETPOWEROFFACTIVE: got %d instead of 0 or %d\n", v, vals[i]); } @@ -2234,12 +2205,9 @@ static void test_SPI_SETMOUSEHOVERWIDTH( void ) /* 99 */ trace("testing SPI_{GET,SET}MOUSEHOVERWIDTH\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETMOUSEHOVERWIDTH, 0, &old_width, 0 ); - /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite - * what MSDN states (Verified on Win98SE) - */ if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEHOVERWIDTH")) return; - + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) { UINT v; @@ -2274,12 +2242,9 @@ static void test_SPI_SETMOUSEHOVERHEIGHT( void ) /* 101 */ trace("testing SPI_{GET,SET}MOUSEHOVERHEIGHT\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETMOUSEHOVERHEIGHT, 0, &old_height, 0 ); - /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite - * what MSDN states (Verified on Win98SE) - */ if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEHOVERHEIGHT")) return; - + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) { UINT v; @@ -2318,12 +2283,9 @@ static void test_SPI_SETMOUSEHOVERTIME( void ) /* 103 */ trace("testing SPI_{GET,SET}MOUSEHOVERTIME\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA( SPI_GETMOUSEHOVERTIME, 0, &old_time, 0 ); - /* SPI_{GET,SET}MOUSEHOVERWIDTH does not seem to be supported on Win9x despite - * what MSDN states (Verified on Win98SE) - */ if (!test_error_msg(rc,"SPI_{GET,SET}MOUSEHOVERTIME")) return; - + for (i=0;i<sizeof(vals)/sizeof(*vals);i++) { UINT v; @@ -2473,9 +2435,6 @@ static void test_SPI_SETWALLPAPER( void ) /* 115 */ trace("testing SPI_{GET,SET}DESKWALLPAPER\n"); SetLastError(0xdeadbeef); rc=SystemParametersInfoA(SPI_GETDESKWALLPAPER, 260, oldval, 0); - /* SPI_{GET,SET}DESKWALLPAPER is completely broken on Win9x and - * unimplemented on NT4 - */ if (!test_error_msg(rc,"SPI_{GET,SET}DESKWALLPAPER")) return; @@ -2947,13 +2906,11 @@ static void test_EnumDisplaySettings(void) DWORD num; memset(&devmode, 0, sizeof(devmode)); - /* Win95 doesn't handle ENUM_CURRENT_SETTINGS correctly */ EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &devmode); hdc = GetDC(0); val = GetDeviceCaps(hdc, BITSPIXEL); - ok(devmode.dmBitsPerPel == val || - broken(devmode.dmDeviceName[0] == 0), /* Win95 */ + ok(devmode.dmBitsPerPel == val, "GetDeviceCaps(BITSPIXEL) returned %d, EnumDisplaySettings returned %d\n", val, devmode.dmBitsPerPel); @@ -3330,7 +3287,6 @@ START_TEST(sysparams) real_dpi = get_real_dpi(); trace("dpi %d real_dpi %d\n", dpi, real_dpi); ReleaseDC( 0, hdc); - iswin9x = GetVersion() & 0x80000000; /* This test requires interactivity, if we don't have it, give up */ if (!SystemParametersInfoA( SPI_SETBEEP, TRUE, 0, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE ) &&

1 0

Alexandre Julliard : user32: Included padded border into the border width in NONCLIENTMETRICS.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: d4d12801bc15b1ec0bdf13d935f7040256f1c303 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d4d12801bc15b1ec0bdf13d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:15:40 2018 +0200 user32: Included padded border into the border width in NONCLIENTMETRICS. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 14 ++++++++------ dlls/user32/tests/sysparams.c | 2 ++ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 7b948eb..3ee0781 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -1616,10 +1616,12 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, case SPI_GETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; + int padded_border; if (!pvParam) return FALSE; ret = get_entry( &entry_BORDER, 0, &lpnm->iBorderWidth ) && + get_entry( &entry_PADDEDBORDERWIDTH, 0, &padded_border ) && get_entry( &entry_SCROLLWIDTH, 0, &lpnm->iScrollWidth ) && get_entry( &entry_SCROLLHEIGHT, 0, &lpnm->iScrollHeight ) && get_entry( &entry_CAPTIONWIDTH, 0, &lpnm->iCaptionWidth ) && @@ -1633,19 +1635,22 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, get_entry( &entry_MENULOGFONT, 0, &lpnm->lfMenuFont ) && get_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont ) && get_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont ); - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) - ret = get_entry( &entry_PADDEDBORDERWIDTH, 0, &lpnm->iPaddedBorderWidth ); + lpnm->iBorderWidth += padded_border; + if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) lpnm->iPaddedBorderWidth = 0; normalize_nonclientmetrics( lpnm ); break; } case SPI_SETNONCLIENTMETRICS: { LPNONCLIENTMETRICSW lpnm = pvParam; + int padded_border; if (lpnm && (lpnm->cbSize == sizeof(NONCLIENTMETRICSW) || lpnm->cbSize == FIELD_OFFSET(NONCLIENTMETRICSW, iPaddedBorderWidth))) { - ret = set_entry( &entry_BORDER, lpnm->iBorderWidth, NULL, fWinIni ) && + get_entry( &entry_PADDEDBORDERWIDTH, 0, &padded_border ); + + ret = set_entry( &entry_BORDER, lpnm->iBorderWidth - padded_border, NULL, fWinIni ) && set_entry( &entry_SCROLLWIDTH, lpnm->iScrollWidth, NULL, fWinIni ) && set_entry( &entry_SCROLLHEIGHT, lpnm->iScrollHeight, NULL, fWinIni ) && set_entry( &entry_CAPTIONWIDTH, lpnm->iCaptionWidth, NULL, fWinIni ) && @@ -1659,9 +1664,6 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, set_entry( &entry_SMCAPTIONLOGFONT, 0, &lpnm->lfSmCaptionFont, fWinIni ) && set_entry( &entry_STATUSLOGFONT, 0, &lpnm->lfStatusFont, fWinIni ) && set_entry( &entry_MESSAGELOGFONT, 0, &lpnm->lfMessageFont, fWinIni ); - - if (ret && lpnm->cbSize == sizeof(NONCLIENTMETRICSW)) - set_entry( &entry_PADDEDBORDERWIDTH, lpnm->iPaddedBorderWidth, NULL, fWinIni ); } break; } diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 3fa6fe2..95273f2 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -2710,8 +2710,10 @@ static void test_GetSystemMetrics( void) ncm.cbSize = sizeof(ncm); /* Vista added padding */ SetLastError(0xdeadbeef); + ncm.iPaddedBorderWidth = 0xcccc; rc = SystemParametersInfoA(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0); ok(rc || broken(!rc) /* before Vista */, "SystemParametersInfoA failed\n"); + if (rc) ok( ncm.iPaddedBorderWidth == 0, "wrong iPaddedBorderWidth %u\n", ncm.iPaddedBorderWidth ); minim.cbSize = sizeof( minim); ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICSA, iPaddedBorderWidth);

1 0

Alexandre Julliard : user32: Fix position of the small icon in the caption bar.
by Alexandre Julliard 13 Apr '18

13 Apr '18

Module: wine Branch: master Commit: 9c225fc3f962f587459774f2c400720b436ba696 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9c225fc3f962f587459774f2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 13 14:33:58 2018 +0200 user32: Fix position of the small icon in the caption bar. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/nonclient.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index fcf32f0..3f3d96a 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -703,7 +703,7 @@ BOOL NC_DrawSysButton (HWND hwnd, HDC hdc, BOOL down) NC_GetInsideRect( hwnd, COORDS_WINDOW, &rect, style, ex_style ); pt.x = rect.left + 2; - pt.y = (rect.top + GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; + pt.y = rect.top + (GetSystemMetrics(SM_CYCAPTION) - GetSystemMetrics(SM_CYSMICON)) / 2; DrawIconEx (hdc, pt.x, pt.y, hIcon, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), 0, 0, DI_NORMAL);

1 0