[ros-diffs] [cfinck] 30306: Silence some warnings when compiling taskmgr with MSVC2005

Author: cfinck
Date: Fri Nov  9 22:46:01 2007
New Revision: 30306

URL: http://svn.reactos.org/svn/reactos?rev=30306&view=rev
Log:
Silence some warnings when compiling taskmgr with MSVC2005

Modified:
    trunk/reactos/base/applications/taskmgr/column.c
    trunk/reactos/base/applications/taskmgr/dbgchnl.c
    trunk/reactos/base/applications/taskmgr/perfdata.c
    trunk/reactos/base/applications/taskmgr/perfpage.c
    trunk/reactos/base/applications/taskmgr/precomp.h

Modified: trunk/reactos/base/applications/taskmgr/column.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/c...
==============================================================================
--- trunk/reactos/base/applications/taskmgr/column.c (original)
+++ trunk/reactos/base/applications/taskmgr/column.c Fri Nov  9 22:46:01 2007
@@ -105,7 +105,7 @@
 void SaveColumnSettings(void)
 {
     HDITEM        hditem;
-    unsigned int  i, n;
+    int           i, n;
     WCHAR         text[260];
     LRESULT       size;

@@ -121,7 +121,7 @@
     SendMessageW(hProcessPageHeaderCtrl, HDM_GETORDERARRAY, (WPARAM) size, (LPARAM) &TaskManagerSettings.ColumnOrderArray);

/* Get visible columns */
-    for (i=0; i<SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) {
+    for (i = 0; i < SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEMCOUNT, 0, 0); i++) {
         memset(&hditem, 0, sizeof(HDITEM));

hditem.mask = HDI_TEXT|HDI_WIDTH;
@@ -130,7 +130,7 @@

SendMessageW(hProcessPageHeaderCtrl, HDM_GETITEM, i, (LPARAM) &hditem);

-        for (n=0; n<COLUMN_NMAX; n++) {
+        for (n = 0; n < COLUMN_NMAX; n++) {
             LoadStringW(hInst, ColumnPresets[n].dwIdsName, szTemp, sizeof(szTemp)/sizeof(WCHAR));
             if (_wcsicmp(text, szTemp) == 0)
             {

Modified: trunk/reactos/base/applications/taskmgr/dbgchnl.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/d...
==============================================================================
--- trunk/reactos/base/applications/taskmgr/dbgchnl.c (original)
+++ trunk/reactos/base/applications/taskmgr/dbgchnl.c Fri Nov  9 22:46:01 2007
@@ -237,7 +237,7 @@
     void*                     buf_addr;
     WCHAR                     buffer[32];
     void*                     addr;
-    const WCHAR**             cache = NULL;
+    WCHAR**                   cache = NULL;
     unsigned                  i, j, num_cache, used_cache;

addr = get_symbol(hProcess, "first_dll", "libwine.so");

Modified: trunk/reactos/base/applications/taskmgr/perfdata.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/p...
==============================================================================
--- trunk/reactos/base/applications/taskmgr/perfdata.c (original)
+++ trunk/reactos/base/applications/taskmgr/perfdata.c Fri Nov  9 22:46:01 2007
@@ -386,7 +386,8 @@

int PerfGetIndexByProcessId(DWORD dwProcessId)
 {
-    int Index, FoundIndex = -1;
+    int FoundIndex = -1;
+    ULONG Index;

EnterCriticalSection(&PerfDataCriticalSection);

Modified: trunk/reactos/base/applications/taskmgr/perfpage.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/p...
==============================================================================
--- trunk/reactos/base/applications/taskmgr/perfpage.c (original)
+++ trunk/reactos/base/applications/taskmgr/perfpage.c Fri Nov  9 22:46:01 2007
@@ -441,8 +441,8 @@
             /*
              *  Get the memory usage
              */
-            CommitChargeTotal = (ULONGLONG)PerfDataGetCommitChargeTotalK();
-            CommitChargeLimit = (ULONGLONG)PerfDataGetCommitChargeLimitK();
+            CommitChargeTotal = PerfDataGetCommitChargeTotalK();
+            CommitChargeLimit = PerfDataGetCommitChargeLimitK();
             nBarsUsed1 = CommitChargeLimit ? ((CommitChargeTotal * 100) / CommitChargeLimit) : 0;

PhysicalMemoryTotal = PerfDataGetPhysicalMemoryTotalK();

Modified: trunk/reactos/base/applications/taskmgr/precomp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/p...
==============================================================================
--- trunk/reactos/base/applications/taskmgr/precomp.h (original)
+++ trunk/reactos/base/applications/taskmgr/precomp.h Fri Nov  9 22:46:01 2007
@@ -5,17 +5,18 @@
 #error Task-Manager uses NDK functions, so it can only be compiled with Unicode support enabled!
 #endif

+#include <ctype.h>
+#include <math.h>
+#include <stdlib.h>
+#include <stdio.h>
+
 #define WIN32_NO_STATUS
 #include <windows.h>
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
+#include <aclapi.h>
 #include <commctrl.h>
 #include <shellapi.h>
-#include <aclapi.h>
-#include <stdlib.h>
-#include <math.h>
-#include <stdio.h>
-#include <ctype.h>

#include "column.h"
 #include "taskmgr.h"
@@ -35,4 +36,5 @@
 #include "priority.h"
 #include "run.h"
 #include "trayicon.h"
+
 #endif /* __PRECOMP_H */