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

Rémi Bernon : wineandroid.drv: Add missing DM_DISPLAYORIENTATION | DM_POSITION flags.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 9698243f44fcae4e1a948a13bef6150e6d7644be URL: https://gitlab.winehq.org/wine/wine/-/commit/9698243f44fcae4e1a948a13bef615… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 28 15:03:25 2022 +0200 wineandroid.drv: Add missing DM_DISPLAYORIENTATION | DM_POSITION flags. --- dlls/wineandroid.drv/init.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index bb691c4cf20..4ddc66e73e8 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -325,7 +325,8 @@ BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, D devmode->dmPelsHeight = screen_height; devmode->dmBitsPerPel = screen_bpp; devmode->dmDisplayFrequency = 60; - devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + devmode->dmFields = DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | + DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; TRACE( "mode %d -- %dx%d %d bpp @%d Hz\n", n, devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); @@ -347,7 +348,8 @@ BOOL ANDROID_GetCurrentDisplaySettings( LPCWSTR name, LPDEVMODEW devmode ) devmode->dmPelsHeight = screen_height; devmode->dmBitsPerPel = screen_bpp; devmode->dmDisplayFrequency = 60; - devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + devmode->dmFields = DM_POSITION | DM_DISPLAYORIENTATION | DM_PELSWIDTH | DM_PELSHEIGHT | + DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; TRACE( "current mode -- %dx%d %d bpp @%d Hz\n", devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel, devmode->dmDisplayFrequency );

1 0

Rémi Bernon : win32u: Split EnumDisplaySettingsEx into CurrentDisplaySettings entry.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 82a77607da032bc04df04b49272d63955c92a39f URL: https://gitlab.winehq.org/wine/wine/-/commit/82a77607da032bc04df04b49272d63… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 10:20:33 2022 +0200 win32u: Split EnumDisplaySettingsEx into CurrentDisplaySettings entry. --- dlls/win32u/driver.c | 12 +++ dlls/win32u/sysparams.c | 3 +- dlls/wineandroid.drv/init.c | 25 +++++- dlls/winemac.drv/display.c | 183 +++++++++++++++++++++++++++----------------- dlls/winemac.drv/gdi.c | 1 + dlls/winemac.drv/macdrv.h | 1 + dlls/winex11.drv/display.c | 33 ++++---- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/x11drv.h | 1 + include/wine/gdi_driver.h | 1 + 10 files changed, 176 insertions(+), 85 deletions(-)

1 0

Rémi Bernon : winemac.drv: Avoid setting DM_POSITION on enumerated modes.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 1c9efdd5abde7d2686bc9e69ca4b7f1e4bdbbc52 URL: https://gitlab.winehq.org/wine/wine/-/commit/1c9efdd5abde7d2686bc9e69ca4b7f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 10:30:21 2022 +0200 winemac.drv: Avoid setting DM_POSITION on enumerated modes. --- dlls/winemac.drv/display.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1fc8b04b440..8baa4b6df83 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1097,11 +1097,6 @@ BOOL macdrv_EnumDisplaySettingsEx(LPCWSTR devname, DWORD mode, LPDEVMODEW devmod if (!display_mode) goto failed; - /* We currently only report modes for the primary display, so it's at (0, 0). */ - devmode->dmPosition.x = 0; - devmode->dmPosition.y = 0; - devmode->dmFields |= DM_POSITION; - display_mode_to_devmode(displays[0].displayID, display_mode, devmode); devmode->dmBitsPerPel = display_mode_bpp; if (devmode->dmBitsPerPel)

1 0

Jacek Caban : win32u: Move builtin classes registration from user32.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: ed693f5b3238c8791324cc29730661805538438a URL: https://gitlab.winehq.org/wine/wine/-/commit/ed693f5b3238c8791324cc29730661… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 20:33:22 2022 +0200 win32u: Move builtin classes registration from user32. --- dlls/user32/button.c | 13 ------ dlls/user32/class.c | 43 +------------------ dlls/user32/combo.c | 14 ------ dlls/user32/controls.h | 24 ----------- dlls/user32/dialog.c | 14 ------ dlls/user32/edit.c | 14 ------ dlls/user32/icontitle.c | 13 ------ dlls/user32/listbox.c | 27 ------------ dlls/user32/mdi.c | 14 ------ dlls/user32/menu.c | 13 ------ dlls/user32/misc.c | 10 ----- dlls/user32/scroll.c | 13 ------ dlls/user32/static.c | 14 ------ dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 2 +- dlls/win32u/class.c | 104 ++++++++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 2 +- 17 files changed, 107 insertions(+), 229 deletions(-)

