Jacek Caban : kernel32: Moved GetPerformanceInfo implementation to kernel32 .
Alexandre Julliard
julliard at winehq.org
Mon May 16 11:36:51 CDT 2011
Module: wine
Branch: master
Commit: e4ffd1f834cb2a237670f0c3f550fbdd093c1d3f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ffd1f834cb2a237670f0c3f550fbdd093c1d3f
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon May 16 15:19:48 2011 +0200
kernel32: Moved GetPerformanceInfo implementation to kernel32.
---
dlls/kernel32/cpu.c | 20 +++++++++++++++
dlls/kernel32/kernel32.spec | 1 +
dlls/psapi/Makefile.in | 3 --
dlls/psapi/psapi.spec | 2 +-
dlls/psapi/psapi_main.c | 55 -------------------------------------------
5 files changed, 22 insertions(+), 59 deletions(-)
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
index 6594450..5d45941 100644
--- a/dlls/kernel32/cpu.c
+++ b/dlls/kernel32/cpu.c
@@ -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;
+}
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index e144fd6..ee4b966 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -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)
diff --git a/dlls/psapi/Makefile.in b/dlls/psapi/Makefile.in
index afdc90a..7d5cd60 100644
--- a/dlls/psapi/Makefile.in
+++ b/dlls/psapi/Makefile.in
@@ -1,9 +1,6 @@
MODULE = psapi.dll
IMPORTLIB = psapi
-C_SRCS = \
- psapi_main.c
-
RC_SRCS = version.rc
@MAKE_DLL_RULES@
diff --git a/dlls/psapi/psapi.spec b/dlls/psapi/psapi.spec
index 844c761..45a1325 100644
--- a/dlls/psapi/psapi.spec
+++ b/dlls/psapi/psapi.spec
@@ -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
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
deleted file mode 100644
index 17f408d..0000000
--- a/dlls/psapi/psapi_main.c
+++ /dev/null
@@ -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;
-}
More information about the wine-cvs
mailing list