January 2023 - Wine-commits

Francisco Casas : vkd3d-shader/hlsl: Use add_unary_arithmetic_expr() in intrinsic_pow().
by Alexandre Julliard 11 Jan '23

11 Jan '23

Module: vkd3d Branch: master Commit: 5b1030e0cb216c9a3985561511736fc427b76be5 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/5b1030e0cb216c9a3985561511736… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Nov 7 19:20:01 2022 -0300 vkd3d-shader/hlsl: Use add_unary_arithmetic_expr() in intrinsic_pow(). Using add_unary_arithmetic_expr() instead of hlsl_new_unary_expr() allows the intrinsic to work with matrices. Otherwise we get: E5017: Aborting due to not yet implemented feature: Copying from unsupported node type. because an HLSL_IR_EXPR reaches split_matrix_copies(). --- libs/vkd3d-shader/hlsl.y | 7 +++---- tests/pow.shader_test | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index cbc59bc5..f67b5118 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2661,16 +2661,15 @@ static bool intrinsic_pow(struct hlsl_ctx *ctx, if (!elementwise_intrinsic_float_convert_args(ctx, params, loc)) return false; - if (!(log = hlsl_new_unary_expr(ctx, HLSL_OP1_LOG2, params->args[0], *loc))) + if (!(log = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, params->args[0], loc))) return false; - list_add_tail(params->instrs, &log->entry); if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, params->args[1], log, loc))) return false; - if (!(exp = hlsl_new_unary_expr(ctx, HLSL_OP1_EXP2, mul, *loc))) + if (!(exp = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, mul, loc))) return false; - list_add_tail(params->instrs, &exp->entry); + return true; } diff --git a/tests/pow.shader_test b/tests/pow.shader_test index 0c1d7de3..1bb3bd94 100644 --- a/tests/pow.shader_test +++ b/tests/pow.shader_test @@ -10,7 +10,7 @@ draw quad probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4 -[pixel shader todo] +[pixel shader] float4 main() : sv_target { float2x3 a = {1, 2, 3, 4, 5, 6}; @@ -21,8 +21,8 @@ float4 main() : sv_target } [test] -todo draw quad -todo probe all rgba (1.0, 32.0, 256.0, 125.0) +draw quad +probe all rgba (1.0, 32.0, 256.0, 125.0) 2 [pixel shader fail]

1 0

Paul Gofman : dwmapi: Fill qpcVBlank in DwmGetCompositionTimingInfo().
by Alexandre Julliard 10 Jan '23

10 Jan '23

Module: wine Branch: master Commit: 62fa96df16a0285cce1694ce47eef946f75bfd42 URL: https://gitlab.winehq.org/wine/wine/-/commit/62fa96df16a0285cce1694ce47eef9… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jan 9 15:53:32 2023 -0600 dwmapi: Fill qpcVBlank in DwmGetCompositionTimingInfo(). --- dlls/dwmapi/dwmapi_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 56730f79cac..9ec03185f36 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -235,7 +235,7 @@ static int get_display_frequency(void) */ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) { - LARGE_INTEGER performance_frequency; + LARGE_INTEGER performance_frequency, qpc; static int i, display_frequency; if (!info) @@ -258,6 +258,9 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) QueryPerformanceFrequency(&performance_frequency); info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; + QueryPerformanceCounter(&qpc); + info->qpcVBlank = (qpc.QuadPart / info->qpcRefreshPeriod) * info->qpcRefreshPeriod; + return S_OK; }

1 0

Jacek Caban : include: Add vadefs.h header.
by Alexandre Julliard 10 Jan '23

10 Jan '23

Module: wine Branch: master Commit: 4c7e7ccac9f2b33d8685fd830e9468a1599f33fd URL: https://gitlab.winehq.org/wine/wine/-/commit/4c7e7ccac9f2b33d8685fd830e9468… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 17:49:24 2022 +0100 include: Add vadefs.h header. Based on mingw-w64. --- include/Makefile.in | 1 + include/msvcrt/vadefs.h | 52 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 23a4265a437..c24ba7eff07 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -527,6 +527,7 @@ SOURCES = \ msvcrt/time.h \ msvcrt/uchar.h \ msvcrt/unistd.h \ + msvcrt/vadefs.h \ msvcrt/wchar.h \ msvcrt/wctype.h \ mswsock.h \ diff --git a/include/msvcrt/vadefs.h b/include/msvcrt/vadefs.h new file mode 100644 index 00000000000..2a612fc055c --- /dev/null +++ b/include/msvcrt/vadefs.h @@ -0,0 +1,52 @@ +/* + * Variable argument definitions + * + * Copyright 2022 Jacek Caban + * + * 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 + */ + +#ifndef _INC_VADEFS +#define _INC_VADEFS + +#ifdef __cplusplus +#define _ADDRESSOF(v) (&reinterpret_cast<const char &>(v)) +#else +#define _ADDRESSOF(v) (&(v)) +#endif + +#if defined(__GNUC__) || defined(__clang__) + +typedef __builtin_va_list va_list; +#define _crt_va_start(v,l) __builtin_va_start(v,l) +#define _crt_va_arg(v,l) __builtin_va_arg(v,l) +#define _crt_va_end(v) __builtin_va_end(v) +#define _crt_va_copy(d,s) __builtin_va_copy(d,s) + +#else + +typedef char *va_list; + +#if defined(__i386__) +#define _INTSIZEOF(n) ((sizeof(n) + sizeof(int) - 1) & ~(sizeof(int) - 1)) +#define _crt_va_start(v,l) ((v) = (va_list)_ADDRESSOF(l) + _INTSIZEOF(l)) +#define _crt_va_arg(v,l) (*(l *)(((v) += _INTSIZEOF(l)) - _INTSIZEOF(l))) +#define _crt_va_end(v) ((v) = (va_list)0) +#define _crt_va_copy(d,s) ((d) = (s)) +#endif + +#endif + +#endif /* _INC_VADEFS */

1 0

Jacek Caban : include: Add stdarg.h header.
by Alexandre Julliard 10 Jan '23

10 Jan '23

Module: wine Branch: master Commit: 4d8091cccc46053c605e68eccd27b94ec297f28e URL: https://gitlab.winehq.org/wine/wine/-/commit/4d8091cccc46053c605e68eccd27b9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 8 17:52:23 2022 +0100 include: Add stdarg.h header. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54263 --- include/Makefile.in | 1 + include/msvcrt/stdarg.h | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index c24ba7eff07..54cbf4d955c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -512,6 +512,7 @@ SOURCES = \ msvcrt/setjmp.h \ msvcrt/share.h \ msvcrt/signal.h \ + msvcrt/stdarg.h \ msvcrt/stdbool.h \ msvcrt/stddef.h \ msvcrt/stdint.h \ diff --git a/include/msvcrt/stdarg.h b/include/msvcrt/stdarg.h new file mode 100644 index 00000000000..6c6b6048351 --- /dev/null +++ b/include/msvcrt/stdarg.h @@ -0,0 +1,31 @@ +/* + * Variable argument definitions + * + * Copyright 2022 Jacek Caban + * + * 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 + */ + +#ifndef _INC_STDARG +#define _INC_STDARG + +#include <vadefs.h> + +#define va_start(v,l) _crt_va_start(v,l) +#define va_arg(v,l) _crt_va_arg(v,l) +#define va_end(v) _crt_va_end(v) +#define va_copy(d,s) _crt_va_copy(d,s) + +#endif /* _INC_STDARG */

1 0

Alexandre Julliard : wow64: Initialize win32u syscall table when it is mapped.
by Alexandre Julliard 10 Jan '23

10 Jan '23

