wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Jacek Caban : winex11: Move user driver to unixlib.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 10f38c06008a1410bc9a1f7d239d831c6b21749a URL: https://source.winehq.org/git/wine.git/?a=commit;h=10f38c06008a1410bc9a1f7d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 12:41:31 2022 +0200 winex11: Move user driver to unixlib. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/Makefile.in | 3 +- dlls/winex11.drv/bitblt.c | 4 +++ dlls/winex11.drv/brush.c | 4 +++ dlls/winex11.drv/clipboard.c | 4 +++ dlls/winex11.drv/desktop.c | 4 +++ dlls/winex11.drv/display.c | 4 +++ dlls/winex11.drv/dllmain.c | 16 ++++++++++- dlls/winex11.drv/event.c | 12 +++++--- dlls/winex11.drv/graphics.c | 4 +++ dlls/winex11.drv/init.c | 4 +++ dlls/winex11.drv/keyboard.c | 4 +++ dlls/winex11.drv/mouse.c | 4 +++ dlls/winex11.drv/opengl.c | 4 +++ dlls/winex11.drv/palette.c | 4 +++ dlls/winex11.drv/pen.c | 4 +++ dlls/winex11.drv/settings.c | 4 +++ dlls/winex11.drv/systray.c | 2 ++ dlls/winex11.drv/unixlib.h | 11 +++++++- dlls/winex11.drv/vulkan.c | 4 +++ dlls/winex11.drv/window.c | 6 +++- dlls/winex11.drv/wintab.c | 4 +++ dlls/winex11.drv/x11drv.h | 64 ++++++++++++++++++++++++++++++++++-------- dlls/winex11.drv/x11drv_main.c | 29 ++++++++++++++++--- dlls/winex11.drv/xim.c | 4 +++ dlls/winex11.drv/xinerama.c | 4 +++ dlls/winex11.drv/xrandr.c | 4 +++ dlls/winex11.drv/xrender.c | 4 +++ dlls/winex11.drv/xvidmode.c | 4 +++ tools/winewrapper | 4 +-- 29 files changed, 201 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10f38c06008a1410bc9a…

1 0

