mirror of
https://github.com/reactos/reactos.git
synced 2025-08-06 00:32:57 +00:00
Sync with trunk head (part 1 of 2)
svn path=/branches/header-work/; revision=46262
This commit is contained in:
commit
b797eef5ea
143 changed files with 15887 additions and 8167 deletions
|
@ -336,22 +336,28 @@ DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000", KSMEDIUMSETID_Standard
|
|||
Clock Properties/Methods/Events
|
||||
*/
|
||||
|
||||
#define KSPROPSETID_Clock \
|
||||
#define STATIC_KSPROPSETID_Clock \
|
||||
0xDF12A4C0L, 0xAC17, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00
|
||||
DEFINE_GUIDSTRUCT("DF12A4C0-AC17-11CF-A5D6-28DB04C10000", KSPROPSETID_Clock);
|
||||
#define KSPROPSETID_Clock DEFINE_GUIDNAMED(KSPROPSETID_Clock)
|
||||
|
||||
typedef enum
|
||||
{
|
||||
KSPROPERTY_CLOCK_TIME,
|
||||
KSPROPERTY_CLOCK_PHYSICALTIME,
|
||||
KSPROPERTY_CORRELATEDTIME,
|
||||
KSPROPERTY_CORRELATEDPHYSICALTIME,
|
||||
KSPROPERTY_CLOCK_CORRELATEDTIME,
|
||||
KSPROPERTY_CLOCK_CORRELATEDPHYSICALTIME,
|
||||
KSPROPERTY_CLOCK_RESOLUTION,
|
||||
KSPROPERTY_CLOCK_STATE,
|
||||
#if defined(_NTDDK_)
|
||||
KSPROPERTY_CLOCK_FUNCTIONTABLE
|
||||
#endif // defined(_NTDDK_)
|
||||
} KSPROPERTY_CLOCK;
|
||||
|
||||
#define KSEVENTSETID_Clock \
|
||||
#define STATIC_KSEVENTSETID_Clock \
|
||||
0x364D8E20L, 0x62C7, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00
|
||||
DEFINE_GUIDSTRUCT("364D8E20-62C7-11CF-A5D6-28DB04C10000", KSEVENTSETID_Clock);
|
||||
#define KSEVENTSETID_Clock DEFINE_GUIDNAMED(KSEVENTSETID_Clock)
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
@ -718,8 +724,10 @@ typedef enum
|
|||
Properties/Methods/Events
|
||||
*/
|
||||
|
||||
#define KSPROPSETID_Stream \
|
||||
#define STATIC_KSPROPSETID_Stream\
|
||||
0x65aaba60L, 0x98ae, 0x11cf, 0xa1, 0x0d, 0x00, 0x20, 0xaf, 0xd1, 0x56, 0xe4
|
||||
DEFINE_GUIDSTRUCT("65aaba60-98ae-11cf-a10d-0020afd156e4", KSPROPSETID_Stream);
|
||||
#define KSPROPSETID_Stream DEFINE_GUIDNAMED(KSPROPSETID_Stream)
|
||||
|
||||
typedef enum
|
||||
{
|
||||
|
@ -1838,11 +1846,32 @@ typedef struct
|
|||
KSEVENTDATA EventData;
|
||||
} KSRELATIVEEVENT, *PKSRELATIVEEVENT;
|
||||
|
||||
#define KSRELATIVEEVENT_FLAG_HANDLE 0x00000001
|
||||
#define KSRELATIVEEVENT_FLAG_POINTER 0x00000002
|
||||
|
||||
/* ===============================================================
|
||||
Timing
|
||||
*/
|
||||
|
||||
|
||||
typedef struct {
|
||||
KSEVENTDATA EventData;
|
||||
LONGLONG MarkTime;
|
||||
} KSEVENT_TIME_MARK, *PKSEVENT_TIME_MARK;
|
||||
|
||||
typedef struct {
|
||||
KSEVENTDATA EventData;
|
||||
LONGLONG TimeBase;
|
||||
LONGLONG Interval;
|
||||
} KSEVENT_TIME_INTERVAL, *PKSEVENT_TIME_INTERVAL;
|
||||
|
||||
typedef struct {
|
||||
LONGLONG TimeBase;
|
||||
LONGLONG Interval;
|
||||
} KSINTERVAL, *PKSINTERVAL;
|
||||
|
||||
|
||||
|
||||
typedef struct
|
||||
{
|
||||
LONGLONG Time;
|
||||
|
@ -1856,12 +1885,6 @@ typedef struct
|
|||
LONGLONG SystemTime;
|
||||
} KSCORRELATED_TIME, *PKSCORRELATED_TIME;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
LONGLONG TimeBase;
|
||||
LONGLONG Interval;
|
||||
} KSINTERVAL, *PKSINTERVAL;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
LONGLONG Duration;
|
||||
|
@ -2070,19 +2093,7 @@ typedef struct {
|
|||
typedef struct _KSEVENT_ENTRY KSEVENT_ENTRY, *PKSEVENT_ENTRY;
|
||||
|
||||
#if defined(_NTDDK_)
|
||||
typedef struct
|
||||
{
|
||||
KSEVENTDATA EventData;
|
||||
LONGLONG MarkTime;
|
||||
} KSEVENT_TIME_MARK, *PKSEVENT_TIME_MARK;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
KSEVENTDATA EventData;
|
||||
LONGLONG TimeBase;
|
||||
LONGLONG Interval;
|
||||
} KSEVENT_TIME_INTERVAL, *PKSEVENT_TIME_INTERVAL;
|
||||
|
||||
|
||||
typedef NTSTATUS (NTAPI *PFNKSADDEVENT)(
|
||||
IN PIRP Irp,
|
||||
IN PKSEVENTDATA EventData,
|
||||
|
@ -3867,6 +3878,26 @@ KsPinGetConnectedPinFileObject(
|
|||
|
||||
#else
|
||||
|
||||
#if !defined( KS_NO_CREATE_FUNCTIONS )
|
||||
|
||||
KSDDKAPI
|
||||
DWORD
|
||||
WINAPI
|
||||
KsCreateAllocator(
|
||||
IN HANDLE ConnectionHandle,
|
||||
IN PKSALLOCATOR_FRAMING AllocatorFraming,
|
||||
OUT PHANDLE AllocatorHandle
|
||||
);
|
||||
|
||||
KSDDKAPI
|
||||
DWORD
|
||||
NTAPI
|
||||
KsCreateClock(
|
||||
IN HANDLE ConnectionHandle,
|
||||
IN PKSCLOCK_CREATE ClockCreate,
|
||||
OUT PHANDLE ClockHandle
|
||||
);
|
||||
|
||||
KSDDKAPI
|
||||
DWORD
|
||||
WINAPI
|
||||
|
@ -3877,6 +3908,17 @@ KsCreatePin(
|
|||
OUT PHANDLE ConnectionHandle
|
||||
);
|
||||
|
||||
KSDDKAPI
|
||||
DWORD
|
||||
WINAPI
|
||||
KsCreateTopologyNode(
|
||||
IN HANDLE ParentHandle,
|
||||
IN PKSNODE_CREATE NodeCreate,
|
||||
IN ACCESS_MASK DesiredAccess,
|
||||
OUT PHANDLE NodeHandle
|
||||
);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
@ -871,20 +871,20 @@ typedef struct _UNWIND_HISTORY_TABLE {
|
|||
*/
|
||||
|
||||
/* This is used by NtQuerySystemInformation */
|
||||
typedef struct _SYSTEM_THREAD_INFORMATION{
|
||||
FILETIME ftKernelTime;
|
||||
FILETIME ftUserTime;
|
||||
FILETIME ftCreateTime;
|
||||
DWORD dwTickCount;
|
||||
DWORD dwStartAddress;
|
||||
DWORD dwOwningPID;
|
||||
DWORD dwThreadID;
|
||||
DWORD dwCurrentPriority;
|
||||
DWORD dwBasePriority;
|
||||
DWORD dwContextSwitches;
|
||||
DWORD dwThreadState;
|
||||
DWORD dwWaitReason;
|
||||
DWORD dwUnknown;
|
||||
typedef struct _SYSTEM_THREAD_INFORMATION
|
||||
{ /* win32/win64 */
|
||||
LARGE_INTEGER KernelTime; /* 00/00 */
|
||||
LARGE_INTEGER UserTime; /* 08/08 */
|
||||
LARGE_INTEGER CreateTime; /* 10/10 */
|
||||
DWORD dwTickCount; /* 18/18 */
|
||||
LPVOID StartAddress; /* 1c/20 */
|
||||
CLIENT_ID ClientId; /* 20/28 */
|
||||
DWORD dwCurrentPriority; /* 28/38 */
|
||||
DWORD dwBasePriority; /* 2c/3c */
|
||||
DWORD dwContextSwitches; /* 30/40 */
|
||||
DWORD dwThreadState; /* 34/44 */
|
||||
DWORD dwWaitReason; /* 38/48 */
|
||||
DWORD dwUnknown; /* 3c/4c */
|
||||
} SYSTEM_THREAD_INFORMATION, *PSYSTEM_THREAD_INFORMATION;
|
||||
|
||||
typedef struct _IO_STATUS_BLOCK {
|
||||
|
@ -1195,38 +1195,39 @@ typedef struct _VM_COUNTERS_ {
|
|||
SIZE_T QuotaNonPagedPoolUsage;
|
||||
SIZE_T PagefileUsage;
|
||||
SIZE_T PeakPagefileUsage;
|
||||
SIZE_T PrivatePageCount;
|
||||
} VM_COUNTERS, *PVM_COUNTERS;
|
||||
|
||||
typedef struct _SYSTEM_PROCESS_INFORMATION {
|
||||
#ifdef __WINESRC__
|
||||
DWORD dwOffset;
|
||||
DWORD dwThreadCount;
|
||||
DWORD dwUnknown1[6];
|
||||
FILETIME ftCreationTime;
|
||||
FILETIME ftUserTime;
|
||||
FILETIME ftKernelTime;
|
||||
UNICODE_STRING ProcessName;
|
||||
DWORD dwBasePriority;
|
||||
DWORD dwProcessID;
|
||||
DWORD dwParentProcessID;
|
||||
DWORD dwHandleCount;
|
||||
DWORD dwUnknown3;
|
||||
DWORD dwUnknown4;
|
||||
VM_COUNTERS vmCounters;
|
||||
IO_COUNTERS ioCounters;
|
||||
SYSTEM_THREAD_INFORMATION ti[1];
|
||||
#ifdef __WINESRC__ /* win32/win64 */
|
||||
ULONG NextEntryOffset; /* 00/00 */
|
||||
DWORD dwThreadCount; /* 04/04 */
|
||||
DWORD dwUnknown1[6]; /* 08/08 */
|
||||
LARGE_INTEGER CreationTime; /* 20/20 */
|
||||
LARGE_INTEGER UserTime; /* 28/28 */
|
||||
LARGE_INTEGER KernelTime; /* 30/30 */
|
||||
UNICODE_STRING ProcessName; /* 38/38 */
|
||||
DWORD dwBasePriority; /* 40/48 */
|
||||
HANDLE UniqueProcessId; /* 44/50 */
|
||||
HANDLE ParentProcessId; /* 48/58 */
|
||||
ULONG HandleCount; /* 4c/60 */
|
||||
DWORD dwUnknown3; /* 50/64 */
|
||||
DWORD dwUnknown4; /* 54/68 */
|
||||
VM_COUNTERS vmCounters; /* 58/70 */
|
||||
IO_COUNTERS ioCounters; /* 88/d0 */
|
||||
SYSTEM_THREAD_INFORMATION ti[1]; /* b8/100 */
|
||||
#else
|
||||
ULONG NextEntryOffset;
|
||||
BYTE Reserved1[52];
|
||||
PVOID Reserved2[3];
|
||||
HANDLE UniqueProcessId;
|
||||
PVOID Reserved3;
|
||||
ULONG HandleCount;
|
||||
BYTE Reserved4[4];
|
||||
PVOID Reserved5[11];
|
||||
SIZE_T PeakPagefileUsage;
|
||||
SIZE_T PrivatePageCount;
|
||||
LARGE_INTEGER Reserved6[6];
|
||||
ULONG NextEntryOffset; /* 00/00 */
|
||||
BYTE Reserved1[52]; /* 04/04 */
|
||||
PVOID Reserved2[3]; /* 38/38 */
|
||||
HANDLE UniqueProcessId; /* 44/50 */
|
||||
PVOID Reserved3; /* 48/58 */
|
||||
ULONG HandleCount; /* 4c/60 */
|
||||
BYTE Reserved4[4]; /* 50/64 */
|
||||
PVOID Reserved5[11]; /* 54/68 */
|
||||
SIZE_T PeakPagefileUsage; /* 80/c0 */
|
||||
SIZE_T PrivatePageCount; /* 84/c8 */
|
||||
LARGE_INTEGER Reserved6[6]; /* 88/d0 */
|
||||
#endif
|
||||
} SYSTEM_PROCESS_INFORMATION, *PSYSTEM_PROCESS_INFORMATION;
|
||||
|
||||
|
@ -1553,7 +1554,7 @@ typedef struct _KEY_MULTIPLE_VALUE_INFORMATION
|
|||
ULONG Type;
|
||||
} KEY_MULTIPLE_VALUE_INFORMATION, *PKEY_MULTIPLE_VALUE_INFORMATION;
|
||||
|
||||
typedef VOID (*PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG );
|
||||
typedef VOID (CALLBACK *PTIMER_APC_ROUTINE) ( PVOID, ULONG, LONG );
|
||||
|
||||
typedef enum _EVENT_TYPE {
|
||||
NotificationEvent,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue