Sync to trunk HEAD (r45072)

svn path=/branches/ros-amd64-bringup/; revision=45074

diff --cc reactos/base/shell/explorer/explorer.cpp
Simple merge

diff --cc reactos/base/shell/explorer/shell/mainframe.cpp
Simple merge

diff --cc reactos/boot/freeldr/freeldr/windows/i386/wlmemory.c
Simple merge

diff --cc reactos/dll/win32/gdi32/objects/region.c
Simple merge

diff --cc reactos/dll/win32/kernel32/misc/toolhelp.c
Simple merge

diff --cc reactos/dll/win32/kernel32/process/proc.c
index cc88e97,6affdf8..2086629
--- 1/reactos/dll/win32/kernel32/process/proc.c
--- 2/reactos/dll/win32/kernel32/process/proc.c
+++ b/reactos/dll/win32/kernel32/process/proc.c
@@@ -33,63 -33,65 +33,65 @@@ RegisterWaitForInputIdle(WaitForInputId
  /*
   * @implemented
   */
- BOOL WINAPI
- GetProcessAffinityMask (HANDLE hProcess,
-                       PDWORD_PTR lpProcessAffinityMask,
-                       PDWORD_PTR lpSystemAffinityMask)
+ BOOL
+ WINAPI
+ GetProcessAffinityMask(HANDLE hProcess,
 -                       LPDWORD lpProcessAffinityMask,
 -                       LPDWORD lpSystemAffinityMask)
++                       PDWORD_PTR lpProcessAffinityMask,
++                       PDWORD_PTR lpSystemAffinityMask)
  {
-   PROCESS_BASIC_INFORMATION ProcessInfo;
-   SYSTEM_BASIC_INFORMATION SystemInfo;
-   NTSTATUS Status;
+     PROCESS_BASIC_INFORMATION ProcessInfo;
+     SYSTEM_BASIC_INFORMATION SystemInfo;
+     NTSTATUS Status;
  
-   Status = NtQuerySystemInformation(SystemBasicInformation,
-                                     &SystemInfo,
-                                     sizeof(SystemInfo),
-                                     NULL);
-   if (!NT_SUCCESS(Status))
+     Status = NtQuerySystemInformation(SystemBasicInformation,
+                                       &SystemInfo,
+                                       sizeof(SystemInfo),
+                                       NULL);
+     if (!NT_SUCCESS(Status))
      {
-       SetLastErrorByStatus (Status);
-       return FALSE;
+         SetLastErrorByStatus(Status);
+         return FALSE;
      }
  
-   Status = NtQueryInformationProcess (hProcess,
-                                     ProcessBasicInformation,
-                                     (PVOID)&ProcessInfo,
-                                     sizeof(PROCESS_BASIC_INFORMATION),
-                                     NULL);
-   if (!NT_SUCCESS(Status))
+     Status = NtQueryInformationProcess(hProcess,
+                                        ProcessBasicInformation,
+                                        (PVOID)&ProcessInfo,
+                                        sizeof(PROCESS_BASIC_INFORMATION),
+                                        NULL);
+     if (!NT_SUCCESS(Status))
      {
-       SetLastErrorByStatus (Status);
-       return FALSE;
+         SetLastErrorByStatus(Status);
+         return FALSE;
      }
  
-   *lpProcessAffinityMask = (DWORD)ProcessInfo.AffinityMask;
-   *lpSystemAffinityMask = (DWORD)SystemInfo.ActiveProcessorsAffinityMask;
+     *lpProcessAffinityMask = (DWORD)ProcessInfo.AffinityMask;
+     *lpSystemAffinityMask = (DWORD)SystemInfo.ActiveProcessorsAffinityMask;
  
-   return TRUE;
+     return TRUE;
  }
  
  
  /*
   * @implemented
   */
- BOOL WINAPI
- SetProcessAffinityMask (HANDLE hProcess,
-                       DWORD_PTR dwProcessAffinityMask)
+ BOOL
+ WINAPI
+ SetProcessAffinityMask(HANDLE hProcess,
 -                       DWORD dwProcessAffinityMask)