1 0

Jacek Caban : user32: Don't include ntuser_private.h.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 1e640b5e7f91dddf483501b67896fa344e8cc572 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e640b5e7f91dddf483501b67896fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 29 21:41:44 2022 +0200 user32: Don't include ntuser_private.h. --- dlls/user32/controls.h | 3 +-- dlls/user32/dialog.c | 2 ++ dlls/user32/user_private.h | 14 +------------- dlls/user32/win.c | 7 +++++++ dlls/user32/win.h | 7 ------- dlls/win32u/ntuser_private.h | 10 ---------- include/ntuser.h | 10 ++++++++++ 7 files changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 66c2d1af2da..613de0af6c2 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -21,8 +21,7 @@ #ifndef __WINE_CONTROLS_H #define __WINE_CONTROLS_H -#include "winuser.h" -#include "../win32u/ntuser_private.h" +#include "ntuser.h" extern LRESULT WINAPI ImeWndProcA(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; extern LRESULT WINAPI ImeWndProcW(HWND,UINT,WPARAM,LPARAM) DECLSPEC_HIDDEN; diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 00d315f9ff7..c8d1596a01b 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -39,6 +39,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dialog); +#define DIALOG_CLASS_ATOM MAKEINTATOM(32770) /* Dialog */ + /* Dialog control information */ typedef struct { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 77a5ba54929..06a358376a8 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -25,21 +25,14 @@ #include "windef.h" #include "winbase.h" #include "wingdi.h" -#include "../win32u/ntuser_private.h" +#include "ntuser.h" #include "winreg.h" -#include "winternl.h" -#include "hidusage.h" #include "wine/heap.h" #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) #define GET_LONG(ptr) (*(const LONG *)(ptr)) -#define WINE_MOUSE_HANDLE ((HANDLE)1) -#define WINE_KEYBOARD_HANDLE ((HANDLE)2) - -struct received_message_info; - /* data to store state for A/W mappings of WM_CHAR */ struct wm_char_mapping_data { @@ -47,11 +40,6 @@ struct wm_char_mapping_data MSG get_msg; }; -static inline struct user_thread_info *get_user_thread_info(void) -{ - return (struct user_thread_info *)NtCurrentTeb()->Win32ClientInfo; -} - extern HMODULE user32_module DECLSPEC_HIDDEN; extern BOOL post_dde_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, DWORD dest_tid, diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8ba4b6ea69e..fa2ae2e9da4 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -121,6 +121,13 @@ BOOL is_desktop_window( HWND hwnd ) } +/* check if hwnd is a broadcast magic handle */ +static inline BOOL is_broadcast( HWND hwnd ) +{ + return hwnd == HWND_BROADCAST || hwnd == HWND_TOPMOST; +} + + /*********************************************************************** * WIN_IsCurrentProcess * diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 5107a606414..ffd4f37d5f0 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -21,14 +21,7 @@ #ifndef __WINE_WIN_H #define __WINE_WIN_H -#include <stdarg.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -#include <winuser.h> - #include "user_private.h" -#include "wine/server_protocol.h" /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 0f25ede6b2b..3b74a2ae83a 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -26,7 +26,6 @@ #include "wine/list.h" -#define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313 enum system_timer_id @@ -205,15 +204,6 @@ struct scroll_bar_win_data #define WINSWITCH_CLASS_ATOM MAKEINTATOM(32771) /* WinSwitch */ #define ICONTITLE_CLASS_ATOM MAKEINTATOM(32772) /* IconTitle */ -/* message spy definitions */ - -#define SPY_DISPATCHMESSAGE 0x0100 -#define SPY_SENDMESSAGE 0x0101 -#define SPY_DEFWNDPROC 0x0102 - -#define SPY_RESULT_OK 0x0001 -#define SPY_RESULT_DEFWND 0x0002 - /* info about the message currently being received by the current thread */ struct received_message_info { diff --git a/include/ntuser.h b/include/ntuser.h index 07b5afe7919..e3694bde779 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -267,6 +267,14 @@ struct unpack_dde_message_params #define NTUSER_DPI_PER_MONITOR_AWARE_V2 0x00000022 #define NTUSER_DPI_PER_UNAWARE_GDISCALED 0x40006010 +/* message spy definitions */ +#define SPY_DISPATCHMESSAGE 0x0100 +#define SPY_SENDMESSAGE 0x0101 +#define SPY_DEFWNDPROC 0x0102 + +#define SPY_RESULT_OK 0x0001 +#define SPY_RESULT_DEFWND 0x0002 + /* NtUserMessageCall codes */ enum { @@ -456,6 +464,8 @@ enum wine_internal_message #define IME_INTERNAL_ACTIVATE 0x17 #define IME_INTERNAL_DEACTIVATE 0x18 +#define WM_SYSTIMER 0x0118 + /* the various structures that can be sent in messages, in platform-independent layout */ struct packed_CREATESTRUCTW {

