Sync to trunk r38500

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

diff --cc reactos/boot/freeldr/freeldr/include/mm.h
Simple merge

diff --cc reactos/dll/cpl/main/mouse.c
Simple merge

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

diff --cc reactos/dll/win32/kernel32/kernel32.rbuild
Simple merge

diff --cc reactos/dll/win32/kernel32/mem/virtual.c
index aa0b6e5,6143097..48640b1
--- 1/reactos/dll/win32/kernel32/mem/virtual.c
--- 2/reactos/dll/win32/kernel32/mem/virtual.c
+++ b/reactos/dll/win32/kernel32/mem/virtual.c
@@@ -76,20 -76,26 +76,26 @@@ VirtualFreeEx(IN HANDLE hProcess
  {
      NTSTATUS Status;
  
-     /* Free the memory */
-     Status = NtFreeVirtualMemory(hProcess,
-                                  (PVOID *)&lpAddress,
-                                  &dwSize,
-                                  dwFreeType);
-     if (!NT_SUCCESS(Status))
+     if (dwSize == 0 || !(dwFreeType & MEM_RELEASE))
      {
-         /* We failed */
-         SetLastErrorByStatus(Status);
-         return FALSE;
+         /* Free the memory */
+         Status = NtFreeVirtualMemory(hProcess,
 -                                     (PVOID *)&lpAddress,
 -                                     (PULONG)&dwSize,
++                                     &lpAddress,
++                                     &dwSize,
+                                      dwFreeType);
+         if (!NT_SUCCESS(Status))
+         {
+             /* We failed */
+             SetLastErrorByStatus(Status);
+             return FALSE;
+         }
+ 
+         /* Return success */
+         return TRUE;
      }
  
-     /* Return success */
-     return TRUE;
+     SetLastErrorByStatus(STATUS_INVALID_PARAMETER);
+     return FALSE;
  }
  
  /*

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

diff --cc reactos/dll/win32/riched20/editor.c
Simple merge

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

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

diff --cc reactos/drivers/video/videoprt/int10.c
index d1c9392,a41bce6..1a05c15
--- 1/reactos/drivers/video/videoprt/int10.c
--- 2/reactos/drivers/video/videoprt/int10.c
+++ b/reactos/drivers/video/videoprt/int10.c
@@@ -201,54 -199,48 +201,54 @@@ IntInt10CallBios
  
  VP_STATUS NTAPI
  VideoPortInt10(
-    IN PVOID HwDeviceExtension,
-    IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments)
+     IN PVOID HwDeviceExtension,
+     IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments)
  {
-    KV86M_REGISTERS Regs;
-    NTSTATUS Status;
-    PKPROCESS CallingProcess;
-    KAPC_STATE ApcState;
 +#if defined(_M_IX86)
+     CONTEXT BiosContext;
+     NTSTATUS Status;
+     PKPROCESS CallingProcess = (PKPROCESS)PsGetCurrentProcess();
+     KAPC_STATE ApcState;
  
-    TRACE_(VIDEOPRT, "VideoPortInt10\n");
+     if (!CsrssInitialized)
+     {
+        return ERROR_INVALID_PARAMETER;
+     }
  
-    if (!CsrssInitialized)
-    {
-       return ERROR_INVALID_PARAMETER;
-    }
+     /* Attach to CSRSS */
+     IntAttachToCSRSS(&CallingProcess, &ApcState);
  
-    IntAttachToCSRSS(&CallingProcess, &ApcState);
+     /* Clear the context */
+     RtlZeroMemory(&BiosContext, sizeof(CONTEXT));
+ 
+     /* Fill out the bios arguments */
+     BiosContext.Eax = BiosArguments->Eax;
+     BiosContext.Ebx = BiosArguments->Ebx;
+     BiosContext.Ecx = BiosArguments->Ecx;
+     BiosContext.Edx = BiosArguments->Edx;
+     BiosContext.Esi = BiosArguments->Esi;
+     BiosContext.Edi = BiosArguments->Edi;
+     BiosContext.Ebp = BiosArguments->Ebp;
  
-    memset(&Regs, 0, sizeof(Regs));
-    INFO_(VIDEOPRT, "- Input register Eax: %x\n", BiosArguments->Eax);
-    Regs.Eax = BiosArguments->Eax;
-    INFO_(VIDEOPRT, "- Input register Ebx: %x\n", BiosArguments->Ebx);
-    Regs.Ebx = BiosArguments->Ebx;
-    INFO_(VIDEOPRT, "- Input register Ecx: %x\n", BiosArguments->Ecx);
-    Regs.Ecx = BiosArguments->Ecx;
-    INFO_(VIDEOPRT, "- Input register Edx: %x\n", BiosArguments->Edx);
-    Regs.Edx = BiosArguments->Edx;
-    INFO_(VIDEOPRT, "- Input register Esi: %x\n", BiosArguments->Esi);
-    Regs.Esi = BiosArguments->Esi;
-    INFO_(VIDEOPRT, "- Input register Edi: %x\n", BiosArguments->Edi);
-    Regs.Edi = BiosArguments->Edi;
-    INFO_(VIDEOPRT, "- Input register Ebp: %x\n", BiosArguments->Ebp);
-    Regs.Ebp = BiosArguments->Ebp;
-    Status = Ke386CallBios(0x10, (PCONTEXT)&Regs);
-    BiosArguments->Eax = Regs.Eax;
-    BiosArguments->Ebx = Regs.Ebx;
-    BiosArguments->Ecx = Regs.Ecx;
-    BiosArguments->Edx = Regs.Edx;
-    BiosArguments->Esi = Regs.Esi;
-    BiosArguments->Edi = Regs.Edi;
-    BiosArguments->Ebp = Regs.Ebp;
+     /* Do the ROM BIOS call */
+     Status = Ke386CallBios(0x10, &BiosContext);
  
-    IntDetachFromCSRSS(&CallingProcess, &ApcState);
+     /* Return the arguments */
+     BiosArguments->Eax = BiosContext.Eax;
+     BiosArguments->Ebx = BiosContext.Ebx;
+     BiosArguments->Ecx = BiosContext.Ecx;
+     BiosArguments->Edx = BiosContext.Edx;
+     BiosArguments->Esi = BiosContext.Esi;
+     BiosArguments->Edi = BiosContext.Edi;
+     BiosArguments->Ebp = BiosContext.Ebp;
  
-    return Status;
+     /* Detach from CSRSS */
+     IntDetachFromCSRSS(&CallingProcess, &ApcState);
+ 
+     return Status;
 +#else
 +    /* Not implemented for anything else than X86*/
 +    DPRINT1("Int10 not available on non-x86!\n");
 +    return ERROR_INVALID_FUNCTION;
 +#endif
  }

