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

Nikolay Sivov : evr/sample: Use proper locking method for SetAllocator().
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 2686550a9919d4af1909b29c5232cedad439c87f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2686550a9919d4af1909b29c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 22 17:07:35 2022 +0300 evr/sample: Use proper locking method for SetAllocator(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 3521e6c4d51..f03292704b5 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -1446,8 +1446,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, TRACE("%p, %p, %p.\n", iface, sample_allocator, state); - IMFSample_LockStore(sample->sample); - + EnterCriticalSection(&sample->cs); if (sample->tracked_result) hr = MF_E_NOTACCEPTING; else @@ -1464,8 +1463,7 @@ static HRESULT WINAPI tracked_video_sample_SetAllocator(IMFTrackedSample *iface, } } } - - IMFSample_UnlockStore(sample->sample); + LeaveCriticalSection(&sample->cs); return hr; }

1 0

Limstash Wong : taskmgr: Fix the unit in memory usage graph on performance tab.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 3e9af4478dcacd08d0e6de2a8631a90b2d01f37e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e9af4478dcacd08d0e6de2a… Author: Limstash Wong <limstash.w(a)gmail.com> Date: Fri May 20 01:31:35 2022 +0800 taskmgr: Fix the unit in memory usage graph on performance tab. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50948 Signed-off-by: Limstash Wong <limstash.w(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/taskmgr/graph.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/taskmgr/graph.c b/programs/taskmgr/graph.c index 12f22145664..4d04017e331 100644 --- a/programs/taskmgr/graph.c +++ b/programs/taskmgr/graph.c @@ -253,8 +253,8 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd) /* * Get the memory usage */ - CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK(); - CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK(); + CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK() << 10; + CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK() << 10; if (CommitChargeTotal < 1024) StrFormatKBSizeW(CommitChargeTotal, Text, ARRAY_SIZE(Text));

1 0

Alexandre Julliard : zlib: Import upstream release 1.2.12.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: b0c9a28e0495cf8bcbf168ef61c946e999940d6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0c9a28e0495cf8bcbf168ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 18:23:35 2022 +0200 zlib: Import upstream release 1.2.12. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/zlib/crc32.c | 1258 +++++-- libs/zlib/crc32.h | 9877 +++++++++++++++++++++++++++++++++++++++++++++++--- libs/zlib/deflate.c | 108 +- libs/zlib/deflate.h | 27 +- libs/zlib/inffast.c | 28 +- libs/zlib/inflate.c | 47 +- libs/zlib/inflate.h | 5 +- libs/zlib/inftrees.c | 6 +- libs/zlib/trees.c | 75 +- libs/zlib/zlib.h | 223 +- libs/zlib/zutil.c | 4 +- libs/zlib/zutil.h | 21 +- 12 files changed, 10720 insertions(+), 959 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0c9a28e0495cf8bcbf1…

1 0

Alexandre Julliard : lcms: Import upstream release 2.13.1.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 95ef954f67a8bfd6da235680d921281aa767d1bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=95ef954f67a8bfd6da235680… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 18:30:43 2022 +0200 lcms: Import upstream release 2.13.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/lcms2/include/lcms2.h | 36 ++- libs/lcms2/include/lcms2_plugin.h | 4 +- libs/lcms2/src/cmsalpha.c | 20 +- libs/lcms2/src/cmscnvrt.c | 2 +- libs/lcms2/src/cmserr.c | 6 +- libs/lcms2/src/cmsgamma.c | 68 +++-- libs/lcms2/src/cmsgmt.c | 88 +++++- libs/lcms2/src/cmshalf.c | 2 +- libs/lcms2/src/cmsintrp.c | 46 ++- libs/lcms2/src/cmsio0.c | 70 +++-- libs/lcms2/src/cmsio1.c | 8 +- libs/lcms2/src/cmslut.c | 7 +- libs/lcms2/src/cmsmtrx.c | 2 +- libs/lcms2/src/cmsnamed.c | 6 +- libs/lcms2/src/cmsopt.c | 30 +- libs/lcms2/src/cmspack.c | 595 ++++++++++++++++++++++++++++++++------ libs/lcms2/src/cmspcs.c | 2 +- libs/lcms2/src/cmsplugin.c | 112 +++++-- libs/lcms2/src/cmssamp.c | 2 +- libs/lcms2/src/cmstypes.c | 229 +++++++++++---- libs/lcms2/src/cmsvirt.c | 4 +- libs/lcms2/src/cmswtpnt.c | 10 +- libs/lcms2/src/cmsxform.c | 15 +- libs/lcms2/src/lcms2_internal.h | 5 +- 24 files changed, 1042 insertions(+), 327 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=95ef954f67a8bfd6da23…

