[ros-diffs] [gdalsnes] 17730: indent with astyle v1.15.3: --style=ansi -c -s3 -S --convert-tabs

indent with astyle v1.15.3: --style=ansi -c -s3 -S --convert-tabs
Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c
Modified: trunk/reactos/subsys/win32k/ntuser/callback.c
Modified: trunk/reactos/subsys/win32k/ntuser/caret.c
Modified: trunk/reactos/subsys/win32k/ntuser/class.c
Modified: trunk/reactos/subsys/win32k/ntuser/clipboard.c
Modified: trunk/reactos/subsys/win32k/ntuser/csr.c
Modified: trunk/reactos/subsys/win32k/ntuser/cursoricon.c
Modified: trunk/reactos/subsys/win32k/ntuser/desktop.c
Modified: trunk/reactos/subsys/win32k/ntuser/focus.c
Modified: trunk/reactos/subsys/win32k/ntuser/guicheck.c
Modified: trunk/reactos/subsys/win32k/ntuser/hook.c
Modified: trunk/reactos/subsys/win32k/ntuser/hotkey.c
Modified: trunk/reactos/subsys/win32k/ntuser/input.c
Modified: trunk/reactos/subsys/win32k/ntuser/keyboard.c
Modified: trunk/reactos/subsys/win32k/ntuser/menu.c
Modified: trunk/reactos/subsys/win32k/ntuser/message.c
Modified: trunk/reactos/subsys/win32k/ntuser/metric.c
Modified: trunk/reactos/subsys/win32k/ntuser/misc.c
Modified: trunk/reactos/subsys/win32k/ntuser/monitor.c
Modified: trunk/reactos/subsys/win32k/ntuser/msgqueue.c
Modified: trunk/reactos/subsys/win32k/ntuser/ntuser.c
Modified: trunk/reactos/subsys/win32k/ntuser/object.c
Modified: trunk/reactos/subsys/win32k/ntuser/painting.c
Modified: trunk/reactos/subsys/win32k/ntuser/prop.c
Modified: trunk/reactos/subsys/win32k/ntuser/scrollbar.c
Modified: trunk/reactos/subsys/win32k/ntuser/ssec.c
Modified: trunk/reactos/subsys/win32k/ntuser/stubs.c
Modified: trunk/reactos/subsys/win32k/ntuser/timer.c
Modified: trunk/reactos/subsys/win32k/ntuser/useratom.c
Modified: trunk/reactos/subsys/win32k/ntuser/vis.c
Modified: trunk/reactos/subsys/win32k/ntuser/windc.c
Modified: trunk/reactos/subsys/win32k/ntuser/window.c
Modified: trunk/reactos/subsys/win32k/ntuser/winpos.c
Modified: trunk/reactos/subsys/win32k/ntuser/winsta.c
  _____  

Modified: trunk/reactos/subsys/win32k/ntuser/accelerator.c
--- trunk/reactos/subsys/win32k/ntuser/accelerator.c	2005-09-07
21:05:16 UTC (rev 17729)
+++ trunk/reactos/subsys/win32k/ntuser/accelerator.c	2005-09-07
21:25:42 UTC (rev 17730)
@@ -59,13 +59,13 @@

 NTSTATUS FASTCALL
 InitAcceleratorImpl(VOID)
 {
-  return(STATUS_SUCCESS);
+   return(STATUS_SUCCESS);
 }
 
 NTSTATUS FASTCALL
 CleanupAcceleratorImpl(VOID)
 {
-  return(STATUS_SUCCESS);
+   return(STATUS_SUCCESS);
 }
 
 
@@ -73,7 +73,7 @@
 PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL hAccel)
 {
    PACCELERATOR_TABLE Accel= UserGetObject(&gHandleTable, hAccel,
otAccel);
-   
+
    if (Accel)
    {
       ASSERT(USER_BODY_TO_HEADER(Accel)->RefCount >= 0);
@@ -92,132 +92,132 @@
 int
 STDCALL
 NtUserCopyAcceleratorTable(
-  HACCEL hAccel,
-  LPACCEL Entries,
-  int EntriesCount)
+   HACCEL hAccel,
+   LPACCEL Entries,
+   int EntriesCount)
 {
-  PWINSTATION_OBJECT WindowStation;
-  PACCELERATOR_TABLE Accel;
-  NTSTATUS Status;
-  int Ret;
-  DECLARE_RETURN(int);
+   PWINSTATION_OBJECT WindowStation;
+   PACCELERATOR_TABLE Accel;
+   NTSTATUS Status;
+   int Ret;
+   DECLARE_RETURN(int);
 
-  DPRINT("Enter NtUserCopyAcceleratorTable\n");
-  UserEnterShared();
+   DPRINT("Enter NtUserCopyAcceleratorTable\n");
+   UserEnterShared();
 
-  Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
-    UserMode,
-	0,
-	&WindowStation);
-   
-  if (!NT_SUCCESS(Status))
-  {
-    SetLastNtError(STATUS_ACCESS_DENIED);
-    RETURN(0);
-  }
+   Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
+                                           UserMode,
+                                           0,
+                                           &WindowStation);
 
