wine-commits June 2022

wine-commits@winehq.org

2 participants
791 discussions

Zhiyi Zhang : light.msstyles: Add Vista+ toolbar parts.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: b1ac164257b40a0a031efe01c1ce357f7e51ba5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1ac164257b40a0a031efe01… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 14 18:04:53 2022 +0800 light.msstyles: Add Vista+ toolbar parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 13 ++- dlls/light.msstyles/blue_toolbar_buttons.bmp | Bin 4890 -> 4170 bytes dlls/light.msstyles/blue_toolbar_buttons.svg | 18 ++- dlls/light.msstyles/blue_toolbar_buttons_split.bmp | Bin 3306 -> 3594 bytes dlls/light.msstyles/blue_toolbar_buttons_split.svg | 14 ++- .../blue_toolbar_buttons_split_dropdown.bmp | Bin 2778 -> 3018 bytes .../blue_toolbar_buttons_split_dropdown.svg | 14 ++- .../blue_toolbar_buttons_split_dropdown_glyph.bmp | Bin 2298 -> 0 bytes .../blue_toolbar_buttons_split_dropdown_glyph.svg | 28 ----- ...e_toolbar_buttons_split_dropdown_glyph_11px.bmp | Bin 0 -> 3306 bytes ...e_toolbar_buttons_split_dropdown_glyph_11px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_14px.bmp | Bin 0 -> 5514 bytes ...e_toolbar_buttons_split_dropdown_glyph_14px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_17px.bmp | Bin 0 -> 8298 bytes ...e_toolbar_buttons_split_dropdown_glyph_17px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_21px.bmp | Bin 0 -> 12234 bytes ...e_toolbar_buttons_split_dropdown_glyph_21px.svg | 37 ++++++ ...e_toolbar_buttons_split_dropdown_glyph_28px.bmp | Bin 0 -> 21642 bytes ...e_toolbar_buttons_split_dropdown_glyph_28px.svg | 37 ++++++ ...ue_toolbar_buttons_split_dropdown_glyph_7px.bmp | Bin 0 -> 1482 bytes ...ue_toolbar_buttons_split_dropdown_glyph_7px.svg | 31 +++++ ...ue_toolbar_buttons_split_dropdown_glyph_9px.bmp | Bin 0 -> 1578 bytes ...ue_toolbar_buttons_split_dropdown_glyph_9px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_11px.bmp | Bin 0 -> 3306 bytes .../blue_toolbar_dropdown_button_glyph_11px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_14px.bmp | Bin 0 -> 5514 bytes .../blue_toolbar_dropdown_button_glyph_14px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_17px.bmp | Bin 0 -> 8298 bytes .../blue_toolbar_dropdown_button_glyph_17px.svg | 37 ++++++ .../blue_toolbar_dropdown_button_glyph_7px.bmp | Bin 0 -> 1482 bytes .../blue_toolbar_dropdown_button_glyph_7px.svg | 31 +++++ .../blue_toolbar_dropdown_button_glyph_9px.bmp | Bin 0 -> 1578 bytes .../blue_toolbar_dropdown_button_glyph_9px.svg | 37 ++++++ .../blue_toolbar_separator_horizontal.bmp | Bin 298 -> 258 bytes .../blue_toolbar_separator_horizontal.svg | 5 +- .../blue_toolbar_separator_vertical.bmp | Bin 298 -> 258 bytes .../blue_toolbar_separator_vertical.svg | 5 +- dlls/light.msstyles/light.rc | 129 ++++++++++++++++++--- 38 files changed, 590 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ac164257b40a0a031e…

1 0

