diff --git a/reactos/include/ddk/ndis.h b/reactos/include/ddk/ndis.h index 76cd5d33b53..55516be51af 100644 --- a/reactos/include/ddk/ndis.h +++ b/reactos/include/ddk/ndis.h @@ -4127,12 +4127,6 @@ typedef struct _NDIS_INTERRUPT { } NDIS_INTERRUPT, *PNDIS_INTERRUPT; -typedef struct _MAP_REGISTER_ENTRY { - PVOID MapRegister; - BOOLEAN WriteToDevice; -} MAP_REGISTER_ENTRY, *PMAP_REGISTER_ENTRY; - - typedef enum _NDIS_WORK_ITEM_TYPE { NdisWorkItemRequest, NdisWorkItemSend, diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h index 1f39e685ace..5fd31b051b4 100644 --- a/reactos/include/ddk/ntifs.h +++ b/reactos/include/ddk/ntifs.h @@ -3915,6 +3915,24 @@ RtlNtStatusToDosError ( IN NTSTATUS Status ); +NTSYSAPI +NTSTATUS +NTAPI +RtlOemStringToUnicodeString( + IN OUT PUNICODE_STRING DestinationString, + IN PCOEM_STRING SourceString, + IN BOOLEAN AllocateDestinationString +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlUnicodeStringToOemString( + IN OUT POEM_STRING DestinationString, + IN PCUNICODE_STRING SourceString, + IN BOOLEAN AllocateDestinationString +); + NTSYSAPI NTSTATUS NTAPI diff --git a/reactos/include/ddk/winddk.h b/reactos/include/ddk/winddk.h index 6406b7bfeb0..537343aa5c4 100644 --- a/reactos/include/ddk/winddk.h +++ b/reactos/include/ddk/winddk.h @@ -201,6 +201,7 @@ typedef struct _ADAPTER_OBJECT *PADAPTER_OBJECT; #define ZwCurrentProcess() NtCurrentProcess() #define NtCurrentThread() ( (HANDLE)(LONG_PTR) -2 ) #define ZwCurrentThread() NtCurrentThread() +#define KIP0PCRADDRESS 0xffdff000 #define KERNEL_STACK_SIZE 12288 #define KERNEL_LARGE_STACK_SIZE 61440 @@ -4119,32 +4120,6 @@ typedef struct _RTL_BITMAP_RUN { ULONG NumberOfBits; } RTL_BITMAP_RUN, *PRTL_BITMAP_RUN; -typedef struct _RTL_RANGE_LIST -{ - LIST_ENTRY ListHead; - ULONG Flags; /* RTL_RANGE_LIST_... flags */ - ULONG Count; - ULONG Stamp; -} RTL_RANGE_LIST, *PRTL_RANGE_LIST; - -typedef struct _RTL_RANGE -{ - ULONGLONG Start; - ULONGLONG End; - PVOID UserData; - PVOID Owner; - UCHAR Attributes; - UCHAR Flags; /* RTL_RANGE_... flags */ -} RTL_RANGE, *PRTL_RANGE; - -typedef struct _RANGE_LIST_ITERATOR -{ - PLIST_ENTRY RangeListHead; - PLIST_ENTRY MergedHead; - PVOID Current; - ULONG Stamp; -} RTL_RANGE_LIST_ITERATOR, *PRTL_RANGE_LIST_ITERATOR; - typedef BOOLEAN (NTAPI *PRTL_CONFLICT_RANGE_CALLBACK) ( PVOID Context, @@ -10475,6 +10450,8 @@ extern BOOLEAN KdDebuggerEnabled; /* Available as intrinsics on MSVC */ static __inline void _disable(void) {__asm__("cli\n\t");} static __inline void _enable(void) {__asm__("sti\n\t");} +static __inline __int64 __readcr3(void) {__asm__("mov %cr3, %eax\n\t");} +static __inline __int64 __readcr4(void) {__asm__("mov %cr4, %eax\n\t");} #ifdef __cplusplus }