May 2022 - Wine-commits - list.winehq.org

Cressida Silver : WWN ISS 419
by Jeremy Newman 31 May '22

31 May '22

Module: website Branch: master Commit: 2d7426ff08694ec3b067cb42aad92ad7a6fee7fa URL: https://source.winehq.org/git/website.git/?a=commit;h=2d7426ff08694ec3b067c… Author: Cressida Silver <cjsilver(a)codeweavers.com> Date: Fri May 27 14:54:01 2022 -0500 WWN ISS 419 --- news/en/2022052702.xml | 13 ++ wwn/en/wn20220527_419.xml | 440 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 453 insertions(+) Diff: https://source.winehq.org/git/website.git/?a=commitdiff;h=2d7426ff08694ec3b…

1 0

Roman Pišl : tapi32: Add lineGetDevConfigW stub.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: a1e1f0346cff8848616a877151779f01ecf3c7c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e1f0346cff8848616a8771… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat May 28 13:18:02 2022 +0200 tapi32: Add lineGetDevConfigW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 2dbca2aba3e..97cd0b24d6f 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -656,6 +656,15 @@ DWORD WINAPI lineGetDevConfigA(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPC return 0; } +/*********************************************************************** + * lineGetDevConfigW (TAPI32.@) + */ +DWORD WINAPI lineGetDevConfigW(DWORD dwDeviceID, LPVARSTRING lpDeviceConfig, LPCWSTR lpszDeviceClass) +{ + FIXME("(%08lx, %p, %s): stub.\n", dwDeviceID, lpDeviceConfig, debugstr_w(lpszDeviceClass)); + return 0; +} + /*********************************************************************** * lineGetIDW (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 757e387c8d2..7e44b92735d 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -50,6 +50,7 @@ @ stdcall lineGetDevCapsW(long long long long ptr) @ stdcall lineGetDevConfig(long ptr str) lineGetDevConfigA @ stdcall lineGetDevConfigA(long ptr str) +@ stdcall lineGetDevConfigW(long ptr wstr) @ stdcall lineGetID(long long long long ptr str) lineGetIDA @ stdcall lineGetIDA(long long long long ptr str) @ stdcall lineGetIDW(long long long long ptr wstr)

1 0

Roman Pišl : tapi32: Add lineGetIconW stub.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 095c1f32af491aa5464f507f8f4848b3eceb181e URL: https://source.winehq.org/git/wine.git/?a=commit;h=095c1f32af491aa5464f507f… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat May 28 13:18:03 2022 +0200 tapi32: Add lineGetIconW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 97cd0b24d6f..83389131346 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -697,6 +697,15 @@ DWORD WINAPI lineGetIconA(DWORD dwDeviceID, LPCSTR lpszDeviceClass, HICON *lphIc return 0; } +/*********************************************************************** + * lineGetIconW (TAPI32.@) + */ +DWORD WINAPI lineGetIconW(DWORD dwDeviceID, LPCWSTR lpszDeviceClass, HICON *lphIcon) +{ + FIXME("(%08lx, %s, %p): stub.\n", dwDeviceID, debugstr_w(lpszDeviceClass), lphIcon); + return 0; +} + /*********************************************************************** * lineGetLineDevStatus (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 7e44b92735d..64ac36310dc 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -56,6 +56,7 @@ @ stdcall lineGetIDW(long long long long ptr wstr) @ stdcall lineGetIcon(long str ptr) lineGetIconA @ stdcall lineGetIconA(long str ptr) +@ stdcall lineGetIconW(long wstr ptr) @ stdcall lineGetLineDevStatus(long ptr) lineGetLineDevStatusA @ stdcall lineGetLineDevStatusA(long ptr) @ stdcall lineGetMessage(long ptr long)

1 0

Roman Pišl : tapi32: Add lineSetDevConfigW stub.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: ab44ef14d7dfb7d99ed7e4c57cfadb3d1ea90ec9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab44ef14d7dfb7d99ed7e4c5… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Sat May 28 13:18:04 2022 +0200 tapi32: Add lineSetDevConfigW stub. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53061 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tapi32/line.c | 9 +++++++++ dlls/tapi32/tapi32.spec | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 83389131346..a4f21a250c5 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -1468,6 +1468,15 @@ DWORD WINAPI lineSetDevConfigA(DWORD dwDeviceID, LPVOID lpDeviceConfig, DWORD dw return 0; } +/*********************************************************************** + * lineSetDevConfigW (TAPI32.@) + */ +DWORD WINAPI lineSetDevConfigW(DWORD dwDeviceID, LPVOID lpDeviceConfig, DWORD dwSize, LPCWSTR lpszDeviceClass) +{ + FIXME("(%08lx, %p, %08lx, %s): stub.\n", dwDeviceID, lpDeviceConfig, dwSize, debugstr_w(lpszDeviceClass)); + return 0; +} + /*********************************************************************** * lineSetMediaControl (TAPI32.@) */ diff --git a/dlls/tapi32/tapi32.spec b/dlls/tapi32/tapi32.spec index 64ac36310dc..efb684161a1 100644 --- a/dlls/tapi32/tapi32.spec +++ b/dlls/tapi32/tapi32.spec @@ -110,6 +110,7 @@ @ stdcall lineSetCurrentLocation(long long) @ stdcall lineSetDevConfig(long ptr long str) lineSetDevConfigA @ stdcall lineSetDevConfigA(long ptr long str) +@ stdcall lineSetDevConfigW(long ptr long wstr) @ stdcall lineSetMediaControl(long long long long ptr long ptr long ptr long ptr long) @ stdcall lineSetMediaMode(long long) @ stdcall lineSetNumRings(long long long)

