Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:32:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[win32k]

Browse source 
-Rename MsqInsertSystemMessage to MsqInsertMouseMessage

svn path=/trunk/; revision=49581
This commit is contained in:
Giannis Adamopoulos 2010-11-14 09:53:07 +00:00
parent 4ac999a033
commit 6fce3aa19b
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsystems/win32/win32k/include/msgqueue.h
View file

@ -196,7 +196,7 @@ co_MsqPostKeyboardMessage(UINT uMsg, WPARAM wParam, LPARAM lParam);
VOID FASTCALL VOID FASTCALL
MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam);
VOID FASTCALL VOID FASTCALL
MsqInsertSystemMessage(MSG* Msg); MsqInsertMouseMessage(MSG* Msg);
BOOL FASTCALL BOOL FASTCALL
MsqIsClkLck(LPMSG Msg, BOOL Remove); MsqIsClkLck(LPMSG Msg, BOOL Remove);
BOOL FASTCALL BOOL FASTCALL

2
reactos/subsystems/win32/win32k/ntuser/cursoricon.c
View file

@ -217,7 +217,7 @@ BOOL UserSetCursorPos( INT x, INT y, BOOL SendMouseMoveMsg)
Msg.wParam = CurInfo->ButtonsDown; Msg.wParam = CurInfo->ButtonsDown;
Msg.lParam = MAKELPARAM(x, y); Msg.lParam = MAKELPARAM(x, y);
Msg.pt = pt; Msg.pt = pt;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
/* Store the new cursor position */ /* Store the new cursor position */

22
reactos/subsystems/win32/win32k/ntuser/input.c
View file