Module: wine Branch: master Commit: f2a07805b9b027da9a1caaf6023abc90bc950459 URL: https://gitlab.winehq.org/wine/wine/-/commit/f2a07805b9b027da9a1caaf6023abc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 15:35:53 2023 +0100 wow64: Initialize win32u syscall table when it is mapped. --- dlls/wow64/syscall.c | 75 +++++++++++++--------------------------------------- 1 file changed, 18 insertions(+), 57 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 8be5a1c300c..5ba9cd14954 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -88,6 +88,7 @@ SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; /* wow64win syscall table */ static const SYSTEM_SERVICE_TABLE *psdwhwin32; +static HMODULE win32u_module; /* cpu backend dll functions */ static void * (WINAPI *pBTCpuGetBopCode)(void); @@ -392,17 +393,6 @@ static DWORD get_syscall_num( const BYTE *syscall ) } -/********************************************************************** - * init_image_mapping - */ -void init_image_mapping( HMODULE module ) -{ - void **ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); - - if (ptr) *ptr = pBTCpuGetBopCode(); -} - - /********************************************************************** * init_syscall_table */ @@ -467,6 +457,23 @@ static void init_syscall_table( HMODULE module, ULONG idx, const SYSTEM_SERVICE_ } +/********************************************************************** + * init_image_mapping + */ +void init_image_mapping( HMODULE module ) +{ + void **ptr = RtlFindExportedRoutineByName( module, "Wow64Transition" ); + + if (!ptr) return; + *ptr = pBTCpuGetBopCode(); + if (!win32u_module && RtlFindExportedRoutineByName( module, "NtUserInitializeClientPfnArrays" )) + { + win32u_module = module; + init_syscall_table( win32u_module, 1, psdwhwin32 ); + } +} + + /********************************************************************** * load_64bit_module */ @@ -489,48 +496,6 @@ static HMODULE load_64bit_module( const WCHAR *name ) } -/********************************************************************** - * load_32bit_module - */ -static HMODULE load_32bit_module( const WCHAR *name ) -{ - NTSTATUS status; - UNICODE_STRING str; - WCHAR path[MAX_PATH]; - HANDLE file, mapping; - LARGE_INTEGER size; - IO_STATUS_BLOCK io; - OBJECT_ATTRIBUTES attr; - SIZE_T len = 0; - void *module = NULL; - const WCHAR *dir = get_machine_wow64_dir( current_machine ); - - swprintf( path, MAX_PATH, L"%s\\%s", dir, name ); - RtlInitUnicodeString( &str, path ); - InitializeObjectAttributes( &attr, &str, OBJ_CASE_INSENSITIVE, 0, NULL ); - if ((status = NtOpenFile( &file, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_DELETE, - FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE ))) goto failed; - - size.QuadPart = 0; - status = NtCreateSection( &mapping, STANDARD_RIGHTS_REQUIRED | SECTION_QUERY | - SECTION_MAP_READ | SECTION_MAP_EXECUTE, - NULL, &size, PAGE_EXECUTE_READ, SEC_IMAGE, file ); - NtClose( file ); - if (status) goto failed; - - status = NtMapViewOfSection( mapping, GetCurrentProcess(), &module, 0, 0, NULL, &len, - ViewShare, 0, PAGE_EXECUTE_READ ); - NtClose( mapping ); - if (!status) return module; - -failed: - ERR( "failed to load dll %lx\n", status ); - NtTerminateProcess( GetCurrentProcess(), status ); - return NULL; -} - - /********************************************************************** * get_cpu_dll_name */ @@ -589,10 +554,6 @@ static DWORD WINAPI process_init( RTL_RUN_ONCE *once, void *param, void **contex *(void **)RtlFindExportedRoutineByName( module, "__wine_syscall_dispatcher" ) = pBTCpuGetBopCode(); *(void **)RtlFindExportedRoutineByName( module, "__wine_unix_call_dispatcher" ) = p__wine_get_unix_opcode(); - module = load_32bit_module( L"win32u.dll" ); - init_syscall_table( module, 1, psdwhwin32 ); - NtUnmapViewOfSection( GetCurrentProcess(), module ); - init_file_redirects(); return TRUE;

1 0

Stefan Dösinger : wined3d: Clamp the bound buffer range to the buffer size.
by Alexandre Julliard 10 Jan '23

10 Jan '23

Module: wine Branch: master Commit: 09cafcc3b6eff3b046d3c08f64d9c1fb9ce54c47 URL: https://gitlab.winehq.org/wine/wine/-/commit/09cafcc3b6eff3b046d3c08f64d9c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jan 4 11:16:14 2023 +0300 wined3d: Clamp the bound buffer range to the buffer size. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53671 --- dlls/wined3d/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index eb25f01130e..a6d0b174e31 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4618,7 +4618,9 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state buffer = buffer_state->buffer; bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, - bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, buffer_state->size)); + bo_gl->id, bo_gl->b.buffer_offset + buffer_state->offset, + min(buffer_state->size, buffer->resource.size - buffer_state->offset))); + buffer->bo_user.valid = true; } checkGLcall("bind constant buffers");

