[jimtabor] 60659: [Win32ss] - Fix up hot keys. Finding out that the wine test_hotkey is brain damaged and even breaks XP.
14 Oct
2013
14 Oct
'13
6:19 a.m.
Author: jimtabor
Date: Mon Oct 14 06:19:48 2013
New Revision: 60659
URL: http://svn.reactos.org/svn/reactos?rev=60659&view=rev
Log:
[Win32ss]
- Fix up hot keys. Finding out that the wine test_hotkey is brain damaged and even breaks
XP.
Modified:
trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt
trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt
trunk/reactos/win32ss/user/ntuser/defwnd.c
trunk/reactos/win32ss/user/ntuser/hotkey.c
trunk/reactos/win32ss/user/ntuser/hotkey.h
trunk/reactos/win32ss/user/ntuser/input.c
trunk/reactos/win32ss/user/ntuser/input.h
trunk/reactos/win32ss/user/ntuser/keyboard.c
trunk/reactos/win32ss/user/ntuser/main.c
trunk/reactos/win32ss/user/ntuser/message.c
trunk/reactos/win32ss/user/ntuser/msgqueue.c
trunk/reactos/win32ss/user/ntuser/msgqueue.h
trunk/reactos/win32ss/user/user32/windows/defwnd.c
Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Oct 14 06:19:48
2013
@@ -74,4 +74,6 @@
vtxfmt.c
)
-add_library(mesa_main STATIC ${SOURCE})
+add_library(mesa_main STATIC ${SOURCE})
+
+allow_warnings(mesa_main)
Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa…
==============================================================================
--- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Mon Oct 14 06:19:48
2013
@@ -27,4 +27,6 @@
s_zoom.c
)
-add_library(mesa_swrast STATIC ${SOURCE})
+add_library(mesa_swrast STATIC ${SOURCE})
+
+allow_warnings(mesa_swrast)
Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -233,7 +233,7 @@
return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam));
case WM_GETHOTKEY:
- return DefWndGetHotKey(UserHMGetHandle(Wnd));
+ return DefWndGetHotKey(Wnd);
case WM_SETHOTKEY:
return DefWndSetHotKey(Wnd, wParam);
Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -2,7 +2,7 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS Win32k subsystem
* PURPOSE: HotKey support
- * FILE: subsystems/win32/win32k/ntuser/hotkey.c
+ * FILE: win32ss/user/ntuser/hotkey.c
* PROGRAMER: Eric Kohl
*/
@@ -30,16 +30,30 @@
* By default the key is VK-F12 on a 101-key keyboard, and is VK_SUBTRACT
* (hyphen / substract sign) on a 82-key keyboard.
*/
-/* thread hwnd modifiers vk id next */
-// HOT_KEY hkF12 = {NULL, NULL, 0, VK_F12, IDHK_F12, NULL};
-// HOT_KEY hkShiftF12 = {NULL, NULL, MOD_SHIFT, VK_F12, IDHK_SHIFTF12, &hkF12};
-// HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12};
-HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, NULL};
-
-PHOT_KEY gphkFirst = &hkWinKey;
+/* pti pwnd modifiers vk id next */
+// HOT_KEY hkF12 = {NULL, 1, 0, VK_F12, IDHK_F12, NULL};
+// HOT_KEY hkShiftF12 = {NULL, 1, MOD_SHIFT, VK_F12, IDHK_SHIFTF12, &hkF12};
+// HOT_KEY hkWinKey = {NULL, 1, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12};
+
+PHOT_KEY gphkFirst = NULL;
BOOL bWinHotkeyActive = FALSE;
/* FUNCTIONS *****************************************************************/
+
+VOID FASTCALL
+StartDebugHotKeys(VOID)
+{
+ UINT vk = VK_F12;
+ UserUnregisterHotKey(PWND_BOTTOM, IDHK_F12);
+ UserUnregisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12);
+ if (!ENHANCED_KEYBOARD(gKeyboardInfo.KeyboardIdentifier))
+ {
+ vk = VK_SUBTRACT;
+ }
+ UserRegisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12, MOD_SHIFT, vk);
+ UserRegisterHotKey(PWND_BOTTOM, IDHK_F12, 0, vk);
+ ERR("Start up the debugger hotkeys!! Should see this once!\n");
+}
/*
* IntGetModifiers
@@ -77,7 +91,6 @@
UnregisterWindowHotKeys(PWND pWnd)
{
PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst;
- HWND hWnd = pWnd->head.h;
while (pHotKey)
{
@@ -85,7 +98,7 @@
phkNext = pHotKey->pNext;
/* Should we delete this hotkey? */
- if (pHotKey->hWnd == hWnd)
+ if (pHotKey->pWnd == pWnd)
{
/* Update next ptr for previous hotkey and free memory */
*pLink = phkNext;
@@ -105,7 +118,7 @@
* Removes hotkeys registered by specified thread on its cleanup
*/
VOID FASTCALL
-UnregisterThreadHotKeys(struct _ETHREAD *pThread)
+UnregisterThreadHotKeys(PTHREADINFO pti)
{
PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst;
@@ -115,7 +128,7 @@
phkNext = pHotKey->pNext;
/* Should we delete this hotkey? */
- if (pHotKey->pThread == pThread)
+ if (pHotKey->pti == pti)
{
/* Update next ptr for previous hotkey and free memory */
*pLink = phkNext;
@@ -165,6 +178,8 @@
{
UINT fModifiers;
PHOT_KEY pHotKey;
+ PWND pWnd;
+ BOOL DoNotPostMsg = FALSE;
if (wVk == VK_SHIFT || wVk == VK_CONTROL || wVk == VK_MENU ||
wVk == VK_LWIN || wVk == VK_RWIN)
@@ -173,59 +188,84 @@
wVk = 0;
}
+ fModifiers = IntGetModifiers(gafAsyncKeyState);
+
/* Check if it is a hotkey */
- fModifiers = IntGetModifiers(gafAsyncKeyState);
pHotKey = IsHotKey(fModifiers, wVk);
+
if (pHotKey)
{
+ TRACE("Hot key Found\n");
+ /* FIXME: See comment about "UserDebuggerHotKey" on top of this file.
*/
+ if (pHotKey->id == IDHK_SHIFTF12 || pHotKey->id == IDHK_F12)
+ {
+ if (bIsDown)
+ {
+ ERR("Hot key pressed for Debug Activation! ShiftF12 = %d or F12 =
%d\n",pHotKey->id == IDHK_SHIFTF12 , pHotKey->id == IDHK_F12);
+ //DoNotPostMsg = co_ActivateDebugger(); // FIXME
+ }
+ return DoNotPostMsg;
+ }
+
/* Process hotkey if it is key up event */
if (!bIsDown)
{
- TRACE("Hot key pressed (hWnd %p, id %d)\n", pHotKey->hWnd,
pHotKey->id);
-
- /* WIN and F12 keys are hardcoded here. See comments on top of this file. */
- if (pHotKey == &hkWinKey)
+ TRACE("Hot key pressed (pWnd %p, id %d)\n", pHotKey->pWnd,
pHotKey->id);
+
+ /* WIN and F12 keys are not hardcoded here. See comments on top of this file.
*/
+ if (pHotKey->id == IDHK_WINKEY && bWinHotkeyActive == TRUE)
{
- if(bWinHotkeyActive == TRUE)
+ pWnd = ValidateHwndNoErr(InputWindowStation->ShellWindow);
+ if (pWnd)
{
- UserPostMessage(InputWindowStation->ShellWindow, WM_SYSCOMMAND,
SC_TASKLIST, 0);
- bWinHotkeyActive = FALSE;
+ TRACE("System Hot key Id %d Key %d\n",pHotKey->id, wVk
);
+ UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST,
0);
+ //ptiLastInput = pWnd->head.pti;
+ bWinHotkeyActive = FALSE;
+ return TRUE;
}
}
-#if 0 /* FIXME: See comment about "UserDebuggerHotKey" on top of this file. */
- else if (pHotKey == &hkF12 || pHotKey == &hkShiftF12)
+
+ if (!pHotKey->pWnd)
{
- //co_ActivateDebugger(); // FIXME
- }
-#endif
- else if (pHotKey->id == IDHK_REACTOS && !pHotKey->pThread) //
FIXME: Those hotkeys doesn't depend on RegisterHotKey
- {
- UserPostMessage(pHotKey->hWnd, WM_SYSCOMMAND, SC_HOTKEY,
(LPARAM)pHotKey->hWnd);
+ TRACE("UPTM Hot key Id %d Key %d\n",pHotKey->id, wVk );
+ UserPostThreadMessage(pHotKey->pti, WM_HOTKEY, pHotKey->id,
MAKELONG(fModifiers, wVk));
+ //ptiLastInput = pHotKey->pti;
}
else
{
- /* If a hotkey with the WIN modifier was activated, do not treat the
release of the WIN key as a hotkey*/
- if((pHotKey->fsModifiers & MOD_WIN) != 0)
- bWinHotkeyActive = FALSE;
-
- MsqPostHotKeyMessage(pHotKey->pThread,
- pHotKey->hWnd,
- (WPARAM)pHotKey->id,
- MAKELPARAM((WORD)fModifiers, wVk));
+ if (pHotKey->pWnd == PWND_BOTTOM)
+ {
+ if (gpqForeground != NULL)
+ {
+ pWnd = gpqForeground->spwndFocus;
+ }
+ else
+ return FALSE;
+ }
+ else
+ {
+ pWnd = pHotKey->pWnd;
+ }
+ if (pWnd)
+ {
+ if (pWnd == pWnd->head.rpdesk->pDeskInfo->spwndShell
&& pHotKey->id == SC_TASKLIST)
+ {
+ ERR("Sending to shell window w/o IDHK_WINKEY..\n");
+ UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST,
0);
+ }
+ else
+ {
+ UserPostMessage(UserHMGetHandle(pWnd), WM_HOTKEY, pHotKey->id,
MAKELONG(fModifiers, wVk));
+ }
+ //ptiLastInput = pWnd->head.pti;
+ }
}
- }
- else
- {
- if (pHotKey == &hkWinKey)
- {
- /* The user pressed the win key */
- bWinHotkeyActive = TRUE;
- }
- }
-
- return TRUE; /* Don't send any message */
- }
-
+ return TRUE; /* Don't send any message */
+ }
+ else /* The user pressed the win key */
+ if (pHotKey->id == IDHK_WINKEY) bWinHotkeyActive = TRUE;
+ }
return FALSE;
}
@@ -236,7 +276,7 @@
* GetHotKey message support
*/
UINT FASTCALL
-DefWndGetHotKey(HWND hWnd)
+DefWndGetHotKey(PWND pWnd)
{
PHOT_KEY pHotKey = gphkFirst;
@@ -244,7 +284,7 @@
while (pHotKey)
{
- if (pHotKey->hWnd == hWnd && pHotKey->id == IDHK_REACTOS)
+ if (pHotKey->pWnd == pWnd && pHotKey->id == IDHK_REACTOS)
{
/* We have found it */
return MAKELONG(pHotKey->vk, pHotKey->fsModifiers);
@@ -267,7 +307,6 @@
{
UINT fsModifiers, vk;
PHOT_KEY pHotKey, *pLink;
- HWND hWnd;
INT iRet = 1;
WARN("DefWndSetHotKey wParam 0x%x\n", wParam);
@@ -286,7 +325,6 @@
vk = LOWORD(wParam);
fsModifiers = HIWORD(wParam);
- hWnd = UserHMGetHandle(pWnd);
if (wParam)
{
@@ -297,7 +335,7 @@
pHotKey->vk == vk &&
pHotKey->id == IDHK_REACTOS)
{
- if (pHotKey->hWnd != hWnd)
+ if (pHotKey->pWnd != pWnd)
iRet = 2; // Another window already has the same hot key.
break;
}
@@ -311,7 +349,7 @@
pLink = &gphkFirst;
while (pHotKey)
{
- if (pHotKey->hWnd == hWnd &&
+ if (pHotKey->pWnd == pWnd &&
pHotKey->id == IDHK_REACTOS)
{
/* This window has already hotkey registered */
@@ -332,7 +370,7 @@
if (pHotKey == NULL)
return 0;
- pHotKey->hWnd = hWnd;
+ pHotKey->pWnd = pWnd;
pHotKey->id = IDHK_REACTOS; // Don't care, these hot keys are
unrelated to the hot keys set by RegisterHotKey
pHotKey->pNext = gphkFirst;
gphkFirst = pHotKey;
@@ -340,7 +378,7 @@
/* A window can only have one hot key. If the window already has a
hot key associated with it, the new hot key replaces the old one. */
- pHotKey->pThread = NULL;
+ pHotKey->pti = NULL;
pHotKey->fsModifiers = fsModifiers;
pHotKey->vk = vk;
}
@@ -353,6 +391,85 @@
return iRet;
}
+
+
+BOOL FASTCALL
+UserRegisterHotKey(PWND pWnd,
+ int id,
+ UINT fsModifiers,
+ UINT vk)
+{
+ PHOT_KEY pHotKey;
+ PTHREADINFO pHotKeyThread;
+
+ /* Find hotkey thread */
+ if (pWnd == NULL || pWnd == PWND_BOTTOM)
+ {
+ pHotKeyThread = PsGetCurrentThreadWin32Thread();
+ }
+ else
+ {
+ pHotKeyThread = pWnd->head.pti;
+ }
+
+ /* Check for existing hotkey */
+ if (IsHotKey(fsModifiers, vk))
+ {
+ EngSetLastError(ERROR_HOTKEY_ALREADY_REGISTERED);
+ WARN("Hotkey already exists\n");
+ return FALSE;
+ }
+
+ /* Create new hotkey */
+ pHotKey = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY), USERTAG_HOTKEY);
+ if (pHotKey == NULL)
+ {
+ EngSetLastError(ERROR_NOT_ENOUGH_MEMORY);
+ return FALSE;
+ }
+
+ pHotKey->pti = pHotKeyThread;
+ pHotKey->pWnd = pWnd;
+ pHotKey->fsModifiers = fsModifiers;
+ pHotKey->vk = vk;
+ pHotKey->id = id;
+
+ /* Insert hotkey to the global list */
+ pHotKey->pNext = gphkFirst;
+ gphkFirst = pHotKey;
+
+ return TRUE;
+}
+
+BOOL FASTCALL
+UserUnregisterHotKey(PWND pWnd, int id)
+{
+ PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst;
+ BOOL bRet = FALSE;
+
+ while (pHotKey)
+ {
+ /* Save next ptr for later use */
+ phkNext = pHotKey->pNext;
+
+ /* Should we delete this hotkey? */
+ if (pHotKey->pWnd == pWnd && pHotKey->id == id)
+ {
+ /* Update next ptr for previous hotkey and free memory */
+ *pLink = phkNext;
+ ExFreePoolWithTag(pHotKey, USERTAG_HOTKEY);
+
+ bRet = TRUE;
+ }
+ else /* This hotkey will stay, use its next ptr */
+ pLink = &pHotKey->pNext;
+
+ /* Move to the next entry */
+ pHotKey = phkNext;
+ }
+ return bRet;
+}
+
/* SYSCALLS *****************************************************************/
@@ -364,8 +481,8 @@
UINT vk)
{
PHOT_KEY pHotKey;
- PWND pWnd;
- PETHREAD pHotKeyThread;
+ PWND pWnd = NULL;
+ PTHREADINFO pHotKeyThread;
BOOL bRet = FALSE;
TRACE("Enter NtUserRegisterHotKey\n");
@@ -382,7 +499,7 @@
/* Find hotkey thread */
if (hWnd == NULL)
{
- pHotKeyThread = PsGetCurrentThread();
+ pHotKeyThread = gptiCurrent;
}
else
{
@@ -390,7 +507,14 @@
if (!pWnd)
goto cleanup;
- pHotKeyThread = pWnd->head.pti->pEThread;
+ pHotKeyThread = pWnd->head.pti;
+
+ /* Fix wine msg "Window on another thread" test_hotkey */
+ if (pWnd->head.pti != gptiCurrent)
+ {
+ WARN("Must be from the same Thread.\n");
+ goto cleanup;
+ }
}
/* Check for existing hotkey */
@@ -409,8 +533,8 @@
goto cleanup;
}
- pHotKey->pThread = pHotKeyThread;
- pHotKey->hWnd = hWnd;
+ pHotKey->pti = pHotKeyThread;
+ pHotKey->pWnd = pWnd;
pHotKey->fsModifiers = fsModifiers;
pHotKey->vk = vk;
pHotKey->id = id;
@@ -433,12 +557,13 @@
{
PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst;
BOOL bRet = FALSE;
+ PWND pWnd;
TRACE("Enter NtUserUnregisterHotKey\n");
UserEnterExclusive();
/* Fail if given window is invalid */
- if (hWnd && !UserGetWindowObject(hWnd))
+ if (hWnd && !(pWnd = UserGetWindowObject(hWnd)))
goto cleanup;
while (pHotKey)
@@ -447,7 +572,7 @@
phkNext = pHotKey->pNext;
/* Should we delete this hotkey? */
- if (pHotKey->hWnd == hWnd && pHotKey->id == id)
+ if (pHotKey->pWnd == pWnd && pHotKey->id == id)
{
/* Update next ptr for previous hotkey and free memory */
*pLink = phkNext;
Modified: trunk/reactos/win32ss/user/ntuser/hotkey.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/hotkey.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/hotkey.h [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -2,8 +2,8 @@
typedef struct _HOT_KEY
{
- struct _ETHREAD *pThread;
- HWND hWnd;
+ PTHREADINFO pti;
+ PWND pWnd;
UINT fsModifiers;
UINT vk;
INT id;
@@ -17,9 +17,12 @@
#define IDHK_REACTOS -8
VOID FASTCALL UnregisterWindowHotKeys(PWND Window);
-VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *pThread);
+VOID FASTCALL UnregisterThreadHotKeys(PTHREADINFO pti);
BOOL NTAPI co_UserProcessHotKeys(WORD wVk, BOOL bIsDown);
-UINT FASTCALL DefWndGetHotKey(HWND hwnd);
+UINT FASTCALL DefWndGetHotKey(PWND pWnd);
INT FASTCALL DefWndSetHotKey(PWND pWnd, WPARAM wParam);
+VOID FASTCALL StartDebugHotKeys(VOID);
+BOOL FASTCALL UserRegisterHotKey(PWND pWnd,int id,UINT fsModifiers,UINT vk);
+BOOL FASTCALL UserUnregisterHotKey(PWND pWnd, int id);
/* EOF */
Modified: trunk/reactos/win32ss/user/ntuser/input.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -13,12 +13,10 @@
/* GLOBALS *******************************************************************/
PTHREADINFO ptiRawInput;
-PTHREADINFO ptiKeyboard;
-PTHREADINFO ptiMouse;
PKTIMER MasterTimer = NULL;
PATTACHINFO gpai = NULL;
INT paiCount = 0;
-HANDLE ghKeyboardDevice;
+HANDLE ghKeyboardDevice = NULL;
static DWORD LastInputTick = 0;
static HANDLE ghMouseDevice;
@@ -131,7 +129,7 @@
{
NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status;
IO_STATUS_BLOCK MouIosb, KbdIosb;
- PFILE_OBJECT pKbdDevice, pMouDevice;
+ PFILE_OBJECT pKbdDevice = NULL, pMouDevice = NULL;
LARGE_INTEGER ByteOffset;
//LARGE_INTEGER WaitTimeout;
PVOID WaitObjects[3], pSignaledObject = NULL;
@@ -175,6 +173,14 @@
{
++cMaxWaitObjects;
TRACE("Keyboard connected!\n");
+ // Get and load keyboard attributes.
+ UserInitKeyboard(ghKeyboardDevice);
+ UserEnterExclusive();
+ // Register the Window hotkey.
+ UserRegisterHotKey(PWND_BOTTOM, IDHK_WINKEY, MOD_WIN, 0);
+ // Register the debug hotkeys.
+ StartDebugHotKeys();
+ UserLeave();
}
}
Modified: trunk/reactos/win32ss/user/ntuser/input.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -99,4 +99,4 @@
extern PKL gspklBaseLayout;
-
+extern KEYBOARD_ATTRIBUTES gKeyboardInfo;
Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -2,7 +2,7 @@
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
* PURPOSE: Keyboard functions
- * FILE: subsystems/win32/win32k/ntuser/keyboard.c
+ * FILE: win32ss/user/ntuser/keyboard.c
* PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net)
* Rafal Harabien (rafalh(a)reactos.org)
*/
@@ -14,6 +14,7 @@
static BYTE gafAsyncKeyStateRecentDown[256 / 8]; // 1 bit per key
static PKEYBOARD_INDICATOR_TRANSLATION gpKeyboardIndicatorTrans = NULL;
static KEYBOARD_INDICATOR_PARAMETERS gIndicators = {0, 0};
+KEYBOARD_ATTRIBUTES gKeyboardInfo;
/* FUNCTIONS *****************************************************************/
@@ -29,6 +30,10 @@
{
RtlZeroMemory(&gafAsyncKeyState, sizeof(gafAsyncKeyState));
RtlZeroMemory(&gafAsyncKeyStateRecentDown, sizeof(gafAsyncKeyStateRecentDown));
+ // Clear and set default information.
+ RtlZeroMemory(&gKeyboardInfo, sizeof(gKeyboardInfo));
+ gKeyboardInfo.KeyboardIdentifier.Type = 4; /* AT-101 */
+ gKeyboardInfo.NumberOfFunctionKeys = 12; /* We're doing an 101 for now, so return
12 F-keys */
return STATUS_SUCCESS;
}
@@ -38,7 +43,7 @@
* Asks the keyboard driver to send a small table that shows which
* lights should connect with which scancodes
*/
-static
+//static
NTSTATUS APIENTRY
IntKeyboardGetIndicatorTrans(HANDLE hKeyboardDevice,
PKEYBOARD_INDICATOR_TRANSLATION *ppIndicatorTrans)
@@ -159,7 +164,7 @@
{
NTSTATUS Status;
IO_STATUS_BLOCK Block;
-
+/*
IntKeyboardGetIndicatorTrans(hKeyboardDevice, &gpKeyboardIndicatorTrans);
Status = NtDeviceIoControlFile(hKeyboardDevice,
@@ -175,13 +180,31 @@
{
WARN("NtDeviceIoControlFile() failed, ignored\n");
}
-
SET_KEY_LOCKED(gafAsyncKeyState, VK_CAPITAL,
gIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON);
SET_KEY_LOCKED(gafAsyncKeyState, VK_NUMLOCK,
gIndicators.LedFlags & KEYBOARD_NUM_LOCK_ON);
SET_KEY_LOCKED(gafAsyncKeyState, VK_SCROLL,
gIndicators.LedFlags & KEYBOARD_SCROLL_LOCK_ON);
+*/
+ // FIXME: Need device driver to work! HID support more than one!!!!
+ Status = NtDeviceIoControlFile(hKeyboardDevice,
+ NULL,
+ NULL,
+ NULL,
+ &Block,
+ IOCTL_KEYBOARD_QUERY_ATTRIBUTES,
+ NULL, 0,
+ &gKeyboardInfo, sizeof(gKeyboardInfo));
+
+ if (!NT_SUCCESS(Status))
+ {
+ ERR("NtDeviceIoControlFile() failed, ignored\n");
+ }
+ ERR("Keyboard type %d, subtype %d and number of func keys %d\n",
+ gKeyboardInfo.KeyboardIdentifier.Type,
+ gKeyboardInfo.KeyboardIdentifier.Subtype,
+ gKeyboardInfo.NumberOfFunctionKeys);
}
/*
@@ -798,8 +821,10 @@
/* Check if this is a hotkey */
if (co_UserProcessHotKeys(wSimpleVk, bIsDown))
+ {
+ TRACE("HotKey Processed\n");
bPostMsg = FALSE;
-
+ }
wFixedVk = IntFixVk(wSimpleVk, bExt); /* LSHIFT + EXT = RSHIFT */
if (wSimpleVk == VK_SHIFT) /* shift can't be extended */
bExt = FALSE;
@@ -1459,11 +1484,11 @@
switch (dwTypeFlag)
{
case 0: /* Keyboard type */
- return 4; /* AT-101 */
+ return (DWORD)gKeyboardInfo.KeyboardIdentifier.Type;
case 1: /* Keyboard Subtype */
- return 0; /* There are no defined subtypes */
+ return (DWORD)gKeyboardInfo.KeyboardIdentifier.Subtype;
case 2: /* Number of F-keys */
- return 12; /* We're doing an 101 for now, so return 12 F-keys */
+ return (DWORD)gKeyboardInfo.NumberOfFunctionKeys;
default:
ERR("Unknown type!\n");
return 0; /* Note: we don't have to set last error here */
Modified: trunk/reactos/win32ss/user/ntuser/main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -544,7 +544,7 @@
EVENT_DestroyThreadEvents(Thread);
DestroyTimersForThread(ptiCurrent);
KeSetEvent(ptiCurrent->pEventQueueServer, IO_NO_INCREMENT, FALSE);
- UnregisterThreadHotKeys(Thread);
+ UnregisterThreadHotKeys(ptiCurrent);
/*
if (IsListEmpty(&ptiCurrent->WindowListHead))
{
Modified: trunk/reactos/win32ss/user/ntuser/message.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -1058,53 +1058,29 @@
}
BOOL FASTCALL
-UserPostThreadMessage( DWORD idThread,
+UserPostThreadMessage( PTHREADINFO pti,
UINT Msg,
WPARAM wParam,
LPARAM lParam )
{
MSG Message;
- PETHREAD peThread;
- PTHREADINFO pThread;
LARGE_INTEGER LargeTickCount;
- NTSTATUS Status;
if (is_pointer_message(Msg))
{
EngSetLastError(ERROR_MESSAGE_SYNC_ONLY );
return FALSE;
}
-
- Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread);
-
- if( Status == STATUS_SUCCESS )
- {
- pThread = (PTHREADINFO)peThread->Tcb.Win32Thread;
- if( !pThread ||
- !pThread->MessageQueue ||
- (pThread->TIF_flags & TIF_INCLEANUP))
- {
- ObDereferenceObject( peThread );
- return FALSE;
- }
-
- Message.hwnd = NULL;
- Message.message = Msg;
- Message.wParam = wParam;
- Message.lParam = lParam;
- Message.pt = gpsi->ptCursor;
-
- KeQueryTickCount(&LargeTickCount);
- Message.time = MsqCalculateMessageTime(&LargeTickCount);
- MsqPostMessage(pThread, &Message, FALSE, QS_POSTMESSAGE, 0);
- ObDereferenceObject( peThread );
- return TRUE;
- }
- else
- {
- SetLastNtError( Status );
- }
- return FALSE;
+ Message.hwnd = NULL;
+ Message.message = Msg;
+ Message.wParam = wParam;
+ Message.lParam = lParam;
+ Message.pt = gpsi->ptCursor;
+
+ KeQueryTickCount(&LargeTickCount);
+ Message.time = MsqCalculateMessageTime(&LargeTickCount);
+ MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0);
+ return TRUE;
}
BOOL FASTCALL
@@ -1157,7 +1133,8 @@
if (!Wnd)
{
- return UserPostThreadMessage( PtrToInt(PsGetCurrentThreadId()),
+ pti = PsGetCurrentThreadWin32Thread();
+ return UserPostThreadMessage( pti,
Msg,
wParam,
lParam);
@@ -1983,13 +1960,33 @@
LPARAM lParam)
{
BOOL ret;
+ PETHREAD peThread;
+ PTHREADINFO pThread;
+ NTSTATUS Status;
UserEnterExclusive();
- ret = UserPostThreadMessage( idThread, Msg, wParam, lParam);
-
+ Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread);
+
+ if ( Status == STATUS_SUCCESS )
+ {
+ pThread = (PTHREADINFO)peThread->Tcb.Win32Thread;
+ if( !pThread ||
+ !pThread->MessageQueue ||
+ (pThread->TIF_flags & TIF_INCLEANUP))
+ {
+ ObDereferenceObject( peThread );
+ goto exit;
+ }
+ ret = UserPostThreadMessage( pThread, Msg, wParam, lParam);
+ ObDereferenceObject( peThread );
+ }
+ else
+ {
+ SetLastNtError( Status );
+ }
+exit:
UserLeave();
-
return ret;
}
Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -638,54 +638,6 @@
}
}
-VOID FASTCALL
-MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam)
-{
- PWND Window;
- PTHREADINFO Win32Thread;
- MSG Mesg;
- LARGE_INTEGER LargeTickCount;
- NTSTATUS Status;
- INT id;
- DWORD Type;
-
- Status = ObReferenceObjectByPointer (Thread,
- THREAD_ALL_ACCESS,
- PsThreadType,
- KernelMode);
- if (!NT_SUCCESS(Status))
- return;
-
- Win32Thread = ((PETHREAD)Thread)->Tcb.Win32Thread;
- if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL)
- {
- ObDereferenceObject ((PETHREAD)Thread);
- return;
- }
-
- Window = IntGetWindowObject(hWnd);
- if (!Window)
- {
- ObDereferenceObject ((PETHREAD)Thread);
- return;
- }
-
- id = wParam; // Check for hot keys unrelated to the hot keys set by RegisterHotKey.
-
- Mesg.hwnd = hWnd;
- Mesg.message = id != IDHK_REACTOS ? WM_HOTKEY : WM_SYSCOMMAND;
- Mesg.wParam = id != IDHK_REACTOS ? wParam : SC_HOTKEY;
- Mesg.lParam = id != IDHK_REACTOS ? lParam : (LPARAM)hWnd;
- Type = id != IDHK_REACTOS ? QS_HOTKEY : QS_POSTMESSAGE;
- KeQueryTickCount(&LargeTickCount);
- Mesg.time = MsqCalculateMessageTime(&LargeTickCount);
- Mesg.pt = gpsi->ptCursor;
- MsqPostMessage(Window->head.pti, &Mesg, FALSE, Type, 0);
- UserDereferenceObject(Window);
- ObDereferenceObject (Thread);
-
-}
-
PUSER_MESSAGE FASTCALL
MsqCreateMessage(LPMSG Msg)
{
@@ -1251,6 +1203,7 @@
&Message->ListEntry);
}
+ if (Msg->message == WM_HOTKEY) MessageBits |= QS_HOTKEY; // Justin Case, just set
it.
Message->dwQEvent = dwQEvent;
Message->QS_Flags = MessageBits;
//Message->pti = pti; Fixed in ATI changes. See CORE-6551
Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Mon Oct 14 06:19:48 2013
@@ -198,7 +198,6 @@
LRESULT FASTCALL IntDispatchMessage(MSG* Msg);
BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, UINT flags);
-VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM
lParam);
VOID FASTCALL co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL
Hook);
BOOL FASTCALL MsqIsClkLck(LPMSG Msg, BOOL Remove);
BOOL FASTCALL MsqIsDblClk(LPMSG Msg, BOOL Remove);
@@ -274,5 +273,10 @@
UINT MsgFilterMax,
UINT RemoveMsg,
BOOL bGMSG );
+BOOL FASTCALL
+UserPostThreadMessage( PTHREADINFO pti,
+ UINT Msg,
+ WPARAM wParam,
+ LPARAM lParam );
/* EOF */
Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window…
==============================================================================
--- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Oct 14 06:19:48
2013
@@ -804,6 +804,10 @@
}
break;
+ case SC_TASKLIST:
+ WinExec( "taskman.exe", SW_SHOWNORMAL );
+ break;
+
case SC_SCREENSAVE:
NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult,
FNID_DEFWINDOWPROC, FALSE);
break;
3994
days inactive
3994
days old
0 comments
1 participants
participants (1)
-
jimtabor＠svn.reactos.org