[ros-diffs] [akhaldi] 64568: [PDH] * Sync with Wine 1.7.27. CORE-8540

Author: akhaldi
Date: Mon Oct  6 18:37:50 2014
New Revision: 64568

URL: http://svn.reactos.org/svn/reactos?rev=64568&view=rev
Log:
[PDH]
* Sync with Wine 1.7.27.
CORE-8540

Modified:
    trunk/reactos/dll/win32/pdh/pdh.spec
    trunk/reactos/dll/win32/pdh/pdh_main.c
    trunk/reactos/media/doc/README.WINE

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] Mon Oct  6 18:37:50 2014
@@ -36,8 +36,8 @@
 @ stub PdhEnumObjectsHA
 @ stub PdhEnumObjectsHW
 @ stub PdhEnumObjectsW
-@ stub PdhExpandCounterPathA
-@ stub PdhExpandCounterPathW
+@ stdcall PdhExpandCounterPathA(str ptr ptr)
+@ stdcall PdhExpandCounterPathW(wstr ptr ptr)
 @ stdcall PdhExpandWildCardPathA(str str ptr ptr long)
 @ stub PdhExpandWildCardPathHA
 @ stub PdhExpandWildCardPathHW

Modified: trunk/reactos/dll/win32/pdh/pdh_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/pdh/pdh_main.c?r…
==============================================================================
--- trunk/reactos/dll/win32/pdh/pdh_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/pdh/pdh_main.c	[iso-8859-1] Mon Oct  6 18:37:50 2014
@@ -638,6 +638,24 @@
 }
 
 /***********************************************************************
+ *              PdhExpandCounterPathA   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhExpandCounterPathA( LPCSTR szWildCardPath, LPSTR
mszExpandedPathList, LPDWORD pcchPathListLength )
+{
+    FIXME("%s, %p, %p: stub\n", debugstr_a(szWildCardPath),
mszExpandedPathList, pcchPathListLength);
+    return PdhExpandWildCardPathA(NULL, szWildCardPath, mszExpandedPathList,
pcchPathListLength, 0);
+}
+
+/***********************************************************************
+ *              PdhExpandCounterPathW   (PDH.@)
+ */
+PDH_STATUS WINAPI PdhExpandCounterPathW( LPCWSTR szWildCardPath, LPWSTR
mszExpandedPathList, LPDWORD pcchPathListLength )
+{
+    FIXME("%s, %p, %p: stub\n", debugstr_w(szWildCardPath),
mszExpandedPathList, pcchPathListLength);
+    return PdhExpandWildCardPathW(NULL, szWildCardPath, mszExpandedPathList,
pcchPathListLength, 0);
+}
+
+/***********************************************************************
  *              PdhGetCounterInfoA   (PDH.@)
  */
 PDH_STATUS WINAPI PdhGetCounterInfoA( PDH_HCOUNTER handle, BOOLEAN text, LPDWORD size,
PPDH_COUNTER_INFO_A info )

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Oct  6 18:37:50 2014
@@ -158,7 +158,7 @@
 reactos/dll/win32/olepro32            # Synced to Wine-1.7.17
 reactos/dll/win32/olesvr32            # Synced to Wine-1.7.17
 reactos/dll/win32/olethk32            # Synced to Wine-1.7.17
-reactos/dll/win32/pdh                 # Synced to Wine-1.7.17
+reactos/dll/win32/pdh                 # Synced to Wine-1.7.27
 reactos/dll/win32/pidgen              # Synced to Wine-1.7.17
 reactos/dll/win32/powrprof            # Forked at Wine-1.0rc5
 reactos/dll/win32/printui             # Synced to Wine-1.7.17