++                       DWORD_PTR dwProcessAffinityMask)
  {
-   NTSTATUS Status;
+     NTSTATUS Status;
  
-   Status = NtSetInformationProcess (hProcess,
-                                   ProcessAffinityMask,
-                                   (PVOID)&dwProcessAffinityMask,
-                                   sizeof(DWORD));
-   if (!NT_SUCCESS(Status))
+     Status = NtSetInformationProcess(hProcess,
+                                      ProcessAffinityMask,
+                                      (PVOID)&dwProcessAffinityMask,
+                                      sizeof(DWORD));
+     if (!NT_SUCCESS(Status))
      {
-       SetLastErrorByStatus (Status);
-       return FALSE;
+         SetLastErrorByStatus(Status);
+         return FALSE;
      }
  
-   return TRUE;
+     return TRUE;
  }
  
  

diff --cc reactos/dll/win32/kernel32/process/procsup.c
Simple merge

diff --cc reactos/dll/win32/kernel32/process/session.c
index 04a43d0,b006e3c..554fc06
--- 1/reactos/dll/win32/kernel32/process/session.c
--- 2/reactos/dll/win32/kernel32/process/session.c
+++ b/reactos/dll/win32/kernel32/process/session.c
@@@ -50,48 -56,50 +56,50 @@@ DosPathToSessionPathA(DWORD SessionId
  /*
   * @implemented
   */
- BOOL WINAPI ProcessIdToSessionId (IN  DWORD dwProcessId,
-                                  OUT DWORD* pSessionId)
+ BOOL
+ WINAPI
+ ProcessIdToSessionId(IN DWORD dwProcessId,
+                      OUT DWORD *pSessionId)
  {
-   PROCESS_SESSION_INFORMATION SessionInformation;
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   CLIENT_ID ClientId;
-   HANDLE ProcessHandle;
-   NTSTATUS Status;
+     PROCESS_SESSION_INFORMATION SessionInformation;
+     OBJECT_ATTRIBUTES ObjectAttributes;
+     CLIENT_ID ClientId;
+     HANDLE ProcessHandle;
+     NTSTATUS Status;
  
-   if(IsBadWritePtr(pSessionId, sizeof(DWORD)))
-   {
-     SetLastError(ERROR_INVALID_PARAMETER);
-     return FALSE;
-   }
- 
-   ClientId.UniqueProcess = (HANDLE)(ULONG_PTR)dwProcessId;
-   ClientId.UniqueThread = 0;
+     if (IsBadWritePtr(pSessionId, sizeof(DWORD)))
+     {
+         SetLastError(ERROR_INVALID_PARAMETER);
+         return FALSE;
+     }
  
-   InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);
 -    ClientId.UniqueProcess = (HANDLE)dwProcessId;
++    ClientId.UniqueProcess = (HANDLE)(ULONG_PTR)dwProcessId;
+     ClientId.UniqueThread = 0;
  
-   Status = NtOpenProcess(&ProcessHandle,
-                          PROCESS_QUERY_INFORMATION,
-                          &ObjectAttributes,
-                          &ClientId);
-   if(NT_SUCCESS(Status))
-   {
-     Status = NtQueryInformationProcess(ProcessHandle,
-                                        ProcessSessionInformation,
-                                        &SessionInformation,
-                                        sizeof(SessionInformation),
-                                        NULL);
-     NtClose(ProcessHandle);
+     InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL);
  
-     if(NT_SUCCESS(Status))
+     Status = NtOpenProcess(&ProcessHandle,
+                            PROCESS_QUERY_INFORMATION,
+                            &ObjectAttributes,
+                            &ClientId);
+     if (NT_SUCCESS(Status))
      {
-       *pSessionId = SessionInformation.SessionId;
-       return TRUE;
+         Status = NtQueryInformationProcess(ProcessHandle,
+                                            ProcessSessionInformation,
+                                            &SessionInformation,
+                                            sizeof(SessionInformation),
+                                            NULL);
+         NtClose(ProcessHandle);
+ 
+         if (NT_SUCCESS(Status))
+         {
+             *pSessionId = SessionInformation.SessionId;
+             return TRUE;
+         }
      }
-   }
  
