Merge trunk (r43561)

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

diff --cc reactos/boot/freeldr/freeldr/bootmgr.c
Simple merge

diff --cc reactos/dll/ntdll/ldr/startup.c
index a87e0a9,33353e7..c52c435
--- 1/reactos/dll/ntdll/ldr/startup.c
--- 2/reactos/dll/ntdll/ldr/startup.c
+++ b/reactos/dll/ntdll/ldr/startup.c
@@@ -426,14 -426,8 +426,8 @@@ LdrpInit2(PCONTEXT Context
      InsertTailList(&Peb->Ldr->InLoadOrderModuleList,
                     &NtModule->InLoadOrderLinks);
      InsertTailList(&Peb->Ldr->InInitializationOrderModuleList,
 -                   &NtModule->InInitializationOrderModuleList);
 +                   &NtModule->InInitializationOrderLinks);
  
- #if DBG || defined(KDBG)
- 
-     LdrpLoadUserModuleSymbols(NtModule);
- 
- #endif /* DBG || KDBG */
- 
      /* add entry for executable (becomes first list entry) */
      ExeModule = (PLDR_DATA_TABLE_ENTRY)
                   RtlAllocateHeap(Peb->ProcessHeap,

diff --cc reactos/dll/ntdll/ldr/utils.c
index 2753814,873cce8..16c7c75
--- 1/reactos/dll/ntdll/ldr/utils.c
--- 2/reactos/dll/ntdll/ldr/utils.c
+++ b/reactos/dll/ntdll/ldr/utils.c
@@@ -2269,12 -2252,10 +2253,10 @@@ LdrpLoadModule(IN PWSTR SearchPath OPTI
              DPRINT1("LdrFixupImports failed for %wZ, status=%x\n", &(*Module)->BaseDllName, Status);
              return Status;
            }
- #if DBG || defined(KDBG)
-         LdrpLoadUserModuleSymbols(*Module);
- #endif /* DBG || KDBG */
+ 
          RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
          InsertTailList(&NtCurrentPeb()->Ldr->InInitializationOrderModuleList,
 -                       &(*Module)->InInitializationOrderModuleList);
 +                       &(*Module)->InInitializationOrderLinks);
          RtlLeaveCriticalSection (NtCurrentPeb()->LoaderLock);
        }
      return STATUS_SUCCESS;

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

diff --cc reactos/dll/win32/kernel32/mem/virtual.c
Simple merge

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

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

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

diff --cc reactos/include/ndk/mmtypes.h
Simple merge

