system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 00:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32u: Move GetShellWindow implementation from user32.

Browse source
This commit is contained in:
Jacek Caban 2022-12-09 12:36:22 +01:00 committed by Alexandre Julliard
parent ae7effbd78
commit 67c3fff7cd
5 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dlls/user32/focus.c
View file

@ -112,17 +112,7 @@ BOOL WINAPI SetShellWindow(HWND hwndShell)
*/
HWND WINAPI GetShellWindow(void)
{
HWND hwndShell = 0;
SERVER_START_REQ(set_global_windows)
{
req->flags = 0;
if (!wine_server_call_err(req))
hwndShell = wine_server_ptr_handle( reply->old_shell_window );
}
SERVER_END_REQ;
return hwndShell;
return NtUserGetShellWindow();
}

15
dlls/win32u/input.c
View file

@ -2150,3 +2150,18 @@ void toggle_caret( HWND hwnd )
if (ret && !hidden) display_caret( hwnd, &r );
}
HWND get_shell_window(void)
{
HWND hwnd = 0;
SERVER_START_REQ(set_global_windows)
{
req->flags = 0;
if (!wine_server_call_err(req))
hwnd = wine_server_ptr_handle( reply->old_shell_window );
}
SERVER_END_REQ;
return hwnd;
}

3
dlls/win32u/sysparams.c
View file

@ -5437,6 +5437,9 @@ ULONG_PTR WINAPI NtUserCallNoParam( ULONG code )
case NtUserCallNoParam_GetProcessDefaultLayout:
return process_layout;
case NtUserCallNoParam_GetShellWindow:
return HandleToUlong( get_shell_window() );
case NtUserCallNoParam_ReleaseCapture:
return release_capture();

1
dlls/win32u/win32u_private.h
View file

@ -271,6 +271,7 @@ extern HWND get_capture(void) DECLSPEC_HIDDEN;
extern BOOL get_cursor_pos( POINT *pt ) DECLSPEC_HIDDEN;
extern HWND get_focus(void) DECLSPEC_HIDDEN;
extern DWORD get_input_state(void) DECLSPEC_HIDDEN;
extern HWND get_shell_window(void) DECLSPEC_HIDDEN;
extern BOOL WINAPI release_capture(void) DECLSPEC_HIDDEN;
extern BOOL set_capture_window( HWND hwnd, UINT gui_flags, HWND *prev_ret ) DECLSPEC_HIDDEN;
extern BOOL set_caret_blink_time( unsigned int time ) DECLSPEC_HIDDEN;

6
include/ntuser.h
View file

@ -910,6 +910,7 @@ enum
NtUserCallNoParam_GetDialogBaseUnits,
NtUserCallNoParam_GetInputState,
NtUserCallNoParam_GetProcessDefaultLayout,
NtUserCallNoParam_GetShellWindow,
NtUserCallNoParam_ReleaseCapture,
/* temporary exports */
NtUserExitingThread,
@ -941,6 +942,11 @@ static inline DWORD NtUserGetProcessDefaultLayout(void)
return NtUserCallNoParam( NtUserCallNoParam_GetProcessDefaultLayout );
}
static inline HWND NtUserGetShellWindow(void)
{
return UlongToHandle( NtUserCallNoParam( NtUserCallNoParam_GetShellWindow ));
}
static inline BOOL NtUserReleaseCapture(void)
{
return NtUserCallNoParam( NtUserCallNoParam_ReleaseCapture );