From cb8297623a8277d3acd039596ac420a83669a753 Mon Sep 17 00:00:00 2001 From: Ricardo Filipe Date: Tue, 27 Jan 2009 16:39:32 +0000 Subject: [PATCH] pdh: Add stub for EdhEnumObjectItemsA/W. --- dlls/pdh/pdh.spec | 4 ++-- dlls/pdh/pdh_main.c | 28 ++++++++++++++++++++++++++++ include/pdh.h | 3 +++ include/pdhmsg.h | 1 + 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec index ad46f402c96..0e1ea84ef38 100644 --- a/dlls/pdh/pdh.spec +++ b/dlls/pdh/pdh.spec @@ -28,10 +28,10 @@ @ stub PdhEnumMachinesHA @ stub PdhEnumMachinesHW @ stub PdhEnumMachinesW -@ stub PdhEnumObjectItemsA +@ stdcall PdhEnumObjectItemsA(str str str ptr ptr ptr ptr long long) @ stub PdhEnumObjectItemsHA @ stub PdhEnumObjectItemsHW -@ stub PdhEnumObjectItemsW +@ stdcall PdhEnumObjectItemsW(wstr wstr wstr ptr ptr ptr ptr long long) @ stub PdhEnumObjectsA @ stub PdhEnumObjectsHA @ stub PdhEnumObjectsHW diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c index 423f033aed1..4a32cf5bbda 100644 --- a/dlls/pdh/pdh_main.c +++ b/dlls/pdh/pdh_main.c @@ -1059,3 +1059,31 @@ PDH_STATUS WINAPI PdhValidatePathExW( PDH_HLOG source, LPCWSTR path ) } return PdhValidatePathW( path ); } + +/*********************************************************************** + * PdhEnumObjectItemsA (PDH.@) + */ +PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR szDataSource, LPCSTR szMachineName, LPCSTR szObjectName, + LPSTR mszCounterList, LPDWORD pcchCounterListLength, LPSTR mszInstanceList, + LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) +{ + FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szMachineName), + debugstr_a(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, + pcchInstanceListLength, dwDetailLevel, dwFlags); + + return PDH_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * PdhEnumObjectItemsW (PDH.@) + */ +PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineName, LPCWSTR szObjectName, + LPWSTR mszCounterList, LPDWORD pcchCounterListLength, LPWSTR mszInstanceList, + LPDWORD pcchInstanceListLength, DWORD dwDetailLevel, DWORD dwFlags) +{ + FIXME("%s, %s, %s, %p, %p, %p, %p, %d, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szMachineName), + debugstr_w(szObjectName), mszCounterList, pcchCounterListLength, mszInstanceList, + pcchInstanceListLength, dwDetailLevel, dwFlags); + + return PDH_NOT_IMPLEMENTED; +} diff --git a/include/pdh.h b/include/pdh.h index 7018247e5bc..082f5ccea94 100644 --- a/include/pdh.h +++ b/include/pdh.h @@ -175,6 +175,9 @@ PDH_STATUS WINAPI PdhCloseQuery(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryData(PDH_HQUERY); PDH_STATUS WINAPI PdhCollectQueryDataEx(PDH_HQUERY, DWORD, HANDLE); PDH_STATUS WINAPI PdhCollectQueryDataWithTime(PDH_HQUERY,LONGLONG *); +PDH_STATUS WINAPI PdhEnumObjectItemsA(LPCSTR, LPCSTR, LPCSTR, LPSTR, LPDWORD, LPSTR, LPDWORD, DWORD, DWORD); +PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR, LPCWSTR, LPCWSTR, LPWSTR, LPDWORD, LPWSTR, LPDWORD, DWORD, DWORD); +#define PdhEnumObjectItems WINELIB_NAME_AW(PdhEnumObjectItems) PDH_STATUS WINAPI PdhGetCounterInfoA(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_A); PDH_STATUS WINAPI PdhGetCounterInfoW(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_W); #define PdhGetCounterInfo WINELIB_NAME_AW(PdhGetCounterInfo) diff --git a/include/pdhmsg.h b/include/pdhmsg.h index bee466e228c..f5bcbb38d0a 100644 --- a/include/pdhmsg.h +++ b/include/pdhmsg.h @@ -33,6 +33,7 @@ #define PDH_CSTATUS_BAD_COUNTERNAME 0xc0000bc0 #define PDH_INSUFFICIENT_BUFFER 0xc0000bc2 #define PDH_INVALID_DATA 0xc0000bc6 +#define PDH_NOT_IMPLEMENTED 0xc0000bd3 #define PDH_STRING_NOT_FOUND 0xc0000bd4 #endif /* _PDH_MSG_H_ */