diff --cc reactos/include/ndk/pstypes.h
index 3bd6f2c,45e27f2..77d7bf3
--- 1/reactos/include/ndk/pstypes.h
--- 2/reactos/include/ndk/pstypes.h
+++ b/reactos/include/ndk/pstypes.h
@@@ -591,26 -621,20 +621,30 @@@ typedef struct _INITIAL_PE
  //
  typedef struct _PEB
  {
-     UCHAR InheritedAddressSpace;
-     UCHAR ReadImageFileExecOptions;
-     UCHAR BeingDebugged;
+     BOOLEAN InheritedAddressSpace;
+     BOOLEAN ReadImageFileExecOptions;
+     BOOLEAN BeingDebugged;
  #if (NTDDI_VERSION >= NTDDI_WS03)
 -    struct
 +    union
      {
-         UCHAR BitField;
+         BOOLEAN ImageUsesLargePages:1;
++        BOOLEAN BitField;
 +        struct
 +        {
 +            UCHAR ImageUsesLargePages:1;
      #if (NTDDI_VERSION >= NTDDI_LONGHORN)
-             UCHAR IsProtectedProcess:1;
-             UCHAR IsLegacyProcess:1;
-             UCHAR IsImageDynamicallyRelocated:1;
-             UCHAR SkipPatchingUser32Forwarders:1;
-             UCHAR SpareBits:3;
+         BOOLEAN IsProtectedProcess:1;
+         BOOLEAN IsLegacyProcess:1;
+         BOOLEAN SpareBits:5;
++            BOOLEAN IsProtectedProcess:1;
++            BOOLEAN IsLegacyProcess:1;
++            BOOLEAN IsImageDynamicallyRelocated:1;
++            BOOLEAN SkipPatchingUser32Forwarders:1;
++            BOOLEAN SpareBits:3;
      #else
-             UCHAR SpareBits:7;
 -        BOOLEAN SpareBits:7;
++            BOOLEAN SpareBits:7;
      #endif
 +        };
      };
  #else
      BOOLEAN SpareBool;

diff --cc reactos/include/psdk/winnt.h
index c9b7f61,d2e7d0d..b1b61a8
--- 1/reactos/include/psdk/winnt.h
--- 2/reactos/include/psdk/winnt.h
+++ b/reactos/include/psdk/winnt.h
@@@ -58,10 -56,10 +58,11 @@@ extern "C" 
  #include <string.h>
  
  /* FIXME: add more architectures. Is there a way to specify this in GCC? */
- #ifdef _X86_
- #define UNALIGNED
+ #if defined(_M_AMD64)
+ #undef UNALIGNED
+ #define UNALIGNED __unaligned
  #else
 +#undef UNALIGNED
  #define UNALIGNED
  #endif
  

diff --cc reactos/lib/sdk/crt/stdio/file.c
Simple merge

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

diff --cc reactos/ntoskrnl/include/internal/ke.h
index 7f16d5d,a85180e..4a95160
--- 1/reactos/ntoskrnl/include/internal/ke.h
--- 2/reactos/ntoskrnl/include/internal/ke.h
+++ b/reactos/ntoskrnl/include/internal/ke.h
@@@ -192,8 -192,31 +192,31 @@@ extern ULONG KiDPCTimeout
  
  /* INTERNAL KERNEL FUNCTIONS ************************************************/
  
+ VOID
+ NTAPI
+ CPUID(
+     IN ULONG InfoType,
+     OUT PULONG CpuInfoEax,
+     OUT PULONG CpuInfoEbx,
+     OUT PULONG CpuInfoEcx,
+     OUT PULONG CpuInfoEdx
+ );
+ 
+ LONGLONG
+ FASTCALL
+ RDMSR(
+     IN ULONG Register
+ );
+ 
+ VOID
+ NTAPI
+ WRMSR(
+     IN ULONG Register,
+     IN LONGLONG Value
+ );
+ 
  /* Finds a new thread to run */
 -NTSTATUS
 +LONG_PTR
  FASTCALL
  KiSwapThread(
      IN PKTHREAD Thread,

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

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

diff --cc reactos/ntoskrnl/kd64/amd64/kdsup.c
Simple merge

diff --cc reactos/ntoskrnl/kd64/kdapi.c
index 77173e2,a68e43b..3d3ff38
--- 1/reactos/ntoskrnl/kd64/kdapi.c
--- 2/reactos/ntoskrnl/kd64/kdapi.c
+++ b/reactos/ntoskrnl/kd64/kdapi.c
@@@ -264,11 -334,15 +334,16 @@@ KdpReadVirtualMemory(IN PDBGKD_MANIPULA
                       IN PSTRING Data,
                       IN PCONTEXT Context)
  {
+     PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory;
      STRING Header;
-     ULONG Length = State->u.ReadMemory.TransferCount;
-     NTSTATUS Status = STATUS_SUCCESS;
+     ULONG Length = ReadMemory->TransferCount;
 +    ULONG64 TargetBaseAddress = State->u.ReadMemory.TargetBaseAddress;
  
+     /* Setup the header */
+     Header.Length = sizeof(DBGKD_MANIPULATE_STATE64);
+     Header.Buffer = (PCHAR)State;
+     ASSERT(Data->Length == 0);
+ 
      /* Validate length */
      if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)))
      {

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

diff --cc reactos/ntoskrnl/mm/ARM3/expool.c
index 5fdc201,8ae73ec..d6274e1
--- 1/reactos/ntoskrnl/mm/ARM3/expool.c
--- 2/reactos/ntoskrnl/mm/ARM3/expool.c
+++ b/reactos/ntoskrnl/mm/ARM3/expool.c
@@@ -547,4 -640,67 +640,67 @@@ ExFreeArmPool(PVOID P
      ExFreeArmPoolWithTag(P, 0);
  }
  
 -                        IN ULONG NumberOfBytes)
+ /*
+  * @unimplemented
+  */
+ SIZE_T
+ NTAPI
+ ExQueryPoolBlockSize(IN PVOID PoolBlock,
+                      OUT PBOOLEAN QuotaCharged)
+ {
+     //
+     // Not implemented
+     //
+     UNIMPLEMENTED;
+     return FALSE;
+ }
+ 
+ /*
+  * @implemented
+  */
+ 
+ PVOID
+ NTAPI
+ ExAllocatePoolWithQuota(IN POOL_TYPE PoolType,
 -                           IN ULONG NumberOfBytes,
++                        IN SIZE_T NumberOfBytes)
+ {
+     //
+     // Allocate the pool
+     //
+     return ExAllocatePoolWithQuotaTag(PoolType, NumberOfBytes, 'enoN');
+ }
+ 
+ /*
+  * @implemented
+  */
+ PVOID
+ NTAPI
+ ExAllocatePoolWithTagPriority(IN POOL_TYPE PoolType,
+                               IN SIZE_T NumberOfBytes,
+                               IN ULONG Tag,
+                               IN EX_POOL_PRIORITY Priority)
+ {
+     //
+     // Allocate the pool
+     //
+     UNIMPLEMENTED;
+     return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag);
+ }
+ 
+ /*
+  * @implemented
+  */
+ PVOID
+ NTAPI
+ ExAllocatePoolWithQuotaTag(IN POOL_TYPE PoolType,
++                           IN SIZE_T NumberOfBytes,
+                            IN ULONG Tag)
+ {
+     //
+     // Allocate the pool
+     //
+     UNIMPLEMENTED;
+     return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag);
+ }
+ 
  /* EOF */

diff --cc reactos/ntoskrnl/mm/ARM3/miarm.h
Simple merge

diff --cc reactos/ntoskrnl/mm/i386/page.c
Simple merge

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

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

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

diff --cc reactos/ntoskrnl/ps/thread.c
Simple merge

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