@ -1156,7 +1156,7 @@ IntMouseInput(MOUSEINPUT *mi)
Msg.message = SwapBtnMsg[0][SwapButtons]; Msg.message = SwapBtnMsg[0][SwapButtons];
CurInfo->ButtonsDown |= SwapBtn[SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[SwapButtons];
Msg.wParam |= CurInfo->ButtonsDown; Msg.wParam |= CurInfo->ButtonsDown;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
else if(mi->dwFlags & MOUSEEVENTF_LEFTUP) else if(mi->dwFlags & MOUSEEVENTF_LEFTUP)
{ {
@ -1164,7 +1164,7 @@ IntMouseInput(MOUSEINPUT *mi)
Msg.message = SwapBtnMsg[1][SwapButtons]; Msg.message = SwapBtnMsg[1][SwapButtons];
CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[SwapButtons];
Msg.wParam |= CurInfo->ButtonsDown; Msg.wParam |= CurInfo->ButtonsDown;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN) if(mi->dwFlags & MOUSEEVENTF_MIDDLEDOWN)
{ {
@ -1172,7 +1172,7 @@ IntMouseInput(MOUSEINPUT *mi)
Msg.message = WM_MBUTTONDOWN; Msg.message = WM_MBUTTONDOWN;
CurInfo->ButtonsDown |= MK_MBUTTON; CurInfo->ButtonsDown |= MK_MBUTTON;
Msg.wParam |= CurInfo->ButtonsDown; Msg.wParam |= CurInfo->ButtonsDown;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP) else if(mi->dwFlags & MOUSEEVENTF_MIDDLEUP)
{ {
@ -1180,7 +1180,7 @@ IntMouseInput(MOUSEINPUT *mi)
Msg.message = WM_MBUTTONUP; Msg.message = WM_MBUTTONUP;
CurInfo->ButtonsDown &= ~MK_MBUTTON; CurInfo->ButtonsDown &= ~MK_MBUTTON;
Msg.wParam |= CurInfo->ButtonsDown; Msg.wParam |= CurInfo->ButtonsDown;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN) if(mi->dwFlags & MOUSEEVENTF_RIGHTDOWN)
{ {
@ -1188,7 +1188,7 @@ IntMouseInput(MOUSEINPUT *mi)
Msg.message = SwapBtnMsg[0][!SwapButtons]; Msg.message = SwapBtnMsg[0][!SwapButtons];
CurInfo->ButtonsDown |= SwapBtn[!SwapButtons]; CurInfo->ButtonsDown |= SwapBtn[!SwapButtons];
Msg.wParam |= CurInfo->ButtonsDown; Msg.wParam |= CurInfo->ButtonsDown;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP) else if(mi->dwFlags & MOUSEEVENTF_RIGHTUP)
{ {
@ -1196,7 +1196,7 @@ IntMouseInput(MOUSEINPUT *mi)
Msg.message = SwapBtnMsg[1][!SwapButtons]; Msg.message = SwapBtnMsg[1][!SwapButtons];
CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons]; CurInfo->ButtonsDown &= ~SwapBtn[!SwapButtons];
Msg.wParam |= CurInfo->ButtonsDown; Msg.wParam |= CurInfo->ButtonsDown;
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) && if((mi->dwFlags & (MOUSEEVENTF_XDOWN | MOUSEEVENTF_XUP)) &&
@ -1214,14 +1214,14 @@ IntMouseInput(MOUSEINPUT *mi)
gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0; gQueueKeyStateTable[VK_XBUTTON1] |= 0xc0;
CurInfo->ButtonsDown |= MK_XBUTTON1; CurInfo->ButtonsDown |= MK_XBUTTON1;
Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1);
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
if(mi->mouseData & XBUTTON2) if(mi->mouseData & XBUTTON2)
{ {
gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0; gQueueKeyStateTable[VK_XBUTTON2] |= 0xc0;
CurInfo->ButtonsDown |= MK_XBUTTON2; CurInfo->ButtonsDown |= MK_XBUTTON2;
Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2);
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
} }
else if(mi->dwFlags & MOUSEEVENTF_XUP) else if(mi->dwFlags & MOUSEEVENTF_XUP)
@ -1232,21 +1232,21 @@ IntMouseInput(MOUSEINPUT *mi)
gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80; gQueueKeyStateTable[VK_XBUTTON1] &= ~0x80;
CurInfo->ButtonsDown &= ~MK_XBUTTON1; CurInfo->ButtonsDown &= ~MK_XBUTTON1;
Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1);
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
if(mi->mouseData & XBUTTON2) if(mi->mouseData & XBUTTON2)
{ {
gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80; gQueueKeyStateTable[VK_XBUTTON2] &= ~0x80;
CurInfo->ButtonsDown &= ~MK_XBUTTON2; CurInfo->ButtonsDown &= ~MK_XBUTTON2;
Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2);
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
} }
if(mi->dwFlags & MOUSEEVENTF_WHEEL) if(mi->dwFlags & MOUSEEVENTF_WHEEL)
{ {
Msg.message = WM_MOUSEWHEEL; Msg.message = WM_MOUSEWHEEL;
Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData); Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, mi->mouseData);
MsqInsertSystemMessage(&Msg); MsqInsertMouseMessage(&Msg);
} }
return TRUE; return TRUE;

2
reactos/subsystems/win32/win32k/ntuser/msgqueue.c
View file

@ -137,7 +137,7 @@ MsqInitializeImpl(VOID)
} }
VOID FASTCALL VOID FASTCALL
MsqInsertSystemMessage(MSG* Msg) MsqInsertMouseMessage(MSG* Msg)
{ {
LARGE_INTEGER LargeTickCount; LARGE_INTEGER LargeTickCount;
KIRQL OldIrql; KIRQL OldIrql;

2
reactos/subsystems/win32/win32k/ntuser/window.c
View file

@ -2569,7 +2569,7 @@ BOOLEAN FASTCALL co_UserDestroyWindow(PWND Window)
msg.wParam = IntGetSysCursorInfo()->ButtonsDown; msg.wParam = IntGetSysCursorInfo()->ButtonsDown;
msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y); msg.lParam = MAKELPARAM(gpsi->ptCursor.x, gpsi->ptCursor.y);
msg.pt = gpsi->ptCursor; msg.pt = gpsi->ptCursor;
MsqInsertSystemMessage(&msg); MsqInsertMouseMessage(&msg);
if (!IntIsWindow(Window->head.h)) if (!IntIsWindow(Window->head.h))
{ {