Headers diff for psapi.dll between 6.3.9600.17415-Windows 8.1 and 10.0.10586.0-Windows 10 1511 10586.494 versions



 psapi.h (6.3.9600.17415-Windows 8.1)   psapi.h (10.0.10586.0-Windows 10 1511 10586.494) 
skipping to change at line 29 skipping to change at line 29
--*/ --*/
#ifndef _PSAPI_H_ #ifndef _PSAPI_H_
#define _PSAPI_H_ #define _PSAPI_H_
#if _MSC_VER > 1000 #if _MSC_VER > 1000
#pragma once #pragma once
#endif #endif
#include <winapifamily.h> #include <winapifamily.h>
#pragma region Desktop Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
#if _MSC_VER >= 1200
#pragma warning(push)
#pragma warning(disable:4820) /* padding added after data member */
#endif
#define LIST_MODULES_DEFAULT 0x0 // This is the default one app would get witho ut any flag. #define LIST_MODULES_DEFAULT 0x0 // This is the default one app would get witho ut any flag.
#define LIST_MODULES_32BIT 0x01 // list 32bit modules in the target process. #define LIST_MODULES_32BIT 0x01 // list 32bit modules in the target process.
#define LIST_MODULES_64BIT 0x02 // list all 64bit modules. 32bit exe will be stripped off. #define LIST_MODULES_64BIT 0x02 // list all 64bit modules. 32bit exe will be stripped off.
// list all the modules // list all the modules
#define LIST_MODULES_ALL (LIST_MODULES_32BIT | LIST_MODULES_64BIT) #define LIST_MODULES_ALL (LIST_MODULES_32BIT | LIST_MODULES_64BIT)
// //
// Give teams a choice of using a downlevel version of psapi.h for an OS version s. // Give teams a choice of using a downlevel version of psapi.h for an OS version s.
// Teams can set C_DEFINES=$(C_DEFINES) -DPSAPI_VERSION=1 for downlevel psapi // Teams can set C_DEFINES=$(C_DEFINES) -DPSAPI_VERSION=1 for downlevel psapi
skipping to change at line 78 skipping to change at line 83
#define InitializeProcessForWsWatch K32InitializeProcessForWsWatch #define InitializeProcessForWsWatch K32InitializeProcessForWsWatch
#define GetWsChanges K32GetWsChanges #define GetWsChanges K32GetWsChanges
#define GetWsChangesEx K32GetWsChangesEx #define GetWsChangesEx K32GetWsChangesEx
#define GetMappedFileNameW K32GetMappedFileNameW #define GetMappedFileNameW K32GetMappedFileNameW
#define GetMappedFileNameA K32GetMappedFileNameA #define GetMappedFileNameA K32GetMappedFileNameA
#define EnumDeviceDrivers K32EnumDeviceDrivers #define EnumDeviceDrivers K32EnumDeviceDrivers
#define GetDeviceDriverBaseNameA K32GetDeviceDriverBaseNameA #define GetDeviceDriverBaseNameA K32GetDeviceDriverBaseNameA
#define GetDeviceDriverBaseNameW K32GetDeviceDriverBaseNameW #define GetDeviceDriverBaseNameW K32GetDeviceDriverBaseNameW
#define GetDeviceDriverFileNameA K32GetDeviceDriverFileNameA #define GetDeviceDriverFileNameA K32GetDeviceDriverFileNameA
#define GetDeviceDriverFileNameW K32GetDeviceDriverFileNameW #define GetDeviceDriverFileNameW K32GetDeviceDriverFileNameW
#define GetProcessMemoryInfo K32GetProcessMemoryInfo
#define GetPerformanceInfo K32GetPerformanceInfo #define GetPerformanceInfo K32GetPerformanceInfo
#define EnumPageFilesW K32EnumPageFilesW #define EnumPageFilesW K32EnumPageFilesW
#define EnumPageFilesA K32EnumPageFilesA #define EnumPageFilesA K32EnumPageFilesA
#define GetProcessImageFileNameA K32GetProcessImageFileNameA #define GetProcessImageFileNameA K32GetProcessImageFileNameA
#define GetProcessImageFileNameW K32GetProcessImageFileNameW #define GetProcessImageFileNameW K32GetProcessImageFileNameW
#endif #endif
BOOL BOOL
WINAPI WINAPI
EnumProcesses ( EnumProcesses (
_Out_writes_bytes_(cb) DWORD * lpidProcess, _Out_writes_bytes_(cb) DWORD * lpidProcess,
_In_ DWORD cb, _In_ DWORD cb,
_Out_ LPDWORD lpcbNeeded _Out_ LPDWORD lpcbNeeded
); );
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */
#pragma endregion
#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
#ifndef PSAPI_VERSION
#if (NTDDI_VERSION >= NTDDI_WIN7)
#define PSAPI_VERSION 2
#else
#define PSAPI_VERSION 1
#endif
#endif
#if (PSAPI_VERSION > 1)
#define GetProcessMemoryInfo K32GetProcessMemoryInfo
#endif
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */
#pragma endregion
#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
BOOL BOOL
WINAPI WINAPI
EnumProcessModules( EnumProcessModules(
_In_ HANDLE hProcess, _In_ HANDLE hProcess,
_Out_writes_bytes_(cb) HMODULE *lphModule, _Out_writes_bytes_(cb) HMODULE *lphModule,
_In_ DWORD cb, _In_ DWORD cb,
_Out_ LPDWORD lpcbNeeded _Out_ LPDWORD lpcbNeeded
); );
BOOL BOOL
skipping to change at line 389 skipping to change at line 419
_Out_writes_(nSize) LPWSTR lpFilename, _Out_writes_(nSize) LPWSTR lpFilename,
_In_ DWORD nSize _In_ DWORD nSize
); );
#ifdef UNICODE #ifdef UNICODE
#define GetDeviceDriverFileName GetDeviceDriverFileNameW #define GetDeviceDriverFileName GetDeviceDriverFileNameW
#else #else
#define GetDeviceDriverFileName GetDeviceDriverFileNameA #define GetDeviceDriverFileName GetDeviceDriverFileNameA
#endif // !UNICODE #endif // !UNICODE
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY
STEM) */
#pragma endregion
#pragma region Application Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM)
// Structure for GetProcessMemoryInfo() // Structure for GetProcessMemoryInfo()
typedef struct _PROCESS_MEMORY_COUNTERS { typedef struct _PROCESS_MEMORY_COUNTERS {
DWORD cb; DWORD cb;
DWORD PageFaultCount; DWORD PageFaultCount;
SIZE_T PeakWorkingSetSize; SIZE_T PeakWorkingSetSize;
SIZE_T WorkingSetSize; SIZE_T WorkingSetSize;
SIZE_T QuotaPeakPagedPoolUsage; SIZE_T QuotaPeakPagedPoolUsage;
SIZE_T QuotaPagedPoolUsage; SIZE_T QuotaPagedPoolUsage;
SIZE_T QuotaPeakNonPagedPoolUsage; SIZE_T QuotaPeakNonPagedPoolUsage;
skipping to change at line 432 skipping to change at line 468
#endif #endif
BOOL BOOL
WINAPI WINAPI
GetProcessMemoryInfo( GetProcessMemoryInfo(
HANDLE Process, HANDLE Process,
PPROCESS_MEMORY_COUNTERS ppsmemCounters, PPROCESS_MEMORY_COUNTERS ppsmemCounters,
DWORD cb DWORD cb
); );
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM
) */
#pragma endregion
#pragma region Desktop Family or OneCore Family
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
typedef struct _PERFORMANCE_INFORMATION { typedef struct _PERFORMANCE_INFORMATION {
DWORD cb; DWORD cb;
SIZE_T CommitTotal; SIZE_T CommitTotal;
SIZE_T CommitLimit; SIZE_T CommitLimit;
SIZE_T CommitPeak; SIZE_T CommitPeak;
SIZE_T PhysicalTotal; SIZE_T PhysicalTotal;
SIZE_T PhysicalAvailable; SIZE_T PhysicalAvailable;
SIZE_T SystemCache; SIZE_T SystemCache;
SIZE_T KernelTotal; SIZE_T KernelTotal;
SIZE_T KernelPaged; SIZE_T KernelPaged;
skipping to change at line 512 skipping to change at line 554
_Out_writes_(nSize) LPWSTR lpImageFileName, _Out_writes_(nSize) LPWSTR lpImageFileName,
_In_ DWORD nSize _In_ DWORD nSize
); );
#ifdef UNICODE #ifdef UNICODE
#define GetProcessImageFileName GetProcessImageFileNameW #define GetProcessImageFileName GetProcessImageFileNameW
#else #else
#define GetProcessImageFileName GetProcessImageFileNameA #define GetProcessImageFileName GetProcessImageFileNameA
#endif // !UNICODE #endif // !UNICODE
#ifdef __cplusplus #if _MSC_VER >= 1200
} #pragma warning(pop)
#endif #endif
#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */ #endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SY STEM) */
#pragma endregion #pragma endregion
#ifdef __cplusplus
}
#endif #endif
#endif /* _PSAPI_H_ */
 End of changes. 10 change blocks. 
7 lines changed or deleted 55 lines changed or added

This html diff was produced by rfcdiff 1.41.