1 0

Alexandre Julliard : xml2: Import upstream release 2.9.14.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: b089c8294f3715507180a8a9e2ab597d6a9c2ce0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b089c8294f3715507180a8a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 20 18:40:18 2022 +0200 xml2: Import upstream release 2.9.14. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/xml2/HTMLparser.c | 47 ++++++++++--------- libs/xml2/buf.c | 86 ++++++++++++++--------------------- libs/xml2/encoding.c | 4 ++ libs/xml2/globals.c | 30 ++++++------ libs/xml2/include/libxml/xmlversion.h | 10 ++-- libs/xml2/libxml.h | 7 ++- libs/xml2/parser.c | 7 +-- libs/xml2/tree.c | 72 +++++++++++------------------ libs/xml2/valid.c | 59 ++++++++++++------------ libs/xml2/xinclude.c | 5 +- libs/xml2/xmlregexp.c | 19 ++++---- libs/xml2/xpath.c | 71 +++++++++++++---------------- libs/xml2/xpointer.c | 1 + 13 files changed, 194 insertions(+), 224 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b089c8294f3715507180…

1 0

Alexandre Julliard : kernel32/tests: Don't use strcmp() to compare sortkeys.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 5a5ae1a0c2f0f6c5f8955485ec78875ecbada7f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a5ae1a0c2f0f6c5f8955485… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 23 17:22:31 2022 +0200 kernel32/tests: Don't use strcmp() to compare sortkeys. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index d8f6fba6b9a..45d5888b432 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2332,7 +2332,7 @@ static void test_LCMapStringA(void) ok(ret2, "LCMapStringA must succeed\n"); ok(buf2[ret2-1] == 0, "LCMapStringA not null-terminated\n" ); ok(ret == ret2, "lengths of sort keys must be equal\n"); - ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n"); + ok(!memcmp(buf, buf2, ret), "sort keys must be equal\n"); /* test we get the same length when no dest buffer is provided */ ret2 = LCMapStringA(LOCALE_USER_DEFAULT, LCMAP_SORTKEY, @@ -2348,7 +2348,7 @@ static void test_LCMapStringA(void) lower_case, -1, buf2, sizeof(buf2)); ok(ret2, "LCMapStringA must succeed\n"); ok(ret == ret2, "lengths of sort keys must be equal\n"); - ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n"); + ok(!memcmp(buf, buf2, ret), "sort keys must be equal\n"); /* Don't test LCMAP_SORTKEY | NORM_IGNORENONSPACE, produces different results from plain LCMAP_SORTKEY on Vista */ @@ -2361,7 +2361,7 @@ static void test_LCMapStringA(void) symbols_stripped, -1, buf2, sizeof(buf2)); ok(ret2, "LCMapStringA must succeed\n"); ok(ret == ret2, "lengths of sort keys must be equal\n"); - ok(!lstrcmpA(buf, buf2), "sort keys must be equal\n"); + ok(!memcmp(buf, buf2, ret), "sort keys must be equal\n"); /* test NORM_IGNORENONSPACE */ lstrcpyA(buf, "foo"); @@ -2585,7 +2585,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f upper_case, lstrlenW(upper_case), buf2, sizeof(buf2)); ok(ret, "%s func_ptr must succeed\n", func_name); ok(ret == ret2, "%s lengths of sort keys must be equal\n", func_name); - ok(!lstrcmpA(p_buf, p_buf2), "%s sort keys must be equal\n", func_name); + ok(!memcmp(p_buf, p_buf2, ret), "%s sort keys must be equal\n", func_name); /* test LCMAP_SORTKEY | NORM_IGNORECASE */ ret = func_ptr(LCMAP_SORTKEY | NORM_IGNORECASE, @@ -2595,7 +2595,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lower_case, -1, buf2, sizeof(buf2)); ok(ret2, "%s func_ptr must succeed\n", func_name); ok(ret == ret2, "%s lengths of sort keys must be equal\n", func_name); - ok(!lstrcmpA(p_buf, p_buf2), "%s sort keys must be equal\n", func_name); + ok(!memcmp(p_buf, p_buf2, ret), "%s sort keys must be equal\n", func_name); /* Don't test LCMAP_SORTKEY | NORM_IGNORENONSPACE, produces different results from plain LCMAP_SORTKEY on Vista */ @@ -2608,7 +2608,7 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f symbols_stripped, -1, buf2, sizeof(buf2)); ok(ret2, "%s func_ptr must succeed\n", func_name); ok(ret == ret2, "%s lengths of sort keys must be equal\n", func_name); - ok(!lstrcmpA(p_buf, p_buf2), "%s sort keys must be equal\n", func_name); + ok(!memcmp(p_buf, p_buf2, ret), "%s sort keys must be equal\n", func_name); /* test NORM_IGNORENONSPACE */ lstrcpyW(buf, fooW); @@ -3221,9 +3221,11 @@ static int compare_string3(const void *e1, const void *e2) const char *s2 = *(const char *const *)e2; char key1[256], key2[256]; - LCMapStringA(0, LCMAP_SORTKEY, s1, -1, key1, sizeof(key1)); - LCMapStringA(0, LCMAP_SORTKEY, s2, -1, key2, sizeof(key2)); - return strcmp(key1, key2); + int len1 = LCMapStringA(0, LCMAP_SORTKEY, s1, -1, key1, sizeof(key1)); + int len2 = LCMapStringA(0, LCMAP_SORTKEY, s2, -1, key2, sizeof(key2)); + int ret = memcmp(key1, key2, min(len1, len2)); + if (!ret) ret = len1 - len2; + return ret; } static void test_sorting(void)

