[SDK] Fix NT6 building issues and improve SDK NT6 headers.

CORE-12596
This commit is contained in:
Denis Malikov 2018-02-04 18:29:23 +07:00 committed by Thomas Faber
parent 44023cb7d7
commit 420c0360ac
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
8 changed files with 26 additions and 6 deletions

View file

@ -556,7 +556,7 @@ HEADER("Data access macros"),
RAW("#define USERDATA ds:[HEX(0FFDF0000)]"), RAW("#define USERDATA ds:[HEX(0FFDF0000)]"),
RAW("#define PCR fs:"), RAW("#define PCR fs:"),
#if (NTDDI_VERSION >= NTDDI_VISTA) #if (NTDDI_VERSION >= NTDDI_WIN8)
HEADER("KNODE offsets"), HEADER("KNODE offsets"),
OFFSET(NdIdleCpuSet, KNODE, IdleCpuSet), OFFSET(NdIdleCpuSet, KNODE, IdleCpuSet),
#endif #endif

View file

@ -125,7 +125,7 @@ RAW("#else"),
{TYPE_CONSTANT, "SYNCH_LEVEL", (IPI_LEVEL - 2)}, {TYPE_CONSTANT, "SYNCH_LEVEL", (IPI_LEVEL - 2)},
RAW("#endif"), RAW("#endif"),
#if (NTDDI_VERSION >= NTDDI_VISTA) #if (NTDDI_VERSION >= NTDDI_WIN8)
HEADER("Entropy Timing Constants"), HEADER("Entropy Timing Constants"),
CONSTANT(KENTROPY_TIMING_INTERRUPTS_PER_BUFFER), CONSTANT(KENTROPY_TIMING_INTERRUPTS_PER_BUFFER),
CONSTANT(KENTROPY_TIMING_BUFFER_MASK), CONSTANT(KENTROPY_TIMING_BUFFER_MASK),
@ -797,7 +797,9 @@ SIZE(KernelThreadObjectLength, KTHREAD),
HEADER("KTIMER"), HEADER("KTIMER"),
OFFSET(TiType, KTIMER, Header.Type), OFFSET(TiType, KTIMER, Header.Type),
OFFSET(TiSize, KTIMER, Header.Size), OFFSET(TiSize, KTIMER, Header.Size),
OFFSET(TiInserted, KTIMER, Header.Inserted), // not in win 10 #if (NTDDI_VERSION < NTDDI_WIN7)
OFFSET(TiInserted, KTIMER, Header.Inserted),
#endif
OFFSET(TiSignalState, KTIMER, Header.SignalState), OFFSET(TiSignalState, KTIMER, Header.SignalState),
OFFSET(TiDueTime, KTIMER, DueTime), OFFSET(TiDueTime, KTIMER, DueTime),
OFFSET(TiTimerListEntry, KTIMER, TimerListEntry), OFFSET(TiTimerListEntry, KTIMER, TimerListEntry),

View file

@ -525,6 +525,7 @@ RxGetFileSizeWithLock(
_Out_ PLONGLONG FileSize); _Out_ PLONGLONG FileSize);
#if (_WIN32_WINNT >= 0x0600) #if (_WIN32_WINNT >= 0x0600)
PFCB
RxCreateNetFcb( RxCreateNetFcb(
_In_ PRX_CONTEXT RxContext, _In_ PRX_CONTEXT RxContext,
_In_ PIRP Irp, _In_ PIRP Irp,

View file

@ -627,6 +627,15 @@ Author:
#define EXCEPTION_NPX_ERROR 0x010 #define EXCEPTION_NPX_ERROR 0x010
#define EXCEPTION_ALIGNMENT_CHECK 0x011 #define EXCEPTION_ALIGNMENT_CHECK 0x011
//
// Hypervisor Enlightenment Definitions
//
#define HV_MMU_USE_HYPERCALL_FOR_ADDRESS_SWITCH 0x01
#define HV_MMU_USE_HYPERCALL_FOR_LOCAL_FLUSH 0x02
#define HV_MMU_USE_HYPERCALL_FOR_REMOTE_FLUSH 0x04
#define HV_APIC_ENLIGHTENED 0x10
#define HV_KE_USE_HYPERCALL_FOR_LONG_SPIN_WAIT 0x40
// //
// VDM State Pointer // VDM State Pointer
// //

View file

@ -344,7 +344,7 @@ typedef struct STRUCT(_TEB)
#endif #endif
PTR(PVOID) WinSockData; PTR(PVOID) WinSockData;
ULONG GdiBatchCount; ULONG GdiBatchCount;
#if (NTDDI_VERSION >= NTDDI_WIN10) #if (NTDDI_VERSION >= NTDDI_WIN7)
union union
{ {
PROCESSOR_NUMBER CurrentIdealProcessor; PROCESSOR_NUMBER CurrentIdealProcessor;

View file

@ -4352,7 +4352,7 @@ typedef HBITMAP
#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ #endif /* (NTDDI_VERSION >= NTDDI_WIN8) */
_Out_ HANDLE* phSharedSurface); _Out_ HANDLE* phSharedSurface);
typedef FN_DrvCreateDeviceBitmapEx *PFN_DrvCreateDeviceBitmapEx; typedef FN_DrvCreateDeviceBitmapEx *PFN_DrvCreateDeviceBitmapEx;
extern DrvCreateDeviceBitmapEx DrvCreateDeviceBitmapEx extern FN_DrvCreateDeviceBitmapEx DrvCreateDeviceBitmapEx;
typedef VOID typedef VOID
(APIENTRY FN_DrvDeleteDeviceBitmapEx)( (APIENTRY FN_DrvDeleteDeviceBitmapEx)(

View file

@ -3446,6 +3446,14 @@ typedef struct tagSOUNDSENTRYW {
DWORD iWindowsEffectOrdinal; DWORD iWindowsEffectOrdinal;
} SOUNDSENTRYW,*LPSOUNDSENTRYW; } SOUNDSENTRYW,*LPSOUNDSENTRYW;
#if (_WIN32_WINNT >= 0x0600)
typedef struct tagAUDIODESCRIPTION {
UINT cbSize;
BOOL Enabled;
LCID Locale;
} AUDIODESCRIPTION, *LPAUDIODESCRIPTION;
#endif
typedef struct tagSTICKYKEYS { typedef struct tagSTICKYKEYS {
DWORD cbSize; DWORD cbSize;
DWORD dwFlags; DWORD dwFlags;

View file

@ -880,7 +880,7 @@ WSCGetProviderInfo(
_In_ LPGUID lpProviderId, _In_ LPGUID lpProviderId,
_In_ WSC_PROVIDER_INFO_TYPE InfoType, _In_ WSC_PROVIDER_INFO_TYPE InfoType,
_Out_writes_bytes_to_(*InfoSize, *InfoSize) PBYTE Info, _Out_writes_bytes_to_(*InfoSize, *InfoSize) PBYTE Info,
_Inout_ *InfoSize, _Inout_ size_t *InfoSize,
_In_ DWORD Flags, _In_ DWORD Flags,
_Out_ LPINT lpErrno); _Out_ LPINT lpErrno);