commit cb8297623a8277d3acd039596ac420a83669a753
author Ricardo Filipe <ricardo_barbano@hotmail.com> Tue Jan 27 16:39:32 2009 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 28 13:47:07 2009 +0100
tree 0421f83dc013619cf0a67fc64ab9b9d13f6872b2
parent 141dcff4412faa564a61f76ca8edef230a01917b

pdh: Add stub for EdhEnumObjectItemsA/W.

dlls/pdh/pdh.spec

diff --git a/dlls/pdh/pdh.spec b/dlls/pdh/pdh.spec
index ad46f40..0e1ea84 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

dlls/pdh/pdh_main.c

diff --git a/dlls/pdh/pdh_main.c b/dlls/pdh/pdh_main.c
index 423f033..4a32cf5 100644
--- a/dlls/pdh/pdh_main.c
+++ b/dlls/pdh/pdh_main.c
@@ -1059,3 +1059,31 @@
     }
     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;
+}

include/pdh.h

diff --git a/include/pdh.h b/include/pdh.h
index 7018247..082f5cc 100644
--- a/include/pdh.h
+++ b/include/pdh.h
@@ -175,6 +175,9 @@
 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)

include/pdhmsg.h

diff --git a/include/pdhmsg.h b/include/pdhmsg.h
index bee466e..f5bcbb3 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_ */