[PDH] Sync with Wine Staging 1.9.4. CORE-10912

svn path=/trunk/; revision=70907

diff --git a/reactos/dll/win32/pdh/pdh.spec b/reactos/dll/win32/pdh/pdh.spec
index fc1aa4f..72e6fa3 100644 (file)
--- a/reactos/dll/win32/pdh/pdh.spec
+++ b/reactos/dll/win32/pdh/pdh.spec
@@ -5,8 +5,8 @@
 @ stdcall PdhAddCounterW(ptr wstr long ptr)
 @ stdcall PdhAddEnglishCounterA(ptr str long ptr)
 @ stdcall PdhAddEnglishCounterW(ptr wstr long ptr)
 @ stdcall PdhAddCounterW(ptr wstr long ptr)
 @ stdcall PdhAddEnglishCounterA(ptr str long ptr)
 @ stdcall PdhAddEnglishCounterW(ptr wstr long ptr)

-@ stub PdhBindInputDataSourceA
-@ stub PdhBindInputDataSourceW
+@ stdcall PdhBindInputDataSourceA(ptr str)
+@ stdcall PdhBindInputDataSourceW(ptr wstr)

 @ stub PdhBrowseCountersA
 @ stub PdhBrowseCountersHA
 @ stub PdhBrowseCountersHW
 @ stub PdhBrowseCountersA
 @ stub PdhBrowseCountersHA
 @ stub PdhBrowseCountersHW


@@ -62,8 +62,8 @@
 @ stub PdhGetFormattedCounterArrayW
 @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr)
 @ stub PdhGetLogFileSize
 @ stub PdhGetFormattedCounterArrayW
 @ stdcall PdhGetFormattedCounterValue(ptr long ptr ptr)
 @ stub PdhGetLogFileSize

-@ stub PdhGetLogFileTypeA
-@ stub PdhGetLogFileTypeW
+@ stdcall PdhGetLogFileTypeA(str ptr)
+@ stdcall PdhGetLogFileTypeW(wstr ptr)

 @ stub PdhGetLogSetGUID
 @ stub PdhGetRawCounterArrayA
 @ stub PdhGetRawCounterArrayW
 @ stub PdhGetLogSetGUID
 @ stub PdhGetRawCounterArrayA
 @ stub PdhGetRawCounterArrayW

diff --git a/reactos/dll/win32/pdh/pdh_main.c b/reactos/dll/win32/pdh/pdh_main.c
index f409512..c4b2bd9 100644 (file)
--- a/reactos/dll/win32/pdh/pdh_main.c
+++ b/reactos/dll/win32/pdh/pdh_main.c
@@ -1271,3 +1271,39 @@ PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source )
     FIXME("%u\n", source);
     return ERROR_SUCCESS;
 }
     FIXME("%u\n", source);
     return ERROR_SUCCESS;
 }

+
+/***********************************************************************
+ *              PdhGetLogFileTypeA   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhGetLogFileTypeA(const char *log, DWORD *type)
+{
+    FIXME("%s, %p: stub\n", debugstr_a(log), type);
+    return PDH_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *              PdhGetLogFileTypeW   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhGetLogFileTypeW(const WCHAR *log, DWORD *type)
+{
+    FIXME("%s, %p: stub\n", debugstr_w(log), type);
+    return PDH_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *              PdhBindInputDataSourceA   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhBindInputDataSourceA(PDH_HLOG *source, const char *filenamelist)
+{
+    FIXME("%p %s: stub\n", source, debugstr_a(filenamelist));
+    return PDH_NOT_IMPLEMENTED;
+}
+
+/***********************************************************************
+ *              PdhBindInputDataSourceW   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhBindInputDataSourceW(PDH_HLOG *source, const WCHAR *filenamelist)
+{
+    FIXME("%p %s: stub\n", source, debugstr_w(filenamelist));
+    return PDH_NOT_IMPLEMENTED;
+}

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index ae21da6..4655f0a 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -150,7 +150,7 @@ reactos/dll/win32/oledlg              # Synced to WineStaging-1.9.4
 reactos/dll/win32/olepro32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/olesvr32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/olethk32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/olepro32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/olesvr32            # Synced to WineStaging-1.7.55
 reactos/dll/win32/olethk32            # Synced to WineStaging-1.7.55

-reactos/dll/win32/pdh                 # Synced to WineStaging-1.7.55
+reactos/dll/win32/pdh                 # Synced to WineStaging-1.9.4

 reactos/dll/win32/pidgen              # Synced to WineStaging-1.7.55
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-1.7.55
 reactos/dll/win32/pidgen              # Synced to WineStaging-1.7.55
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to WineStaging-1.7.55