1 0

Jacek Caban : winemac: Directly use win32u for user functions in display.c.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 973e12daae6356c3cb702dd5fe226a03bf7be05c URL: https://source.winehq.org/git/wine.git/?a=commit;h=973e12daae6356c3cb702dd5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 18:52:38 2022 +0200 winemac: Directly use win32u for user functions in display.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/display.c | 27 ++++++++++++++++----------- dlls/winemac.drv/macdrv.h | 7 +++++++ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index 4b6740b9274..dc22131e36a 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -806,7 +806,7 @@ static BOOL get_primary_adapter(WCHAR *name) DWORD i; dd.cb = sizeof(dd); - for (i = 0; EnumDisplayDevicesW(NULL, i, &dd, 0); ++i) + for (i = 0; !NtUserEnumDisplayDevices(NULL, i, &dd, 0); ++i) { if (dd.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) { @@ -856,9 +856,11 @@ LONG macdrv_ChangeDisplaySettingsEx(LPCWSTR devname, LPDEVMODEW devmode, if (!devname && !devmode) { + UNICODE_STRING str; memset(&default_mode, 0, sizeof(default_mode)); default_mode.dmSize = sizeof(default_mode); - if (!EnumDisplaySettingsExW(primary_adapter, ENUM_REGISTRY_SETTINGS, &default_mode, 0)) + 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; @@ -1009,7 +1011,7 @@ better: height *= 2; } - SendMessageW(GetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + send_message(NtUserGetDesktopWindow(), WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); ret = DISP_CHANGE_SUCCESSFUL; } @@ -1378,16 +1380,19 @@ static void init_registry_display_settings(void) { DEVMODEW dm = {.dmSize = sizeof(dm)}; DISPLAY_DEVICEW dd = {sizeof(dd)}; + UNICODE_STRING str; DWORD i = 0; LONG ret; - while (EnumDisplayDevicesW(NULL, i++, &dd, 0)) + while (!NtUserEnumDisplayDevices(NULL, i++, &dd, 0)) { + RtlInitUnicodeString(&str, dd.DeviceName); + /* Skip if the device already has registry display settings */ - if (EnumDisplaySettingsExW(dd.DeviceName, ENUM_REGISTRY_SETTINGS, &dm, 0)) + if (NtUserEnumDisplaySettings(&str, ENUM_REGISTRY_SETTINGS, &dm, 0)) continue; - if (!EnumDisplaySettingsExW(dd.DeviceName, ENUM_CURRENT_SETTINGS, &dm, 0)) + if (!NtUserEnumDisplaySettings(&str, ENUM_CURRENT_SETTINGS, &dm, 0)) { ERR("Failed to query current display settings for %s.\n", wine_dbgstr_w(dd.DeviceName)); continue; @@ -1397,8 +1402,8 @@ static void init_registry_display_settings(void) wine_dbgstr_w(dd.DeviceName), dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel, dm.dmDisplayFrequency, dm.dmPosition.x, dm.dmPosition.y); - ret = ChangeDisplaySettingsExW(dd.DeviceName, &dm, NULL, - CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); + ret = NtUserChangeDisplaySettings(&str, &dm, NULL, + CDS_GLOBAL | CDS_NORESET | CDS_UPDATEREGISTRY, NULL); if (ret != DISP_CHANGE_SUCCESSFUL) ERR("Failed to save registry display settings for %s, returned %d.\n", wine_dbgstr_w(dd.DeviceName), ret); @@ -1412,7 +1417,7 @@ static void init_registry_display_settings(void) */ void macdrv_displays_changed(const macdrv_event *event) { - HWND hwnd = GetDesktopWindow(); + HWND hwnd = NtUserGetDesktopWindow(); /* A system display change will get delivered to all GUI-attached threads, so the desktop-window-owning thread will get it and all others should @@ -1420,7 +1425,7 @@ void macdrv_displays_changed(const macdrv_event *event) will only get delivered to the activated process. So, it needs to process it (by sending it to the desktop window). */ if (event->displays_changed.activating || - GetWindowThreadProcessId(hwnd, NULL) == GetCurrentThreadId()) + NtUserGetWindowThread(hwnd, NULL) == GetCurrentThreadId()) { CGDirectDisplayID mainDisplay = CGMainDisplayID(); CGDisplayModeRef mode = CGDisplayCopyDisplayMode(mainDisplay); @@ -1442,7 +1447,7 @@ void macdrv_displays_changed(const macdrv_event *event) height *= 2; } - SendMessageW(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, + send_message(hwnd, WM_MACDRV_UPDATE_DESKTOP_RECT, mode_bpp, MAKELPARAM(width, height)); } } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 29fbe8a8cb9..2cac6acf4f3 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -295,6 +295,13 @@ extern void macdrv_im_set_text(const macdrv_event *event) DECLSPEC_HIDDEN; extern void macdrv_sent_text_input(const macdrv_event *event) DECLSPEC_HIDDEN; extern BOOL query_ime_char_rect(macdrv_query* query) DECLSPEC_HIDDEN; +/* user helpers */ + +static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) +{ + return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE); +} + /* registry helpers */ extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winemac: Directly use win32u for user functions in clipboard.c.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 0dc076154ecd7a5d251b356d27adc7b09c8dd73d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0dc076154ecd7a5d251b356d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 18:57:31 2022 +0200 winemac: Directly use win32u for user functions in clipboard.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 63c8bc76e75..9a498cde2f7 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -220,7 +220,7 @@ const char *debugstr_format(UINT id) { WCHAR buffer[256]; - if (GetClipboardFormatNameW(id, buffer, 256)) + if (NtUserGetClipboardFormatName(id, buffer, 256)) return wine_dbg_sprintf("0x%04x %s", id, debugstr_w(buffer)); switch (id) @@ -280,7 +280,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) { WCHAR buffer[256]; - if (!GetClipboardFormatNameW(format->format_id, buffer, ARRAY_SIZE(buffer))) + if (!NtUserGetClipboardFormatName(format->format_id, buffer, ARRAY_SIZE(buffer))) { WARN("failed to get name for format %s; error 0x%08x\n", debugstr_format(format->format_id), GetLastError()); HeapFree(GetProcessHeap(), 0, format); @@ -338,6 +338,14 @@ static WINE_CLIPFORMAT* natural_format_for_format(UINT format_id) } +static ATOM register_clipboard_format(const WCHAR *name) +{ + ATOM atom; + if (NtAddAtom(name, lstrlenW(name) * sizeof(WCHAR), &atom)) return 0; + return atom; +} + + /************************************************************************** * register_builtin_formats */ @@ -363,7 +371,7 @@ static void register_builtin_formats(void) for (i = 0; i < ARRAY_SIZE(builtin_format_names); i++) { if (!(format = HeapAlloc(GetProcessHeap(), 0, sizeof(*format)))) break; - format->format_id = RegisterClipboardFormatW(builtin_format_names[i].name); + format->format_id = register_clipboard_format(builtin_format_names[i].name); format->import_func = builtin_format_names[i].import; format->export_func = builtin_format_names[i].export; format->synthesized = builtin_format_names[i].synthesized; @@ -421,7 +429,7 @@ static WINE_CLIPFORMAT* format_for_type(CFStringRef type) (UniChar*)name); name[len] = 0; - format = register_format(RegisterClipboardFormatW(name), type); + format = register_format(register_clipboard_format(name), type); if (!format) ERR("Failed to register format for type %s name %s\n", debugstr_cf(type), debugstr_w(name)); @@ -471,7 +479,7 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP bitmap) { HANDLE ret = 0; BITMAPINFOHEADER header; - HDC hdc = GetDC(0); + HDC hdc = NtUserGetDCEx(0, 0, DCX_USESTYLE); DWORD header_size; BITMAPINFO *bmi; @@ -487,7 +495,7 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP bitmap) GetDIBits(hdc, bitmap, 0, abs(header.biHeight), (char *)bmi + header_size, bmi, DIB_RGB_COLORS); done: - ReleaseDC(0, hdc); + NtUserReleaseDC(0, hdc); return ret; } @@ -507,7 +515,7 @@ static HANDLE create_bitmap_from_dib(HANDLE dib) HDC hdc; unsigned int offset; - hdc = GetDC(NULL); + hdc = NtUserGetDCEx(NULL, 0, DCX_USESTYLE); offset = bitmap_info_size(bmi, DIB_RGB_COLORS); @@ -515,7 +523,7 @@ static HANDLE create_bitmap_from_dib(HANDLE dib) bmi, DIB_RGB_COLORS); GlobalUnlock(dib); - ReleaseDC(NULL, hdc); + NtUserReleaseDC(NULL, hdc); } return ret; @@ -1762,13 +1770,13 @@ static void grab_win32_clipboard(void) if (last_types) CFRelease(last_types); last_types = types; /* takes ownership */ - if (!OpenClipboard(clipboard_hwnd)) return; - EmptyClipboard(); + if (!NtUserOpenClipboard(clipboard_hwnd, 0)) return; + NtUserEmptyClipboard(); is_clipboard_owner = TRUE; last_clipboard_update = GetTickCount64(); set_win32_clipboard_formats_from_mac_pasteboard(types); - CloseClipboard(); - SetTimer(clipboard_hwnd, 1, CLIPBOARD_UPDATE_DELAY, NULL); + NtUserCloseClipboard(); + NtUserSetTimer(clipboard_hwnd, 1, CLIPBOARD_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING); } @@ -1965,7 +1973,7 @@ static DWORD WINAPI clipboard_thread(void *arg) } clipboard_thread_id = GetCurrentThreadId(); - AddClipboardFormatListener(clipboard_hwnd); + NtUserAddClipboardFormatListener(clipboard_hwnd); register_builtin_formats(); grab_win32_clipboard(); @@ -2217,7 +2225,7 @@ BOOL query_pasteboard_data(HWND hwnd, CFStringRef type) last_get_seqno = GetClipboardSequenceNumber(); - CloseClipboard(); + NtUserCloseClipboard(); return ret; }

