wine-commits April 2022

wine-commits@winehq.org

2 participants
1024 discussions

Jacek Caban : win32u: Use user mode callback for registering builtin classes.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: a37cae58d984b6d7e0c4c3de21f0b7cbef603ffd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a37cae58d984b6d7e0c4c3de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:11 2022 +0100 win32u: Use user mode callback for registering builtin classes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/class.c | 15 ++------------- dlls/user32/controls.h | 1 - dlls/user32/user_main.c | 2 +- dlls/user32/user_private.h | 1 + dlls/win32u/class.c | 16 ++++++++++++++++ dlls/win32u/ntuser_private.h | 2 +- dlls/win32u/window.c | 2 +- dlls/win32u/winstation.c | 2 +- include/ntuser.h | 1 + 9 files changed, 24 insertions(+), 18 deletions(-) diff --git a/dlls/user32/class.c b/dlls/user32/class.c index aaa8f75bebe..620477f1b14 100644 --- a/dlls/user32/class.c +++ b/dlls/user32/class.c @@ -40,8 +40,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(class); #define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */ -static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; - static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>"; @@ -307,9 +305,9 @@ static void load_uxtheme(void) } /*********************************************************************** - * register_builtins + * User32RegisterBuiltinClasses */ -static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **context ) +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ) { register_builtin( &BUTTON_builtin_class ); register_builtin( &COMBO_builtin_class ); @@ -330,15 +328,6 @@ static BOOL WINAPI register_builtins( INIT_ONCE *once, void *param, void **conte } -/*********************************************************************** - * register_builtin_classes - */ -void register_builtin_classes(void) -{ - InitOnceExecuteOnce( &init_once, register_builtins, NULL, NULL ); -} - - /*********************************************************************** * register_desktop_class */ diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index a410bf27460..5dcdd9bb935 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -104,7 +104,6 @@ extern LRESULT StaticWndProc_common(HWND,UINT,WPARAM,LPARAM,BOOL) DECLSPEC_HIDDE struct tagCLASS; /* opaque structure */ struct tagWND; extern ATOM get_int_atom_value( UNICODE_STRING *name ) DECLSPEC_HIDDEN; -extern void register_builtin_classes(void) DECLSPEC_HIDDEN; extern void register_desktop_class(void) DECLSPEC_HIDDEN; /* defwnd proc */ diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 1258181c88a..1400597eb5d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -172,7 +172,6 @@ static const struct user_callbacks user_funcs = post_dde_message, process_rawinput_message, rawinput_device_get_usages, - register_builtin_classes, SCROLL_SetStandardScrollPainted, unpack_dde_message, register_imm, @@ -207,6 +206,7 @@ static const void *kernel_callback_table[NtUserCallCount] = User32CallWindowsHook, User32FreeCachedClipboardData, User32LoadDriver, + User32RegisterBuiltinClasses, User32RenderSsynthesizedFormat, }; diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index f28fc66bbf2..aa3e1565bfa 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -124,6 +124,7 @@ BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, BOOL WINAPI User32CallWinEventHook( const struct win_event_hook_params *params, ULONG size ); BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ); BOOL WINAPI User32CallWindowsHook( const struct win_hook_params *params, ULONG size ); +BOOL WINAPI User32RegisterBuiltinClasses( const struct win_hook_params *params, ULONG size ); /* message spy definitions */ diff --git a/dlls/win32u/class.c b/dlls/win32u/class.c index ba60794ccd7..c52fcad6025 100644 --- a/dlls/win32u/class.c +++ b/dlls/win32u/class.c @@ -972,3 +972,19 @@ WORD get_class_word( HWND hwnd, INT offset ) release_class_ptr( class ); return retvalue; } + +static void register_builtins(void) +{ + void *ret_ptr; + ULONG ret_len; + KeUserModeCallback( NtUserRegisterBuiltinClasses, NULL, 0, &ret_ptr, &ret_len ); +} + +/*********************************************************************** + * register_builtin_classes + */ +void register_builtin_classes(void) +{ + static pthread_once_t init_once = PTHREAD_ONCE_INIT; + pthread_once( &init_once, register_builtins ); +} diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 632cb16d23a..fe9d7e18bc9 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -46,7 +46,6 @@ struct user_callbacks DWORD type ); BOOL (CDECL *process_rawinput_message)( MSG *msg, UINT hw_id, const struct hardware_msg_data *msg_data ); BOOL (CDECL *rawinput_device_get_usages)(HANDLE handle, USHORT *usage_page, USHORT *usage); - void (CDECL *register_builtin_classes)(void); void (WINAPI *set_standard_scroll_painted)( HWND hwnd, INT bar, BOOL visible ); BOOL (CDECL *unpack_dde_message)( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, void **buffer, size_t size ); @@ -303,6 +302,7 @@ WNDPROC get_winproc( WNDPROC proc, BOOL ansi ) DECLSPEC_HIDDEN; void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; struct dce *get_class_dce( struct tagCLASS *class ) DECLSPEC_HIDDEN; struct dce *set_class_dce( struct tagCLASS *class, struct dce *dce ) DECLSPEC_HIDDEN; +extern void register_builtin_classes(void) DECLSPEC_HIDDEN; /* cursoricon.c */ HICON alloc_cursoricon_handle( BOOL is_icon ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index e206881e596..edafc522d14 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4732,7 +4732,7 @@ static WND *create_window_handle( HWND parent, HWND owner, UNICODE_STRING *name, else assert( full_parent == thread_info->top_window ); if (full_parent && !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); } else /* HWND_MESSAGE parent */ { diff --git a/dlls/win32u/winstation.c b/dlls/win32u/winstation.c index 4cd223750c2..0f6fb66a2b2 100644 --- a/dlls/win32u/winstation.c +++ b/dlls/win32u/winstation.c @@ -499,7 +499,7 @@ HWND get_desktop_window(void) if (!thread_info->top_window || !user_driver->pCreateDesktopWindow( thread_info->top_window )) ERR_(win)( "failed to create desktop window\n" ); - if (user_callbacks) user_callbacks->register_builtin_classes(); + register_builtin_classes(); return thread_info->top_window; } diff --git a/include/ntuser.h b/include/ntuser.h index cad90b91882..58486fcfcb0 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -34,6 +34,7 @@ enum NtUserCallWindowsHook, NtUserFreeCachedClipboardData, NtUserLoadDriver, + NtUserRegisterBuiltinClasses, NtUserRenderSynthesizedFormat, /* win16 hooks */ NtUserCallFreeIcon,