Jacek Caban : winex11: Use wcsicmp for string comparison.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 6dd08c34dccd491add3528b29726ae684b6be264 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6dd08c34dccd491add3528b2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 23:55:41 2022 +0200 winex11: Use wcsicmp for string comparison. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 4 ++-- dlls/winex11.drv/keyboard.c | 2 +- dlls/winex11.drv/settings.c | 8 ++++---- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index c335bc5ba2b..20f4063c343 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -90,7 +90,7 @@ static BOOL X11DRV_desktop_get_id( const WCHAR *device_name, ULONG_PTR *id ) { WCHAR primary_adapter[CCHDEVICENAME]; - if (!get_primary_adapter( primary_adapter ) || lstrcmpiW( primary_adapter, device_name )) + if (!get_primary_adapter( primary_adapter ) || wcsicmp( primary_adapter, device_name )) return FALSE; *id = 0; @@ -342,7 +342,7 @@ NTSTATUS x11drv_create_desktop( void *arg ) TRACE( "%s %ux%u\n", debugstr_w(name), params->width, params->height ); /* magic: desktop "root" means use the root window */ - if (!lstrcmpiW( name, rootW )) return FALSE; + if (!wcsicmp( name, rootW )) return FALSE; /* Create window */ win_attr.event_mask = ExposureMask | KeyPressMask | KeyReleaseMask | EnterWindowMask | diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 6b876c3bee9..ff43939a858 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -2203,7 +2203,7 @@ INT X11DRV_GetKeyNameText( LONG lParam, LPWSTR lpBuffer, INT nSize ) if (name && (vkey == VK_SHIFT || vkey == VK_CONTROL || vkey == VK_MENU)) { char* idx = strrchr(name, '_'); - if (idx && (_strnicmp(idx, "_r", -1) == 0 || _strnicmp(idx, "_l", -1) == 0)) + if (idx && (idx[1] == 'r' || idx[1] == 'R' || idx[1] == 'l' || idx[1] == 'L') && !idx[2]) { pthread_mutex_unlock( &kbd_mutex ); TRACE("found scan=%04x keyc=%u keysym=%lx modified_string=%s\n", diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 1e8868acc6c..3e83e467c63 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -91,7 +91,7 @@ static BOOL nores_get_id(const WCHAR *device_name, ULONG_PTR *id) if (!get_primary_adapter( primary_adapter )) return FALSE; - *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; return TRUE; } @@ -500,7 +500,7 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW } pthread_mutex_lock( &settings_mutex ); - if (n == 0 || lstrcmpiW(cached_device_name, name) || cached_flags != flags) + 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)) { @@ -654,7 +654,7 @@ static LONG get_display_settings(struct x11drv_display_setting **new_displays, displays[display_idx].desired_mode = registry_mode; } - else if (!lstrcmpiW(dev_name, display_device.DeviceName)) + else if (!wcsicmp(dev_name, display_device.DeviceName)) { displays[display_idx].desired_mode = *dev_mode; if (!(dev_mode->dmFields & DM_POSITION)) @@ -950,7 +950,7 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, { for (display_idx = 0; display_idx < display_count; ++display_idx) { - if (!lstrcmpiW(displays[display_idx].desired_mode.dmDeviceName, devname)) + if (!wcsicmp(displays[display_idx].desired_mode.dmDeviceName, devname)) { full_mode = get_full_mode(displays[display_idx].id, &displays[display_idx].desired_mode); if (!full_mode) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 42d9e39b082..5540a6ebbb5 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -949,4 +949,6 @@ static inline int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DW return WideCharToMultiByte( CP_UNIXCP, 0, src, srclen, dst, dstlen, NULL, NULL ); } +#define wcsicmp lstrcmpiW + #endif /* __WINE_X11DRV_H */ diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6ede776d76b..eec7a81a4cb 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -151,7 +151,7 @@ static BOOL xrandr10_get_id( const WCHAR *device_name, ULONG_PTR *id ) /* RandR 1.0 only supports changing the primary adapter settings. * For non-primary adapters, an id is still provided but getting * and changing non-primary adapters' settings will be ignored. */ - *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; return TRUE; } diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 126e2bf2a69..a51ded9fe4a 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -91,7 +91,7 @@ static BOOL xf86vm_get_id(const WCHAR *device_name, ULONG_PTR *id) /* XVidMode only supports changing the primary adapter settings. * For non-primary adapters, an id is still provided but getting * and changing non-primary adapters' settings will be ignored. */ - *id = !lstrcmpiW( device_name, primary_adapter ) ? 1 : 0; + *id = !wcsicmp( device_name, primary_adapter ) ? 1 : 0; return TRUE; }

1 0

Jacek Caban : include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 497f37cf99575191e8a0b4bed40f554c9bb03794 URL: https://source.winehq.org/git/wine.git/?a=commit;h=497f37cf99575191e8a0b4be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 12:23:01 2022 +0200 include: Don't use DECLSPEC_HIDDEN for WINGDIAPI and WINUSERAPI in unuxlibs. Allows win32u.so to expose such functions using unixlib interface. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dde.h | 2 +- include/ddeml.h | 2 +- include/wingdi.h | 2 +- include/winuser.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dde.h b/include/dde.h index 35623615398..4e0d1176727 100644 --- a/include/dde.h +++ b/include/dde.h @@ -28,7 +28,7 @@ extern "C" { #endif -#ifdef _USER32_ +#if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else #define WINUSERAPI DECLSPEC_HIDDEN diff --git a/include/ddeml.h b/include/ddeml.h index b8d7f00631a..dcac04bfb19 100644 --- a/include/ddeml.h +++ b/include/ddeml.h @@ -26,7 +26,7 @@ extern "C" { #endif /* defined(__cplusplus) */ -#ifdef _USER32_ +#if defined(_USER32_) || defined(WINE_UNIX_LIB) #define WINUSERAPI #else #define WINUSERAPI DECLSPEC_HIDDEN diff --git a/include/wingdi.h b/include/wingdi.h index 7220aff089b..6778c60db79 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -24,7 +24,7 @@ extern "C" { #endif -#ifdef _GDI32_ +#if defined(_GDI32_) || defined(WINE_UNIX_LIB) #define WINGDIAPI #else #define WINGDIAPI DECLSPEC_HIDDEN diff --git a/include/winuser.h b/include/winuser.h index 01660e8a8f7..a227b912e0e 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -19,7 +19,7 @@ #ifndef _WINUSER_ #define _WINUSER_ -#if !defined(_USER32_) +#if !defined(_USER32_) && !defined(WINE_UNIX_LIB) #define WINUSERAPI DECLSPEC_HIDDEN #else #define WINUSERAPI

1 0

Jacek Caban : winex11: Move LoadIcon call to dllmain.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 2c1b7c8c170224657aa4ccbc79374c543d6b84f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c1b7c8c170224657aa4ccbc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:31:51 2022 +0200 winex11: Move LoadIcon call to dllmain. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 7 +++++++ dlls/winex11.drv/unixlib.h | 1 + dlls/winex11.drv/window.c | 5 ++++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 705503dc37c..2a361c477f4 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -151,6 +151,12 @@ static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size ) } +static NTSTATUS x11drv_load_icon( UINT id ) +{ + return HandleToUlong( LoadIconW( NULL, UlongToPtr( id ))); +} + + typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -162,6 +168,7 @@ static const callback_func callback_funcs[] = x11drv_ime_set_cursor_pos, x11drv_ime_set_open_status, x11drv_ime_update_association, + x11drv_load_icon, }; C_ASSERT( ARRAYSIZE(callback_funcs) == client_funcs_count ); diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index 233a2578b41..f3f6b9b8f06 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -117,6 +117,7 @@ enum client_callback client_ime_set_cursor_pos, client_ime_set_open_status, client_ime_update_association, + client_load_icon, client_funcs_count }; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 161f749a81d..a62a3e84e81 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -627,7 +627,10 @@ static void fetch_icon_data( HWND hwnd, HICON icon_big, HICON icon_small ) if (!icon_big) icon_big = get_icon_info( (HICON)NtUserGetClassLongPtrW( hwnd, GCLP_HICON ), &ii ); if (!icon_big) - icon_big = get_icon_info( LoadIconW( 0, (LPWSTR)IDI_WINLOGO ), &ii); + { + UINT winlogo = x11drv_client_call( client_load_icon, IDI_WINLOGO ); + icon_big = get_icon_info( UlongToHandle( winlogo ), &ii ); + } } if (!icon_small) {

1 0

Jacek Caban : winex11: Use unixlib interface for x11drv_is_system_module.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 2f4a338da3fd80a0bffd4bfdafbd81208928b977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f4a338da3fd80a0bffd4bfd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 00:45:01 2022 +0200 winex11: Use unixlib interface for x11drv_is_system_module. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 26 ++++++++++++++++++++++++++ dlls/winex11.drv/mouse.c | 25 +++++++++---------------- dlls/winex11.drv/unixlib.h | 10 ++++++++++ 3 files changed, 45 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index 7ea07647dc9..705503dc37c 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -127,6 +127,30 @@ static NTSTATUS x11drv_clipboard_init( UINT arg ) } +static NTSTATUS WINAPI x11drv_is_system_module( void *arg, ULONG size ) +{ + HMODULE module; + unsigned int i; + + static const WCHAR cursor_modules[][16] = + { + { 'u','s','e','r','3','2','.','d','l','l',0 }, + { 'c','o','m','c','t','l','3','2','.','d','l','l',0 }, + { 'o','l','e','3','2','.','d','l','l',0 }, + { 'r','i','c','h','e','d','2','0','.','d','l','l',0 } + }; + + if (!(module = GetModuleHandleW( arg ))) return system_module_none; + + for (i = 0; i < ARRAYSIZE(cursor_modules); i++) + { + if (GetModuleHandleW( cursor_modules[i] ) == module) return i; + } + + return system_module_none; +} + + typedef NTSTATUS (*callback_func)( UINT arg ); static const callback_func callback_funcs[] = { @@ -157,11 +181,13 @@ static const kernel_callback kernel_callbacks[] = x11drv_dnd_post_drop, x11drv_ime_set_composition_string, x11drv_ime_set_result, + x11drv_is_system_module, x11drv_systray_change_owner, }; C_ASSERT( NtUserDriverCallbackFirst + ARRAYSIZE(kernel_callbacks) == client_func_last ); + BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) { void **callback_table; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index d080ed5458e..adf23d04450 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -930,16 +930,12 @@ static const struct system_cursors riched20_cursors[] = { 0 } }; -static const struct +static const struct system_cursors *module_cursors[] = { - const struct system_cursors *cursors; - WCHAR name[16]; -} module_cursors[] = -{ - { user32_cursors, {'u','s','e','r','3','2','.','d','l','l',0} }, - { comctl32_cursors, {'c','o','m','c','t','l','3','2','.','d','l','l',0} }, - { ole32_cursors, {'o','l','e','3','2','.','d','l','l',0} }, - { riched20_cursors, {'r','i','c','h','e','d','2','0','.','d','l','l',0} } + user32_cursors, + comctl32_cursors, + ole32_cursors, + riched20_cursors, }; struct cursor_font_fallback @@ -1059,7 +1055,6 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) const struct system_cursors *cursors; unsigned int i; Cursor cursor = 0; - HMODULE module; HKEY key; const char * const *names = NULL; WCHAR *p, name[MAX_PATH * 2]; @@ -1098,13 +1093,11 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) } if (info->szResName[0]) goto done; /* only integer resources are supported here */ - if (!(module = GetModuleHandleW( info->szModName ))) goto done; - - for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) - if (GetModuleHandleW( module_cursors[i].name ) == module) break; - if (i == ARRAY_SIZE( module_cursors )) goto done; + i = x11drv_client_func( client_func_is_system_module, info->szModName, + (lstrlenW( info->szModName ) + 1) * sizeof(WCHAR) ); + if (i == system_module_none) goto done; - cursors = module_cursors[i].cursors; + cursors = module_cursors[i]; for (i = 0; cursors[i].id; i++) if (cursors[i].id == info->wResID) { diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index dc3c74979ca..233a2578b41 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -66,6 +66,15 @@ struct systray_dock_params BOOL *layered; }; +enum system_modules +{ + system_module_user32, + system_module_comctl32, + system_module_ole32, + system_module_riched20, + system_module_none = 0xffff, +}; + /* x11drv_tablet_info params */ struct tablet_info_params { @@ -90,6 +99,7 @@ enum x11drv_client_funcs client_func_dnd_post_drop, client_func_ime_set_composition_string, client_func_ime_set_result, + client_func_is_system_module, client_func_systray_change_owner, client_func_last };