1 0

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

23 May '22

Module: wine Branch: master Commit: 169a09b443fc193a73fd87f0a07447f969e30b9a URL: https://source.winehq.org/git/wine.git/?a=commit;h=169a09b443fc193a73fd87f0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 21:09:17 2022 +0200 winemac: Directly use win32u in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/image.c | 6 +++--- dlls/winemac.drv/keyboard.c | 4 ++-- dlls/winemac.drv/macdrv.h | 7 +++++++ dlls/winemac.drv/macdrv_main.c | 2 +- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/image.c b/dlls/winemac.drv/image.c index d501b27a3c3..943ad97b749 100644 --- a/dlls/winemac.drv/image.c +++ b/dlls/winemac.drv/image.c @@ -70,7 +70,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol /* draw the cursor frame to a temporary buffer then create a CGImage from that */ memset(color_bits, 0x00, color_size); NtGdiSelectBitmap(hdc, hbmColor); - if (!DrawIconEx(hdc, 0, 0, icon, width, height, istep, NULL, DI_NORMAL)) + if (!NtUserDrawIconEx(hdc, 0, 0, icon, width, height, istep, NULL, DI_NORMAL)) { WARN("Could not draw frame %d (walk past end of frames).\n", istep); return NULL; @@ -129,7 +129,7 @@ CGImageRef create_cgimage_from_icon_bitmaps(HDC hdc, HANDLE icon, HBITMAP hbmCol /* draw the cursor mask to a temporary buffer */ memset(mask_bits, 0xFF, mask_size); NtGdiSelectBitmap(hdc, hbmMask); - if (!DrawIconEx(hdc, 0, 0, icon, width, height, istep, NULL, DI_MASK)) + if (!NtUserDrawIconEx(hdc, 0, 0, icon, width, height, istep, NULL, DI_MASK)) { WARN("Failed to draw frame mask %d.\n", istep); CGImageRelease(cgimage); @@ -199,7 +199,7 @@ CGImageRef create_cgimage_from_icon(HANDLE icon, int width, int height) ICONINFO info; BITMAP bm; - if (!GetIconInfo(icon, &info)) + if (!NtUserGetIconInfo(icon, &info, NULL, NULL, NULL, 0)) return NULL; NtGdiExtGetObjectW(info.hbmMask, sizeof(bm), &bm); diff --git a/dlls/winemac.drv/keyboard.c b/dlls/winemac.drv/keyboard.c index 79f208edfc8..9dca17e5c4e 100644 --- a/dlls/winemac.drv/keyboard.c +++ b/dlls/winemac.drv/keyboard.c @@ -1045,9 +1045,9 @@ void macdrv_keyboard_changed(const macdrv_event *event) macdrv_compute_keyboard_layout(thread_data); - ActivateKeyboardLayout(thread_data->active_keyboard_layout, 0); + NtUserActivateKeyboardLayout(thread_data->active_keyboard_layout, 0); - SendMessageW(GetActiveWindow(), WM_CANCELMODE, 0, 0); + send_message(get_active_window(), WM_CANCELMODE, 0, 0); } diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 2cac6acf4f3..5cde6667a46 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -302,6 +302,13 @@ static inline LRESULT send_message(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lp return NtUserMessageCall(hwnd, msg, wparam, lparam, NULL, NtUserSendMessage, FALSE); } +static inline HWND get_active_window(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo(GetCurrentThreadId(), &info) ? info.hwndActive : 0; +} + /* registry helpers */ extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index f7b530f50a7..2f05e55cb23 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -558,7 +558,7 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) set_queue_display_fd(macdrv_get_event_queue_fd(data->queue)); TlsSetValue(thread_data_tls_index, data); - ActivateKeyboardLayout(data->active_keyboard_layout, 0); + NtUserActivateKeyboardLayout(data->active_keyboard_layout, 0); return data; }