diff --cc reactos/drivers/video/videoprt/resource.c
Simple merge

diff --cc reactos/hal/halx86/mp/apic.c
Simple merge

diff --cc reactos/include/crt/sys/types.h
index 8ba3df7,8ba3df7..6a0dabd
--- 1/reactos/include/crt/sys/types.h
--- 2/reactos/include/crt/sys/types.h
+++ b/reactos/include/crt/sys/types.h
@@@ -36,4 -36,4 +36,17 @@@ typedef unsigned int dev_t
  # endif
  #endif
  
++// HACK HACK HACK
++#ifndef _PID_T_
++#define       _PID_T_
++#ifndef _WIN64
++typedef int   _pid_t;
++#else
++typedef __int64       _pid_t;
++#endif
++#ifndef       NO_OLDNAMES
++typedef _pid_t        pid_t;
++#endif
++#endif        /* Not _PID_T_ */
++
  #endif /* !_INC_TYPES */

diff --cc reactos/include/ddk/ntdef.h
Simple merge

diff --cc reactos/include/psdk/windef.h
Simple merge

diff --cc reactos/include/psdk/winuser.h
Simple merge

diff --cc reactos/include/reactos/libs/pseh/pseh2.h
Simple merge

diff --cc reactos/ntoskrnl/ex/harderr.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/include/internal/mm.h
Simple merge

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

diff --cc reactos/ntoskrnl/kd/kdmain.c
Simple merge

diff --cc reactos/ntoskrnl/mm/mminit.c
Simple merge

diff --cc reactos/subsystems/win32/win32k/ntuser/misc.c
Simple merge

diff --cc reactos/subsystems/win32/win32k/ntuser/simplecall.c
Simple merge

diff --cc reactos/tools/rbuild/backend/mingw/mingw.cpp
Simple merge

diff --cc reactos/tools/rbuild/backend/mingw/modulehandler.cpp
Simple merge

diff --cc reactos/tools/rbuild/backend/msvc/msvc.cpp
Simple merge

diff --cc reactos/tools/rbuild/module.cpp
Simple merge