Gerald Pfeifer : taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a9742b3210c4cec67aca3c0012f3b9504a4368cf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a9742b3210c4cec67aca3c0012...

Author: Gerald Pfeifer 
Date:   Thu Nov 15 14:06:59 2007 +0100

taskmgr: Move out-of-domain checking into PerfDataGetProcessorUsage() and PerfDataGetProcessorSystemUsage().

---

programs/taskmgr/perfdata.c |    8 ++++++++
 programs/taskmgr/perfpage.c |    4 ----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/programs/taskmgr/perfdata.c b/programs/taskmgr/perfdata.c
index 611990f..3a32fa2 100644
--- a/programs/taskmgr/perfdata.c
+++ b/programs/taskmgr/perfdata.c
@@ -332,11 +332,19 @@ ULONG PerfDataGetProcessCount(void)

ULONG PerfDataGetProcessorUsage(void)
 {
+    if( dbIdleTime < 0.0 )
+        return 0;
+    if( dbIdleTime > 100.0 )
+        return 100;
     return (ULONG)dbIdleTime;
 }

ULONG PerfDataGetProcessorSystemUsage(void)
 {
+    if( dbKernelTime < 0.0 )
+        return 0;
+    if( dbKernelTime > 100.0 )
+        return 100;
     return (ULONG)dbKernelTime;
 }

diff --git a/programs/taskmgr/perfpage.c b/programs/taskmgr/perfpage.c
index 7b30994..11220e6 100644
--- a/programs/taskmgr/perfpage.c
+++ b/programs/taskmgr/perfpage.c
@@ -234,10 +234,6 @@ static DWORD WINAPI PerformancePageRefreshThread(void *lpParameter)
                          */
                         CpuUsage = PerfDataGetProcessorUsage();
                         CpuKernelUsage = PerfDataGetProcessorSystemUsage();
-                        if (CpuUsage < 0 )        CpuUsage = 0;
-                        if (CpuUsage > 100)       CpuUsage = 100;
-                        if (CpuKernelUsage < 0)   CpuKernelUsage = 0;
-                        if (CpuKernelUsage > 100) CpuKernelUsage = 100;

/*
                          *  Get the memory usage