1 0

Jacek Caban : winex11: Directly use win32u and ntdll in a few more places.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 0082d58cb5375a06ce33f431f6cf338e9c4b672b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0082d58cb5375a06ce33f431… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:10 2022 +0100 winex11: Directly use win32u and ntdll in a few more places. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index eb357ed4643..a0ccc3ebc96 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -203,7 +203,7 @@ static const char *debugstr_format( UINT id ) { WCHAR buffer[256]; - if (GetClipboardFormatNameW( id, buffer, 256 )) + if (NtUserGetClipboardFormatName( id, buffer, ARRAYSIZE(buffer) )) return wine_dbg_sprintf( "%04x %s", id, debugstr_w(buffer) ); switch (id) @@ -349,7 +349,8 @@ static void register_win32_formats( const UINT *ids, UINT size ) for (count = 0; count < 256 && size; ids++, size--) { if (find_win32_format( *ids )) continue; /* it already exists */ - if (!GetClipboardFormatNameW( *ids, buffer, 256 )) continue; /* not a named format */ + if (!NtUserGetClipboardFormatName( *ids, buffer, ARRAYSIZE(buffer) )) + continue; /* not a named format */ if (!(len = WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, NULL, 0, NULL, NULL ))) continue; if (!(names[count] = malloc( len ))) continue; WideCharToMultiByte( CP_UNIXCP, 0, buffer, -1, names[count], len, NULL, NULL ); @@ -434,6 +435,14 @@ static void put_property( Display *display, Window win, Atom prop, Atom type, in } +static void selection_sleep(void) +{ + LARGE_INTEGER timeout; + timeout.QuadPart = (ULONGLONG)SELECTION_WAIT * -10000; + NtDelayExecution( FALSE, &timeout ); +} + + /************************************************************************** * convert_selection */ @@ -455,7 +464,7 @@ static BOOL convert_selection( Display *display, Window win, Atom selection, Bool res = XCheckTypedWindowEvent( display, win, SelectionNotify, &event ); if (res && event.xselection.selection == selection && event.xselection.target == format->atom) return read_property( display, win, event.xselection.property, type, data, size ); - Sleep( SELECTION_WAIT ); + selection_sleep(); } ERR( "Timed out waiting for SelectionNotify event\n" ); return FALSE; @@ -1414,7 +1423,7 @@ static UINT *get_clipboard_formats( UINT *size ) for (;;) { if (!(ids = malloc( *size * sizeof(*ids) ))) return NULL; - if (GetUpdatedClipboardFormats( ids, *size, size )) break; + if (NtUserGetUpdatedClipboardFormats( ids, *size, size )) break; free( ids ); if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL; } @@ -1706,7 +1715,7 @@ static BOOL read_property( Display *display, Window w, Atom prop, if (res && xe.xproperty.atom == prop && xe.xproperty.state == PropertyNewValue) break; - Sleep(SELECTION_WAIT); + selection_sleep(); } if (i >= SELECTION_RETRIES || @@ -1863,14 +1872,14 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_size != size || memcmp( last_data, data, size )); - if (!changed || !OpenClipboard( clipboard_hwnd )) + if (!changed || !NtUserOpenClipboard( clipboard_hwnd, 0 )) { free( data ); return FALSE; } TRACE( "selection changed, importing\n" ); - EmptyClipboard(); + NtUserEmptyClipboard(); is_clipboard_owner = TRUE; rendered_formats = 0; @@ -1884,9 +1893,9 @@ static BOOL request_selection_contents( Display *display, BOOL changed ) last_data = data; last_size = size; last_clipboard_update = GetTickCount64(); - CloseClipboard(); + NtUserCloseClipboard(); if (!use_xfixes) - SetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL ); + NtUserSetTimer( clipboard_hwnd, 1, SELECTION_UPDATE_DELAY, NULL, TIMERV_DEFAULT_COALESCING ); return TRUE; }