Zhiyi Zhang : light.msstyles: Add taskdialog class.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: c894d9a41ca91e616e87b04e8916dd18eb6c97d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c894d9a41ca91e616e87b04e… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 1 15:49:32 2022 +0800 light.msstyles: Add taskdialog class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53066 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/Makefile.in | 44 +++ ...skdialog_expando_button_expanded_hover_19px.bmp | Bin 0 -> 1734 bytes ...skdialog_expando_button_expanded_hover_19px.svg | 6 + ...skdialog_expando_button_expanded_hover_24px.bmp | Bin 0 -> 2634 bytes ...skdialog_expando_button_expanded_hover_24px.svg | 6 + ...skdialog_expando_button_expanded_hover_29px.bmp | Bin 0 -> 3850 bytes ...skdialog_expando_button_expanded_hover_29px.svg | 6 + ...skdialog_expando_button_expanded_hover_33px.bmp | Bin 0 -> 5022 bytes ...skdialog_expando_button_expanded_hover_33px.svg | 6 + ...skdialog_expando_button_expanded_hover_38px.bmp | Bin 0 -> 6522 bytes ...skdialog_expando_button_expanded_hover_38px.svg | 6 + ...skdialog_expando_button_expanded_hover_43px.bmp | Bin 0 -> 8222 bytes ...skdialog_expando_button_expanded_hover_43px.svg | 6 + ...skdialog_expando_button_expanded_hover_48px.bmp | Bin 0 -> 10314 bytes ...skdialog_expando_button_expanded_hover_48px.svg | 6 + ...kdialog_expando_button_expanded_normal_19px.bmp | Bin 0 -> 1734 bytes ...kdialog_expando_button_expanded_normal_19px.svg | 6 + ...kdialog_expando_button_expanded_normal_24px.bmp | Bin 0 -> 2634 bytes ...kdialog_expando_button_expanded_normal_24px.svg | 6 + ...kdialog_expando_button_expanded_normal_29px.bmp | Bin 0 -> 3850 bytes ...kdialog_expando_button_expanded_normal_29px.svg | 6 + ...kdialog_expando_button_expanded_normal_33px.bmp | Bin 0 -> 5022 bytes ...kdialog_expando_button_expanded_normal_33px.svg | 6 + ...kdialog_expando_button_expanded_normal_38px.bmp | Bin 0 -> 6522 bytes ...kdialog_expando_button_expanded_normal_38px.svg | 6 + ...kdialog_expando_button_expanded_normal_43px.bmp | Bin 0 -> 8222 bytes ...kdialog_expando_button_expanded_normal_43px.svg | 6 + ...kdialog_expando_button_expanded_normal_48px.bmp | Bin 0 -> 10314 bytes ...kdialog_expando_button_expanded_normal_48px.svg | 6 + ...dialog_expando_button_expanded_pressed_19px.bmp | Bin 0 -> 1734 bytes ...dialog_expando_button_expanded_pressed_19px.svg | 6 + ...dialog_expando_button_expanded_pressed_24px.bmp | Bin 0 -> 2634 bytes ...dialog_expando_button_expanded_pressed_24px.svg | 6 + ...dialog_expando_button_expanded_pressed_29px.bmp | Bin 0 -> 3850 bytes ...dialog_expando_button_expanded_pressed_29px.svg | 6 + ...dialog_expando_button_expanded_pressed_33px.bmp | Bin 0 -> 5022 bytes ...dialog_expando_button_expanded_pressed_33px.svg | 6 + ...dialog_expando_button_expanded_pressed_38px.bmp | Bin 0 -> 6522 bytes ...dialog_expando_button_expanded_pressed_38px.svg | 6 + ...dialog_expando_button_expanded_pressed_43px.bmp | Bin 0 -> 8222 bytes ...dialog_expando_button_expanded_pressed_43px.svg | 6 + ...dialog_expando_button_expanded_pressed_48px.bmp | Bin 0 -> 10314 bytes ...dialog_expando_button_expanded_pressed_48px.svg | 6 + .../blue_taskdialog_expando_button_hover_19px.bmp | Bin 0 -> 1734 bytes .../blue_taskdialog_expando_button_hover_19px.svg | 6 + .../blue_taskdialog_expando_button_hover_24px.bmp | Bin 0 -> 2634 bytes .../blue_taskdialog_expando_button_hover_24px.svg | 6 + .../blue_taskdialog_expando_button_hover_29px.bmp | Bin 0 -> 3850 bytes .../blue_taskdialog_expando_button_hover_29px.svg | 6 + .../blue_taskdialog_expando_button_hover_33px.bmp | Bin 0 -> 5022 bytes .../blue_taskdialog_expando_button_hover_33px.svg | 6 + .../blue_taskdialog_expando_button_hover_38px.bmp | Bin 0 -> 6522 bytes .../blue_taskdialog_expando_button_hover_38px.svg | 6 + .../blue_taskdialog_expando_button_hover_43px.bmp | Bin 0 -> 8222 bytes .../blue_taskdialog_expando_button_hover_43px.svg | 6 + .../blue_taskdialog_expando_button_hover_48px.bmp | Bin 0 -> 10314 bytes .../blue_taskdialog_expando_button_hover_48px.svg | 6 + .../blue_taskdialog_expando_button_normal_19px.bmp | Bin 0 -> 1734 bytes .../blue_taskdialog_expando_button_normal_19px.svg | 6 + .../blue_taskdialog_expando_button_normal_24px.bmp | Bin 0 -> 2634 bytes .../blue_taskdialog_expando_button_normal_24px.svg | 6 + .../blue_taskdialog_expando_button_normal_29px.bmp | Bin 0 -> 3850 bytes .../blue_taskdialog_expando_button_normal_29px.svg | 6 + .../blue_taskdialog_expando_button_normal_33px.bmp | Bin 0 -> 5022 bytes .../blue_taskdialog_expando_button_normal_33px.svg | 6 + .../blue_taskdialog_expando_button_normal_38px.bmp | Bin 0 -> 6522 bytes .../blue_taskdialog_expando_button_normal_38px.svg | 6 + .../blue_taskdialog_expando_button_normal_43px.bmp | Bin 0 -> 8222 bytes .../blue_taskdialog_expando_button_normal_43px.svg | 6 + .../blue_taskdialog_expando_button_normal_48px.bmp | Bin 0 -> 10314 bytes .../blue_taskdialog_expando_button_normal_48px.svg | 6 + ...blue_taskdialog_expando_button_pressed_19px.bmp | Bin 0 -> 1734 bytes ...blue_taskdialog_expando_button_pressed_19px.svg | 6 + ...blue_taskdialog_expando_button_pressed_24px.bmp | Bin 0 -> 2634 bytes ...blue_taskdialog_expando_button_pressed_24px.svg | 6 + ...blue_taskdialog_expando_button_pressed_29px.bmp | Bin 0 -> 3850 bytes ...blue_taskdialog_expando_button_pressed_29px.svg | 6 + ...blue_taskdialog_expando_button_pressed_33px.bmp | Bin 0 -> 5022 bytes ...blue_taskdialog_expando_button_pressed_33px.svg | 6 + ...blue_taskdialog_expando_button_pressed_38px.bmp | Bin 0 -> 6522 bytes ...blue_taskdialog_expando_button_pressed_38px.svg | 6 + ...blue_taskdialog_expando_button_pressed_43px.bmp | Bin 0 -> 8222 bytes ...blue_taskdialog_expando_button_pressed_43px.svg | 6 + ...blue_taskdialog_expando_button_pressed_48px.bmp | Bin 0 -> 10314 bytes ...blue_taskdialog_expando_button_pressed_48px.svg | 6 + .../blue_taskdialog_footnote_separator.bmp | Bin 0 -> 146 bytes .../blue_taskdialog_footnote_separator.svg | 13 + .../blue_taskdialog_secondary_panel.bmp | Bin 0 -> 146 bytes .../blue_taskdialog_secondary_panel.svg | 13 + dlls/light.msstyles/light.rc | 347 +++++++++++++++++++++ 90 files changed, 669 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c894d9a41ca91e616e87…