1 0

Jacek Caban : winex11: Directly use NtUserCreateWindowEx.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 0dcd1eaae57a6d14a9166c21ab99edf3ec3b036a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dcd1eaae57a6d14a9166c21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 16:57:41 2022 +0200 winex11: Directly use NtUserCreateWindowEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 7 +++++-- dlls/winex11.drv/window.c | 19 ++++++++++++------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 02c5bf88f0e..d080ed5458e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -373,6 +373,7 @@ static BOOL grab_clipping_window( const RECT *clip ) #if HAVE_X11_EXTENSIONS_XINPUT2_H static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; struct x11drv_thread_data *data = x11drv_thread_data(); + UNICODE_STRING class_name; Window clip_window; HWND msg_hwnd = 0; POINT pos; @@ -383,8 +384,10 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data) return FALSE; if (!(clip_window = init_clip_window())) return TRUE; - if (!(msg_hwnd = CreateWindowW( messageW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, - GetModuleHandleW(0), NULL ))) + RtlInitUnicodeString( &class_name, messageW ); + if (!(msg_hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, 0, 0, 0, 0, 0, + HWND_MESSAGE, 0, NtCurrentTeb()->Peb->ImageBaseAddress, + NULL, 0, NULL, 0, FALSE ))) return TRUE; if (keyboard_grabbed) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index cfb61c3217a..161f749a81d 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2004,10 +2004,11 @@ HWND create_foreign_window( Display *display, Window xwin ) unsigned int nchildren; XWindowAttributes attr; DWORD style = WS_CLIPCHILDREN; + UNICODE_STRING class_name; if (!class_registered) { - UNICODE_STRING class_name, version = { 0 }; + UNICODE_STRING version = { 0 }; WNDCLASSEXW class; memset( &class, 0, sizeof(class) ); @@ -2050,8 +2051,10 @@ HWND create_foreign_window( Display *display, Window xwin ) pos.y = attr.y; } - hwnd = CreateWindowW( classW, NULL, style, pos.x, pos.y, attr.width, attr.height, - parent, 0, 0, NULL ); + RtlInitUnicodeString( &class_name, classW ); + hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, style, pos.x, pos.y, + attr.width, attr.height, parent, 0, NULL, NULL, 0, NULL, + 0, FALSE ); if (!(data = alloc_win_data( display, hwnd ))) { @@ -2167,6 +2170,7 @@ NTSTATUS x11drv_systray_dock( void *arg ) XSetWindowAttributes attr; XVisualInfo visual; struct x11drv_win_data *data; + UNICODE_STRING class_name; BOOL layered; HWND hwnd; @@ -2189,10 +2193,11 @@ NTSTATUS x11drv_systray_dock( void *arg ) *params->layered = layered = (visual.depth == 32); - hwnd = CreateWindowExW( layered ? WS_EX_LAYERED : 0, - icon_classname, NULL, WS_CLIPSIBLINGS | WS_POPUP, - CW_USEDEFAULT, CW_USEDEFAULT, params->cx, params->cy, - NULL, NULL, NULL, params->icon ); + RtlInitUnicodeString( &class_name, icon_classname ); + hwnd = NtUserCreateWindowEx( layered ? WS_EX_LAYERED : 0, &class_name, &class_name, NULL, + WS_CLIPSIBLINGS | WS_POPUP, CW_USEDEFAULT, CW_USEDEFAULT, + params->cx, params->cy, NULL, 0, NULL, params->icon, 0, + NULL, 0, FALSE ); if (!(data = get_win_data( hwnd ))) return STATUS_UNSUCCESSFUL; if (layered) set_window_visual( data, &visual, TRUE );