1 0

Jacek Caban : winex11: Directly use ntdll in uri_to_dos.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 1c01148696b164094b11624cee2985573744f83a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c01148696b164094b11624c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:09 2022 +0100 winex11: Directly use ntdll in uri_to_dos. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index ec0392f3ec8..eb357ed4643 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -569,6 +569,29 @@ static HGLOBAL create_dib_from_bitmap(HBITMAP hBmp) } +/* based on wine_get_dos_file_name */ +static WCHAR *get_dos_file_name( const char *path ) +{ + ULONG len = strlen( path ) + 9; /* \??\unix prefix */ + WCHAR *ret; + + if (!(ret = malloc( len * sizeof(WCHAR) ))) return NULL; + if (wine_unix_to_nt_file_name( path, ret, &len )) + { + free( ret ); + return NULL; + } + + if (ret[5] == ':') + { + /* get rid of the \??\ prefix */ + memmove( ret, ret + 4, (len - 4) * sizeof(WCHAR) ); + } + else ret[1] = '\\'; + return ret; +} + + /*********************************************************************** * uri_to_dos * @@ -616,7 +639,7 @@ static WCHAR* uri_to_dos(char *encodedURI) if (uri[7] == '/') { /* file:///path/to/file (nautilus, thunar) */ - ret = wine_get_dos_file_name(&uri[7]); + ret = get_dos_file_name( &uri[7] ); } else if (uri[7]) { @@ -629,14 +652,14 @@ static WCHAR* uri_to_dos(char *encodedURI) if (strcmp(&uri[7], "localhost") == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } else if (gethostname(hostname, sizeof(hostname)) == 0) { if (strcmp(hostname, &uri[7]) == 0) { *path = '/'; - ret = wine_get_dos_file_name(path); + ret = get_dos_file_name( path ); } } } @@ -645,7 +668,7 @@ static WCHAR* uri_to_dos(char *encodedURI) else if (uri[6]) { /* file:/path/to/file (konqueror) */ - ret = wine_get_dos_file_name(&uri[5]); + ret = get_dos_file_name( &uri[5] ); } } free( uri ); @@ -938,7 +961,7 @@ static HANDLE import_text_uri_list( Atom type, const void *data, size_t size ) memcpy(&out[total], path, pathSize * sizeof(WCHAR)); total += pathSize; done: - HeapFree( GetProcessHeap(), 0, path ); + free( path ); if (out == NULL) break; }