-  if (!(Accel = UserGetAccelObject(hAccel)))
-  {
-    ObDereferenceObject(WindowStation);
-    RETURN(0);
-  }
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(STATUS_ACCESS_DENIED);
+      RETURN(0);
+   }
 
-  if(Entries)
-  {
-    Ret = min(EntriesCount, Accel->Count);
-    Status = MmCopyToCaller(Entries, Accel->Table, Ret *
sizeof(ACCEL));
-    if (!NT_SUCCESS(Status))
-    {
+   if (!(Accel = UserGetAccelObject(hAccel)))
+   {
       ObDereferenceObject(WindowStation);
-      SetLastNtError(Status);
       RETURN(0);
-    }
-  }
-  else
-  {
-    Ret = Accel->Count;
-  }
+   }
 
-  ObDereferenceObject(WindowStation);
+   if(Entries)
+   {
+      Ret = min(EntriesCount, Accel->Count);
+      Status = MmCopyToCaller(Entries, Accel->Table, Ret *
sizeof(ACCEL));
+      if (!NT_SUCCESS(Status))
+      {
+         ObDereferenceObject(WindowStation);
+         SetLastNtError(Status);
+         RETURN(0);
+      }
+   }
+   else
+   {
+      Ret = Accel->Count;
+   }
 
-  RETURN(Ret);
-  
+   ObDereferenceObject(WindowStation);
+
+   RETURN(Ret);
+
 CLEANUP:
-  DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_);
-  UserLeave();
-  END_CLEANUP;
+   DPRINT("Leave NtUserCopyAcceleratorTable, ret=%i\n",_ret_);
+   UserLeave();
+   END_CLEANUP;
 }
 
 HACCEL
 STDCALL
 NtUserCreateAcceleratorTable(
-  LPACCEL Entries,
-  SIZE_T EntriesCount)
+   LPACCEL Entries,
+   SIZE_T EntriesCount)
 {
-  PWINSTATION_OBJECT WindowStation;
-  PACCELERATOR_TABLE Accel;
-  NTSTATUS Status;
-  HACCEL hAccel;
-  DECLARE_RETURN(HACCEL);
+   PWINSTATION_OBJECT WindowStation;
+   PACCELERATOR_TABLE Accel;
+   NTSTATUS Status;
+   HACCEL hAccel;
+   DECLARE_RETURN(HACCEL);
 
-  DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount
%d)\n",
+   DPRINT("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount
%d)\n",
           Entries, EntriesCount);
-  UserEnterExclusive();
+   UserEnterExclusive();
 
-  Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
-    UserMode,
-	0,
-	&WindowStation);
-   
-  if (!NT_SUCCESS(Status))
-  {
-    SetLastNtError(STATUS_ACCESS_DENIED);
-    RETURN( FALSE );
-  }
+   Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
+                                           UserMode,
+                                           0,
+                                           &WindowStation);
 
-  Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel,
sizeof(ACCELERATOR_TABLE));
-   
-  if (Accel == NULL)
-  {
-    ObDereferenceObject(WindowStation);
-    SetLastNtError(STATUS_NO_MEMORY);
-    RETURN( (HACCEL) 0 );
-  }
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(STATUS_ACCESS_DENIED);
+      RETURN( FALSE );
+   }
 
-  Accel->Count = EntriesCount;
-  if (Accel->Count > 0)
-  {
-	Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount *
sizeof(ACCEL), TAG_ACCEL);
-	if (Accel->Table == NULL)
-	{
-      ObmDeleteObject(hAccel, otAccel);
-		ObDereferenceObject(WindowStation);
-		SetLastNtError(Status);
-      RETURN( (HACCEL) 0);
-	}
+   Accel = ObmCreateObject(&gHandleTable, (PHANDLE)&hAccel, otAccel,
sizeof(ACCELERATOR_TABLE));
 
