Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-05 06:31:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K] - Formatting... No code change.

Browse source 
svn path=/trunk/; revision=54066
This commit is contained in:
Rafal Harabien 2011-10-09 20:41:09 +00:00
parent 28e930a691
commit b63c511bbf
2 changed files with 499 additions and 499 deletions
Download patch file Download diff file Expand all files Collapse all files

10
reactos/subsystems/win32/win32k/ntuser/accelerator.c
View file

@ -28,7 +28,7 @@ PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel)
return NULL; return NULL;
} }
Accel= UserGetObject(gHandleTable, hAccel, otAccel); Accel = UserGetObject(gHandleTable, hAccel, otAccel);
if (!Accel) if (!Accel)
{ {
EngSetLastError(ERROR_INVALID_ACCEL_HANDLE); EngSetLastError(ERROR_INVALID_ACCEL_HANDLE);
@ -109,7 +109,7 @@ co_IntTranslateAccelerator(
&SubMenu, &SubMenu,
&MenuItem, &MenuItem,
NULL); NULL);
if (nPos != (UINT)-1) if (nPos != (UINT) - 1)
hSubMenu = SubMenu->head.h; hSubMenu = SubMenu->head.h;
else else
hMenu = NULL; hMenu = NULL;
@ -128,7 +128,7 @@ co_IntTranslateAccelerator(
&SubMenu, &SubMenu,
&MenuItem, &MenuItem,
NULL); NULL);
if (nPos != (UINT)-1) if (nPos != (UINT) - 1)
hSubMenu = SubMenu->head.h; hSubMenu = SubMenu->head.h;
else else
hMenu = NULL; hMenu = NULL;
@ -153,7 +153,7 @@ co_IntTranslateAccelerator(
- menu item is disabled - menu item is disabled
- this is window menu and window is minimized */ - this is window menu and window is minimized */
if (!(Window->style & WS_DISABLED) && if (!(Window->style & WS_DISABLED) &&
!(hMenu && IntGetMenuState(hMenu, pAccel->cmd, MF_BYCOMMAND) & (MF_DISABLED|MF_GRAYED)) && !(hMenu && IntGetMenuState(hMenu, pAccel->cmd, MF_BYCOMMAND) & (MF_DISABLED | MF_GRAYED)) &&
!(hMenu && hMenu == (HMENU)Window->IDMenu && (Window->style & WS_MINIMIZED))) !(hMenu && hMenu == (HMENU)Window->IDMenu && (Window->style & WS_MINIMIZED)))
{ {
/* If this is system menu item, send WM_SYSCOMMAND, otherwise send WM_COMMAND */ /* If this is system menu item, send WM_SYSCOMMAND, otherwise send WM_COMMAND */
@ -356,7 +356,7 @@ NtUserDestroyAcceleratorTable(
RETURN( TRUE); RETURN( TRUE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel,_ret_); TRACE("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n", hAccel, _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }

40
reactos/subsystems/win32/win32k/ntuser/hotkey.c
View file

@ -78,8 +78,8 @@ UnregisterWindowHotKeys(PWND Window)
{ {
if (HotKeyItem->hWnd == Window->head.h) if (HotKeyItem->hWnd == Window->head.h)
{ {
RemoveEntryList (&HotKeyItem->ListEntry); RemoveEntryList(&HotKeyItem->ListEntry);
ExFreePool (HotKeyItem); ExFreePool(HotKeyItem);
} }
} }
} }
@ -93,8 +93,8 @@ UnregisterThreadHotKeys(struct _ETHREAD *Thread)
{ {
if (HotKeyItem->Thread == Thread) if (HotKeyItem->Thread == Thread)
{ {
RemoveEntryList (&HotKeyItem->ListEntry); RemoveEntryList(&HotKeyItem->ListEntry);
ExFreePool (HotKeyItem); ExFreePool(HotKeyItem);
} }
} }
@ -177,7 +177,7 @@ co_UserProcessHotKeys(WORD wVk, BOOL bIsDown)
// Get/SetHotKey message support. // Get/SetHotKey message support.
// //
UINT FASTCALL UINT FASTCALL
DefWndGetHotKey( HWND hwnd ) DefWndGetHotKey(HWND hwnd)
{ {
PHOT_KEY_ITEM HotKeyItem; PHOT_KEY_ITEM HotKeyItem;
@ -187,8 +187,8 @@ DefWndGetHotKey( HWND hwnd )
LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry)
{ {
if ( HotKeyItem->hWnd == hwnd && if (HotKeyItem->hWnd == hwnd &&
HotKeyItem->id == IDHOT_REACTOS ) HotKeyItem->id == IDHOT_REACTOS)
{ {
return MAKELONG(HotKeyItem->vk, HotKeyItem->fsModifiers); return MAKELONG(HotKeyItem->vk, HotKeyItem->fsModifiers);
} }
@ -197,7 +197,7 @@ DefWndGetHotKey( HWND hwnd )
} }
INT FASTCALL INT FASTCALL
DefWndSetHotKey( PWND pWnd, WPARAM wParam ) DefWndSetHotKey(PWND pWnd, WPARAM wParam)
{ {
UINT fsModifiers, vk; UINT fsModifiers, vk;
PHOT_KEY_ITEM HotKeyItem; PHOT_KEY_ITEM HotKeyItem;
@ -211,9 +211,9 @@ DefWndSetHotKey( PWND pWnd, WPARAM wParam )
if (pWnd->style & WS_CHILD) return 0; if (pWnd->style & WS_CHILD) return 0;
// VK_ESCAPE, VK_SPACE, and VK_TAB are invalid hot keys. // VK_ESCAPE, VK_SPACE, and VK_TAB are invalid hot keys.
if ( LOWORD(wParam) == VK_ESCAPE || if (LOWORD(wParam) == VK_ESCAPE ||
LOWORD(wParam) == VK_SPACE || LOWORD(wParam) == VK_SPACE ||
LOWORD(wParam) == VK_TAB ) return -1; LOWORD(wParam) == VK_TAB) return -1;
vk = LOWORD(wParam); vk = LOWORD(wParam);
fsModifiers = HIWORD(wParam); fsModifiers = HIWORD(wParam);
@ -223,9 +223,9 @@ DefWndSetHotKey( PWND pWnd, WPARAM wParam )
{ {
LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry)
{ {
if ( HotKeyItem->fsModifiers == fsModifiers && if (HotKeyItem->fsModifiers == fsModifiers &&
HotKeyItem->vk == vk && HotKeyItem->vk == vk &&
HotKeyItem->id == IDHOT_REACTOS ) HotKeyItem->id == IDHOT_REACTOS)
{ {
if (HotKeyItem->hWnd != hWnd) if (HotKeyItem->hWnd != hWnd)
Ret = 2; // Another window already has the same hot key. Ret = 2; // Another window already has the same hot key.
@ -236,8 +236,8 @@ DefWndSetHotKey( PWND pWnd, WPARAM wParam )
LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry) LIST_FOR_EACH(HotKeyItem, &gHotkeyList, HOT_KEY_ITEM, ListEntry)
{ {
if ( HotKeyItem->hWnd == hWnd && if (HotKeyItem->hWnd == hWnd &&
HotKeyItem->id == IDHOT_REACTOS ) HotKeyItem->id == IDHOT_REACTOS)
{ {
HaveSameWnd = TRUE; HaveSameWnd = TRUE;
break; break;
@ -262,7 +262,7 @@ DefWndSetHotKey( PWND pWnd, WPARAM wParam )
if (wParam == 0) if (wParam == 0)
return 1; // Do nothing, exit. return 1; // Do nothing, exit.
HotKeyItem = ExAllocatePoolWithTag (PagedPool, sizeof(HOT_KEY_ITEM), USERTAG_HOTKEY); HotKeyItem = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY_ITEM), USERTAG_HOTKEY);
if (HotKeyItem == NULL) if (HotKeyItem == NULL)
{ {
return 0; return 0;
@ -274,7 +274,7 @@ DefWndSetHotKey( PWND pWnd, WPARAM wParam )
HotKeyItem->fsModifiers = fsModifiers; HotKeyItem->fsModifiers = fsModifiers;
HotKeyItem->vk = vk; HotKeyItem->vk = vk;
InsertHeadList (&gHotkeyList, &HotKeyItem->ListEntry); InsertHeadList(&gHotkeyList, &HotKeyItem->ListEntry);
} }
return Ret; return Ret;
} }
@ -327,12 +327,12 @@ NtUserRegisterHotKey(HWND hWnd,
HotKeyItem->fsModifiers = fsModifiers; HotKeyItem->fsModifiers = fsModifiers;
HotKeyItem->vk = vk; HotKeyItem->vk = vk;
InsertHeadList (&gHotkeyList, &HotKeyItem->ListEntry); InsertHeadList(&gHotkeyList, &HotKeyItem->ListEntry);
RETURN( TRUE); RETURN( TRUE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserRegisterHotKey, ret=%i\n",_ret_); TRACE("Leave NtUserRegisterHotKey, ret=%i\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }
@ -357,7 +357,7 @@ NtUserUnregisterHotKey(HWND hWnd, int id)
{ {
if (HotKeyItem->hWnd == hWnd && HotKeyItem->id == id) if (HotKeyItem->hWnd == hWnd && HotKeyItem->id == id)
{ {
RemoveEntryList (&HotKeyItem->ListEntry); RemoveEntryList(&HotKeyItem->ListEntry);
ExFreePoolWithTag(HotKeyItem, USERTAG_HOTKEY); ExFreePoolWithTag(HotKeyItem, USERTAG_HOTKEY);
RETURN( TRUE); RETURN( TRUE);
@ -367,7 +367,7 @@ NtUserUnregisterHotKey(HWND hWnd, int id)
RETURN( FALSE); RETURN( FALSE);
CLEANUP: CLEANUP:
TRACE("Leave NtUserUnregisterHotKey, ret=%i\n",_ret_); TRACE("Leave NtUserUnregisterHotKey, ret=%i\n", _ret_);
UserLeave(); UserLeave();
END_CLEANUP; END_CLEANUP;
} }