1 0

Gabriel Ivăncescu : winex11.drv: Obtain icon info for icons passed to fetch_icon_data().
by Alexandre Julliard 09 Jan '23

09 Jan '23

Module: wine Branch: master Commit: 95b96a4a84c9038e788a2fd888b0a669ebb4a3a1 URL: https://gitlab.winehq.org/wine/wine/-/commit/95b96a4a84c9038e788a2fd888b0a6… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jan 9 17:22:16 2023 +0200 winex11.drv: Obtain icon info for icons passed to fetch_icon_data(). SetWindowIcon can pass an icon as a parameter, but in that case NtUserGetIconInfo is never called, so the icon info is never filled. Fixes a regression introduced by 3eb944c0a7a1b4857cb0b74d04a8450b636c98de. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/winex11.drv/window.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 603314ff3bb..98b0b23e103 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -625,6 +625,7 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) unsigned long *bits; Pixmap icon_pixmap, mask_pixmap; + icon_big = get_icon_info( icon_big, &ii ); if (!icon_big) { icon_big = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_BIG, 0 ), &ii ); @@ -637,6 +638,8 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) icon_big = get_icon_info( icon_big, &ii ); } } + + icon_small = get_icon_info( icon_small, &ii_small ); if (!icon_small) { icon_small = get_icon_info( (HICON)send_message( hwnd, WM_GETICON, ICON_SMALL, 0 ), &ii_small );

1 0

Zhiyi Zhang : win32u: Introduce a get_display_depth() helper to retrieve emulated display depth.
by Alexandre Julliard 09 Jan '23

09 Jan '23