-    Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount *
sizeof(ACCEL));
-    if (!NT_SUCCESS(Status))
-    {
-	  ExFreePool(Accel->Table);
-     ObmDeleteObject(hAccel, otAccel);
+   if (Accel == NULL)
+   {
       ObDereferenceObject(WindowStation);
-      SetLastNtError(Status);
-      RETURN((HACCEL) 0);
-    }
-  }
+      SetLastNtError(STATUS_NO_MEMORY);
+      RETURN( (HACCEL) 0 );
+   }
 
-  ObDereferenceObject(WindowStation);
+   Accel->Count = EntriesCount;
+   if (Accel->Count > 0)
+   {
+      Accel->Table = ExAllocatePoolWithTag(PagedPool, EntriesCount *
sizeof(ACCEL), TAG_ACCEL);
+      if (Accel->Table == NULL)
+      {
+         ObmDeleteObject(hAccel, otAccel);
+         ObDereferenceObject(WindowStation);
+         SetLastNtError(Status);
+         RETURN( (HACCEL) 0);
+      }
 
-  /* FIXME: Save HandleTable in a list somewhere so we can clean it up
again */
+      Status = MmCopyFromCaller(Accel->Table, Entries, EntriesCount *
sizeof(ACCEL));
+      if (!NT_SUCCESS(Status))
+      {
+         ExFreePool(Accel->Table);
+         ObmDeleteObject(hAccel, otAccel);
+         ObDereferenceObject(WindowStation);
+         SetLastNtError(Status);
+         RETURN((HACCEL) 0);
+      }
+   }
 
-  RETURN(hAccel);
-  
+   ObDereferenceObject(WindowStation);
+
+   /* FIXME: Save HandleTable in a list somewhere so we can clean it up
again */
+
+   RETURN(hAccel);
+
 CLEANUP:
-  DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount
%d) = %x\n",
-      Entries, EntriesCount,_ret_);
-  UserLeave();
-  END_CLEANUP;
+   DPRINT("Leave NtUserCreateAcceleratorTable(Entries %p, EntriesCount
%d) = %x\n",
+          Entries, EntriesCount,_ret_);
+   UserLeave();
+   END_CLEANUP;
 }
 
 
@@ -225,219 +225,224 @@
 BOOLEAN
 STDCALL
 NtUserDestroyAcceleratorTable(
-  HACCEL hAccel)
+   HACCEL hAccel)
 {
-  PWINSTATION_OBJECT WindowStation;
-  PACCELERATOR_TABLE Accel;
-  NTSTATUS Status;
-  DECLARE_RETURN(BOOLEAN);
+   PWINSTATION_OBJECT WindowStation;
+   PACCELERATOR_TABLE Accel;
+   NTSTATUS Status;
+   DECLARE_RETURN(BOOLEAN);
 
-  /* FIXME: If the handle table is from a call to LoadAcceleratorTable,
decrement it's
-     usage count (and return TRUE).
-	 FIXME: Destroy only tables created using
CreateAcceleratorTable.
-   */
+   /* FIXME: If the handle table is from a call to
LoadAcceleratorTable, decrement it's
+      usage count (and return TRUE).
+   FIXME: Destroy only tables created using CreateAcceleratorTable.
+    */
 
-  DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel);
-  UserEnterExclusive();
+   DPRINT("NtUserDestroyAcceleratorTable(Table %x)\n", hAccel);
+   UserEnterExclusive();
 
-  Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
-    UserMode,
-	0,
-	&WindowStation);
-   
-  if (!NT_SUCCESS(Status))
-  {
-    SetLastNtError(STATUS_ACCESS_DENIED);
-    DPRINT1("E1\n");
-    RETURN( FALSE);
-  }
+   Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
+                                           UserMode,
+                                           0,
+                                           &WindowStation);
 
-  if (!(Accel = UserGetAccelObject(hAccel)))
-  {
-    ObDereferenceObject(WindowStation);
-    RETURN( FALSE);
-  }
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(STATUS_ACCESS_DENIED);
+      DPRINT1("E1\n");
+      RETURN( FALSE);
+   }
 
-  ObmDeleteObject(hAccel, otAccel);
+   if (!(Accel = UserGetAccelObject(hAccel)))
+   {
+      ObDereferenceObject(WindowStation);
+      RETURN( FALSE);
+   }
 
-  if (Accel->Table != NULL)
-  {
-    ExFreePool(Accel->Table);
-  }
+   ObmDeleteObject(hAccel, otAccel);
 
-  ObDereferenceObject(WindowStation);
+   if (Accel->Table != NULL)
+   {
+      ExFreePool(Accel->Table);
+   }
 
-  RETURN( TRUE);
-  
+   ObDereferenceObject(WindowStation);
+
+   RETURN( TRUE);
+
 CLEANUP:
-  DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n",
hAccel,_ret_);
-  UserLeave();
-  END_CLEANUP;
+   DPRINT("Leave NtUserDestroyAcceleratorTable(Table %x) = %i\n",
hAccel,_ret_);
+   UserLeave();
+   END_CLEANUP;
 }
 
-static 
+static
 BOOLEAN FASTCALL
 co_IntTranslateAccelerator(
-  PWINDOW_OBJECT Window,
-  UINT message,
-  WPARAM wParam,
-  LPARAM lParam,
-  BYTE fVirt,
-  WORD key,
-  WORD cmd)
+   PWINDOW_OBJECT Window,
+   UINT message,
+   WPARAM wParam,
+   LPARAM lParam,
+   BYTE fVirt,
+   WORD key,
+   WORD cmd)
 {
-  UINT mesg = 0;
+   UINT mesg = 0;
 
-  ASSERT_REFS_CO(Window); 
+   ASSERT_REFS_CO(Window);
 
-  DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x,
lParam %x, fVirt %d, key %x, cmd %x)\n",
-    Window->hSelf, message, wParam, lParam, fVirt, key, cmd);
+   DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x,
lParam %x, fVirt %d, key %x, cmd %x)\n",
+          Window->hSelf, message, wParam, lParam, fVirt, key, cmd);
 
-  if (wParam != key)
-    {
+   if (wParam != key)
+   {
       DPRINT("T0\n");
       return FALSE;
-    }
+   }
 
-  if (message == WM_CHAR)
-    {
+   if (message == WM_CHAR)
+   {
       if (!(fVirt & FALT) && !(fVirt & FVIRTKEY))
-        {
-          DPRINT("found accel for WM_CHAR: ('%c')\n", wParam &
0xff);
-          goto found;
-        }
-    }
-  else
-    {
+      {
+         DPRINT("found accel for WM_CHAR: ('%c')\n", wParam &
0xff);
+         goto found;
+      }
+   }
+   else
+   {
       if ((fVirt & FVIRTKEY) > 0)
-        {
-          INT mask = 0;
-          DPRINT("found accel for virt_key %04x (scan %04x)\n",
-            wParam, 0xff & HIWORD(lParam));
+      {
+         INT mask = 0;
+         DPRINT("found accel for virt_key %04x (scan %04x)\n",
+                wParam, 0xff & HIWORD(lParam));
 
-		  DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n",
-            UserGetKeyState(VK_SHIFT));
-		  DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n",
-            UserGetKeyState(VK_CONTROL));
-		  DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n",
-            UserGetKeyState(VK_MENU));
+         DPRINT("NtUserGetKeyState(VK_SHIFT) = 0x%x\n",
+                UserGetKeyState(VK_SHIFT));
+         DPRINT("NtUserGetKeyState(VK_CONTROL) = 0x%x\n",
+                UserGetKeyState(VK_CONTROL));
+         DPRINT("NtUserGetKeyState(VK_MENU) = 0x%x\n",
+                UserGetKeyState(VK_MENU));
 
-		  if (UserGetKeyState(VK_SHIFT) & 0x8000) mask |=
FSHIFT;
-          if (UserGetKeyState(VK_CONTROL) & 0x8000) mask |= FCONTROL;
-          if (UserGetKeyState(VK_MENU) & 0x8000) mask |= FALT;
-          if (mask == (fVirt & (FSHIFT | FCONTROL | FALT))) goto found;
-          DPRINT("but incorrect SHIFT/CTRL/ALT-state\n");
-        }
+         if (UserGetKeyState(VK_SHIFT) & 0x8000)
+            mask |= FSHIFT;
+         if (UserGetKeyState(VK_CONTROL) & 0x8000)
+            mask |= FCONTROL;
+         if (UserGetKeyState(VK_MENU) & 0x8000)
+            mask |= FALT;
+         if (mask == (fVirt & (FSHIFT | FCONTROL | FALT)))
+            goto found;
+         DPRINT("but incorrect SHIFT/CTRL/ALT-state\n");
+      }
       else
-        {
-          if (!(lParam & 0x01000000))  /* no special_key */
-            {
-              if ((fVirt & FALT) && (lParam & 0x20000000))
-                {                            /* ^^ ALT pressed */
-                  DPRINT("found accel for Alt-%c\n", wParam & 0xff);
-                  goto found;
-                }
+      {
+         if (!(lParam & 0x01000000))  /* no special_key */
+         {
+            if ((fVirt & FALT) && (lParam & 0x20000000))
+            {                            /* ^^ ALT pressed */
+               DPRINT("found accel for Alt-%c\n", wParam & 0xff);
+               goto found;
             }
-        }
-    }
+         }
+      }
+   }
 