1 0

Eric Pouech : test.h: WINETEST_COLOR=auto only outputs colors to a TTY.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 1cbbbd9d737f315042313e587a20b453e2660618 URL: https://gitlab.winehq.org/wine/wine/-/commit/1cbbbd9d737f315042313e587a20b4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Aug 3 09:52:06 2022 +0200 test.h: WINETEST_COLOR=auto only outputs colors to a TTY. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/test.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 7779e252dd7..1690c5613d8 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -23,6 +23,7 @@ #include <stdarg.h> #include <stdlib.h> +#include <io.h> #include <windef.h> #include <winbase.h> #include <wine/debug.h> @@ -676,7 +677,8 @@ int main( int argc, char **argv ) else if (running_under_wine()) winetest_platform = "wine"; - if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) winetest_color = atoi(p); + if (GetEnvironmentVariableA( "WINETEST_COLOR", p, sizeof(p) )) + winetest_color = !strcasecmp(p, "auto") ? isatty(fileno(stdout)) : atoi(p); if (GetEnvironmentVariableA( "WINETEST_DEBUG", p, sizeof(p) )) winetest_debug = atoi(p); if (GetEnvironmentVariableA( "WINETEST_INTERACTIVE", p, sizeof(p) )) winetest_interactive = atoi(p); if (GetEnvironmentVariableA( "WINETEST_REPORT_SUCCESS", p, sizeof(p) )) winetest_report_success = atoi(p);

1 0