Module: wine Branch: master Commit: d81cf4ed555e87e469146829b86bd3bca801efd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/d81cf4ed555e87e469146829b86bd3… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jan 3 22:38:09 2023 +0800 win32u: Introduce a get_display_depth() helper to retrieve emulated display depth. Using EnumDisplaySettings() directly to query display depth has a high overhead when using the XRandR 1.0 display device handler on some NVIDIA setups. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51420 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53382 --- dlls/win32u/driver.c | 19 +++++++++++++------ dlls/win32u/sysparams.c | 25 +++++++++++++++++++++++++ dlls/win32u/win32u_private.h | 1 + dlls/winemac.drv/display.c | 8 ++++++++ dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winex11.drv/display.c | 10 ++++++++++ dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + include/wine/gdi_driver.h | 1 + 10 files changed, 62 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 557d555d673..e2c9ba04efd 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -207,18 +207,13 @@ static INT CDECL nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case BITSPIXEL: { UNICODE_STRING display; - DEVMODEW devmode; DC *dc; if (NtGdiGetDeviceCaps( dev->hdc, TECHNOLOGY ) == DT_RASDISPLAY) { dc = get_nulldrv_dc( dev ); - memset( &devmode, 0, sizeof(devmode) ); - devmode.dmSize = sizeof(devmode); RtlInitUnicodeString( &display, dc->display ); - if (NtUserEnumDisplaySettings( &display, ENUM_CURRENT_SETTINGS, &devmode, 0 ) && - (devmode.dmFields & DM_BITSPERPEL) && devmode.dmBitsPerPel) - return devmode.dmBitsPerPel; + return get_display_depth( &display ); } return 32; } @@ -764,6 +759,11 @@ static BOOL nulldrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LP return FALSE; /* use default implementation */ } +static INT nulldrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) +{ + return 32; +} + static BOOL nulldrv_UpdateDisplayDevices( const struct gdi_device_manager *manager, BOOL force, void *param ) { return FALSE; @@ -1077,6 +1077,11 @@ static BOOL loaderdrv_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, return load_driver()->pGetCurrentDisplaySettings( name, is_primary, mode ); } +static INT loaderdrv_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) +{ + return load_driver()->pGetDisplayDepth( name, is_primary ); +} + static void loaderdrv_SetCursor( HCURSOR cursor ) { load_driver()->pSetCursor( cursor ); @@ -1179,6 +1184,7 @@ static const struct user_driver_funcs lazy_load_driver = /* display modes */ loaderdrv_ChangeDisplaySettings, loaderdrv_GetCurrentDisplaySettings, + loaderdrv_GetDisplayDepth, loaderdrv_UpdateDisplayDevices, /* windowing functions */ loaderdrv_CreateDesktopWindow, @@ -1254,6 +1260,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(UpdateClipboard); SET_USER_FUNC(ChangeDisplaySettings); SET_USER_FUNC(GetCurrentDisplaySettings); + SET_USER_FUNC(GetDisplayDepth); SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktopWindow); SET_USER_FUNC(CreateWindow); diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 13aaaa308c9..2269193b7ff 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -2655,6 +2655,31 @@ static unsigned int active_monitor_count(void) return count; } +INT get_display_depth( UNICODE_STRING *name ) +{ + struct display_device *device; + INT depth; + + if (!lock_display_devices()) + return 32; + + if (name && name->Length) + device = find_adapter_device_by_name( name ); + else + device = find_adapter_device_by_id( 0 ); /* use primary adapter */ + + if (!device) + { + unlock_display_devices(); + return 32; + } + + depth = user_driver->pGetDisplayDepth( device->device_name, + !!(device->state_flags & DISPLAY_DEVICE_PRIMARY_DEVICE) ); + unlock_display_devices(); + return depth; +} + /*********************************************************************** * NtUserEnumDisplayMonitors (win32u.@) */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index dfa83daba91..96b1b7647fe 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -334,6 +334,7 @@ extern BOOL enable_thunk_lock DECLSPEC_HIDDEN; extern HBRUSH get_55aa_brush(void) DECLSPEC_HIDDEN; extern DWORD get_dialog_base_units(void) DECLSPEC_HIDDEN; extern LONG get_char_dimensions( HDC hdc, TEXTMETRICW *metric, int *height ) DECLSPEC_HIDDEN; +extern INT get_display_depth( UNICODE_STRING *name ) DECLSPEC_HIDDEN; extern RECT get_display_rect( const WCHAR *display ) DECLSPEC_HIDDEN; extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 12e12d297d9..dab81cc8ffb 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -927,6 +927,14 @@ BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR devname, BOOL is_primary, LPDEVMOD return TRUE; } +/*********************************************************************** + * GetDisplayDepth (MACDRV.@) + * + */ +INT macdrv_GetDisplayDepth(LPCWSTR name, BOOL is_primary) +{ + return get_default_bpp(); +} /*********************************************************************** * GetDeviceGammaRamp (MACDRV.@) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index 193a3f4bbd2..fd1da722061 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -276,6 +276,7 @@ static const struct user_driver_funcs macdrv_funcs = .pDestroyCursorIcon = macdrv_DestroyCursorIcon, .pDestroyWindow = macdrv_DestroyWindow, .pGetCurrentDisplaySettings = macdrv_GetCurrentDisplaySettings, + .pGetDisplayDepth = macdrv_GetDisplayDepth, .pUpdateDisplayDevices = macdrv_UpdateDisplayDevices, .pGetCursorPos = macdrv_GetCursorPos, .pGetKeyboardLayoutList = macdrv_GetKeyboardLayoutList, diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index f6f9e5b6c67..40f70e55094 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -124,6 +124,7 @@ extern BOOL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags) DECLSPEC_HIDDEN; extern void macdrv_Beep(void) DECLSPEC_HIDDEN; extern LONG macdrv_ChangeDisplaySettings(LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid) DECLSPEC_HIDDEN; extern BOOL macdrv_GetCurrentDisplaySettings(LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode) DECLSPEC_HIDDEN; +extern INT macdrv_GetDisplayDepth(LPCWSTR name, BOOL is_primary) DECLSPEC_HIDDEN; extern LRESULT macdrv_ClipboardWindowProc(HWND hwnd, UINT msg, WPARAM wp, LPARAM lp) DECLSPEC_HIDDEN; extern BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 5e8305432a0..34085c49543 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -239,6 +239,16 @@ static DWORD get_display_depth(ULONG_PTR display_id) return screen_bpp; } +INT X11DRV_GetDisplayDepth(LPCWSTR name, BOOL is_primary) +{ + ULONG_PTR id; + + if (settings_handler.get_id( name, is_primary, &id )) + return get_display_depth( id ); + + return screen_bpp; +} + /*********************************************************************** * GetCurrentDisplaySettings (X11DRV.@) * diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index 4ebe3a16367..7e343591413 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -405,6 +405,7 @@ static const struct user_driver_funcs x11drv_funcs = .pClipCursor = X11DRV_ClipCursor, .pChangeDisplaySettings = X11DRV_ChangeDisplaySettings, .pGetCurrentDisplaySettings = X11DRV_GetCurrentDisplaySettings, + .pGetDisplayDepth = X11DRV_GetDisplayDepth, .pUpdateDisplayDevices = X11DRV_UpdateDisplayDevices, .pCreateDesktopWindow = X11DRV_CreateDesktopWindow, .pCreateWindow = X11DRV_CreateWindow, diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index b394795a326..4997367ce9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -216,6 +216,7 @@ extern BOOL X11DRV_GetCursorPos( LPPOINT pos ) DECLSPEC_HIDDEN; extern BOOL X11DRV_ClipCursor( LPCRECT clip ) DECLSPEC_HIDDEN; extern LONG X11DRV_ChangeDisplaySettings( LPDEVMODEW displays, LPCWSTR primary_name, HWND hwnd, DWORD flags, LPVOID lpvoid ) DECLSPEC_HIDDEN; extern BOOL X11DRV_GetCurrentDisplaySettings( LPCWSTR name, BOOL is_primary, LPDEVMODEW devmode ) DECLSPEC_HIDDEN; +extern INT X11DRV_GetDisplayDepth( LPCWSTR name, BOOL is_primary ) DECLSPEC_HIDDEN; extern BOOL X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device_manager, BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index d074c09cceb..3db3d0d6af3 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -299,6 +299,7 @@ struct user_driver_funcs /* display modes */ LONG (*pChangeDisplaySettings)(LPDEVMODEW,LPCWSTR,HWND,DWORD,LPVOID); BOOL (*pGetCurrentDisplaySettings)(LPCWSTR,BOOL,LPDEVMODEW); + INT (*pGetDisplayDepth)(LPCWSTR,BOOL); BOOL (*pUpdateDisplayDevices)(const struct gdi_device_manager *,BOOL,void*); /* windowing functions */ BOOL (*pCreateDesktopWindow)(HWND);