-  DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x,
lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n",
-    Window->hSelf, message, wParam, lParam, fVirt, key, cmd);
+   DPRINT("IntTranslateAccelerator(hwnd %x, message %x, wParam %x,
lParam %x, fVirt %d, key %x, cmd %x) = FALSE\n",
+          Window->hSelf, message, wParam, lParam, fVirt, key, cmd);
 
-  return FALSE;
+   return FALSE;
 
- found:
-    if (message == WM_KEYUP || message == WM_SYSKEYUP)
-        mesg = 1;
-    else if (IntGetCaptureWindow())
-        mesg = 2;
-    else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE
IsWindowEnabled == IntIsWindowVisible? */
-        mesg = 3;
-    else
-    {
+found:
+   if (message == WM_KEYUP || message == WM_SYSKEYUP)
+      mesg = 1;
+   else if (IntGetCaptureWindow())
+      mesg = 2;
+   else if (!IntIsWindowVisible(Window->hSelf)) /* FIXME: WINE
IsWindowEnabled == IntIsWindowVisible? */
+      mesg = 3;
+   else
+   {
 #if 0
-        HMENU hMenu, hSubMenu, hSysMenu;
-        UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos;
+      HMENU hMenu, hSubMenu, hSysMenu;
+      UINT uSysStat = (UINT)-1, uStat = (UINT)-1, nPos;
 
-        hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 :
GetMenu(hWnd);
-        hSysMenu = get_win_sys_menu(hWnd);
+      hMenu = (UserGetWindowLongW(hWnd, GWL_STYLE) & WS_CHILD) ? 0 :
GetMenu(hWnd);
+      hSysMenu = get_win_sys_menu(hWnd);
 
-        /* find menu item and ask application to initialize it */
-        /* 1. in the system menu */
-        hSubMenu = hSysMenu;
-        nPos = cmd;
-        if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND))
-        {
-			co_IntSendMessage(hWnd, WM_INITMENU,
(WPARAM)hSysMenu, 0L);
-            if(hSubMenu != hSysMenu)
+      /* find menu item and ask application to initialize it */
+      /* 1. in the system menu */
+      hSubMenu = hSysMenu;
+      nPos = cmd;
+      if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND))
+      {
+         co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hSysMenu, 0L);
+         if(hSubMenu != hSysMenu)
+         {
+            nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu);
+            TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos = %d\n",
hSysMenu, hSubMenu, nPos);
+            co_IntSendMessage(hWnd, WM_INITMENUPOPUP, (WPARAM)hSubMenu,
MAKELPARAM(nPos, TRUE));
+         }
+         uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd,
MF_BYCOMMAND);
+      }
+      else /* 2. in the window's menu */
+      {
+         hSubMenu = hMenu;
+         nPos = cmd;
+         if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND))
+         {
+            co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu, 0L);
+            if(hSubMenu != hMenu)
             {
-                nPos = MENU_FindSubMenu(&hSysMenu, hSubMenu);
-                TRACE_(accel)("hSysMenu = %p, hSubMenu = %p, nPos =
%d\n", hSysMenu, hSubMenu, nPos);
-                co_IntSendMessage(hWnd, WM_INITMENUPOPUP,
(WPARAM)hSubMenu, MAKELPARAM(nPos, TRUE));
+               nPos = MENU_FindSubMenu(&hMenu, hSubMenu);
+               TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos = %d\n",
hMenu, hSubMenu, nPos);
+               co_IntSendMessage(hWnd, WM_INITMENUPOPUP,
(WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE));
             }
-            uSysStat = GetMenuState(GetSubMenu(hSysMenu, 0), cmd,
MF_BYCOMMAND);
-        }
-        else /* 2. in the window's menu */
-        {
-            hSubMenu = hMenu;
-            nPos = cmd;
-            if(MENU_FindItem(&hSubMenu, &nPos, MF_BYCOMMAND))
-            {
-                co_IntSendMessage(hWnd, WM_INITMENU, (WPARAM)hMenu,
0L);
-                if(hSubMenu != hMenu)
-                {
-                    nPos = MENU_FindSubMenu(&hMenu, hSubMenu);
-                    TRACE_(accel)("hMenu = %p, hSubMenu = %p, nPos =
%d\n", hMenu, hSubMenu, nPos);
-                    co_IntSendMessage(hWnd, WM_INITMENUPOPUP,
(WPARAM)hSubMenu, MAKELPARAM(nPos, FALSE));
-                }
-                uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND);
-            }
-        }
+            uStat = GetMenuState(hMenu, cmd, MF_BYCOMMAND);
+         }
+      }
 