Rémi Bernon : winemac.drv: Split best display mode lookup to a separate helper.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 7b376555da097e6d4f244b5da08c89df368f50c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7b376555da097e6d4f244b5da08c89… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jul 29 16:02:08 2022 +0200 winemac.drv: Split best display mode lookup to a separate helper. --- dlls/winemac.drv/display.c | 161 +++++++++++++++++++++++---------------------- 1 file changed, 84 insertions(+), 77 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 1350ffcede9..bc671dc9f1d 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -716,85 +716,14 @@ static BOOL is_detached_mode(const DEVMODEW *mode) mode->dmPelsHeight == 0; } -/*********************************************************************** - * ChangeDisplaySettingsEx (MACDRV.@) - * - */ -LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, - HWND hwnd, DWORD flags, LPVOID lpvoid) +static CGDisplayModeRef find_best_display_mode(DEVMODEW *devmode, CFArrayRef display_modes, int bpp, struct display_mode_descriptor *desc) { - WCHAR primary_adapter[CCHDEVICENAME]; - LONG ret = DISP_CHANGE_BADMODE; - DEVMODEW default_mode; - int bpp; - struct macdrv_display *displays; - int num_displays; - CFArrayRef display_modes; - struct display_mode_descriptor* desc; CFIndex count, i, best; CGDisplayModeRef best_display_mode; uint32_t best_io_flags; - BOOL best_is_original; - - TRACE("%s %p %p 0x%08x %p\n", debugstr_w(devname), devmode, hwnd, flags, lpvoid); - - init_original_display_mode(); - - if (!get_primary_adapter(primary_adapter)) - return DISP_CHANGE_FAILED; - - if (!devname && !devmode) - { - UNICODE_STRING str; - memset(&default_mode, 0, sizeof(default_mode)); - default_mode.dmSize = sizeof(default_mode); - RtlInitUnicodeString(&str, primary_adapter); - if (!NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) - { - ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); - return DISP_CHANGE_BADMODE; - } - - devname = primary_adapter; - devmode = &default_mode; - } - - if (is_detached_mode(devmode)) - { - FIXME("Detaching adapters is currently unsupported.\n"); - return DISP_CHANGE_SUCCESSFUL; - } - - if (macdrv_get_displays(&displays, &num_displays)) - return DISP_CHANGE_FAILED; - - display_modes = copy_display_modes(displays[0].displayID, FALSE); - if (!display_modes) - { - macdrv_free_displays(displays); - return DISP_CHANGE_FAILED; - } - - pthread_mutex_lock(&modes_mutex); - bpp = get_default_bpp(); - pthread_mutex_unlock(&modes_mutex); - if ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel != bpp) - TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, devmode->dmBitsPerPel); - - TRACE("looking for %dx%dx%dbpp @%d Hz", - (devmode->dmFields & DM_PELSWIDTH ? devmode->dmPelsWidth : 0), - (devmode->dmFields & DM_PELSHEIGHT ? devmode->dmPelsHeight : 0), - bpp, - (devmode->dmFields & DM_DISPLAYFREQUENCY ? devmode->dmDisplayFrequency : 0)); - if (devmode->dmFields & DM_DISPLAYFIXEDOUTPUT) - TRACE(" %sstretched", devmode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un"); - if (devmode->dmFields & DM_DISPLAYFLAGS) - TRACE(" %sinterlaced", devmode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); - TRACE("\n"); - - desc = create_original_display_mode_descriptor(displays[0].displayID); best_display_mode = NULL; + count = CFArrayGetCount(display_modes); for (i = 0; i < count; i++) { @@ -866,14 +795,92 @@ better: best_display_mode = display_mode; best = i; best_io_flags = io_flags; - best_is_original = is_original; } if (best_display_mode) - { - /* we have a valid mode */ TRACE("Requested display settings match mode %ld\n", best); + return best_display_mode; +} + +/*********************************************************************** + * ChangeDisplaySettingsEx (MACDRV.@) + * + */ +LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, + HWND hwnd, DWORD flags, LPVOID lpvoid) +{ + WCHAR primary_adapter[CCHDEVICENAME]; + LONG ret = DISP_CHANGE_BADMODE; + DEVMODEW default_mode; + int bpp; + struct macdrv_display *displays; + int num_displays; + CFArrayRef display_modes; + struct display_mode_descriptor *desc; + CGDisplayModeRef best_display_mode; + + TRACE("%s %p %p 0x%08x %p\n", debugstr_w(devname), devmode, hwnd, flags, lpvoid); + + init_original_display_mode(); + + if (!get_primary_adapter(primary_adapter)) + return DISP_CHANGE_FAILED; + + if (!devname && !devmode) + { + UNICODE_STRING str; + memset(&default_mode, 0, sizeof(default_mode)); + default_mode.dmSize = sizeof(default_mode); + RtlInitUnicodeString(&str, primary_adapter); + if (!NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + { + ERR("Default mode not found for %s!\n", wine_dbgstr_w(primary_adapter)); + return DISP_CHANGE_BADMODE; + } + + devname = primary_adapter; + devmode = &default_mode; + } + + if (is_detached_mode(devmode)) + { + FIXME("Detaching adapters is currently unsupported.\n"); + return DISP_CHANGE_SUCCESSFUL; + } + + if (macdrv_get_displays(&displays, &num_displays)) + return DISP_CHANGE_FAILED; + + display_modes = copy_display_modes(displays[0].displayID, FALSE); + if (!display_modes) + { + macdrv_free_displays(displays); + return DISP_CHANGE_FAILED; + } + + pthread_mutex_lock(&modes_mutex); + bpp = get_default_bpp(); + pthread_mutex_unlock(&modes_mutex); + if ((devmode->dmFields & DM_BITSPERPEL) && devmode->dmBitsPerPel != bpp) + TRACE("using default %d bpp instead of caller's request %d bpp\n", bpp, devmode->dmBitsPerPel); + + TRACE("looking for %dx%dx%dbpp @%d Hz", + (devmode->dmFields & DM_PELSWIDTH ? devmode->dmPelsWidth : 0), + (devmode->dmFields & DM_PELSHEIGHT ? devmode->dmPelsHeight : 0), + bpp, + (devmode->dmFields & DM_DISPLAYFREQUENCY ? devmode->dmDisplayFrequency : 0)); + if (devmode->dmFields & DM_DISPLAYFIXEDOUTPUT) + TRACE(" %sstretched", devmode->dmDisplayFixedOutput == DMDFO_STRETCH ? "" : "un"); + if (devmode->dmFields & DM_DISPLAYFLAGS) + TRACE(" %sinterlaced", devmode->dmDisplayFlags & DM_INTERLACED ? "" : "non-"); + TRACE("\n"); + + desc = create_original_display_mode_descriptor(displays[0].displayID); + best_display_mode = find_best_display_mode(devmode, display_modes, bpp, desc); + + if (best_display_mode) + { if (flags & (CDS_TEST | CDS_NORESET)) ret = DISP_CHANGE_SUCCESSFUL; else if (wcsicmp(primary_adapter, devname)) { @@ -888,7 +895,7 @@ better: macdrv_init_display_devices(TRUE); - if (best_is_original && retina_enabled) + if (retina_enabled && display_mode_matches_descriptor(best_display_mode, desc)) { width *= 2; height *= 2;

1 0

Rémi Bernon : wineandroid.drv: Return early on EnumDisplaySettingsEx error.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 25c57c79a7d90cc6f888ec563776b54686a7fafd URL: https://gitlab.winehq.org/wine/wine/-/commit/25c57c79a7d90cc6f888ec563776b5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 10:20:05 2022 +0200 wineandroid.drv: Return early on EnumDisplaySettingsEx error. --- dlls/wineandroid.drv/init.c | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 04328346852..f6c8eec8c34 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -309,29 +309,27 @@ BOOL ANDROID_UpdateDisplayDevices( const struct gdi_device_manager *device_manag */ BOOL ANDROID_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DWORD flags ) { + if (n > 0 && n != ENUM_CURRENT_SETTINGS) + { + TRACE( "mode %d -- not present\n", n ); + SetLastError( ERROR_NO_MORE_FILES ); + return FALSE; + } + devmode->u2.dmDisplayFlags = 0; - devmode->dmDisplayFrequency = 0; devmode->u1.s2.dmPosition.x = 0; devmode->u1.s2.dmPosition.y = 0; devmode->u1.s2.dmDisplayOrientation = 0; devmode->u1.s2.dmDisplayFixedOutput = 0; - - if (n == ENUM_CURRENT_SETTINGS) n = 0; - if (n == 0) - { - devmode->dmPelsWidth = screen_width; - devmode->dmPelsHeight = screen_height; - devmode->dmBitsPerPel = screen_bpp; - devmode->dmDisplayFrequency = 60; - devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; - TRACE( "mode %d -- %dx%d %d bpp @%d Hz\n", n, - devmode->dmPelsWidth, devmode->dmPelsHeight, - devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); - return TRUE; - } - TRACE( "mode %d -- not present\n", n ); - SetLastError( ERROR_NO_MORE_FILES ); - return FALSE; + devmode->dmPelsWidth = screen_width; + devmode->dmPelsHeight = screen_height; + devmode->dmBitsPerPel = screen_bpp; + devmode->dmDisplayFrequency = 60; + devmode->dmFields = DM_PELSWIDTH | DM_PELSHEIGHT | DM_BITSPERPEL | DM_DISPLAYFLAGS | DM_DISPLAYFREQUENCY; + TRACE( "mode %d -- %dx%d %d bpp @%d Hz\n", n, + devmode->dmPelsWidth, devmode->dmPelsHeight, + devmode->dmBitsPerPel, devmode->dmDisplayFrequency ); + return TRUE; }

1 0

Rémi Bernon : win32u: Ignore DM_POSITION mode fields for available modes.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: 77412c1ca87b6a4f7aa8f8c0183e4437b055d71e URL: https://gitlab.winehq.org/wine/wine/-/commit/77412c1ca87b6a4f7aa8f8c0183e44… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Jul 28 10:10:27 2022 +0200 win32u: Ignore DM_POSITION mode fields for available modes. --- dlls/win32u/sysparams.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 3a77ec47769..d2dab86efc3 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -448,8 +448,11 @@ static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *m set_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); set_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); set_mode_field( fixed_outputW, dmDisplayFixedOutput, DM_DISPLAYFIXEDOUTPUT ); - set_mode_field( x_panningW, dmPosition.x, DM_POSITION ); - set_mode_field( y_panningW, dmPosition.y, DM_POSITION ); + if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) + { + set_mode_field( x_panningW, dmPosition.x, DM_POSITION ); + set_mode_field( y_panningW, dmPosition.y, DM_POSITION ); + } ret = set_reg_value( hkey, driver_extraW, REG_BINARY, mode + 1, mode->dmDriverExtra ); #undef set_mode_field @@ -487,8 +490,11 @@ static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) query_mode_field( y_resolutionW, dmPelsHeight, DM_PELSHEIGHT ); query_mode_field( v_refreshW, dmDisplayFrequency, DM_DISPLAYFREQUENCY ); query_mode_field( flagsW, dmDisplayFlags, DM_DISPLAYFLAGS ); - query_mode_field( x_panningW, dmPosition.x, DM_POSITION ); - query_mode_field( y_panningW, dmPosition.y, DM_POSITION ); + if (index == ENUM_CURRENT_SETTINGS || index == ENUM_REGISTRY_SETTINGS) + { + query_mode_field( x_panningW, dmPosition.x, DM_POSITION ); + query_mode_field( y_panningW, dmPosition.y, DM_POSITION ); + } query_mode_field( orientationW, dmDisplayOrientation, DM_DISPLAYORIENTATION ); query_mode_field( fixed_outputW, dmDisplayFixedOutput, 0 );

1 0

Rémi Bernon : mf: Propagate missing attributes to downstream media types.
by Alexandre Julliard Aug. 8, 2022

Aug. 8, 2022

Module: wine Branch: master Commit: ee0e10be895fa4e2660917ff87013212fd547a94 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee0e10be895fa4e2660917ff870132… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Aug 1 15:05:53 2022 +0200 mf: Propagate missing attributes to downstream media types. --- dlls/mf/tests/mf.c | 2 +- dlls/mf/topology_loader.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index f5d110174b0..9dab87b928d 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2283,7 +2283,7 @@ static void test_topology_loader(void) /* I420 -> RGB32, Video Processor media type without frame size */ .input_type = &video_i420_1280, .output_type = &video_video_processor_rgb32, .sink_method = -1, .source_method = -1, .expected_result = S_OK, - .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, + .flags = LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER, }, }; diff --git a/dlls/mf/topology_loader.c b/dlls/mf/topology_loader.c index f7d1007971d..08ee7922094 100644 --- a/dlls/mf/topology_loader.c +++ b/dlls/mf/topology_loader.c @@ -215,6 +215,30 @@ static HRESULT topology_node_list_branches(IMFTopologyNode *node, struct list *b return hr; } +static HRESULT topology_branch_fill_media_type(IMFMediaType *up_type, IMFMediaType *down_type) +{ + HRESULT hr = S_OK; + PROPVARIANT value; + UINT32 count; + GUID key; + + if (FAILED(hr = IMFMediaType_GetCount(up_type, &count))) + return hr; + + while (count--) + { + PropVariantInit(&value); + hr = IMFMediaType_GetItemByIndex(up_type, count, &key, &value); + if (SUCCEEDED(hr) && FAILED(IMFMediaType_GetItem(down_type, &key, NULL))) + hr = IMFMediaType_SetItem(down_type, &key, &value); + PropVariantClear(&value); + if (FAILED(hr)) + return hr; + } + + return hr; +} + static HRESULT topology_branch_connect(IMFTopology *topology, MF_CONNECT_METHOD method_mask, struct topology_branch *branch); static HRESULT topology_branch_connect_down(IMFTopology *topology, MF_CONNECT_METHOD method_mask, @@ -276,6 +300,8 @@ static HRESULT topology_branch_connect_indirect(IMFTopology *topology, MF_CONNEC IMFTopologyNode_SetGUID(node, &MF_TOPONODE_TRANSFORM_OBJECTID, &guid); hr = topology_branch_connect_down(topology, MF_CONNECT_DIRECT, &up_branch, up_type); + if (SUCCEEDED(hr)) + hr = topology_branch_fill_media_type(up_type, down_type); if (SUCCEEDED(hr)) hr = IMFTransform_SetOutputType(transform, 0, down_type, 0); IMFTransform_Release(transform);

1 0