1 0

Jacek Caban : win32u: Allow NULL cbtc in NtUserCreateWindowEx.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 21c8ff873b9657a1b8cb632ab4ec435d6ffdf065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21c8ff873b9657a1b8cb632a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 6 03:04:20 2022 +0200 win32u: Allow NULL cbtc in NtUserCreateWindowEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/window.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9231f98539e..94cdd7f7280 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4845,9 +4845,10 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, HWND parent, HMENU menu, HINSTANCE instance, void *params, DWORD flags, CBT_CREATEWNDW *cbtc, DWORD unk, BOOL ansi ) { - CREATESTRUCTW cs, *client_cs = cbtc->lpcs; + CREATESTRUCTW cs, *client_cs, cs_buf; UINT win_dpi, thread_dpi = get_thread_dpi(); DPI_AWARENESS_CONTEXT context; + CBT_CREATEWNDW cbtc_buf; HWND hwnd, owner = 0; INT sw = SW_SHOW; RECT rect; @@ -4855,8 +4856,24 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, static const WCHAR messageW[] = {'M','e','s','s','a','g','e'}; + /* FIXME: We should pass a packed struct to client instead of using client_cs */ + if (cbtc) + { + client_cs = cbtc->lpcs; + cs.lpszName = client_cs->lpszName; + cs.lpszClass = client_cs->lpszClass; + cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ + } + else + { + cbtc = &cbtc_buf; + client_cs = cbtc->lpcs = &cs_buf; + cs.lpszName = window_name ? window_name->Buffer : NULL; + cs.lpszClass = class_name->Buffer; + cs.hInstance = instance; + } + cs.lpCreateParams = params; - cs.hInstance = client_cs->hInstance; /* may be different than instance for win16 */ cs.hMenu = menu; cs.hwndParent = parent; cs.style = style; @@ -4865,10 +4882,6 @@ HWND WINAPI NtUserCreateWindowEx( DWORD ex_style, UNICODE_STRING *class_name, cs.y = y; cs.cx = cx; cs.cy = cy; - /* We use client_cs to pass original class and name pointers, - * that's probably not how native handles it. */ - cs.lpszName = client_cs->lpszName; - cs.lpszClass = client_cs->lpszClass; /* Find the parent window */ if (parent == HWND_MESSAGE)

1 0

Nikolay Sivov : kernel32: Implement UnmapViewOfFileEx().
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 1e2bc2f50e0a7f2546067c1811cdadbc7c580ba7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e2bc2f50e0a7f2546067c18… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 6 18:04:04 2022 +0300 kernel32: Implement UnmapViewOfFileEx(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/memory.c | 9 +++++++++ include/winbase.h | 1 + 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index bc5913b6d7d..ca339181e32 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1557,6 +1557,7 @@ @ stdcall -import UnlockFile(long long long long long) @ stdcall -import UnlockFileEx(long long long long ptr) @ stdcall -import UnmapViewOfFile(ptr) +@ stdcall -import UnmapViewOfFileEx(ptr long) # @ stub UnregisterApplicationRecoveryCallback @ stdcall UnregisterApplicationRestart() # @ stub UnregisterConsoleIME diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 854797ddeb0..791c3603918 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1654,7 +1654,7 @@ @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) @ stdcall UnmapViewOfFile2(long ptr long) -# @ stub UnmapViewOfFileEx +@ stdcall UnmapViewOfFileEx(ptr long) # @ stub UnregisterBadMemoryNotification # @ stub UnregisterGPNotificationInternal # @ stub UnregisterStateChangeNotification diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 87c07887482..35e6d4e3b8c 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -312,6 +312,15 @@ BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFile2( HANDLE process, void *addr, ULON } +/*********************************************************************** + * UnmapViewOfFileEx (kernelbase.@) + */ +BOOL WINAPI DECLSPEC_HOTPATCH UnmapViewOfFileEx( void *addr, ULONG flags ) +{ + return set_ntstatus( NtUnmapViewOfSectionEx( GetCurrentProcess(), addr, flags )); +} + + /*********************************************************************** * VirtualAlloc (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 2b109af19df..9fbaa466b54 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2742,6 +2742,7 @@ WINBASEAPI BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED #define UnlockSegment(handle) GlobalUnfix((HANDLE)(handle)) WINBASEAPI BOOL WINAPI UnmapViewOfFile(LPCVOID); WINBASEAPI BOOL WINAPI UnmapViewOfFile2(HANDLE,PVOID,ULONG); +WINBASEAPI BOOL WINAPI UnmapViewOfFileEx(PVOID,ULONG); WINBASEAPI BOOL WINAPI UmsThreadYield(void *); WINBASEAPI HRESULT WINAPI UnregisterApplicationRestart(void); WINBASEAPI BOOL WINAPI UnregisterWait(HANDLE);

1 0

Francois Gouget : kernelbase/tests: Loosen up the Sleep() test lower bound.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 48d538ba82a1564329d0cd0ac4d35685a4a80cb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48d538ba82a1564329d0cd0a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 6 14:50:31 2022 +0200 kernelbase/tests: Loosen up the Sleep() test lower bound. It looks like Windows tries to work around the timer granularity by sometimes returning early such that the total may be a bit less than requested. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/tests/sync.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index ecbff6d5707..4dfcfde3f26 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -213,8 +213,11 @@ static void test_Sleep(void) min = 50.0 * (r1 < r2 ? r1 : r2) / 10000000.0; max = 50.0 * (r1 < r2 ? r2 : r1) / 10000000.0; - /* Add an extra 1s to account for potential scheduling delays */ - ok(0.9 * min <= elapsed_time && elapsed_time <= 1.0 + max, + /* Windows tries to work around the timer resolution by sometimes + * returning early such that the total may be a bit less than requested! + * Also add an extra 1s to account for potential scheduling delays. + */ + ok(0.7 * min <= elapsed_time && elapsed_time <= 1.0 + max, "got %f, expected between %f and %f\n", elapsed_time, min, max); }

1 0

Francois Gouget : user32/tests: Make the test_char_from_pos() failures more informative.
by Alexandre Julliard 06 May '22

06 May '22

Module: wine Branch: master Commit: 3ce1d494a6d4ac855c350225a1c62c65f58a6c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ce1d494a6d4ac855c350225… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 6 14:50:03 2022 +0200 user32/tests: Make the test_char_from_pos() failures more informative. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/edit.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 1607e9d84d9..1e5ed8dbfa0 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -1154,11 +1154,11 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(0 == ret, "expected 0 got %d\n", ret); + ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1172,11 +1172,11 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(0 == ret, "expected 0 got %d\n", ret); + ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1190,11 +1190,11 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(0 == ret, "expected 0 got %d\n", ret); + ok(0 == ret, "%d/%d/%d: expected 0 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1208,11 +1208,12 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + ok(0 == ret || 1 == ret /* Vista */, + "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1226,11 +1227,12 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + ok(0 == ret || 1 == ret /* Vista */, + "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret); @@ -1244,11 +1246,12 @@ static void test_char_from_pos(void) for (i = lo; i < mid; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok((0 == ret || 1 == ret /* Vista */), "expected 0 or 1 got %d\n", ret); + ok(0 == ret || 1 == ret /* Vista */, + "%d/%d/%d: expected 0 or 1 got %d\n", lo, i, mid, ret); } for (i = mid; i <= hi; i++) { ret = LOWORD(SendMessageA(hwEdit, EM_CHARFROMPOS, 0, i)); - ok(1 == ret, "expected 1 got %d\n", ret); + ok(1 == ret, "%d/%d/%d: expected 1 got %d\n", mid, i, hi, ret); } ret = SendMessageA(hwEdit, EM_POSFROMCHAR, 2, 0); ok(-1 == ret, "expected -1 got %d\n", ret);

1 0

← Newer
1
...
62
63
64
65
66
67
68
...
91
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 May 2022