-        if (uSysStat != (UINT)-1)
-        {
-            if (uSysStat & (MF_DISABLED|MF_GRAYED))
-                mesg=4;
+      if (uSysStat != (UINT)-1)
+      {
+         if (uSysStat & (MF_DISABLED|MF_GRAYED))
+            mesg=4;
+         else
+            mesg=WM_SYSCOMMAND;
+      }
+      else
+      {
+         if (uStat != (UINT)-1)
+         {
+            if (IsIconic(hWnd))
+               mesg=5;
             else
-                mesg=WM_SYSCOMMAND;
-        }
-        else
-        {
-            if (uStat != (UINT)-1)
             {
-                if (IsIconic(hWnd))
-                    mesg=5;
-                else
-                {
-                    if (uStat & (MF_DISABLED|MF_GRAYED))
-                        mesg=6;
-                    else
-                        mesg=WM_COMMAND;
-                }
+               if (uStat & (MF_DISABLED|MF_GRAYED))
+                  mesg=6;
+               else
+                  mesg=WM_COMMAND;
             }
-            else
-			{
-              mesg=WM_COMMAND;
-			}
-        }
+         }
+         else
+         {
+            mesg=WM_COMMAND;
+         }
+      }
 #else
       DPRINT1("menu search not implemented");
       mesg = WM_COMMAND;
 #endif
-    }
 
-  if (mesg == WM_COMMAND)
-    {
+   }
+
+   if (mesg == WM_COMMAND)
+   {
       DPRINT(", sending WM_COMMAND, wParam=%0x\n", 0x10000 | cmd);
       co_IntSendMessage(Window->hSelf, mesg, 0x10000 | cmd, 0L);
-    }
-  else if (mesg == WM_SYSCOMMAND)
-    {
+   }
+   else if (mesg == WM_SYSCOMMAND)
+   {
       DPRINT(", sending WM_SYSCOMMAND, wParam=%0x\n", cmd);
       co_IntSendMessage(Window->hSelf, mesg, cmd, 0x00010000L);
-    }
-  else
-    {
+   }
+   else
+   {
       /*  some reasons for NOT sending the WM_{SYS}COMMAND message:
        *   #0: unknown (please report!)
        *   #1: for WM_KEYUP,WM_SYSKEYUP
@@ -449,104 +454,107 @@
        */
       DPRINT(", but won't send WM_{SYS}COMMAND, reason is #%d\n",
mesg);
       if (mesg == 0)
-	    {
-          DPRINT1(" unknown reason - please report!");
-	    }
-    }
+      {
+         DPRINT1(" unknown reason - please report!");
+      }
+   }
 
-  DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x,
lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n",
-    Window->hSelf, message, wParam, lParam, fVirt, key, cmd);
+   DPRINT("IntTranslateAccelerator(hWnd %x, message %x, wParam %x,
lParam %x, fVirt %d, key %x, cmd %x) = TRUE\n",
+          Window->hSelf, message, wParam, lParam, fVirt, key, cmd);
 
-  return TRUE;
+   return TRUE;
 }
 
 int
 STDCALL
 NtUserTranslateAccelerator(
-  HWND hWnd,
-  HACCEL hAccel,
-  LPMSG Message)
+   HWND hWnd,
+   HACCEL hAccel,
+   LPMSG Message)
 {
-  PWINSTATION_OBJECT WindowStation = NULL;
-  PWINDOW_OBJECT Window = NULL;
-  PACCELERATOR_TABLE Accel = NULL;
-  NTSTATUS Status;
-  ULONG i;
-  DECLARE_RETURN(int);
+   PWINSTATION_OBJECT WindowStation = NULL;
+   PWINDOW_OBJECT Window = NULL;
+   PACCELERATOR_TABLE Accel = NULL;
+   NTSTATUS Status;
+   ULONG i;
+   DECLARE_RETURN(int);
 
-  DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p)\n",
-    hWnd, hAccel, Message);
-  UserEnterShared();
+   DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message
%p)\n",
+          hWnd, hAccel, Message);
+   UserEnterShared();
 
-  if (Message == NULL)
-    {
-	  SetLastNtError(STATUS_INVALID_PARAMETER);
+   if (Message == NULL)
+   {
+      SetLastNtError(STATUS_INVALID_PARAMETER);
       RETURN( 0);
-    }
+   }
 
