ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 12:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sync to trunk revision 61757.

Browse Source 
svn path=/branches/ntvdm/; revision=61758
This commit is contained in:
Hermès Bélusca-Maïto
2014-01-22 22:56:41 +00:00
parent 6e741d3856 52da71702d
commit 3224e67cfc
1113 changed files with 18193 additions and 7105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/ddk/ndis.h
+10 -2
View File
@@ -2168,7 +2168,11 @@ typedef VOID
NDIS50_MINIPORT_CHARACTERISTICS Ndis50Chars; \
W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \
W_PNP_EVENT_NOTIFY_HANDLER PnPEventNotifyHandler; \
W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler;
W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler; \
PVOID Reserved1; \
PVOID Reserved2; \
PVOID Reserved3; \
PVOID Reserved4;
#else
@@ -2176,7 +2180,11 @@ typedef VOID
NDIS50_MINIPORT_CHARACTERISTICS_S \
W_CANCEL_SEND_PACKETS_HANDLER CancelSendPacketsHandler; \
W_PNP_EVENT_NOTIFY_HANDLER PnPEventNotifyHandler; \
W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler;
W_MINIPORT_SHUTDOWN_HANDLER AdapterShutdownHandler; \
PVOID Reserved1; \
PVOID Reserved2; \
PVOID Reserved3; \
PVOID Reserved4;
#endif
include/ddk/ntifs.h
-13
View File
@@ -11416,19 +11416,6 @@ typedef struct _GET_RETRIEVAL_DESCRIPTOR {
MAPPING_PAIR Pair[1];
} GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR;
typedef struct _MBCB {
CSHORT NodeTypeCode;
CSHORT NodeIsInZone;
ULONG PagesToWrite;
ULONG DirtyPages;
ULONG Reserved;
LIST_ENTRY BitmapRanges;
LONGLONG ResumeWritePage;
BITMAP_RANGE BitmapRange1;
BITMAP_RANGE BitmapRange2;
BITMAP_RANGE BitmapRange3;
} MBCB, *PMBCB;
typedef struct _MOVEFILE_DESCRIPTOR {
HANDLE FileHandle;
ULONG Reserved;
include/ddk/wdm.h
+15 -3
View File
@@ -11063,9 +11063,21 @@ RtlCheckBit(
(__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE)
#define NT_ASSERT(exp) ((void)NT_VERIFY(exp))
#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp))
#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp))
/* Can't reuse verify, see above */
#define NT_ASSERT(exp) \
((VOID)((!(exp)) ? \
(__assert_annotationA(#exp), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationA(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSGW(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#else /* !DBG */
include/ndk/cctypes.h
+17 -4
View File
@@ -81,6 +81,19 @@ typedef struct _PRIVATE_CACHE_MAP
LIST_ENTRY PrivateLinks;
} PRIVATE_CACHE_MAP, *PPRIVATE_CACHE_MAP;
typedef struct _MBCB {
CSHORT NodeTypeCode;
CSHORT NodeIsInZone;
ULONG PagesToWrite;
ULONG DirtyPages;
ULONG Reserved;
LIST_ENTRY BitmapRanges;
LONGLONG ResumeWritePage;
BITMAP_RANGE BitmapRange1;
BITMAP_RANGE BitmapRange2;
BITMAP_RANGE BitmapRange3;
} MBCB, *PMBCB;
#ifdef _NTIFS_INCLUDED_
//
@@ -103,12 +116,12 @@ typedef struct _SHARED_CACHE_MAP
PVOID NeedToZero;
ULONG ActivePage;
ULONG NeedToZeroPage;
ULONG ActiveVacbSpinLock;
KSPIN_LOCK ActiveVacbSpinLock;
ULONG VacbActiveCount;
ULONG DirtyPages;
LIST_ENTRY SharedCacheMapLinks;
ULONG Flags;
ULONG Status;
LONG Status;
PMBCB Mbcb;
PVOID Section;
PKEVENT CreateEvent;
@@ -119,12 +132,12 @@ typedef struct _SHARED_CACHE_MAP
PVOID LazyWriteContext;
LIST_ENTRY PrivateList;
PVOID LogHandle;
PVOID FlushToLsnRoutine;
PFLUSH_TO_LSN FlushToLsnRoutine;
ULONG DirtyPageThreshold;
ULONG LazyWritePassCount;
PCACHE_UNINITIALIZE_EVENT UninitializeEvent;
PVACB NeedToZeroVacb;
ULONG BcbSpinLock;
KSPIN_LOCK BcbSpinLock;
PVOID Reserved;
KEVENT Event;
EX_PUSH_LOCK VacbPushLock;
include/ndk/psfuncs.h
+7
View File
@@ -149,6 +149,13 @@ PsGetCurrentProcessSessionId(
//
// Process Impersonation Functions
//
NTKERNELAPI
BOOLEAN
NTAPI
PsIsThreadImpersonating(
_In_ PETHREAD Thread
);
NTKERNELAPI
VOID
NTAPI
include/ndk/rtlfuncs.h
+31 -1
View File
@@ -3991,16 +3991,46 @@ RtlComputeCrc32(
//
// Network Functions
//
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressA(
_In_ PCSTR String,
_In_ BOOLEAN Strict,
_Out_ PCSTR *Terminator,
_Out_ struct in_addr *Addr
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressW(
_In_ PCWSTR String,
_In_ BOOLEAN Strict,
_Out_ LPWSTR *Terminator,
_Out_ PCWSTR *Terminator,
_Out_ struct in_addr *Addr
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressExA(
_In_ PCSTR AddressString,
_In_ BOOLEAN Strict,
_Out_ struct in_addr *Address,
_Out_ PUSHORT Port
);
NTSYSAPI
NTSTATUS
NTAPI
RtlIpv4StringToAddressExW(
_In_ PCWSTR AddressString,
_In_ BOOLEAN Strict,
_Out_ struct in_addr *Address,
_Out_ PUSHORT Port
);
NTSYSAPI
NTSTATUS
NTAPI
include/psdk/mstcpip.h
+3 -3
View File
@@ -1340,7 +1340,7 @@ NTSYSAPI
LONG
NTAPI
RtlIpv4StringToAddressA(
_In_ PCSTR S,
_In_ PCSTR String,
_In_ BOOLEAN Strict,
_Out_ PCSTR *Terminator,
_Out_ struct in_addr *Addr);
@@ -1358,9 +1358,9 @@ NTSYSAPI
LONG
NTAPI
RtlIpv4StringToAddressW(
_In_ PCWSTR S,
_In_ PCWSTR String,
_In_ BOOLEAN Strict,
_Out_ LPCWSTR *Terminator,
_Out_ PCWSTR *Terminator,
_Out_ struct in_addr *Addr);
NTSYSAPI
include/xdk/ntifs.template.h
-13
View File
@@ -1535,19 +1535,6 @@ typedef struct _GET_RETRIEVAL_DESCRIPTOR {
MAPPING_PAIR Pair[1];
} GET_RETRIEVAL_DESCRIPTOR, *PGET_RETRIEVAL_DESCRIPTOR;
typedef struct _MBCB {
CSHORT NodeTypeCode;
CSHORT NodeIsInZone;
ULONG PagesToWrite;
ULONG DirtyPages;
ULONG Reserved;
LIST_ENTRY BitmapRanges;
LONGLONG ResumeWritePage;
BITMAP_RANGE BitmapRange1;
BITMAP_RANGE BitmapRange2;
BITMAP_RANGE BitmapRange3;
} MBCB, *PMBCB;
typedef struct _MOVEFILE_DESCRIPTOR {
HANDLE FileHandle;
ULONG Reserved;
include/xdk/rtlfuncs.h
+15 -3
View File
@@ -3133,9 +3133,21 @@ RtlCheckBit(
(__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE)
#define NT_ASSERT(exp) ((void)NT_VERIFY(exp))
#define NT_ASSERTMSG(msg, exp) ((void)NT_VERIFYMSG(msg, exp))
#define NT_ASSERTMSGW(msg, exp) ((void)NT_VERIFYMSGW(msg, exp))
/* Can't reuse verify, see above */
#define NT_ASSERT(exp) \
((VOID)((!(exp)) ? \
(__assert_annotationA(#exp), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSG(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationA(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#define NT_ASSERTMSGW(msg, exp) \
((VOID)((!(exp)) ? \
(__assert_annotationW(msg), \
DbgRaiseAssertionFailure(), FALSE) : TRUE))
#else /* !DBG */