1 0

Jacek Caban : winex11: Use data-only NtUserGetClipboardData to export clipboard data.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 55bbe99c29264aeddec6932cb5e4fca03ecc9471 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55bbe99c29264aeddec6932c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:08 2022 +0100 winex11: Use data-only NtUserGetClipboardData to export clipboard data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 167 +++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 92 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=55bbe99c29264aeddec6…

1 0

Jacek Caban : winex11: Don't use DragQueryFileW in export_hdrop.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 93543d9e6a3e2003a60dc9fa13ec3607a7817fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=93543d9e6a3e2003a60dc9fa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:07 2022 +0100 winex11: Don't use DragQueryFileW in export_hdrop. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/clipboard.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index d677aad034b..02456ef3870 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1336,30 +1336,39 @@ static BOOL export_text_html( Display *display, Window win, Atom prop, Atom targ */ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, HANDLE handle ) { - UINT i; - UINT numFiles; - char *textUriList; + char *textUriList = NULL; UINT textUriListSize = 32; UINT next = 0; + const WCHAR *ptr; + WCHAR *unicode_data = NULL; + void *data = GlobalLock( handle ); + DROPFILES *drop_files = data; - textUriList = malloc( textUriListSize ); - if (!textUriList) return FALSE; - numFiles = DragQueryFileW( handle, 0xFFFFFFFF, NULL, 0 ); - for (i = 0; i < numFiles; i++) + 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; + } + else ptr = (const WCHAR *)((char *)data + drop_files->pFiles); + + if (!(textUriList = malloc( textUriListSize ))) goto failed; + + while (*ptr) { - UINT dosFilenameSize; - WCHAR *dosFilename = NULL; char *unixFilename = NULL; UINT uriSize; UINT u; - dosFilenameSize = 1 + DragQueryFileW( handle, i, NULL, 0 ); - dosFilename = malloc( dosFilenameSize * sizeof(WCHAR) ); - if (dosFilename == NULL) goto failed; - DragQueryFileW( handle, i, dosFilename, dosFilenameSize ); - unixFilename = wine_get_unix_file_name(dosFilename); - free( dosFilename ); + unixFilename = wine_get_unix_file_name( ptr ); if (unixFilename == NULL) goto failed; + ptr += lstrlenW( ptr ) + 1; + uriSize = 8 + /* file:/// */ 3 * (lstrlenA(unixFilename) - 1) + /* "%xy" per char except first '/' */ 2; /* \r\n */ @@ -1397,6 +1406,8 @@ static BOOL export_hdrop( Display *display, Window win, Atom prop, Atom target, return TRUE; failed: + GlobalUnlock( handle ); + free( unicode_data ); free( textUriList ); return FALSE; }

1 0

Jacek Caban : win32u: Introduce data-only mode in NtUserGetClipboardData.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 286471a307792dc6662043ce36438a285cb506a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=286471a307792dc6662043ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 26 16:06:06 2022 +0100 win32u: Introduce data-only mode in NtUserGetClipboardData. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/clipboard.c | 19 +++++++++++++++---- include/ntuser.h | 1 + 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/win32u/clipboard.c b/dlls/win32u/clipboard.c index 63306702b1c..67bdd0ba391 100644 --- a/dlls/win32u/clipboard.c +++ b/dlls/win32u/clipboard.c @@ -631,7 +631,7 @@ done: */ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params *params ) { - struct cached_format *cache; + struct cached_format *cache = NULL; NTSTATUS status; UINT from, data_seqno; size_t size; @@ -642,7 +642,7 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * { pthread_mutex_lock( &clipboard_mutex ); - cache = get_cached_format( format ); + if (!params->data_only) cache = get_cached_format( format ); SERVER_START_REQ( get_clipboard_data ) { @@ -662,6 +662,8 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * } SERVER_END_REQ; + params->size = size; + if (!status && size) { if (cache) @@ -679,8 +681,18 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * list_add_tail( &formats_to_free, &cache->entry ); } + if (params->data_only) + { + pthread_mutex_unlock( &clipboard_mutex ); + return params->data; + } + /* allocate new cache entry */ - if (!(cache = malloc( sizeof(*cache) ))) return 0; + if (!(cache = malloc( sizeof(*cache) ))) + { + pthread_mutex_unlock( &clipboard_mutex ); + return 0; + } cache->format = format; cache->seqno = data_seqno; @@ -690,7 +702,6 @@ HANDLE WINAPI NtUserGetClipboardData( UINT format, struct get_clipboard_params * pthread_mutex_unlock( &clipboard_mutex ); TRACE( "%s needs unmarshaling\n", debugstr_format( format ) ); params->data_size = ~0; - params->size = size; return 0; } pthread_mutex_unlock( &clipboard_mutex ); diff --git a/include/ntuser.h b/include/ntuser.h index f49c9bc7723..cad90b91882 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -257,6 +257,7 @@ struct get_clipboard_params size_t size; size_t data_size; UINT seqno; + BOOL data_only; }; /* NtUserSetClipboardData params, not compatible with Windows */

1 0

Zebediah Figura : user32: Merge caret.c into input.c.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: ba8024bfcdb26d4a7eb8dc1ad53a3424d13df7e2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba8024bfcdb26d4a7eb8dc1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:05 2022 +0100 user32: Merge caret.c into input.c. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/Makefile.in | 1 - dlls/user32/caret.c | 58 ------------------------------------------------- dlls/user32/input.c | 27 +++++++++++++++++++++++ 3 files changed, 27 insertions(+), 59 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index dd83ecec5cf..92d5c1ec1d9 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -7,7 +7,6 @@ DELAYIMPORTS = hid setupapi imm32 C_SRCS = \ button.c \ - caret.c \ class.c \ clipboard.c \ combo.c \ diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c deleted file mode 100644 index 9e0ff5ca48c..00000000000 --- a/dlls/user32/caret.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Caret functions - * - * Copyright 1993 David Metcalfe - * Copyright 1996 Frans van Dorsselaer - * Copyright 2001 Eric Pouech - * Copyright 2002 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "ntuser.h" -#include "user_private.h" -#include "wine/server.h" -#include "wine/debug.h" - -/***************************************************************** - * DestroyCaret (USER32.@) - */ -BOOL WINAPI DestroyCaret(void) -{ - return NtUserDestroyCaret(); -} - - -/***************************************************************** - * SetCaretPos (USER32.@) - */ -BOOL WINAPI SetCaretPos( INT x, INT y ) -{ - return NtUserSetCaretPos( x, y ); -} - - -/***************************************************************** - * SetCaretBlinkTime (USER32.@) - */ -BOOL WINAPI SetCaretBlinkTime( unsigned int time ) -{ - return NtUserSetCaretBlinkTime( time ); -} diff --git a/dlls/user32/input.c b/dlls/user32/input.c index dcb46df22b5..06756b5551e 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -162,6 +162,33 @@ HWND WINAPI GetCapture(void) } +/***************************************************************** + * DestroyCaret (USER32.@) + */ +BOOL WINAPI DestroyCaret(void) +{ + return NtUserDestroyCaret(); +} + + +/***************************************************************** + * SetCaretPos (USER32.@) + */ +BOOL WINAPI SetCaretPos( int x, int y ) +{ + return NtUserSetCaretPos( x, y ); +} + + +/***************************************************************** + * SetCaretBlinkTime (USER32.@) + */ +BOOL WINAPI SetCaretBlinkTime( unsigned int time ) +{ + return NtUserSetCaretBlinkTime( time ); +} + + /*********************************************************************** * GetInputState (USER32.@) */

1 0

Zebediah Figura : win32u: Move caret APIs from user32.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: b8732c80b112af388264ac84d726aad09d93c8c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8732c80b112af388264ac84… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:04 2022 +0100 win32u: Move caret APIs from user32. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 371 +---------------------------------------- dlls/user32/edit.c | 8 +- dlls/user32/menu.c | 4 +- dlls/user32/painting.c | 4 +- dlls/user32/scroll.c | 20 +-- dlls/user32/user32.spec | 10 +- dlls/user32/user_main.c | 4 - dlls/user32/user_private.h | 1 - dlls/win32u/dce.c | 4 +- dlls/win32u/gdiobj.c | 3 + dlls/win32u/input.c | 384 +++++++++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 3 +- dlls/win32u/ntuser_private.h | 4 - dlls/win32u/syscall.c | 2 + dlls/win32u/sysparams.c | 9 + dlls/win32u/win32u.spec | 10 +- dlls/win32u/win32u_private.h | 7 + dlls/win32u/window.c | 13 +- dlls/win32u/wrappers.c | 18 ++ dlls/wow64win/syscall.h | 2 + dlls/wow64win/user.c | 12 ++ include/ntuser.h | 23 +++ 22 files changed, 500 insertions(+), 416 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b8732c80b112af388264…

1 0

Zebediah Figura : user32: Query CursorBlinkRate from the registry.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 535682cd79251c921121b0c87857a1f77cc27607 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535682cd79251c921121b0c8… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:03 2022 +0100 user32: Query CursorBlinkRate from the registry. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/caret.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c index bdc7780bf8f..7b21e03c764 100644 --- a/dlls/user32/caret.c +++ b/dlls/user32/caret.c @@ -96,6 +96,24 @@ void CDECL toggle_caret( HWND hwnd ) } +static unsigned int get_caret_registry_timeout(void) +{ + unsigned int ret = 500; + WCHAR value[11]; + DWORD size; + HKEY key; + + if (RegOpenKeyExW( HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_READ, &key )) + return ret; + + size = sizeof(value); + if (!RegQueryValueExW( key, L"CursorBlinkRate", NULL, NULL, (BYTE *)value, &size )) + ret = wcstoul( value, NULL, 10 ); + RegCloseKey( key ); + return ret; +} + + /***************************************************************** * CreateCaret (USER32.@) */ @@ -185,7 +203,8 @@ BOOL WINAPI CreateCaret( HWND hwnd, HBITMAP bitmap, INT width, INT height ) if (Caret.hBmp) DeleteObject( Caret.hBmp ); Caret.hBmp = hBmp; - Caret.timeout = GetProfileIntA( "windows", "CursorBlinkRate", 500 ); + + Caret.timeout = get_caret_registry_timeout(); return TRUE; }

1 0

Zebediah Figura : win32u: Move NtUserTrackMouseEvent() implementation from user32.
by Alexandre Julliard 26 Apr '22

26 Apr '22

Module: wine Branch: master Commit: 5ce53f95cf61cbd7f998ddc706a88cddb7a70c76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ce53f95cf61cbd7f998ddc7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Apr 26 16:06:02 2022 +0100 win32u: Move NtUserTrackMouseEvent() implementation from user32. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/input.c | 254 ------------------------------------------- dlls/user32/scroll.c | 8 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_main.c | 1 - dlls/user32/user_private.h | 1 - dlls/win32u/gdiobj.c | 1 + dlls/win32u/input.c | 218 +++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 3 +- dlls/win32u/ntuser_private.h | 1 - dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 2 + dlls/win32u/wrappers.c | 6 + include/ntuser.h | 1 + 13 files changed, 235 insertions(+), 265 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5ce53f95cf61cbd7f998…

1 0

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 April 2022