[cwittich] 45824: [PDH] sync pdh to wine 1.1.39

Author: cwittich
Date: Thu Mar  4 13:21:55 2010
New Revision: 45824

URL: http://svn.reactos.org/svn/reactos?rev=45824&view=rev
Log:
[PDH]
sync pdh to wine 1.1.39

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

Modified: trunk/reactos/dll/win32/pdh/pdh.spec
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh.spec?rev=...
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh.spec [iso-8859-1] Thu Mar  4 13:21:55 2010
@@ -38,10 +38,10 @@
 @ stub PdhEnumObjectsW
 @ stub PdhExpandCounterPathA
 @ stub PdhExpandCounterPathW
-@ stub PdhExpandWildCardPathA
+@ stdcall PdhExpandWildCardPathA(str str ptr ptr long)
 @ stub PdhExpandWildCardPathHA
 @ stub PdhExpandWildCardPathHW
-@ stub PdhExpandWildCardPathW
+@ stdcall PdhExpandWildCardPathW(wstr wstr ptr ptr long)
 @ stub PdhFormatFromRawValue
 @ stdcall PdhGetCounterInfoA(ptr long ptr ptr)
 @ stdcall PdhGetCounterInfoW(ptr long ptr ptr)
@@ -57,7 +57,7 @@
 @ stub PdhGetDefaultPerfObjectHA
 @ stub PdhGetDefaultPerfObjectHW
 @ stub PdhGetDefaultPerfObjectW
-@ stub PdhGetDllVersion
+@ stdcall PdhGetDllVersion(ptr)
 @ stub PdhGetFormattedCounterArrayA
 @ stub PdhGetFormattedCounterArrayW
 @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr)
@@ -127,7 +127,7 @@
 @ stub PdhSelectDataSourceA
 @ stub PdhSelectDataSourceW
 @ stdcall PdhSetCounterScaleFactor(ptr long)
-@ stub PdhSetDefaultRealTimeDataSource
+@ stdcall PdhSetDefaultRealTimeDataSource(long)
 @ stub PdhSetLogSetRunID
 @ stub PdhSetQueryTimeRange
 @ stub PdhTranslate009CounterA

Modified: trunk/reactos/dll/win32/pdh/pdh_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?re...
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh_main.c [iso-8859-1] Thu Mar  4 13:21:55 2010
@@ -600,6 +600,24 @@
 }

/***********************************************************************
+ *              PdhExpandWildCardPathA   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhExpandWildCardPathA( LPCSTR szDataSource, LPCSTR szWildCardPath, LPSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags )
+{
+    FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_a(szDataSource), debugstr_a(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags);
+    return PDH_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *              PdhExpandWildCardPathW   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhExpandWildCardPathW( LPCWSTR szDataSource, LPCWSTR szWildCardPath, LPWSTR mszExpandedPathList, LPDWORD pcchPathListLength, DWORD dwFlags )
+{
+    FIXME("%s, %s, %p, %p, 0x%x: stub\n", debugstr_w(szDataSource), debugstr_w(szWildCardPath), mszExpandedPathList, pcchPathListLength, dwFlags);
+    return PDH_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
  *              PdhGetCounterInfoA   (PDH.@)
  */
 PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size, PPDH_COUNTER_INFO_A info )
@@ -704,6 +722,19 @@
     *base = counter->base;

LeaveCriticalSection( &pdh_handle_cs );
+    return ERROR_SUCCESS;
+}
+
+/***********************************************************************
+ *              PdhGetDllVersion   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhGetDllVersion( LPDWORD version )
+{
+    if (!version)
+        return PDH_INVALID_ARGUMENT;
+
+    *version = PDH_VERSION;
+
     return ERROR_SUCCESS;
 }

@@ -1193,3 +1224,12 @@

return PDH_NOT_IMPLEMENTED;
 }
+
+/***********************************************************************
+ *              PdhSetDefaultRealTimeDataSource   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source )
+{
+    FIXME("%u\n", source);
+    return ERROR_SUCCESS;
+}

Modified: trunk/reactos/include/psdk/pdh.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/pdh.h?rev=4582...
==============================================================================
--- trunk/reactos/include/psdk/pdh.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/pdh.h [iso-8859-1] Thu Mar  4 13:21:55 2010
@@ -37,6 +37,10 @@
 typedef HANDLE PDH_HCOUNTER;
 typedef HANDLE PDH_HLOG;

+#define PDH_CVERSION_WIN40  0x0400
+#define PDH_CVERSION_WIN50  0x0500
+#define PDH_VERSION         0x0503
+
 #define PDH_MAX_SCALE 7
 #define PDH_MIN_SCALE (-7)

@@ -48,6 +52,10 @@
 #define PDH_FMT_NOSCALE     0x00001000
 #define PDH_FMT_1000        0x00002000
 #define PDH_FMT_NOCAP100    0x00008000
+
+#define DATA_SOURCE_REGISTRY    0x00000001
+#define DATA_SOURCE_LOGFILE     0x00000002
+#define DATA_SOURCE_WBEM        0x00000004

typedef struct _PDH_FMT_COUNTERVALUE
 {
@@ -182,6 +190,7 @@
 PDH_STATUS WINAPI PdhGetCounterInfoW(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTER_INFO_W);
 #define    PdhGetCounterInfo WINELIB_NAME_AW(PdhGetCounterInfo)
 PDH_STATUS WINAPI PdhGetCounterTimeBase(PDH_HCOUNTER, LONGLONG *);
+PDH_STATUS WINAPI PdhGetDllVersion(LPDWORD);
 PDH_STATUS WINAPI PdhGetFormattedCounterValue(PDH_HCOUNTER, DWORD, LPDWORD, PPDH_FMT_COUNTERVALUE);
 PDH_STATUS WINAPI PdhGetRawCounterValue(PDH_HCOUNTER, LPDWORD, PPDH_RAW_COUNTER);
 PDH_STATUS WINAPI PdhLookupPerfIndexByNameA(LPCSTR, LPCSTR, LPDWORD);
@@ -198,6 +207,7 @@
 #define    PdhOpenQuery WINELIB_NAME_AW(PdhOpenQuery)
 PDH_STATUS WINAPI PdhRemoveCounter(PDH_HCOUNTER);
 PDH_STATUS WINAPI PdhSetCounterScaleFactor(PDH_HCOUNTER, LONG);
+PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource(DWORD);
 PDH_STATUS WINAPI PdhValidatePathA(LPCSTR);
 PDH_STATUS WINAPI PdhValidatePathW(LPCWSTR);
 #define    PdhValidatePath WINELIB_NAME_AW(PdhValidatePath)