-  if ((Message->message != WM_KEYDOWN) &&
-	  (Message->message != WM_SYSKEYDOWN) &&
-	  (Message->message != WM_SYSCHAR) &&
-	  (Message->message != WM_CHAR))
-  {
-    RETURN( 0);
-  }
+   if ((Message->message != WM_KEYDOWN) &&
+         (Message->message != WM_SYSKEYDOWN) &&
+         (Message->message != WM_SYSCHAR) &&
+         (Message->message != WM_CHAR))
+   {
+      RETURN( 0);
+   }
 
-  Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
-    UserMode,
-	0,
-	&WindowStation);
-   
-  if (!NT_SUCCESS(Status))
-  {
-    SetLastNtError(STATUS_ACCESS_DENIED);
-    RETURN( 0);
-  }
+   Status =
IntValidateWindowStationHandle(UserGetProcessWindowStation(),
+                                           UserMode,
+                                           0,
+                                           &WindowStation);
 
-  if (!(Accel = UserGetAccelObject(hAccel)))
-  {
-    RETURN( 0);
-  }
+   if (!NT_SUCCESS(Status))
+   {
+      SetLastNtError(STATUS_ACCESS_DENIED);
+      RETURN( 0);
+   }
 
-  UserRefObjectCo(Accel); 
+   if (!(Accel = UserGetAccelObject(hAccel)))
+   {
+      RETURN( 0);
+   }
 
-  if (!(Window = UserGetWindowObject(hWnd)))
-  {
-    RETURN( 0);
-  }
+   UserRefObjectCo(Accel);
 
-  UserRefObjectCo(Window); 
-  
+   if (!(Window = UserGetWindowObject(hWnd)))
+   {
+      RETURN( 0);
+   }
 
-  /* FIXME: Associate AcceleratorTable with the current thread */
+   UserRefObjectCo(Window);
 
-  for (i = 0; i < Accel->Count; i++)
-    {
+
+   /* FIXME: Associate AcceleratorTable with the current thread */
+
+   for (i = 0; i < Accel->Count; i++)
+   {
       if (co_IntTranslateAccelerator(Window, Message->message,
Message->wParam, Message->lParam,
-		  Accel->Table[i].fVirt, Accel->Table[i].key,
-		  Accel->Table[i].cmd))
-        {
-          DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message
%p) = %i end\n",
-                 hWnd, hAccel, Message, 1);
-          RETURN( 1);
-        }
+                                     Accel->Table[i].fVirt,
Accel->Table[i].key,
+                                     Accel->Table[i].cmd))
+      {
+         DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message
%p) = %i end\n",
+                hWnd, hAccel, Message, 1);
+         RETURN( 1);
+      }
       if (((Accel->Table[i].fVirt & 0x80) > 0))
-        {
-          break;
-        }
-    }
+      {
+         break;
+      }
+   }
 
-  RETURN( 0);
-  
+   RETURN( 0);
+
 CLEANUP:
-  
-  if (Window) UserDerefObjectCo(Window); 
-  if (Accel) UserDerefObjectCo(Accel); 
 
-  if (WindowStation) ObDereferenceObject(WindowStation);
+   if (Window)
+      UserDerefObjectCo(Window);
+   if (Accel)
+      UserDerefObjectCo(Accel);
 
-  DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) =
%i end\n",
-    hWnd, hAccel, Message, 0);
-  UserLeave();
-  END_CLEANUP;
+   if (WindowStation)
+      ObDereferenceObject(WindowStation);
+
+   DPRINT("NtUserTranslateAccelerator(hWnd %x, Table %x, Message %p) =
%i end\n",
+          hWnd, hAccel, Message, 0);
+   UserLeave();
+   END_CLEANUP;
 }
  _____  

Modified: trunk/reactos/subsys/win32k/ntuser/callback.c
--- trunk/reactos/subsys/win32k/ntuser/callback.c	2005-09-07
21:05:16 UTC (rev 17729)
+++ trunk/reactos/subsys/win32k/ntuser/callback.c	2005-09-07
21:25:42 UTC (rev 17730)
@@ -42,368 +42,369 @@

 
 typedef struct _INT_CALLBACK_HEADER
 {
-  /* list entry in the W32THREAD structure */
-  LIST_ENTRY ListEntry;
-} INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER;
+   /* list entry in the W32THREAD structure */
+   LIST_ENTRY ListEntry;
+}
+INT_CALLBACK_HEADER, *PINT_CALLBACK_HEADER;
 
 PVOID FASTCALL
 IntCbAllocateMemory(ULONG Size)
 {
-  PINT_CALLBACK_HEADER Mem;
-  PW32THREAD W32Thread;
+   PINT_CALLBACK_HEADER Mem;
+   PW32THREAD W32Thread;
 
-  if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size +
sizeof(INT_CALLBACK_HEADER),
-                                   TAG_CALLBACK)))
-  {
-    return NULL;
-  }
+   if(!(Mem = ExAllocatePoolWithTag(PagedPool, Size +
sizeof(INT_CALLBACK_HEADER),
+                                    TAG_CALLBACK)))
+   {
+      return NULL;
+   }
 