1 0

Jacek Caban : winemac: Directly use win32u for user functions in mouse.c.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 7b9fd8012f30da74ebe33e3863cc41480c640dc8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b9fd8012f30da74ebe33e38… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 21:19:32 2022 +0200 winemac: Directly use win32u for user functions in mouse.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/macdrv.h | 7 +++++++ dlls/winemac.drv/mouse.c | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 5cde6667a46..29ad7216841 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -309,6 +309,13 @@ static inline HWND get_active_window(void) return NtUserGetGUIThreadInfo(GetCurrentThreadId(), &info) ? info.hwndActive : 0; } +static inline HWND get_capture(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo(GetCurrentThreadId(), &info) ? info.hwndCapture : 0; +} + /* registry helpers */ extern HKEY open_hkcu_key( const char *name ) DECLSPEC_HIDDEN; diff --git a/dlls/winemac.drv/mouse.c b/dlls/winemac.drv/mouse.c index e22cbe5e23f..52e978567de 100644 --- a/dlls/winemac.drv/mouse.c +++ b/dlls/winemac.drv/mouse.c @@ -131,7 +131,7 @@ static void send_mouse_input(HWND hwnd, macdrv_window cocoa_window, UINT flags, INPUT input; HWND top_level_hwnd; - top_level_hwnd = GetAncestor(hwnd, GA_ROOT); + top_level_hwnd = NtUserGetAncestor(hwnd, GA_ROOT); if ((flags & MOUSEEVENTF_MOVE) && (flags & MOUSEEVENTF_ABSOLUTE) && !drag && cocoa_window != macdrv_thread_data()->capture_window) @@ -500,7 +500,7 @@ static CFDictionaryRef create_cursor_frame(HDC hdc, const ICONINFOEXW *iinfo, HA CFDictionarySetValue(frame, CFSTR("hotSpot"), hot_spot_dict); CFRelease(hot_spot_dict); - if (GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, istep, &delay_jiffies, &num_steps) != 0) + if (NtUserGetCursorFrameInfo(icon, istep, &delay_jiffies, &num_steps) != 0) duration = delay_jiffies / 60.0; /* convert jiffies (1/60s) to seconds */ else { @@ -554,7 +554,7 @@ static CFArrayRef create_color_cursor(HDC hdc, const ICONINFOEXW *iinfo, HANDLE TRACE("hdc %p iinfo %p icon %p width %d height %d\n", hdc, iinfo, icon, width, height); /* Retrieve the number of frames to render */ - if (!GetCursorFrameInfo(icon, 0x0 /* unknown parameter */, 0, &delay_jiffies, &nFrames)) + if (!NtUserGetCursorFrameInfo(icon, 0, &delay_jiffies, &nFrames)) { WARN("GetCursorFrameInfo failed\n"); return NULL; @@ -699,7 +699,7 @@ BOOL macdrv_GetCursorPos(LPPOINT pos) void macdrv_SetCapture(HWND hwnd, UINT flags) { struct macdrv_thread_data *thread_data = macdrv_thread_data(); - HWND top = GetAncestor(hwnd, GA_ROOT); + HWND top = NtUserGetAncestor(hwnd, GA_ROOT); macdrv_window cocoa_window = macdrv_get_cocoa_window(top, FALSE); TRACE("hwnd %p top %p/%p flags 0x%08x\n", hwnd, top, cocoa_window, flags); @@ -711,6 +711,28 @@ BOOL macdrv_GetCursorPos(LPPOINT pos) } +static BOOL get_icon_info(HICON handle, ICONINFOEXW *ret) +{ + UNICODE_STRING module, res_name; + ICONINFO info; + + module.Buffer = ret->szModName; + module.MaximumLength = sizeof(ret->szModName) - sizeof(WCHAR); + res_name.Buffer = ret->szResName; + res_name.MaximumLength = sizeof(ret->szResName) - sizeof(WCHAR); + if (!NtUserGetIconInfo(handle, &info, &module, &res_name, NULL, 0)) return FALSE; + ret->fIcon = info.fIcon; + ret->xHotspot = info.xHotspot; + ret->yHotspot = info.yHotspot; + ret->hbmColor = info.hbmColor; + ret->hbmMask = info.hbmMask; + ret->wResID = res_name.Length ? 0 : LOWORD(res_name.Buffer); + ret->szModName[module.Length] = 0; + ret->szResName[res_name.Length] = 0; + return TRUE; +} + + /*********************************************************************** * SetCursor (MACDRV.@) */ @@ -742,7 +764,7 @@ void macdrv_SetCursor(HCURSOR cursor) goto done; info.cbSize = sizeof(info); - if (!GetIconInfoExW(cursor, &info)) + if (!get_icon_info(cursor, &info)) { WARN("GetIconInfoExW failed\n"); return; @@ -919,16 +941,16 @@ void macdrv_mouse_scroll(HWND hwnd, const macdrv_event *event) void macdrv_release_capture(HWND hwnd, const macdrv_event *event) { struct macdrv_thread_data *thread_data = macdrv_thread_data(); - HWND capture = GetCapture(); - HWND capture_top = GetAncestor(capture, GA_ROOT); + HWND capture = get_capture(); + HWND capture_top = NtUserGetAncestor(capture, GA_ROOT); TRACE("win %p/%p thread_data->capture_window %p GetCapture() %p in %p\n", hwnd, event->window, thread_data->capture_window, capture, capture_top); if (event->window == thread_data->capture_window && hwnd == capture_top) { - ReleaseCapture(); - if (!PostMessageW(capture, WM_CANCELMODE, 0, 0)) + NtUserReleaseCapture(); + if (!NtUserPostMessage(capture, WM_CANCELMODE, 0, 0)) WARN("failed to post WM_CANCELMODE; error 0x%08x\n", GetLastError()); } }

1 0