1 0

Zhiyi Zhang : light.msstyles: Add Vista+ tab parts.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: b5301fb1477a347997f125ec4c53d780ef02ab1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5301fb1477a347997f125ec… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Jun 14 15:47:51 2022 +0800 light.msstyles: Add Vista+ tab parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/light.msstyles/light.rc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index 774183473a7..e22612122c1 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -1837,6 +1837,11 @@ BLUE_INI TEXTFILE "BgType = ImageFile\r\n" "ImageFile = blue_tab_background.bmp\r\n" +"[Tab.AeroWizardBody]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 0\r\n" +"FillColor = 255 255 255\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n"

1 0

Rémi Bernon : winex11.drv: Avoid requesting current mode in X11DRV_desktop_get_modes.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: b5c65f1ee095a1729ea8dd95a895a404cee48de7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5c65f1ee095a1729ea8dd95… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 15:34:02 2022 +0200 winex11.drv: Avoid requesting current mode in X11DRV_desktop_get_modes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/desktop.c | 42 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index bc2ba60397b..162b524d504 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -83,6 +83,39 @@ static struct screen_size { #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 +/* parse the desktop size specification */ +static BOOL parse_size( const WCHAR *size, unsigned int *width, unsigned int *height ) +{ + WCHAR *end; + + *width = wcstoul( size, &end, 10 ); + if (end == size) return FALSE; + if (*end != 'x') return FALSE; + size = end + 1; + *height = wcstoul( size, &end, 10 ); + return !*end; +} + +/* retrieve the default desktop size from the registry */ +static BOOL get_default_desktop_size( unsigned int *width, unsigned int *height ) +{ + static const WCHAR defaultW[] = {'D','e','f','a','u','l','t',0}; + WCHAR buffer[4096]; + KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; + DWORD size; + HKEY hkey; + + /* @@ Wine registry key: HKCU\Software\Wine\Explorer\Desktops */ + if (!(hkey = open_hkcu_key( "Software\\Wine\\Explorer\\Desktops" ))) return FALSE; + + size = query_reg_value( hkey, defaultW, value, sizeof(buffer) ); + NtClose( hkey ); + if (!size || value->Type != REG_SZ) return FALSE; + + if (!parse_size( (const WCHAR *)value->Data, width, height )) return FALSE; + return TRUE; +} + /* Return TRUE if Wine is currently in virtual desktop mode */ BOOL is_virtual_desktop(void) { @@ -118,12 +151,13 @@ static BOOL X11DRV_desktop_get_modes( ULONG_PTR id, DWORD flags, DEVMODEW **new_ { UINT depth_idx, size_idx, mode_idx = 0; UINT screen_width, screen_height; - RECT primary_rect; DEVMODEW *modes; - primary_rect = NtUserGetPrimaryMonitorRect(); - screen_width = primary_rect.right - primary_rect.left; - screen_height = primary_rect.bottom - primary_rect.top; + if (!get_default_desktop_size( &screen_width, &screen_height )) + { + screen_width = max_width; + screen_height = max_height; + } /* Allocate memory for modes in different color depths */ if (!(modes = calloc( (ARRAY_SIZE(screen_sizes) + 2) * DEPTH_COUNT, sizeof(*modes))) )

1 0

Rémi Bernon : winex11.drv: Merge settings.c into display.c.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 5cc3808a629b8517c3d7375284bfab9f01c818b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5cc3808a629b8517c3d73752… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:14:33 2022 +0200 winex11.drv: Merge settings.c into display.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/Makefile.in | 1 - dlls/winex11.drv/display.c | 962 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/settings.c | 999 ------------------------------------------- 3 files changed, 962 insertions(+), 1000 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5cc3808a629b8517c3d7…

1 0

Rémi Bernon : winex11.drv: Use nameless structs and unions in settings.c.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: a4c36cba8d1ad35711b97c0b75bfe4c73b2f2cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4c36cba8d1ad35711b97c0b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:13:55 2022 +0200 winex11.drv: Use nameless structs and unions in settings.c. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 69 ++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a4c36cba8d1ad35711b9…

1 0

Rémi Bernon : winex11.drv: Rename display settings handlers to settings_handler.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: b8a639c08c252abce2f77296ec38177a0c31377d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8a639c08c252abce2f77296… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 14:13:11 2022 +0200 winex11.drv: Rename display settings handlers to settings_handler. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/settings.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index e7e353b33ad..0f9c4c876de 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -38,6 +38,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(x11settings); +static struct x11drv_settings_handler settings_handler; + struct x11drv_display_setting { ULONG_PTR id; @@ -64,8 +66,6 @@ static const unsigned int depths_24[] = {8, 16, 24}; static const unsigned int depths_32[] = {8, 16, 32}; const unsigned int *depths; -static struct x11drv_settings_handler handler; - /* Cached display modes for a device, protected by modes_section */ static WCHAR cached_device_name[CCHDEVICENAME]; static DWORD cached_flags; @@ -76,10 +76,10 @@ static pthread_mutex_t settings_mutex = PTHREAD_MUTEX_INITIALIZER; void X11DRV_Settings_SetHandler(const struct x11drv_settings_handler *new_handler) { - if (new_handler->priority > handler.priority) + if (new_handler->priority > settings_handler.priority) { - handler = *new_handler; - TRACE("Display settings are now handled by: %s.\n", handler.name); + settings_handler = *new_handler; + TRACE("Display settings are now handled by: %s.\n", settings_handler.name); } } @@ -490,7 +490,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW if (n == ENUM_CURRENT_SETTINGS) { - if (!handler.get_id(name, &id) || !handler.get_current_mode(id, devmode)) + if (!settings_handler.get_id(name, &id) || !settings_handler.get_current_mode(id, devmode)) { ERR("Failed to get %s current display settings.\n", wine_dbgstr_w(name)); return FALSE; @@ -505,7 +505,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW pthread_mutex_lock( &settings_mutex ); if (n == 0 || wcsicmp(cached_device_name, name) || cached_flags != flags) { - if (!handler.get_id(name, &id) || !handler.get_modes(id, flags, &modes, &mode_count)) + if (!settings_handler.get_id(name, &id) || !settings_handler.get_modes(id, flags, &modes, &mode_count)) { ERR("Failed to get %s supported display modes.\n", wine_dbgstr_w(name)); pthread_mutex_unlock( &settings_mutex ); @@ -515,7 +515,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); if (cached_modes) - handler.free_modes(cached_modes); + settings_handler.free_modes(cached_modes); lstrcpyW(cached_device_name, name); cached_flags = flags; cached_modes = modes; @@ -525,7 +525,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW if (n >= cached_mode_count) { pthread_mutex_unlock( &settings_mutex ); - WARN("handler:%s device:%s mode index:%#x not found.\n", handler.name, wine_dbgstr_w(name), n); + WARN("handler:%s device:%s mode index:%#x not found.\n", settings_handler.name, wine_dbgstr_w(name), n); SetLastError(ERROR_NO_MORE_FILES); return FALSE; } @@ -562,7 +562,7 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (is_detached_mode(dev_mode)) return dev_mode; - if (!handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) + if (!settings_handler.get_modes(id, EDS_ROTATEDMODE, &modes, &mode_count)) return NULL; qsort(modes, mode_count, sizeof(*modes) + modes[0].dmDriverExtra, mode_compare); @@ -593,18 +593,18 @@ static DEVMODEW *get_full_mode(ULONG_PTR id, DEVMODEW *dev_mode) if (!found_mode || mode_idx == mode_count) { - handler.free_modes(modes); + settings_handler.free_modes(modes); return NULL; } if (!(full_mode = malloc(sizeof(*found_mode) + found_mode->dmDriverExtra))) { - handler.free_modes(modes); + settings_handler.free_modes(modes); return NULL; } memcpy(full_mode, found_mode, sizeof(*found_mode) + found_mode->dmDriverExtra); - handler.free_modes(modes); + settings_handler.free_modes(modes); full_mode->dmFields |= DM_POSITION; full_mode->u1.s2.dmPosition = dev_mode->u1.s2.dmPosition; @@ -640,7 +640,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, if (NtUserEnumDisplayDevices( NULL, display_idx, &display_device, 0 )) goto done; - if (!handler.get_id(display_device.DeviceName, &displays[display_idx].id)) + if (!settings_handler.get_id(display_device.DeviceName, &displays[display_idx].id)) { ret = DISP_CHANGE_BADPARAM; goto done; @@ -903,13 +903,13 @@ static LONG apply_display_settings(struct x11drv_display_setting *displays, INT return DISP_CHANGE_BADMODE; TRACE("handler:%s changing %s to position:(%d,%d) resolution:%ux%u frequency:%uHz " - "depth:%ubits orientation:%#x.\n", handler.name, + "depth:%ubits orientation:%#x.\n", settings_handler.name, wine_dbgstr_w(displays[display_idx].desired_mode.dmDeviceName), full_mode->u1.s2.dmPosition.x, full_mode->u1.s2.dmPosition.y, full_mode->dmPelsWidth, full_mode->dmPelsHeight, full_mode->dmDisplayFrequency, full_mode->dmBitsPerPel, full_mode->u1.s2.dmDisplayOrientation); - ret = handler.set_current_mode(displays[display_idx].id, full_mode); + ret = settings_handler.set_current_mode(displays[display_idx].id, full_mode); if (attached_mode && ret == DISP_CHANGE_SUCCESSFUL) set_display_depth(displays[display_idx].id, full_mode->dmBitsPerPel); free_full_mode(full_mode);

1 0

Zebediah Figura : user32: Merge rawinput.c into input.c.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: ff166bac152a38b6984fe58ff3142c054251aab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff166bac152a38b6984fe58f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 18:30:25 2022 -0500 user32: Merge rawinput.c into input.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/input.c | 49 +++++++++++++++++++++++++++ dlls/user32/rawinput.c | 88 ------------------------------------------------- 3 files changed, 49 insertions(+), 89 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 79821929390..3a01810991d 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -34,7 +34,6 @@ C_SRCS = \ nonclient.c \ painting.c \ property.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 52d4414b673..106f890da7a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -6,6 +6,8 @@ * Copyright 1997 David Faure * Copyright 1998 Morten Welinder * Copyright 1998 Ulrich Weigand + * Copyright 2012 Henri Verbeet + * Copyright 2018 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -623,3 +625,50 @@ BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) return I_ScUnregisterDeviceNotification( handle ); } + +/*********************************************************************** + * GetRawInputDeviceInfoA (USER32.@) + */ +UINT WINAPI GetRawInputDeviceInfoA( HANDLE device, UINT command, void *data, UINT *size ) +{ + TRACE( "device %p, command %#x, data %p, size %p.\n", device, command, data, size ); + + /* RIDI_DEVICENAME size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, sizeW; + + if (!size) return ~0U; + + sizeW = *size; + + if (data && sizeW > 0) + nameW = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * sizeW ); + else + nameW = NULL; + + ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &sizeW ); + + if (ret && ret != ~0U) + WideCharToMultiByte( CP_ACP, 0, nameW, -1, data, *size, NULL, NULL ); + + *size = sizeW; + + HeapFree( GetProcessHeap(), 0, nameW ); + + return ret; + } + + return NtUserGetRawInputDeviceInfo( device, command, data, size ); +} + +/*********************************************************************** + * DefRawInputProc (USER32.@) + */ +LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_size ) +{ + FIXME( "data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size ); + + return 0; +} diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c deleted file mode 100644 index 98854d75690..00000000000 --- a/dlls/user32/rawinput.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Raw Input - * - * Copyright 2012 Henri Verbeet - * Copyright 2018 Zebediah Figura 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 "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winioctl.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" -#include "ddk/hidclass.h" -#include "wine/debug.h" -#include "wine/server.h" -#include "wine/hid.h" - -#include "user_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(rawinput); - -/*********************************************************************** - * GetRawInputDeviceInfoA (USER32.@) - */ -UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) -{ - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); - - /* RIDI_DEVICENAME data_size is in chars, not bytes */ - if (command == RIDI_DEVICENAME) - { - WCHAR *nameW; - UINT ret, nameW_sz; - - if (!data_size) return ~0U; - - nameW_sz = *data_size; - - if (data && nameW_sz > 0) - nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz); - else - nameW = NULL; - - ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &nameW_sz ); - - if (ret && ret != ~0U) - WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL); - - *data_size = nameW_sz; - - HeapFree(GetProcessHeap(), 0, nameW); - - return ret; - } - - return NtUserGetRawInputDeviceInfo( device, command, data, data_size ); -} - -/*********************************************************************** - * DefRawInputProc (USER32.@) - */ -LRESULT WINAPI DefRawInputProc(RAWINPUT **data, INT data_count, UINT header_size) -{ - FIXME("data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size); - - return 0; -}

1 0

Zebediah Figura : win32u: Move raw input device list management from user32.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 0a930890192726e64bc6207c0d04f44e4c849b7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a930890192726e64bc6207c… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 18:25:56 2022 -0500 win32u: Move raw input device list management from user32. --- dlls/user32/rawinput.c | 433 +----------------------------------------- dlls/user32/user32.spec | 4 +- dlls/user32/user_main.c | 2 - dlls/user32/user_private.h | 6 - dlls/win32u/message.c | 5 +- dlls/win32u/ntuser_private.h | 2 - dlls/win32u/rawinput.c | 434 ++++++++++++++++++++++++++++++++++++++++++- dlls/win32u/syscall.c | 2 + dlls/win32u/win32u.spec | 4 +- dlls/win32u/win32u_private.h | 1 + dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 55 ++++++ include/ntuser.h | 2 + 13 files changed, 503 insertions(+), 449 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a930890192726e64bc6…

1 0

Zebediah Figura : win32u: Move NtUserGetRegisteredRawInputDevices from user32.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: cbbab655710ad938d8455568487e47c33aa7240f URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbbab655710ad938d8455568… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 17:49:57 2022 -0500 win32u: Move NtUserGetRegisteredRawInputDevices from user32. --- dlls/user32/rawinput.c | 57 ----------------------------------------------- dlls/user32/user32.spec | 2 +- dlls/win32u/rawinput.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 41 ++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 8 files changed, 105 insertions(+), 59 deletions(-) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index 1b02be1398d..588d1685cc0 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -506,63 +506,6 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT return *data_size; } -static int __cdecl compare_raw_input_devices(const void *ap, const void *bp) -{ - const RAWINPUTDEVICE a = *(const RAWINPUTDEVICE *)ap; - const RAWINPUTDEVICE b = *(const RAWINPUTDEVICE *)bp; - - if (a.usUsagePage != b.usUsagePage) return a.usUsagePage - b.usUsagePage; - if (a.usUsage != b.usUsage) return a.usUsage - b.usUsage; - return 0; -} - -/*********************************************************************** - * GetRegisteredRawInputDevices (USER32.@) - */ -UINT WINAPI DECLSPEC_HOTPATCH GetRegisteredRawInputDevices(RAWINPUTDEVICE *devices, UINT *device_count, UINT size) -{ - struct rawinput_device *buffer = NULL; - unsigned int i, status, count = ~0U, buffer_size; - - TRACE("devices %p, device_count %p, size %u\n", devices, device_count, size); - - if (size != sizeof(RAWINPUTDEVICE) || !device_count || (devices && !*device_count)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return ~0U; - } - - buffer_size = *device_count * sizeof(*buffer); - if (devices && !(buffer = HeapAlloc(GetProcessHeap(), 0, buffer_size))) - return ~0U; - - SERVER_START_REQ(get_rawinput_devices) - { - if (buffer) wine_server_set_reply(req, buffer, buffer_size); - status = wine_server_call_err(req); - *device_count = reply->device_count; - } - SERVER_END_REQ; - - if (buffer && !status) - { - for (i = 0, count = *device_count; i < count; ++i) - { - devices[i].usUsagePage = buffer[i].usage_page; - devices[i].usUsage = buffer[i].usage; - devices[i].dwFlags = buffer[i].flags; - devices[i].hwndTarget = wine_server_ptr_handle(buffer[i].target); - } - - qsort(devices, count, sizeof(*devices), compare_raw_input_devices); - } - - if (buffer) HeapFree(GetProcessHeap(), 0, buffer); - else count = 0; - return count; -} - - /*********************************************************************** * DefRawInputProc (USER32.@) */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index dbe2a4c1430..3e20277251a 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -372,7 +372,7 @@ @ stdcall GetRawInputDeviceInfoW(ptr long ptr ptr) @ stdcall GetRawInputDeviceList(ptr ptr long) # @ stub GetReasonTitleFromReasonCode -@ stdcall GetRegisteredRawInputDevices(ptr ptr long) +@ stdcall GetRegisteredRawInputDevices(ptr ptr long) NtUserGetRegisteredRawInputDevices @ stdcall GetScrollBarInfo(long long ptr) @ stdcall GetScrollInfo(long long ptr) @ stdcall GetScrollPos(long long) diff --git a/dlls/win32u/rawinput.c b/dlls/win32u/rawinput.c index 359faa39083..1caf11f2e76 100644 --- a/dlls/win32u/rawinput.c +++ b/dlls/win32u/rawinput.c @@ -427,3 +427,62 @@ BOOL WINAPI NtUserRegisterRawInputDevices( const RAWINPUTDEVICE *devices, UINT d return ret; } + +static int compare_raw_input_devices( const void *ap, const void *bp ) +{ + const RAWINPUTDEVICE a = *(const RAWINPUTDEVICE *)ap; + const RAWINPUTDEVICE b = *(const RAWINPUTDEVICE *)bp; + + if (a.usUsagePage != b.usUsagePage) return a.usUsagePage - b.usUsagePage; + if (a.usUsage != b.usUsage) return a.usUsage - b.usUsage; + return 0; +} + +/********************************************************************** + * NtUserGetRegisteredRawInputDevices (win32u.@) + */ +UINT WINAPI NtUserGetRegisteredRawInputDevices( RAWINPUTDEVICE *devices, UINT *device_count, UINT size ) +{ + struct rawinput_device *buffer = NULL; + unsigned int i, status, buffer_size; + + TRACE("devices %p, device_count %p, size %u\n", devices, device_count, size); + + if (size != sizeof(RAWINPUTDEVICE) || !device_count || (devices && !*device_count)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + buffer_size = *device_count * sizeof(*buffer); + if (devices && !(buffer = malloc( buffer_size ))) + return ~0u; + + SERVER_START_REQ(get_rawinput_devices) + { + if (buffer) wine_server_set_reply( req, buffer, buffer_size ); + status = wine_server_call_err(req); + *device_count = reply->device_count; + } + SERVER_END_REQ; + if (status) + { + free( buffer ); + return ~0u; + } + + if (!devices) return 0; + + for (i = 0; i < *device_count; ++i) + { + devices[i].usUsagePage = buffer[i].usage_page; + devices[i].usUsage = buffer[i].usage; + devices[i].dwFlags = buffer[i].flags; + devices[i].hwndTarget = wine_server_ptr_handle(buffer[i].target); + } + + qsort( devices, *device_count, sizeof(*devices), compare_raw_input_devices ); + + free( buffer ); + return *device_count; +} diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 3f2c596f727..49746725816 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -147,6 +147,7 @@ static void * const syscalls[] = NtUserGetProp, NtUserGetRawInputBuffer, NtUserGetRawInputData, + NtUserGetRegisteredRawInputDevices, NtUserGetSystemDpiForProcess, NtUserGetThreadDesktop, NtUserGetTitleBarInfo, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 687ef3af8dc..dab6e2a5ed8 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -988,7 +988,7 @@ @ stub NtUserGetRawInputDeviceInfo @ stub NtUserGetRawInputDeviceList @ stub NtUserGetRawPointerDeviceData -@ stub NtUserGetRegisteredRawInputDevices +@ stdcall -syscall NtUserGetRegisteredRawInputDevices(ptr ptr long) @ stub NtUserGetRequiredCursorSizes @ stub NtUserGetResizeDCompositionSynchronizationObject @ stub NtUserGetScrollBarInfo diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 531f9f7f9cd..903f146025d 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -134,6 +134,7 @@ SYSCALL_ENTRY( NtUserGetProp ) \ SYSCALL_ENTRY( NtUserGetRawInputBuffer ) \ SYSCALL_ENTRY( NtUserGetRawInputData ) \ + SYSCALL_ENTRY( NtUserGetRegisteredRawInputDevices ) \ SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserGetTitleBarInfo ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 231f6a04a1e..87c522071aa 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -1015,3 +1015,44 @@ NTSTATUS WINAPI wow64_NtUserRegisterRawInputDevices( UINT *args ) return NtUserRegisterRawInputDevices( devices64, count, sizeof(*devices64) ); } + +NTSTATUS WINAPI wow64_NtUserGetRegisteredRawInputDevices( UINT *args ) +{ + RAWINPUTDEVICE32 *devices32 = get_ptr( &args ); + UINT *count = get_ptr( &args ); + UINT size = get_ulong( &args ); + + if (size != sizeof(RAWINPUTDEVICE32)) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return ~0u; + } + + if (devices32) + { + RAWINPUTDEVICE *devices64; + unsigned int ret, i; + + if (!(devices64 = Wow64AllocateTemp( (*count) * sizeof(*devices64) ))) + { + SetLastError( ERROR_NOT_ENOUGH_MEMORY ); + return ~0u; + } + + ret = NtUserGetRegisteredRawInputDevices( devices64, count, sizeof(RAWINPUTDEVICE) ); + if (ret == ~0u) return ret; + + for (i = 0; i < *count; ++i) + { + devices32[i].usUsagePage = devices64[i].usUsagePage; + devices32[i].usUsage = devices64[i].usUsage; + devices32[i].dwFlags = devices64[i].dwFlags; + devices32[i].hwndTarget = (ULONG_PTR)devices64[i].hwndTarget; + } + return ret; + } + else + { + return NtUserGetRegisteredRawInputDevices( NULL, count, sizeof(RAWINPUTDEVICE) ); + } +} diff --git a/include/ntuser.h b/include/ntuser.h index cb5696ec827..9c4aaf041a4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -621,6 +621,7 @@ ULONG WINAPI NtUserGetProcessDpiAwarenessContext( HANDLE process ); DWORD WINAPI NtUserGetQueueStatus( UINT flags ); UINT WINAPI NtUserGetRawInputBuffer( RAWINPUT *data, UINT *data_size, UINT header_size ); UINT WINAPI NtUserGetRawInputData( HRAWINPUT rawinput, UINT command, void *data, UINT *data_size, UINT header_size ); +UINT WINAPI NtUserGetRegisteredRawInputDevices( RAWINPUTDEVICE *devices, UINT *device_count, UINT size ); ULONG WINAPI NtUserGetSystemDpiForProcess( HANDLE process ); HMENU WINAPI NtUserGetSystemMenu( HWND hwnd, BOOL revert ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread );

1 0

← Newer
1
2
3
4
5
6
7
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2022