Headers diff for pdh.dll between 6.0.6002.18005-Windows 6.0 and 6.1.7601.17514-Windows 7.0 versions



 pdh.h (6.0.6002.18005-Windows 6.0)   pdh.h (6.1.7601.17514-Windows 7.0) 
skipping to change at line 347 skipping to change at line 347
); );
PDH_FUNCTION PDH_FUNCTION
PdhAddCounterA( PdhAddCounterA(
__in PDH_HQUERY hQuery, __in PDH_HQUERY hQuery,
__in LPCSTR szFullCounterPath, __in LPCSTR szFullCounterPath,
__in DWORD_PTR dwUserData, __in DWORD_PTR dwUserData,
__out PDH_HCOUNTER * phCounter __out PDH_HCOUNTER * phCounter
); );
#if (_WIN32_WINDOWS >= 0x0600 || _WIN32_WINNT >= 0x0600 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_LONGHORN)) #if (_WIN32_WINDOWS >= 0x0600 || _WIN32_WINNT >= 0x0600 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_VISTA))
PDH_FUNCTION PDH_FUNCTION
PdhAddEnglishCounterW( PdhAddEnglishCounterW(
__in PDH_HQUERY hQuery, __in PDH_HQUERY hQuery,
__in LPCWSTR szFullCounterPath, __in LPCWSTR szFullCounterPath,
__in DWORD_PTR dwUserData, __in DWORD_PTR dwUserData,
__out PDH_HCOUNTER * phCounter __out PDH_HCOUNTER * phCounter
); );
PDH_FUNCTION PDH_FUNCTION
PdhAddEnglishCounterA( PdhAddEnglishCounterA(
skipping to change at line 531 skipping to change at line 531
); );
PDH_FUNCTION PDH_FUNCTION
PdhConnectMachineA( PdhConnectMachineA(
__in_opt LPCSTR szMachineName __in_opt LPCSTR szMachineName
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumMachinesW( PdhEnumMachinesW(
__in_opt LPCWSTR szDataSource, __in_opt LPCWSTR szDataSource,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPWSTR mszMachineList , __out_ecount_opt(* pcchBufferSize) PZZWSTR mszMachineList,
__inout LPDWORD pcchBufferSize __inout LPDWORD pcchBufferSize
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumMachinesA( PdhEnumMachinesA(
__in_opt LPCSTR szDataSource, __in_opt LPCSTR szDataSource,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPSTR mszMachineList, __out_ecount_opt(* pcchBufferSize) PZZSTR mszMachineList,
__inout LPDWORD pcchBufferSize __inout LPDWORD pcchBufferSize
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectsW( PdhEnumObjectsW(
__in_opt LPCWSTR szDataSource, __in_opt LPCWSTR szDataSource,
__in_opt LPCWSTR szMachineName, __in_opt LPCWSTR szMachineName,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPWSTR mszObjectList , __out_ecount_opt(* pcchBufferSize) PZZWSTR mszObjectList,
__inout LPDWORD pcchBufferSize, __inout LPDWORD pcchBufferSize,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in BOOL bRefresh __in BOOL bRefresh
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectsA( PdhEnumObjectsA(
__in_opt LPCSTR szDataSource, __in_opt LPCSTR szDataSource,
__in_opt LPCSTR szMachineName, __in_opt LPCSTR szMachineName,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPSTR mszObjectList , __out_ecount_opt(* pcchBufferSize) PZZSTR mszObjectList,
__inout LPDWORD pcchBufferSize, __inout LPDWORD pcchBufferSize,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in BOOL bRefresh __in BOOL bRefresh
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectItemsW( PdhEnumObjectItemsW(
__in_opt LPCWSTR szDataSource, __in_opt LPCWSTR szDataSource,
__in_opt LPCWSTR szMachineName, __in_opt LPCWSTR szMachineName,
__in LPCWSTR szObjectName, __in LPCWSTR szObjectName,
__out_ecount_opt(* pcchCounterListLength)__nullnullterminated LPWSTR mszCo unterList, __out_ecount_opt(* pcchCounterListLength) PZZWSTR mszCounterList,
__inout LPDWORD pcchCounterListLength, __inout LPDWORD pcchCounterListLength,
__out_ecount_opt(* pcchInstanceListLength)__nullnullterminated LPWSTR mszIn stanceList, __out_ecount_opt(* pcchInstanceListLength) PZZWSTR mszInstanceList,
__inout LPDWORD pcchInstanceListLength, __inout LPDWORD pcchInstanceListLength,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in DWORD dwFlags __in DWORD dwFlags
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectItemsA( PdhEnumObjectItemsA(
__in_opt LPCSTR szDataSource, __in_opt LPCSTR szDataSource,
__in_opt LPCSTR szMachineName, __in_opt LPCSTR szMachineName,
__in LPCSTR szObjectName, __in LPCSTR szObjectName,
__out_ecount_opt(* pcchCounterListLength)__nullnullterminated LPSTR mszCo unterList, __out_ecount_opt(* pcchCounterListLength) PZZSTR mszCounterList,
__inout LPDWORD pcchCounterListLength, __inout LPDWORD pcchCounterListLength,
__out_ecount_opt(* pcchInstanceListLength)__nullnullterminated LPSTR mszIn stanceList, __out_ecount_opt(* pcchInstanceListLength) PZZSTR mszInstanceList,
__inout LPDWORD pcchInstanceListLength, __inout LPDWORD pcchInstanceListLength,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in DWORD dwFlags __in DWORD dwFlags
); );
PDH_FUNCTION PDH_FUNCTION
PdhMakeCounterPathW( PdhMakeCounterPathW(
__in PPDH_COUNTER_PATH_ELEMENTS_W pCounterPathElements, __in PPDH_COUNTER_PATH_ELEMENTS_W pCounterPathElements,
__out_ecount_opt(* pcchBufferSize) LPWSTR szFullPathBuffer, __out_ecount_opt(* pcchBufferSize) LPWSTR szFullPathBuffer,
__inout LPDWORD pcchBufferSize, __inout LPDWORD pcchBufferSize,
skipping to change at line 868 skipping to change at line 868
); );
PDH_FUNCTION PDH_FUNCTION
PdhBrowseCountersA( PdhBrowseCountersA(
__in PPDH_BROWSE_DLG_CONFIG_A pBrowseDlgData __in PPDH_BROWSE_DLG_CONFIG_A pBrowseDlgData
); );
PDH_FUNCTION PDH_FUNCTION
PdhExpandCounterPathW( PdhExpandCounterPathW(
__in LPCWSTR szWildCardPath, __in LPCWSTR szWildCardPath,
__out_ecount_opt(* pcchPathListLength)__nullnullterminated LPWSTR mszExpand edPathList, __out_ecount_opt(* pcchPathListLength) PZZWSTR mszExpandedPathList,
__inout LPDWORD pcchPathListLength __inout LPDWORD pcchPathListLength
); );
PDH_FUNCTION PDH_FUNCTION
PdhExpandCounterPathA( PdhExpandCounterPathA(
__in LPCSTR szWildCardPath, __in LPCSTR szWildCardPath,
__out_ecount_opt(* pcchPathListLength)__nullnullterminated LPSTR mszExpand edPathList, __out_ecount_opt(* pcchPathListLength) PZZSTR mszExpandedPathList,
__inout LPDWORD pcchPathListLength __inout LPDWORD pcchPathListLength
); );
// //
// v2.0 functions // v2.0 functions
// //
PDH_FUNCTION PDH_FUNCTION
PdhLookupPerfNameByIndexW( PdhLookupPerfNameByIndexW(
__in_opt LPCWSTR szMachineName, __in_opt LPCWSTR szMachineName,
__in DWORD dwNameIndex, __in DWORD dwNameIndex,
skipping to change at line 922 skipping to change at line 922
#define PDH_NOEXPANDCOUNTERS 1 #define PDH_NOEXPANDCOUNTERS 1
#define PDH_NOEXPANDINSTANCES 2 #define PDH_NOEXPANDINSTANCES 2
#if (_WIN32_WINDOWS >= 0x0502 || _WIN32_WINNT >= 0x0502 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_WIN2003)) #if (_WIN32_WINDOWS >= 0x0502 || _WIN32_WINNT >= 0x0502 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_WIN2003))
#define PDH_REFRESHCOUNTERS 4 #define PDH_REFRESHCOUNTERS 4
#endif #endif
PDH_FUNCTION PDH_FUNCTION
PdhExpandWildCardPathA( PdhExpandWildCardPathA(
__in_opt LPCSTR szDataSource, __in_opt LPCSTR szDataSource,
__in LPCSTR szWildCardPath, __in LPCSTR szWildCardPath,
__out_ecount_opt(* pcchPathListLength)__nullnullterminated LPSTR mszExpand edPathList, __out_ecount_opt(* pcchPathListLength) PZZSTR mszExpandedPathList,
__inout LPDWORD pcchPathListLength, __inout LPDWORD pcchPathListLength,
__in DWORD dwFlags __in DWORD dwFlags
); );
PDH_FUNCTION PDH_FUNCTION
PdhExpandWildCardPathW( PdhExpandWildCardPathW(
__in_opt LPCWSTR szDataSource, __in_opt LPCWSTR szDataSource,
__in LPCWSTR szWildCardPath, __in LPCWSTR szWildCardPath,
__out_ecount_opt(* pcchPathListLength)__nullnullterminated LPWSTR mszExpand edPathList, __out_ecount_opt(* pcchPathListLength) PZZWSTR mszExpandedPathList,
__inout LPDWORD pcchPathListLength, __inout LPDWORD pcchPathListLength,
__in DWORD dwFlags __in DWORD dwFlags
); );
// //
// Logging Functions // Logging Functions
// //
#define PDH_LOG_READ_ACCESS ((DWORD) 0x00010000) #define PDH_LOG_READ_ACCESS ((DWORD) 0x00010000)
#define PDH_LOG_WRITE_ACCESS ((DWORD) 0x00020000) #define PDH_LOG_WRITE_ACCESS ((DWORD) 0x00020000)
skipping to change at line 1141 skipping to change at line 1141
PDH_FUNCTION PDH_FUNCTION
PdhOpenQueryH( PdhOpenQueryH(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in DWORD_PTR dwUserData, __in DWORD_PTR dwUserData,
__out PDH_HQUERY * phQuery __out PDH_HQUERY * phQuery
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumMachinesHW( PdhEnumMachinesHW(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPWSTR mszMachineLi st, __out_ecount_opt(* pcchBufferSize) PZZWSTR mszMachineList,
__inout LPDWORD pcchBufferSize __inout LPDWORD pcchBufferSize
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumMachinesHA( PdhEnumMachinesHA(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPSTR mszMachineLi st, __out_ecount_opt(* pcchBufferSize) PZZSTR mszMachineList,
__inout LPDWORD pcchBufferSize __inout LPDWORD pcchBufferSize
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectsHW( PdhEnumObjectsHW(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in_opt LPCWSTR szMachineName, __in_opt LPCWSTR szMachineName,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPWSTR mszObjectLis t, __out_ecount_opt(* pcchBufferSize) PZZWSTR mszObjectList,
__inout LPDWORD pcchBufferSize, __inout LPDWORD pcchBufferSize,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in BOOL bRefresh __in BOOL bRefresh
) ; ) ;
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectsHA( PdhEnumObjectsHA(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in_opt LPCSTR szMachineName, __in_opt LPCSTR szMachineName,
__out_ecount_opt(* pcchBufferSize)__nullnullterminated LPSTR mszObjectLis t, __out_ecount_opt(* pcchBufferSize) PZZSTR mszObjectList,
__inout LPDWORD pcchBufferSize, __inout LPDWORD pcchBufferSize,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in BOOL bRefresh __in BOOL bRefresh
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectItemsHW( PdhEnumObjectItemsHW(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in_opt LPCWSTR szMachineName, __in_opt LPCWSTR szMachineName,
__in LPCWSTR szObjectName, __in LPCWSTR szObjectName,
__out_ecount_opt(* pcchCounterListLength)__nullnullterminated LPWSTR mszCo unterList, __out_ecount_opt(* pcchCounterListLength) PZZWSTR mszCounterList,
__inout LPDWORD pcchCounterListLength, __inout LPDWORD pcchCounterListLength,
__out_ecount_opt(* pcchInstanceListLength)__nullnullterminated LPWSTR mszI nstanceList, __out_ecount_opt(* pcchInstanceListLength) PZZWSTR mszInstanceList,
__inout LPDWORD pcchInstanceListLength, __inout LPDWORD pcchInstanceListLength,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in DWORD dwFlags __in DWORD dwFlags
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumObjectItemsHA( PdhEnumObjectItemsHA(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in_opt LPCSTR szMachineName, __in_opt LPCSTR szMachineName,
__in LPCSTR szObjectName, __in LPCSTR szObjectName,
__out_ecount_opt(* pcchCounterListLength)__nullnullterminated LPSTR mszCo unterList, __out_ecount_opt(* pcchCounterListLength) PZZSTR mszCounterList,
__inout LPDWORD pcchCounterListLength, __inout LPDWORD pcchCounterListLength,
__out_ecount_opt(* pcchInstanceListLength)__nullnullterminated LPSTR mszI nstanceList, __out_ecount_opt(* pcchInstanceListLength) PZZSTR mszInstanceList,
__inout LPDWORD pcchInstanceListLength, __inout LPDWORD pcchInstanceListLength,
__in DWORD dwDetailLevel, __in DWORD dwDetailLevel,
__in DWORD dwFlags __in DWORD dwFlags
); );
PDH_FUNCTION PDH_FUNCTION
PdhExpandWildCardPathHW( PdhExpandWildCardPathHW(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in LPCWSTR szWildCardPath, __in LPCWSTR szWildCardPath,
__out_ecount_opt(* pcchPathListLength)__nullnullterminated LPWSTR mszExpan dedPathList, __out_ecount_opt(* pcchPathListLength) PZZWSTR mszExpandedPathList,
__inout LPDWORD pcchPathListLength, __inout LPDWORD pcchPathListLength,
__in DWORD dwFlags __in DWORD dwFlags
); );
PDH_FUNCTION PDH_FUNCTION
PdhExpandWildCardPathHA( PdhExpandWildCardPathHA(
__in_opt PDH_HLOG hDataSource, __in_opt PDH_HLOG hDataSource,
__in LPCSTR szWildCardPath, __in LPCSTR szWildCardPath,
__out_ecount_opt(* pcchPathListLength)__nullnullterminated LPSTR mszExpan dedPathList, __out_ecount_opt(* pcchPathListLength) PZZSTR mszExpandedPathList,
__inout LPDWORD pcchPathListLength, __inout LPDWORD pcchPathListLength,
__in DWORD dwFlags __in DWORD dwFlags
); );
__success(return == ERROR_SUCCESS) __success(return == ERROR_SUCCESS)
PDH_FUNCTION PDH_FUNCTION
PdhGetDataSourceTimeRangeH( PdhGetDataSourceTimeRangeH(
__inout_opt PDH_HLOG hDataSource, __inout_opt PDH_HLOG hDataSource,
__out LPDWORD pdwNumEntries, __out LPDWORD pdwNumEntries,
__out_bcount(* pdwBufferSize) PPDH_TIME_INFO pInfo, __out_bcount(* pdwBufferSize) PPDH_TIME_INFO pInfo,
skipping to change at line 1295 skipping to change at line 1295
PDH_FUNCTION PDH_FUNCTION
PdhCreateSQLTablesA( PdhCreateSQLTablesA(
__in LPCSTR szDataSource __in LPCSTR szDataSource
); );
//Return the list of Log set names in the database pointed to by the DSN. //Return the list of Log set names in the database pointed to by the DSN.
PDH_FUNCTION PDH_FUNCTION
PdhEnumLogSetNamesW( PdhEnumLogSetNamesW(
__in LPCWSTR szDataSource, __in LPCWSTR szDataSource,
__out_ecount_opt(* pcchBufferLength)__nullnullterminated LPWSTR mszDataSetN ameList, __out_ecount_opt(* pcchBufferLength) PZZWSTR mszDataSetNameList,
__inout LPDWORD pcchBufferLength __inout LPDWORD pcchBufferLength
); );
PDH_FUNCTION PDH_FUNCTION
PdhEnumLogSetNamesA( PdhEnumLogSetNamesA(
__in LPCSTR szDataSource, __in LPCSTR szDataSource,
__out_ecount_opt(* pcchBufferLength)__nullnullterminated LPSTR mszDataSetN ameList, __out_ecount_opt(* pcchBufferLength) PZZSTR mszDataSetNameList,
__inout LPDWORD pcchBufferLength __inout LPDWORD pcchBufferLength
); );
//Retrieve the GUID for an open Log Set //Retrieve the GUID for an open Log Set
PDH_FUNCTION PDH_FUNCTION
PdhGetLogSetGUID( PdhGetLogSetGUID(
__in PDH_HLOG hLog, __in PDH_HLOG hLog,
__out_opt GUID * pGuid, __out_opt GUID * pGuid,
__out_opt int * pRunId __out_opt int * pRunId
); );
skipping to change at line 1341 skipping to change at line 1341
#ifdef _UNICODE #ifdef _UNICODE
#ifndef UNICODE #ifndef UNICODE
#define UNICODE #define UNICODE
#endif #endif
#endif #endif
#ifdef UNICODE #ifdef UNICODE
// start of UNICODE definitions // start of UNICODE definitions
#define PdhOpenQuery PdhOpenQueryW #define PdhOpenQuery PdhOpenQueryW
#define PdhAddCounter PdhAddCounterW #define PdhAddCounter PdhAddCounterW
#if (_WIN32_WINDOWS >= 0x0600 || _WIN32_WINNT >= 0x0600 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_LONGHORN)) #if (_WIN32_WINDOWS >= 0x0600 || _WIN32_WINNT >= 0x0600 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_VISTA))
#define PdhAddEnglishCounter PdhAddEnglishCounterW #define PdhAddEnglishCounter PdhAddEnglishCounterW
#define PdhValidatePathEx PdhValidatePathExW #define PdhValidatePathEx PdhValidatePathExW
#endif #endif
#define PdhGetCounterInfo PdhGetCounterInfoW #define PdhGetCounterInfo PdhGetCounterInfoW
#define PDH_COUNTER_INFO PDH_COUNTER_INFO_W #define PDH_COUNTER_INFO PDH_COUNTER_INFO_W
#define PPDH_COUNTER_INFO PPDH_COUNTER_INFO_W #define PPDH_COUNTER_INFO PPDH_COUNTER_INFO_W
#define PdhConnectMachine PdhConnectMachineW #define PdhConnectMachine PdhConnectMachineW
#define PdhEnumMachines PdhEnumMachinesW #define PdhEnumMachines PdhEnumMachinesW
#define PdhEnumObjects PdhEnumObjectsW #define PdhEnumObjects PdhEnumObjectsW
#define PdhEnumObjectItems PdhEnumObjectItemsW #define PdhEnumObjectItems PdhEnumObjectItemsW
skipping to change at line 1404 skipping to change at line 1404
#define PdhCreateSQLTables PdhCreateSQLTablesW #define PdhCreateSQLTables PdhCreateSQLTablesW
#define PdhVerifySQLDB PdhVerifySQLDBW #define PdhVerifySQLDB PdhVerifySQLDBW
#define PdhLookupPerfIndexByName PdhLookupPerfIndexByNameW #define PdhLookupPerfIndexByName PdhLookupPerfIndexByNameW
#endif #endif
// end of UNICODE definitions // end of UNICODE definitions
#else #else
// start of ANSI definitions // start of ANSI definitions
#define PdhOpenQuery PdhOpenQueryA #define PdhOpenQuery PdhOpenQueryA
#define PdhAddCounter PdhAddCounterA #define PdhAddCounter PdhAddCounterA
#if (_WIN32_WINDOWS >= 0x0600 || _WINNT_WINNT >= 0x0600 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_LONGHORN)) #if (_WIN32_WINDOWS >= 0x0600 || _WINNT_WINNT >= 0x0600 || (defined(NTDDI_VERSIO N) && NTDDI_VERSION >= NTDDI_VISTA))
#define PdhAddEnglishCounter PdhAddEnglishCounterA #define PdhAddEnglishCounter PdhAddEnglishCounterA
#define PdhValidatePathEx PdhValidatePathExA #define PdhValidatePathEx PdhValidatePathExA
#endif #endif
#define PdhGetCounterInfo PdhGetCounterInfoA #define PdhGetCounterInfo PdhGetCounterInfoA
#define PDH_COUNTER_INFO PDH_COUNTER_INFO_A #define PDH_COUNTER_INFO PDH_COUNTER_INFO_A
#define PPDH_COUNTER_INFO PPDH_COUNTER_INFO_A #define PPDH_COUNTER_INFO PPDH_COUNTER_INFO_A
#define PdhConnectMachine PdhConnectMachineA #define PdhConnectMachine PdhConnectMachineA
#define PdhEnumMachines PdhEnumMachinesA #define PdhEnumMachines PdhEnumMachinesA
#define PdhEnumObjects PdhEnumObjectsA #define PdhEnumObjects PdhEnumObjectsA
#define PdhEnumObjectItems PdhEnumObjectItemsA #define PdhEnumObjectItems PdhEnumObjectItemsA
 End of changes. 27 change blocks. 
27 lines changed or deleted 27 lines changed or added

This html diff was produced by rfcdiff 1.41.