1 0

Jacek Caban : winemac: Directly use ntdll in get_lcid.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 221fce4c17751da0966c2d5750f1f067592f9638 URL: https://source.winehq.org/git/wine.git/?a=commit;h=221fce4c17751da0966c2d57… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 19:38:15 2022 +0200 winemac: Directly use ntdll in get_lcid. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/keyboard.c | 80 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 94860f2e36c..9574b2797b5 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -441,16 +441,94 @@ static pthread_mutex_t layout_list_mutex = PTHREAD_MUTEX_INITIALIZER; int macdrv_layout_list_needs_update = TRUE; +static const NLS_LOCALE_HEADER *locale_table; + +static int compare_locale_names(const WCHAR *n1, const WCHAR *n2) +{ + for (;;) + { + WCHAR ch1 = *n1++; + WCHAR ch2 = *n2++; + if (ch1 >= 'a' && ch1 <= 'z') ch1 -= 'a' - 'A'; + else if (ch1 == '_') ch1 = '-'; + if (ch2 >= 'a' && ch2 <= 'z') ch2 -= 'a' - 'A'; + else if (ch2 == '_') ch2 = '-'; + if (!ch1 || ch1 != ch2) return ch1 - ch2; + } +} + + +static const NLS_LOCALE_LCNAME_INDEX *find_lcname_entry(const WCHAR *name) +{ + const NLS_LOCALE_LCNAME_INDEX *lcnames_index; + const WCHAR *locale_strings; + int min = 0, max = locale_table->nb_lcnames - 1; + + locale_strings = (const WCHAR *)((char *)locale_table + locale_table->strings_offset); + lcnames_index = (const NLS_LOCALE_LCNAME_INDEX *)((char *)locale_table + locale_table->lcnames_offset); + + while (min <= max) + { + int res, pos = (min + max) / 2; + const WCHAR *str = locale_strings + lcnames_index[pos].name; + res = compare_locale_names(name, str + 1); + if (res < 0) max = pos - 1; + else if (res > 0) min = pos + 1; + else return &lcnames_index[pos]; + } + return NULL; +} + + static DWORD get_lcid(CFStringRef lang) { + const NLS_LOCALE_LCNAME_INDEX *entry; + const NLS_LOCALE_DATA *locale; CFRange range; WCHAR str[10]; + ULONG offset; + + if (!locale_table) + { + struct + { + UINT ctypes; + UINT unknown1; + UINT unknown2; + UINT unknown3; + UINT locales; + UINT charmaps; + UINT geoids; + UINT scripts; + } *header; + LCID system_lcid; + LARGE_INTEGER size; + + if (NtInitializeNlsFiles((void **)&header, &system_lcid, &size)) + { + ERR("NtInitializeNlsFiles failed\n"); + return 0; + } + + if (InterlockedCompareExchangePointer((void **)&locale_table, + (char *)header + header->locales, NULL)) + NtUnmapViewOfSection(GetCurrentProcess(), header); + } range.location = 0; range.length = min(CFStringGetLength(lang), ARRAY_SIZE(str) - 1); CFStringGetCharacters(lang, range, str); str[range.length] = 0; - return LocaleNameToLCID(str, 0); + + if (!(entry = find_lcname_entry(str))) + { + ERR("%s not found\n", debugstr_w(str)); + return 0; + } + + offset = locale_table->locales_offset + entry->idx * locale_table->locale_size; + locale = (const NLS_LOCALE_DATA *)((const char *)locale_table + offset); + return locale->inotneutral ? entry->id : locale->idefaultlanguage; } static HKL get_hkl(CFStringRef lang, CFStringRef type)

1 0

Jacek Caban : winemac: Directly use ntdll in macdrv_vkQueuePresentKHR.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: cdb23964b0bfb10260561531f72ea4513b503981 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdb23964b0bfb10260561531… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 28 17:49:31 2022 +0200 winemac: Directly use ntdll in macdrv_vkQueuePresentKHR. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/vulkan.c b/dlls/winemac.drv/vulkan.c index 8481176fd70..ddef551c3d7 100644 --- a/dlls/winemac.drv/vulkan.c +++ b/dlls/winemac.drv/vulkan.c @@ -558,7 +558,7 @@ static VkResult macdrv_vkQueuePresentKHR(VkQueue queue, const VkPresentInfoKHR * static long prev_time, start_time; DWORD time; - time = GetTickCount(); + time = NtGetTickCount(); frames++; frames_total++; if (time - prev_time > 1500)

1 0

Jacek Caban : winemac: Directly use win32u in more places.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: ef0cb9157fec8e23cf970b7a1e2934a974fc55da URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef0cb9157fec8e23cf970b7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 28 17:42:38 2022 +0200 winemac: Directly use win32u in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/surface.c | 4 ++-- dlls/winemac.drv/window.c | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/surface.c b/dlls/winemac.drv/surface.c index 5d51d18422a..e8039b3b3aa 100644 --- a/dlls/winemac.drv/surface.c +++ b/dlls/winemac.drv/surface.c @@ -86,7 +86,7 @@ static void update_blit_data(struct macdrv_window_surface *surface) if (NtGdiCombineRgn(blit, surface->drawn, 0, RGN_COPY) > NULLREGION && (!surface->region || NtGdiCombineRgn(blit, blit, surface->region, RGN_AND) > NULLREGION) && - OffsetRgn(blit, surface->header.rect.left, surface->header.rect.top) > NULLREGION) + NtGdiOffsetRgn(blit, surface->header.rect.left, surface->header.rect.top) > NULLREGION) surface->blit_data = get_region_data(blit, 0); NtGdiDeleteObjectApp(blit); @@ -285,7 +285,7 @@ struct window_surface *create_surface(macdrv_window window, const RECT *rect, if (old_mac_surface && old_mac_surface->drawn) { surface->drawn = NtGdiCreateRectRgn(rect->left, rect->top, rect->right, rect->bottom); - OffsetRgn(surface->drawn, -rect->left, -rect->top); + NtGdiOffsetRgn(surface->drawn, -rect->left, -rect->top); if (NtGdiCombineRgn(surface->drawn, surface->drawn, old_mac_surface->drawn, RGN_AND) <= NULLREGION) { NtGdiDeleteObjectApp(surface->drawn); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 36e34abbd12..59788244c22 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -396,8 +396,8 @@ static void sync_window_region(struct macdrv_win_data *data, HRGN win_region) NtUserMirrorRgn(data->hwnd, hrgn); if (hrgn) { - OffsetRgn(hrgn, data->window_rect.left - data->whole_rect.left, - data->window_rect.top - data->whole_rect.top); + NtGdiOffsetRgn(hrgn, data->window_rect.left - data->whole_rect.left, + data->window_rect.top - data->whole_rect.top); } region_data = get_region_data(hrgn, 0); if (region_data) @@ -540,7 +540,8 @@ static void sync_window_min_max_info(HWND hwnd) primary_monitor_rect.left = primary_monitor_rect.top = 0; primary_monitor_rect.right = NtUserGetSystemMetrics(SM_CXSCREEN); primary_monitor_rect.bottom = NtUserGetSystemMetrics(SM_CYSCREEN); - AdjustWindowRectEx(&primary_monitor_rect, adjustedStyle, ((style & WS_POPUP) && GetMenu(hwnd)), exstyle); + AdjustWindowRectEx(&primary_monitor_rect, adjustedStyle, + ((style & WS_POPUP) && NtUserGetWindowLongPtrW(hwnd, GWLP_ID)), exstyle); xinc = -primary_monitor_rect.left; yinc = -primary_monitor_rect.top; @@ -1848,7 +1849,8 @@ LRESULT macdrv_SysCommand(HWND hwnd, WPARAM wparam, LPARAM lparam) /* prevent a simple ALT press+release from activating the system menu, as that can get confusing */ - if (command == SC_KEYMENU && !(WCHAR)lparam && !GetMenu(hwnd) && + if (command == SC_KEYMENU && !(WCHAR)lparam && + !NtUserGetWindowLongPtrW(hwnd, GWLP_ID) && (NtUserGetWindowLongW(hwnd, GWL_STYLE) & WS_SYSMENU)) { TRACE("ignoring SC_KEYMENU wp %lx lp %lx\n", wparam, lparam);

1 0

Jacek Caban : winex11: Detect system cursors from cursor module name in create_xcursor_system_cursor.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 5e18d7d8234e5d9186e94c58d0ef21bf62d05544 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e18d7d8234e5d9186e94c58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 16:13:31 2022 +0200 winex11: Detect system cursors from cursor module name in create_xcursor_system_cursor. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/dllmain.c | 25 ------------------------- dlls/winex11.drv/mouse.c | 26 +++++++++++++++++--------- dlls/winex11.drv/unixlib.h | 10 ---------- 3 files changed, 17 insertions(+), 44 deletions(-) diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c index b9bf5efd1e3..b06c955c2a4 100644 --- a/dlls/winex11.drv/dllmain.c +++ b/dlls/winex11.drv/dllmain.c @@ -128,30 +128,6 @@ 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; -} - - static NTSTATUS x11drv_load_icon( UINT id ) { return HandleToUlong( LoadIconW( NULL, UlongToPtr( id ))); @@ -189,7 +165,6 @@ 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, }; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 2ce03c3f12f..9e005881170 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -931,12 +931,16 @@ static const struct system_cursors riched20_cursors[] = { 0 } }; -static const struct system_cursors *module_cursors[] = +static const struct { - user32_cursors, - comctl32_cursors, - ole32_cursors, - riched20_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} } }; struct cursor_font_fallback @@ -1054,6 +1058,7 @@ static int find_fallback_shape( const char *name ) static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) { const struct system_cursors *cursors; + const WCHAR *module; unsigned int i; Cursor cursor = 0; HKEY key; @@ -1094,11 +1099,14 @@ static Cursor create_xcursor_system_cursor( const ICONINFOEXW *info ) } if (info->szResName[0]) goto done; /* only integer resources are supported here */ - 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]; + if ((module = wcsrchr( info->szModName, '\\' ))) module++; + else module = info->szModName; + for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) + if (!wcsicmp( module, module_cursors[i].name )) break; + if (i == ARRAY_SIZE( module_cursors )) goto done; + + cursors = module_cursors[i].cursors; 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 9be7c18cd12..76cfad88f4d 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -75,15 +75,6 @@ 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 { @@ -108,7 +99,6 @@ 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 : winemac: Detect system cursors from cursor module name in copy_system_cursor_name.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: a0a890b78cede1afb84acff163bc1ef54bf5beb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a890b78cede1afb84acff1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 16:20:48 2022 +0200 winemac: Detect system cursors from cursor module name in copy_system_cursor_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/macdrv.h | 1 + dlls/winemac.drv/mouse.c | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 04a8af81c53..26028247a96 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -367,6 +367,7 @@ static inline UINT asciiz_to_unicode(WCHAR *dst, const char *src) } /* FIXME: remove once we use unixlib */ +#define wcsicmp strcmpiW #define wcsnicmp strncmpiW #define wcsrchr strrchrW #define wcstol strtolW diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index d5db014dece..078b674d7c0 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -170,7 +170,7 @@ CFStringRef copy_system_cursor_name(ICONINFOEXW *info) const struct system_cursors *cursors; unsigned int i; CFStringRef cursor_name = NULL; - HMODULE module; + const WCHAR *module; HKEY key; WCHAR *p, name[MAX_PATH * 2]; @@ -223,10 +223,11 @@ CFStringRef copy_system_cursor_name(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 ((module = wcsrchr(info->szModName, '\\'))) module++; + else module = info->szModName; + for (i = 0; i < ARRAY_SIZE( module_cursors ); i++) + if (!wcsicmp(module, module_cursors[i].name)) break; if (i == ARRAY_SIZE(module_cursors)) goto done; cursors = module_cursors[i].cursors;

1 0

Jacek Caban : winemac: Use window messages instead of named pipe for macdrv_UpdateClipboard implementation.
by Alexandre Julliard 30 May '22

30 May '22

Module: wine Branch: master Commit: 4312d209232c701b0b78d9f8b463917c989005c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4312d209232c701b0b78d9f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 29 23:29:16 2022 +0200 winemac: Use window messages instead of named pipe for macdrv_UpdateClipboard implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 261 ++++--------------------------------------- 1 file changed, 22 insertions(+), 239 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4312d209232c701b0b78…

1 0