Module: wine Branch: master Commit: f44cd1823f61acb83b353918b28850c75749550b URL: https://gitlab.winehq.org/wine/wine/-/commit/f44cd1823f61acb83b353918b28850c...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Dec 9 12:58:04 2022 +0100
user32: Merge focus.c into input.c.
---
dlls/user32/Makefile.in | 1 - dlls/user32/focus.c | 111 ------------------------------------------------ dlls/user32/input.c | 84 ++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 112 deletions(-)
diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 0cf2d575e87..112afa4c9a0 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -20,7 +20,6 @@ C_SRCS = \ dialog.c \ edit.c \ exticon.c \ - focus.c \ hook.c \ icontitle.c \ input.c \ diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c deleted file mode 100644 index 3d996b61510..00000000000 --- a/dlls/user32/focus.c +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Focus and activation functions - * - * Copyright 1993 David Metcalfe - * Copyright 1995 Alex Korobka - * Copyright 1994, 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 "user_private.h" -#include "wine/server.h" - - -/******************************************************************* - * SetForegroundWindow (USER32.@) - */ -BOOL WINAPI SetForegroundWindow( HWND hwnd ) -{ - return NtUserSetForegroundWindow( hwnd ); -} - - -/******************************************************************* - * GetActiveWindow (USER32.@) - */ -HWND WINAPI GetActiveWindow(void) -{ - GUITHREADINFO info; - info.cbSize = sizeof(info); - return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; -} - - -/***************************************************************** - * GetFocus (USER32.@) - */ -HWND WINAPI GetFocus(void) -{ - GUITHREADINFO info; - info.cbSize = sizeof(info); - return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndFocus : 0; -} - - -/******************************************************************* -* SetShellWindow (USER32.@) -*/ -BOOL WINAPI SetShellWindow( HWND hwnd ) -{ - return NtUserSetShellWindowEx( hwnd, hwnd ); -} - - -/******************************************************************* -* GetShellWindow (USER32.@) -*/ -HWND WINAPI GetShellWindow(void) -{ - return NtUserGetShellWindow(); -} - - -/*********************************************************************** - * SetProgmanWindow (USER32.@) - */ -HWND WINAPI SetProgmanWindow( HWND hwnd ) -{ - return NtUserSetProgmanWindow( hwnd ); -} - - -/*********************************************************************** - * GetProgmanWindow (USER32.@) - */ -HWND WINAPI GetProgmanWindow(void) -{ - return NtUserGetProgmanWindow(); -} - - -/*********************************************************************** - * SetTaskmanWindow (USER32.@) - * NOTES - * hwnd = MSTaskSwWClass - * |-> SysTabControl32 - */ -HWND WINAPI SetTaskmanWindow( HWND hwnd ) -{ - return NtUserSetTaskmanWindow( hwnd ); -} - -/*********************************************************************** - * GetTaskmanWindow (USER32.@) - */ -HWND WINAPI GetTaskmanWindow(void) -{ - return NtUserGetTaskmanWindow(); -} diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 34e3a620cc5..c5387cf9212 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -770,3 +770,87 @@ BOOL WINAPI GetPointerTouchInfoHistory( UINT32 id, UINT32 *count, POINTER_TOUCH_ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); return FALSE; } + + +/******************************************************************* + * SetForegroundWindow (USER32.@) + */ +BOOL WINAPI SetForegroundWindow( HWND hwnd ) +{ + return NtUserSetForegroundWindow( hwnd ); +} + + +/******************************************************************* + * GetActiveWindow (USER32.@) + */ +HWND WINAPI GetActiveWindow(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndActive : 0; +} + + +/***************************************************************** + * GetFocus (USER32.@) + */ +HWND WINAPI GetFocus(void) +{ + GUITHREADINFO info; + info.cbSize = sizeof(info); + return NtUserGetGUIThreadInfo( GetCurrentThreadId(), &info ) ? info.hwndFocus : 0; +} + + +/******************************************************************* + * SetShellWindow (USER32.@) + */ +BOOL WINAPI SetShellWindow( HWND hwnd ) +{ + return NtUserSetShellWindowEx( hwnd, hwnd ); +} + + +/******************************************************************* + * GetShellWindow (USER32.@) + */ +HWND WINAPI GetShellWindow(void) +{ + return NtUserGetShellWindow(); +} + + +/*********************************************************************** + * SetProgmanWindow (USER32.@) + */ +HWND WINAPI SetProgmanWindow( HWND hwnd ) +{ + return NtUserSetProgmanWindow( hwnd ); +} + + +/*********************************************************************** + * GetProgmanWindow (USER32.@) + */ +HWND WINAPI GetProgmanWindow(void) +{ + return NtUserGetProgmanWindow(); +} + + +/*********************************************************************** + * SetTaskmanWindow (USER32.@) + */ +HWND WINAPI SetTaskmanWindow( HWND hwnd ) +{ + return NtUserSetTaskmanWindow( hwnd ); +} + +/*********************************************************************** + * GetTaskmanWindow (USER32.@) + */ +HWND WINAPI GetTaskmanWindow(void) +{ + return NtUserGetTaskmanWindow(); +}