[ros-diffs] [cwittich] 39272: sync pdh with wine 1.1.14

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sun Feb  1 11:20:58 2009
New Revision: 39272

URL: http://svn.reactos.org/svn/reactos?rev=39272&view=rev
Log:
sync pdh with wine 1.1.14

Modified:
    trunk/reactos/dll/win32/pdh/pdh.spec
    trunk/reactos/dll/win32/pdh/pdh_main.c
    trunk/reactos/include/psdk/pdh.h
    trunk/reactos/include/psdk/pdhmsg.h

Modified: trunk/reactos/dll/win32/pdh/pdh.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev=39272&r1=39271&r2=39272&view=diff
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Sun Feb  1 11:20:58 2009
@@ -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

Modified: trunk/reactos/dll/win32/pdh/pdh_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?rev=39272&r1=39271&r2=39272&view=diff
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Sun Feb  1 11:20:58 2009
@@ -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;
+}

Modified: trunk/reactos/include/psdk/pdh.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdh.h?rev=39272&r1=39271&r2=39272&view=diff
==============================================================================
--- trunk/reactos/include/psdk/pdh.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/pdh.h [iso-8859-1] Sun Feb  1 11:20:58 2009
@@ -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)

Modified: trunk/reactos/include/psdk/pdhmsg.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdhmsg.h?rev=39272&r1=39271&r2=39272&view=diff
==============================================================================
--- trunk/reactos/include/psdk/pdhmsg.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/pdhmsg.h [iso-8859-1] Sun Feb  1 11:20:58 2009
@@ -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_ */