system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-14 18:07:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel32: Moved GetPerformanceInfo implementation to kernel32.

Browse source
This commit is contained in:
Jacek Caban 2011-05-16 15:19:48 +02:00 committed by Alexandre Julliard
parent 595521bc95
commit e4ffd1f834
5 changed files with 22 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/kernel32/cpu.c
View file

@ -38,6 +38,7 @@
#include "winbase.h"
#include "winnt.h"
#include "winternl.h"
#include "psapi.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "ddk/wdm.h"
@ -207,3 +208,22 @@ BOOL WINAPI IsProcessorFeaturePresent (
else
return FALSE;
}
/***********************************************************************
* K32GetPerformanceInfo (KERNEL32.@)
*/
BOOL WINAPI K32GetPerformanceInfo(PPERFORMANCE_INFORMATION info, DWORD size)
{
NTSTATUS status;
TRACE( "(%p, %d)\n", info, size );
status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL );
if (status)
{
SetLastError( RtlNtStatusToDosError( status ) );
return FALSE;
}
return TRUE;
}

1
dlls/kernel32/kernel32.spec
View file

@ -786,6 +786,7 @@
@ stdcall K32GetModuleFileNameExA(long long ptr long)
@ stdcall K32GetModuleFileNameExW(long long ptr long)
@ stdcall K32GetModuleInformation(long long ptr long)
@ stdcall K32GetPerformanceInfo(ptr long)
@ stdcall K32GetProcessMemoryInfo(long ptr long)
@ stdcall K32GetWsChanges(long ptr long)
@ stdcall K32InitializeProcessForWsWatch(long)

3
dlls/psapi/Makefile.in
View file

@ -1,9 +1,6 @@
MODULE = psapi.dll
IMPORTLIB = psapi
C_SRCS = \
psapi_main.c
RC_SRCS = version.rc
@MAKE_DLL_RULES@

2
dlls/psapi/psapi.spec
View file

@ -15,7 +15,7 @@
@ stdcall GetModuleFileNameExA(long long ptr long) kernel32.K32GetModuleFileNameExA
@ stdcall GetModuleFileNameExW(long long ptr long) kernel32.K32GetModuleFileNameExW
@ stdcall GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation
@ stdcall GetPerformanceInfo(ptr long)
@ stdcall GetPerformanceInfo(ptr long) kernel32.K32GetPerformanceInfo
@ stdcall GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA
@ stdcall GetProcessImageFileNameW(long ptr long) kernel32.K32GetProcessImageFileNameW
@ stdcall GetProcessMemoryInfo(long ptr long) kernel32.K32GetProcessMemoryInfo

55
dlls/psapi/psapi_main.c
View file

@ -1,55 +0,0 @@
/*
* PSAPI library
*
* Copyright 1998 Patrik Stridvall
* Copyright 2003 Eric Pouech
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdarg.h>
#include "ntstatus.h"
#define WIN32_NO_STATUS
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "wine/unicode.h"
#include "wine/debug.h"
#include "winnls.h"
#include "winternl.h"
#include "psapi.h"
WINE_DEFAULT_DEBUG_CHANNEL(psapi);
/***********************************************************************
* GetPerformanceInfo (PSAPI.@)
*/
BOOL WINAPI GetPerformanceInfo( PPERFORMANCE_INFORMATION info, DWORD size )
{
NTSTATUS status;
TRACE( "(%p, %d)\n", info, size );
status = NtQuerySystemInformation( SystemPerformanceInformation, info, size, NULL );
if (status)
{
SetLastError( RtlNtStatusToDosError( status ) );
return FALSE;
}
return TRUE;
}