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

Paul Gofman : crypt32: Fix filling short output in CertGetNameStringA().
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: bc96cfac1171ec4124b6af5903b3e4ab928d2d7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc96cfac1171ec4124b6af59… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 14 14:09:01 2022 +0300 crypt32: Fix filling short output in CertGetNameStringA(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/str.c | 60 +++++++++++++++++++++--------------------------- dlls/crypt32/tests/str.c | 8 +++++-- 2 files changed, 32 insertions(+), 36 deletions(-) diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index ad0c71d697f..5ddad1ff4e6 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -1110,46 +1110,38 @@ BOOL WINAPI CertStrToNameW(DWORD dwCertEncodingType, LPCWSTR pszX500, return ret; } -DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT pCertContext, DWORD dwType, - DWORD dwFlags, void *pvTypePara, LPSTR pszNameString, DWORD cchNameString) +DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT cert, DWORD type, + DWORD flags, void *type_para, LPSTR name, DWORD name_len) { - DWORD ret; + DWORD len, len_mb, ret; + LPWSTR nameW; - TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", pCertContext, dwType, dwFlags, - pvTypePara, pszNameString, cchNameString); + TRACE("(%p, %ld, %08lx, %p, %p, %ld)\n", cert, type, flags, type_para, name, name_len); - if (pszNameString) + len = CertGetNameStringW(cert, type, flags, type_para, NULL, 0); + + if (!(nameW = CryptMemAlloc(len * sizeof(*nameW)))) { - LPWSTR wideName; - DWORD nameLen; + ERR("No memory.\n"); + if (name && name_len) *name = 0; + return 1; + } - nameLen = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, - NULL, 0); - wideName = CryptMemAlloc(nameLen * sizeof(WCHAR)); - if (wideName) - { - CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, - wideName, nameLen); - nameLen = WideCharToMultiByte(CP_ACP, 0, wideName, nameLen, - pszNameString, cchNameString, NULL, NULL); - if (nameLen <= cchNameString) - ret = nameLen; - else - { - pszNameString[cchNameString - 1] = '\0'; - ret = cchNameString; - } - CryptMemFree(wideName); - } - else - { - *pszNameString = '\0'; - ret = 1; - } + len = CertGetNameStringW(cert, type, flags, type_para, nameW, len); + len_mb = WideCharToMultiByte(CP_ACP, 0, nameW, len, NULL, 0, NULL, NULL); + if (!name || !name_len) + { + CryptMemFree(nameW); + return len_mb; } - else - ret = CertGetNameStringW(pCertContext, dwType, dwFlags, pvTypePara, - NULL, 0); + + ret = WideCharToMultiByte(CP_ACP, 0, nameW, len, name, name_len, NULL, NULL); + if (ret < len_mb) + { + name[0] = 0; + ret = 1; + } + CryptMemFree(nameW); return ret; } diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index 3009fb72c03..1cfdf8ee7b7 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -766,9 +766,13 @@ static void test_CertGetNameString_value_(unsigned int line, PCCERT_CONTEXT cont ok(!strcmp(str, expected), "line %u: unexpected value %s.\n", line, str); str[0] = str[1] = 0xcc; retlen = CertGetNameStringA(context, type, 0, type_para, str, len - 1); - todo_wine ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); - todo_wine ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); + ok(retlen == 1, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + ok(!str[0], "line %u: unexpected str[0] %#x.\n", line, str[0]); ok(str[1] == expected[1], "line %u: unexpected str[1] %#x.\n", line, str[1]); + + retlen = CertGetNameStringA(context, type, 0, type_para, str, 0); + ok(retlen == len, "line %u: Unexpected len %lu, expected 1.\n", line, retlen); + retlen = CertGetNameStringW(context, type, 0, type_para, strW, len); ok(retlen == len, "line %u: unexpected len %lu, expected 1.\n", line, retlen); ok(!wcscmp(strW, expectedW), "line %u: unexpected value %s.\n", line, debugstr_w(strW));

1 0

Paul Gofman : crypt32/tests: Add tests for short return string buffer.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 20fd7dacd4d1ab975b67343df43a33d2ec810f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=20fd7dacd4d1ab975b67343d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Apr 14 14:05:37 2022 +0300 crypt32/tests: Add tests for short return string buffer. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/str.c | 331 ++++++++++++++++++----------------------------- 1 file changed, 127 insertions(+), 204 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20fd7dacd4d1ab975b67…

1 0

Jacek Caban : win32u: Allow NULL client_menu_name in NtUserRegisterClassExWOW.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: f4b9ff7850d0d55cd0ac4bf383de2aca323d7f4a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4b9ff7850d0d55cd0ac4bf3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 19:09:44 2022 +0200 win32u: Allow NULL client_menu_name in NtUserRegisterClassExWOW. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index 64ac48cad19..fd74f63291a 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -443,7 +443,7 @@ ATOM WINAPI NtUserRegisterClassExWOW( const WNDCLASSEXW *wc, UNICODE_STRING *nam class->hCursor = wc->hCursor; class->hbrBackground = wc->hbrBackground; class->winproc = alloc_winproc( wc->lpfnWndProc, ansi ); - class->menu_name = *client_menu_name; + if (client_menu_name) class->menu_name = *client_menu_name; if (wc->hIcon && !wc->hIconSm && user_callbacks) class->hIconSmIntern = user_callbacks->pCopyImage( wc->hIcon, IMAGE_ICON, get_system_metrics( SM_CXSMICON ),

1 0

Jacek Caban : winex11: Use ntdll for Unicode conversion.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 0e37ee61b577ca1ec337718ef8681f9a40a8150a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e37ee61b577ca1ec337718e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 21:18:38 2022 +0200 winex11: Use ntdll for Unicode conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 56 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 45 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 30534af6bf3..506d1a81f0f 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -672,6 +672,35 @@ char *get_unix_file_name( const WCHAR *dosW ) } +static CPTABLEINFO *get_xstring_cp(void) +{ + static CPTABLEINFO cp; + if (!cp.CodePage) + { + USHORT *ptr; + SIZE_T nls_size; + if (NtGetNlsSectionPtr( 11, 28591, NULL, (void **)&ptr, &nls_size )) return NULL; + RtlInitCodePageTable( ptr, &cp ); + } + return &cp; +} + + +static CPTABLEINFO *get_ansi_cp(void) +{ + USHORT utf8_hdr[2] = { 0, CP_UTF8 }; + static CPTABLEINFO cp; + if (!cp.CodePage) + { + if (NtCurrentTeb()->Peb->AnsiCodePageData) + RtlInitCodePageTable( NtCurrentTeb()->Peb->AnsiCodePageData, &cp ); + else + RtlInitCodePageTable( utf8_hdr, &cp ); + } + return &cp; +} + + /*********************************************************************** * uri_to_dos * @@ -788,8 +817,8 @@ static void *import_string( Atom type, const void *data, size_t size, size_t *re WCHAR *ret; if (!(ret = malloc( (size * 2 + 1) * sizeof(WCHAR) ))) return NULL; - str_size = MultiByteToWideChar( 28591, 0, data, size, ret + size, size ); - return unicode_text_from_string( ret, ret + size, str_size, ret_size ); + RtlCustomCPToUnicodeN( get_xstring_cp(), ret + size, size * sizeof(WCHAR), &str_size, data, size ); + return unicode_text_from_string( ret, ret + size, str_size / sizeof(WCHAR), ret_size ); } @@ -1301,7 +1330,7 @@ static BOOL export_string( Display *display, Window win, Atom prop, Atom target, char *text; if (!(text = malloc( size ))) return FALSE; - len = WideCharToMultiByte( 28591, 0, data, size / sizeof(WCHAR), text, size, NULL, NULL ); + RtlUnicodeToCustomCPN( get_xstring_cp(), text, size, &len, data, size ); string_from_unicode_text( text, len, &len ); put_property( display, win, prop, target, 8, text, len ); @@ -1476,14 +1505,19 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, if (!drop_files->fWide) { - char *p, *files = (char *)data + drop_files->pFiles; - p = files; - while (*p) p += strlen( p ) + 1; - p++; - - if (!(unicode_data = malloc( (p - files) * sizeof(WCHAR) ))) goto failed; - MultiByteToWideChar( CP_ACP, 0, files, p - files, unicode_data, p - files ); - ptr = unicode_data; + char *files = (char *)data + drop_files->pFiles; + CPTABLEINFO *cp = get_ansi_cp(); + DWORD len = 0; + + while (files[len]) len += strlen( files + len ) + 1; + len++; + + if (!(ptr = unicode_data = malloc( len * sizeof(WCHAR) ))) goto failed; + + if (cp->CodePage == CP_UTF8) + RtlUTF8ToUnicodeN( unicode_data, len * sizeof(WCHAR), &len, files, len ); + else + RtlCustomCPToUnicodeN( cp, unicode_data, len * sizeof(WCHAR), &len, files, len ); } else ptr = (const WCHAR *)((char *)data + drop_files->pFiles);

1 0

Jacek Caban : winex11: Use ntdll_umbstowcs and ntdll_wcstoumbs for Unicode conversion.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: c0a8b2dbd55e8d7e1e66960076ec07da645e85d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0a8b2dbd55e8d7e1e669600… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 20:59:57 2022 +0200 winex11: Use ntdll_umbstowcs and ntdll_wcstoumbs for Unicode conversion. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 14 +++++++------- dlls/winex11.drv/keyboard.c | 12 ++++++------ dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/wintab.c | 6 +++--- dlls/winex11.drv/x11drv.h | 13 +++++++++++++ dlls/winex11.drv/xim.c | 39 +++++++++++++++------------------------ 7 files changed, 47 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c0a8b2dbd55e8d7e1e66…

1 0

Jacek Caban : winex11: Use passed point in handle_position_event.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 03e8991735f9c5f0634821e680015a1dd747f6a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03e8991735f9c5f0634821e6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 15:13:32 2022 +0200 winex11: Use passed point in handle_position_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xdnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 8240bbbf5d6..d5ae510db49 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -185,7 +185,7 @@ static BOOL handle_position_event( struct dnd_position_event_params *params ) int accept = 0; /* Assume we're not accepting */ IDropTarget *dropTarget = NULL; DWORD effect = params->effect; - POINTL pointl; + POINTL pointl = { .x = params->point.x, .y = params->point.y }; HWND targetWindow; HRESULT hr;

1 0

Jacek Caban : win32u: Move normalize_std_handle call to NtUserMsgWaitForMultipleObjectsEx.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 365bc308bed3391fe3cc9c6ac8fc34c7a484d9d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=365bc308bed3391fe3cc9c6a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 12:43:13 2022 +0200 win32u: Move normalize_std_handle call to NtUserMsgWaitForMultipleObjectsEx. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/driver.c | 22 +--------------------- dlls/win32u/message.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 22 deletions(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 175fde1fa40..ebc512bb4ee 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -792,35 +792,15 @@ static inline LARGE_INTEGER *get_nt_timeout( LARGE_INTEGER *time, DWORD timeout return time; } -static HANDLE normalize_std_handle( HANDLE handle ) -{ - if (handle == (HANDLE)STD_INPUT_HANDLE) - return NtCurrentTeb()->Peb->ProcessParameters->hStdInput; - if (handle == (HANDLE)STD_OUTPUT_HANDLE) - return NtCurrentTeb()->Peb->ProcessParameters->hStdOutput; - if (handle == (HANDLE)STD_ERROR_HANDLE) - return NtCurrentTeb()->Peb->ProcessParameters->hStdError; - - return handle; -} - static DWORD nulldrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { NTSTATUS status; - HANDLE hloc[MAXIMUM_WAIT_OBJECTS]; LARGE_INTEGER time; - unsigned int i; if (!count && !timeout) return WAIT_TIMEOUT; - if (count > MAXIMUM_WAIT_OBJECTS) - { - SetLastError(ERROR_INVALID_PARAMETER); - return WAIT_FAILED; - } - for (i = 0; i < count; i++) hloc[i] = normalize_std_handle( handles[i] ); - status = NtWaitForMultipleObjects( count, hloc, !(flags & MWMO_WAITALL), !!(flags & MWMO_ALERTABLE), + status = NtWaitForMultipleObjects( count, handles, !(flags & MWMO_WAITALL), !!(flags & MWMO_ALERTABLE), get_nt_timeout( &time, timeout ) ); if (HIWORD(status)) /* is it an error code? */ { diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index d43dca723d2..67990e7b1f4 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -1963,6 +1963,18 @@ static DWORD wait_objects( DWORD count, const HANDLE *handles, DWORD timeout, return ret; } +static HANDLE normalize_std_handle( HANDLE handle ) +{ + if (handle == (HANDLE)STD_INPUT_HANDLE) + return NtCurrentTeb()->Peb->ProcessParameters->hStdInput; + if (handle == (HANDLE)STD_OUTPUT_HANDLE) + return NtCurrentTeb()->Peb->ProcessParameters->hStdOutput; + if (handle == (HANDLE)STD_ERROR_HANDLE) + return NtCurrentTeb()->Peb->ProcessParameters->hStdError; + + return handle; +} + /*********************************************************************** * NtUserMsgWaitForMultipleObjectsEx (win32u.@) */ @@ -1979,7 +1991,7 @@ DWORD WINAPI NtUserMsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handl } /* add the queue to the handle list */ - for (i = 0; i < count; i++) wait_handles[i] = handles[i]; + for (i = 0; i < count; i++) wait_handles[i] = normalize_std_handle( handles[i] ); wait_handles[count] = get_server_queue_handle(); return wait_objects( count+1, wait_handles, timeout,

1 0

Francois Gouget : winebus.sys: Fix the HAVE_SYS_INOTIFY_H checks.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: 9aa1d0a1a79647a8b575f6a68473392e16a5efcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=9aa1d0a1a79647a8b575f6a6… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 2 19:42:19 2022 +0200 winebus.sys: Fix the HAVE_SYS_INOTIFY_H checks. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 6b4bf09a773..39573162afa 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1773,7 +1773,7 @@ NTSTATUS udev_bus_init(void *args) goto error; } -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H if (options.disable_udevd) monitor_fd = create_inotify(); if (monitor_fd < 0) options.disable_udevd = FALSE; #else @@ -1798,7 +1798,7 @@ NTSTATUS udev_bus_init(void *args) poll_count = 2; if (!options.disable_udevd) build_initial_deviceset_udevd(); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else build_initial_deviceset_direct(); #endif @@ -1841,7 +1841,7 @@ NTSTATUS udev_bus_wait(void *args) if (pfd[0].revents) { if (udev_monitor) process_monitor_event(udev_monitor); -#if HAVE_SYS_INOTIFY_H +#ifdef HAVE_SYS_INOTIFY_H else process_inotify_event(pfd[0].fd); #endif }

1 0

Jacek Caban : winex11: Directly use ntdll in more places.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: c736411fb897444609fd539d0a110772a292daca URL: https://source.winehq.org/git/wine.git/?a=commit;h=c736411fb897444609fd539d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 00:21:21 2022 +0200 winex11: Directly use ntdll in more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 6 +++--- dlls/winex11.drv/keyboard.c | 6 +++--- dlls/winex11.drv/mouse.c | 10 +++++----- dlls/winex11.drv/vulkan.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv_main.c | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 3bd771fa4fd..a6499400283 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -512,7 +512,7 @@ NTSTATUS X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD EVENT_x11_time_to_win32_time(Time time) { static DWORD adjust = 0; - DWORD now = GetTickCount(); + DWORD now = NtGetTickCount(); DWORD ret; if (! adjust && time != 0) @@ -1365,7 +1365,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) { Display *display = thread_display(); struct x11drv_win_data *data; - DWORD end = GetTickCount() + 2000; + DWORD end = NtGetTickCount() + 2000; TRACE( "waiting for window %p to become %swithdrawn\n", hwnd, set ? "" : "not " ); @@ -1401,7 +1401,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) if (!count) { struct pollfd pfd; - int timeout = end - GetTickCount(); + int timeout = end - NtGetTickCount(); pfd.fd = ConnectionNumber(display); pfd.events = POLLIN; diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c index 7a30b3b4a3e..6b876c3bee9 100644 --- a/dlls/winex11.drv/keyboard.c +++ b/dlls/winex11.drv/keyboard.c @@ -1525,7 +1525,7 @@ X11DRV_KEYBOARD_DetectLayout( Display *display ) static HKL get_locale_kbd_layout(void) { - ULONG_PTR layout; + LCID layout; LANGID langid; /* FIXME: @@ -1539,7 +1539,7 @@ static HKL get_locale_kbd_layout(void) * locale id we return the US one. */ - layout = GetUserDefaultLCID(); + NtQueryDefaultLocale( TRUE, &layout ); /* * Microsoft Office expects this value to be something specific @@ -1553,7 +1553,7 @@ static HKL get_locale_kbd_layout(void) else layout |= layout << 16; - return (HKL)layout; + return (HKL)(UINT_PTR)layout; } diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1a5230300a3..3d68dc80b3e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -513,7 +513,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) { TRACE( "clip hwnd reset from %p\n", hwnd ); data->clip_hwnd = 0; - data->clip_reset = GetTickCount(); + data->clip_reset = NtGetTickCount(); disable_xinput2(); NtUserDestroyWindow( hwnd ); } @@ -553,7 +553,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) release_win_data( data ); if (!fullscreen) return FALSE; if (!(thread_data = x11drv_thread_data())) return FALSE; - if (GetTickCount() - thread_data->clip_reset < 1000) return FALSE; + if (NtGetTickCount() - thread_data->clip_reset < 1000) return FALSE; if (!reset && clipping_cursor && thread_data->clip_hwnd) return FALSE; /* already clipping */ monitor = NtUserMonitorFromWindow( hwnd, MONITOR_DEFAULTTONEAREST ); @@ -1472,9 +1472,9 @@ void X11DRV_DestroyCursorIcon( HCURSOR handle ) void X11DRV_SetCursor( HCURSOR handle ) { if (InterlockedExchangePointer( (void **)&last_cursor, handle ) != handle || - GetTickCount() - last_cursor_change > 100) + NtGetTickCount() - last_cursor_change > 100) { - last_cursor_change = GetTickCount(); + last_cursor_change = NtGetTickCount(); if (cursor_window) send_notify_message( cursor_window, WM_X11DRV_SET_CURSOR, 0, (LPARAM)handle ); } } @@ -1667,7 +1667,7 @@ void move_resize_window( HWND hwnd, int dir ) input.u.mi.dy = pos.y; input.u.mi.mouseData = button_up_data[button - 1]; input.u.mi.dwFlags = button_up_flags[button - 1] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; - input.u.mi.time = GetTickCount(); + input.u.mi.time = NtGetTickCount(); input.u.mi.dwExtraInfo = 0; __wine_send_input( hwnd, &input, NULL ); } diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 29e0b10763a..0f96b6860fd 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -650,7 +650,7 @@ static VkResult X11DRV_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) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 79970f55444..de52023c467 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1861,8 +1861,8 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, { case WM_WINE_NOTIFY_ACTIVITY: { - static ULONGLONG last = 0; - ULONGLONG now = GetTickCount64(); + static ULONG last = 0; + ULONG now = NtGetTickCount(); /* calling XResetScreenSaver too often can cause performance * problems, so throttle it */ if (now > last + 5000) diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 6042f2522b5..aa8ddc49385 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -722,7 +722,7 @@ static void set_queue_display_fd( Display *display ) if (wine_server_fd_to_handle( ConnectionNumber(display), GENERIC_READ | SYNCHRONIZE, 0, &handle )) { MESSAGE( "x11drv: Can't allocate handle for display fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } SERVER_START_REQ( set_queue_fd ) { @@ -733,9 +733,9 @@ static void set_queue_display_fd( Display *display ) if (ret) { MESSAGE( "x11drv: Can't store handle for display fd\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } - CloseHandle( handle ); + NtClose( handle ); } @@ -751,12 +751,12 @@ struct x11drv_thread_data *x11drv_init_thread_data(void) if (!(data = calloc( 1, sizeof(*data) ))) { ERR( "could not create data\n" ); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } if (!(data->display = XOpenDisplay(NULL))) { ERR_(winediag)( "x11drv: Can't open display: %s. Please ensure that your X server is running and that $DISPLAY is set correctly.\n", XDisplayName(NULL)); - ExitProcess(1); + NtTerminateProcess( 0, 1 ); } fcntl( ConnectionNumber(data->display), F_SETFD, 1 ); /* set close on exec flag */

1 0

Jacek Caban : winex11: Reimplement EVENT_DropFromOffiX using get_dos_file_name.
by Alexandre Julliard May 3, 2022

May 3, 2022

Module: wine Branch: master Commit: e02c2f82d49c98424f3743c50a32a47d23e15295 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e02c2f82d49c98424f3743c5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun May 1 22:18:43 2022 +0200 winex11: Reimplement EVENT_DropFromOffiX using get_dos_file_name. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/event.c | 49 ++++++++++------------------------------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 64 insertions(+), 38 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index f2f93c9ee38..4ba36239595 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1042,6 +1042,58 @@ static void *import_text_html( Atom type, const void *data, size_t size, size_t } +/************************************************************************** + * file_list_to_drop_files + */ +void *file_list_to_drop_files( const void *data, size_t size, size_t *ret_size ) +{ + size_t buf_size = 4096, path_size; + DROPFILES *drop = NULL; + const char *ptr; + WCHAR *path; + + for (ptr = data; ptr < (const char *)data + size; ptr += strlen( ptr ) + 1) + { + path = get_dos_file_name( ptr ); + + TRACE( "converted URI %s to DOS path %s\n", debugstr_a(ptr), debugstr_w(path) ); + + if (!path) continue; + + if (!drop) + { + if (!(drop = malloc( buf_size ))) return NULL; + drop->pFiles = sizeof(*drop); + drop->pt.x = drop->pt.y = 0; + drop->fNC = FALSE; + drop->fWide = TRUE; + *ret_size = sizeof(*drop); + } + + path_size = (lstrlenW( path ) + 1) * sizeof(WCHAR); + if (*ret_size + path_size > buf_size - sizeof(WCHAR)) + { + void *new_buf; + if (!(new_buf = realloc( drop, buf_size * 2 + path_size ))) + { + free( path ); + continue; + } + buf_size = buf_size * 2 + path_size; + drop = new_buf; + } + + memcpy( (char *)drop + *ret_size, path, path_size ); + *ret_size += path_size; + } + + if (!drop) return NULL; + *(WCHAR *)((char *)drop + *ret_size) = 0; + *ret_size += sizeof(WCHAR); + return drop; +} + + /************************************************************************** * uri_list_to_drop_files */ diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index cb0e91821e4..3bd771fa4fd 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1503,7 +1503,7 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) unsigned long aux_long; unsigned char* p_data = NULL; Atom atom_aux; - int x, y, cx, cy, dummy; + int x, y, cx, cy, dummy, format; Window win, w_aux_root, w_aux_child; if (!(data = get_win_data( hWnd ))) return; @@ -1529,50 +1529,23 @@ static void EVENT_DropFromOffiX( HWND hWnd, XClientMessageEvent *event ) XGetWindowProperty( event->display, DefaultRootWindow(event->display), x11drv_atom(DndSelection), 0, 65535, FALSE, - AnyPropertyType, &atom_aux, &dummy, + AnyPropertyType, &atom_aux, &format, &data_length, &aux_long, &p_data); - if( !aux_long && p_data) /* don't bother if > 64K */ + if (!aux_long && p_data) /* don't bother if > 64K */ { - char *p = (char *)p_data; - char *p_drop; + DROPFILES *drop; + size_t drop_size; - aux_long = 0; - while( *p ) /* calculate buffer size */ + drop = file_list_to_drop_files( p_data, get_property_size( format, data_length ), &drop_size ); + if (drop) { - INT len = GetShortPathNameA( p, NULL, 0 ); - if (len) aux_long += len + 1; - p += strlen(p) + 1; - } - if( aux_long && aux_long < 65535 ) - { - HDROP hDrop; - DROPFILES *lpDrop; - - aux_long += sizeof(DROPFILES) + 1; - hDrop = GlobalAlloc( GMEM_SHARE, aux_long ); - lpDrop = GlobalLock( hDrop ); - - if( lpDrop ) - { - lpDrop->pFiles = sizeof(DROPFILES); - lpDrop->pt = pt; - lpDrop->fNC = FALSE; - lpDrop->fWide = FALSE; - p_drop = (char *)(lpDrop + 1); - p = (char *)p_data; - while(*p) - { - if (GetShortPathNameA( p, p_drop, aux_long - (p_drop - (char *)lpDrop) )) - p_drop += strlen( p_drop ) + 1; - p += strlen(p) + 1; - } - *p_drop = '\0'; - PostMessageA( hWnd, WM_DROPFILES, (WPARAM)hDrop, 0L ); - } + post_drop( hWnd, drop, drop_size ); + free( drop ); } } - if( p_data ) XFree(p_data); + + if (p_data) XFree(p_data); } /********************************************************************** diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 6b224f5426a..957ef6ea667 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -661,6 +661,7 @@ extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; extern void init_win_context(void) DECLSPEC_HIDDEN; +extern void *file_list_to_drop_files( const void *data, size_t size, size_t *ret_size ) DECLSPEC_HIDDEN; extern void *uri_list_to_drop_files( const void *data, size_t size, size_t *ret_size ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect )

1 0