sync pdh to wine 1.1.39

svn path=/trunk/; revision=45824
This commit is contained in:
Christoph von Wittich 2010-03-04 12:21:55 +00:00
parent 97f9d48ec3
commit 666d517053
3 changed files with 54 additions and 4 deletions

View file

@ -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

View file

@ -599,6 +599,24 @@ PDH_STATUS WINAPI PdhCollectQueryDataWithTime( PDH_HQUERY handle, LONGLONG *time
return ERROR_SUCCESS;
}
/***********************************************************************
* 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.@)
*/
@ -707,6 +725,19 @@ PDH_STATUS WINAPI PdhGetCounterTimeBase( PDH_HCOUNTER handle, LONGLONG *base )
return ERROR_SUCCESS;
}
/***********************************************************************
* PdhGetDllVersion (PDH.@)
*/
PDH_STATUS WINAPI PdhGetDllVersion( LPDWORD version )
{
if (!version)
return PDH_INVALID_ARGUMENT;
*version = PDH_VERSION;
return ERROR_SUCCESS;
}
/***********************************************************************
* PdhGetFormattedCounterValue (PDH.@)
*/
@ -1193,3 +1224,12 @@ PDH_STATUS WINAPI PdhEnumObjectItemsW(LPCWSTR szDataSource, LPCWSTR szMachineNam
return PDH_NOT_IMPLEMENTED;
}
/***********************************************************************
* PdhSetDefaultRealTimeDataSource (PDH.@)
*/
PDH_STATUS WINAPI PdhSetDefaultRealTimeDataSource( DWORD source )
{
FIXME("%u\n", source);
return ERROR_SUCCESS;
}

View file

@ -37,6 +37,10 @@ typedef HANDLE PDH_HQUERY;
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)
@ -49,6 +53,10 @@ typedef HANDLE PDH_HLOG;
#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
{
DWORD CStatus;
@ -182,6 +190,7 @@ PDH_STATUS WINAPI PdhGetCounterInfoA(PDH_HCOUNTER, BOOLEAN, LPDWORD, PPDH_COUNTE
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 @@ PDH_STATUS WINAPI PdhOpenQueryW(LPCWSTR, DWORD_PTR, PDH_HQUERY *);
#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)