-  W32Thread = PsGetWin32Thread();
-  ASSERT(W32Thread);
+   W32Thread = PsGetWin32Thread();
+   ASSERT(W32Thread);
 
-  /* insert the callback memory into the thread's callback list */
+   /* insert the callback memory into the thread's callback list */
 
-  InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry);
+   InsertTailList(&W32Thread->W32CallbackListHead, &Mem->ListEntry);
 
-  return (Mem + 1);
+   return (Mem + 1);
 }
 
 VOID FASTCALL
 IntCbFreeMemory(PVOID Data)
 {
-  PINT_CALLBACK_HEADER Mem;
-  PW32THREAD W32Thread;
+   PINT_CALLBACK_HEADER Mem;
+   PW32THREAD W32Thread;
 
-  ASSERT(Data);
+   ASSERT(Data);
 
-  Mem = ((PINT_CALLBACK_HEADER)Data - 1);
+   Mem = ((PINT_CALLBACK_HEADER)Data - 1);
 
-  W32Thread = PsGetWin32Thread();
-  ASSERT(W32Thread);
+   W32Thread = PsGetWin32Thread();
+   ASSERT(W32Thread);
 
-  /* remove the memory block from the thread's callback list */
-  RemoveEntryList(&Mem->ListEntry);
+   /* remove the memory block from the thread's callback list */
+   RemoveEntryList(&Mem->ListEntry);
 
-  /* free memory */
-  ExFreePool(Mem);
+   /* free memory */
+   ExFreePool(Mem);
 }
 
 VOID FASTCALL
 IntCleanupThreadCallbacks(PW32THREAD W32Thread)
 {
-  PLIST_ENTRY CurrentEntry;
-  PINT_CALLBACK_HEADER Mem;
+   PLIST_ENTRY CurrentEntry;
+   PINT_CALLBACK_HEADER Mem;
 
-  while (!IsListEmpty(&W32Thread->W32CallbackListHead))
-  {
-    CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead);
-    Mem = CONTAINING_RECORD(CurrentEntry, INT_CALLBACK_HEADER,
-                            ListEntry);
+   while (!IsListEmpty(&W32Thread->W32CallbackListHead))
+   {
+      CurrentEntry = RemoveHeadList(&W32Thread->W32CallbackListHead);
+      Mem = CONTAINING_RECORD(CurrentEntry, INT_CALLBACK_HEADER,
+                              ListEntry);
 
-    /* free memory */
-    ExFreePool(Mem);
-  }
+      /* free memory */
+      ExFreePool(Mem);
+   }
 }
 
 /* FUNCTIONS
*****************************************************************/
 
 VOID STDCALL
 co_IntCallSentMessageCallback(SENDASYNCPROC CompletionCallback,
-			    HWND hWnd,
-			    UINT Msg,
-			    ULONG_PTR CompletionCallbackContext,
-			    LRESULT Result)
+                              HWND hWnd,
+                              UINT Msg,
+                              ULONG_PTR CompletionCallbackContext,
+                              LRESULT Result)
 {
-  SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments;
-  NTSTATUS Status;
+   SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments;
+   NTSTATUS Status;
 
-  Arguments.Callback = CompletionCallback;
-  Arguments.Wnd = hWnd;
-  Arguments.Msg = Msg;
-  Arguments.Context = CompletionCallbackContext;
-  Arguments.Result = Result;
-  
-  UserLeaveCo();
-  
-  Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC,
-		     &Arguments,
-		     sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS),
-		     NULL,
-		     NULL);
-           
-  UserEnterCo();           
-           
-  if (!NT_SUCCESS(Status))
-    {
+   Arguments.Callback = CompletionCallback;
+   Arguments.Wnd = hWnd;
+   Arguments.Msg = Msg;
+   Arguments.Context = CompletionCallbackContext;
+   Arguments.Result = Result;
+
+   UserLeaveCo();
+
+   Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC,
+                      &Arguments,
+                      sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS),
+                      NULL,
+                      NULL);
+
+   UserEnterCo();
+
+   if (!NT_SUCCESS(Status))
+   {
       return;
-    }
-  return;
+   }
+   return;
[truncated at 1000 lines; 41714 more skipped]