-   SetLastErrorByStatus(Status);
-   return FALSE;
+     SetLastErrorByStatus(Status);
+     return FALSE;
  }
  
  /*

diff --cc reactos/dll/win32/kernel32/thread/fiber.c
index 1f62d99,58aa6e9..e7e3c06
--- 1/reactos/dll/win32/kernel32/thread/fiber.c
--- 2/reactos/dll/win32/kernel32/thread/fiber.c
+++ b/reactos/dll/win32/kernel32/thread/fiber.c
@@@ -47,9 -47,9 +47,9 @@@ ConvertFiberToThread(VOID
      pTeb->HasFiberData = FALSE;
  
      /* free the fiber */
-     if(pTeb->NtTib.FiberData != NULL)
 -    if (pTeb->Tib.FiberData != NULL)
++    if (pTeb->NtTib.FiberData != NULL)
      {
 -        RtlFreeHeap(GetProcessHeap(), 0, pTeb->Tib.FiberData);
 +        RtlFreeHeap(GetProcessHeap(), 0, pTeb->NtTib.FiberData);
      }
  
      /* success */

diff --cc reactos/dll/win32/user32/include/user32p.h
index 851bfe8,fabbb09..6e62d95
--- 1/reactos/dll/win32/user32/include/user32p.h
--- 2/reactos/dll/win32/user32/include/user32p.h
+++ b/reactos/dll/win32/user32/include/user32p.h
@@@ -97,8 -97,11 +97,11 @@@
    NtUserCallOneParam((DWORD_PTR)bShow, ONEPARAM_ROUTINE_SHOWCURSOR)
  
  #define NtUserGetDesktopMapping(Ptr) \
 -  (PVOID)NtUserCallOneParam((DWORD)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING)
 +  (PVOID)NtUserCallOneParam((DWORD_PTR)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING)
  
+ #define NtUserSetCursorPos(x, y) \
+   (BOOL)NtUserCallTwoParam((DWORD)x, (DWORD)y, TWOPARAM_ROUTINE_SETCURSORPOS)
+ 
  #define ShowCaret(hwnd) \
    NtUserShowCaret(hwnd)
  

diff --cc reactos/dll/win32/user32/misc/dde.c
Simple merge

diff --cc reactos/dll/win32/user32/misc/exit.c
Simple merge

diff --cc reactos/dll/win32/user32/misc/misc.c
Simple merge

diff --cc reactos/drivers/storage/scsiport/scsiport.c
Simple merge

diff --cc reactos/hal/halx86/generic/cmos.c
index fcede5d,0457498..7702988
--- 1/reactos/hal/halx86/generic/cmos.c
--- 2/reactos/hal/halx86/generic/cmos.c
+++ b/reactos/hal/halx86/generic/cmos.c
@@@ -4,8 -4,7 +4,8 @@@
   * FILE:            hal/halx86/generic/cmos.c
   * PURPOSE:         CMOS Access Routines (Real Time Clock and LastKnownGood)
   * PROGRAMMERS:     Alex Ionescu (alex.ionescu@reactos.org)
-  *                  Eric Kohl (ekohl@abo.rhein-zeitung.de)
+  *                  Eric Kohl
 + *                  Timo Kreuzer (timo.kreuzer@reactos.org)
   */
  
  /* INCLUDES ******************************************************************/

diff --cc reactos/hal/halx86/generic/misc.c
Simple merge

diff --cc reactos/hal/halx86/include/halp.h
Simple merge

diff --cc reactos/include/ndk/i386/ketypes.h
Simple merge

diff --cc reactos/include/reactos/win32k/ntuser.h
Simple merge

diff --cc reactos/ntoskrnl/ex/init.c
Simple merge

diff --cc reactos/ntoskrnl/ex/sysinfo.c
Simple merge

diff --cc reactos/ntoskrnl/include/internal/ke.h
Simple merge

diff --cc reactos/ntoskrnl/io/iomgr/arcname.c
Simple merge

diff --cc reactos/ntoskrnl/kdbg/kdb.c
Simple merge

diff --cc reactos/ntoskrnl/ke/dpc.c
Simple merge

diff --cc reactos/ntoskrnl/ke/i386/cpu.c
Simple merge

diff --cc reactos/ntoskrnl/ke/i386/ctxswitch.S
Simple merge

diff --cc reactos/ntoskrnl/ntoskrnl-generic.rbuild
Simple merge