1 0

Hans Leidekker : iphlpapi: Handle errors from DnsQueryConfig(DnsConfigDnsServerList).
by Alexandre Julliard 09 Jan '23

09 Jan '23

Module: wine Branch: master Commit: fbf4544f7d49fab5bc00b972cd6c9441004cf3e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/fbf4544f7d49fab5bc00b972cd6c94… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 6 14:05:45 2023 +0100 iphlpapi: Handle errors from DnsQueryConfig(DnsConfigDnsServerList). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52557 --- dlls/iphlpapi/iphlpapi_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index a95a581532f..f8fb5de3f0e 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -2599,6 +2599,7 @@ static DWORD get_dns_server_list( const NET_LUID *luid, IP_ADDR_STRING *list, IP for (;;) { err = DnsQueryConfig( DnsConfigDnsServerList, 0, NULL, NULL, servers, &array_len ); + if (err != ERROR_SUCCESS && err != ERROR_MORE_DATA) goto err; num = (array_len - FIELD_OFFSET(IP4_ARRAY, AddrArray[0])) / sizeof(IP4_ADDRESS); needed = num * sizeof(IP_ADDR_STRING); if (!list || *len < needed)

1 0

Gabriel Ivăncescu : win32u: Initialize the tracking_info for NtUserDrawScrollBar params.
by Alexandre Julliard 09 Jan '23

09 Jan '23

Module: wine Branch: master Commit: 29ebb5b3ec2b09a77676df31f21eb9142ee287f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/29ebb5b3ec2b09a77676df31f21eb9… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jan 6 21:20:06 2023 +0200 win32u: Initialize the tracking_info for NtUserDrawScrollBar params. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/win32u/scroll.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index de688e36f23..ce3af5189d3 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -354,6 +354,7 @@ void draw_scroll_bar( HWND hwnd, HDC hdc, int bar, enum SCROLL_HITTEST hit_test, params.hdc = hdc; params.bar = bar; params.hit_test = hit_test; + params.tracking_info = *tracking_info; params.arrows = draw_arrows; params.interior = draw_interior; KeUserModeCallback( NtUserDrawScrollBar, &params, sizeof(params), &ret_ptr, &ret_len );

1 0