[ros-diffs] [janderwald] 27843: - update italian translation and a few code simplifications by Carlo Bramini (carlo dot bramix at libero dot it) - fix a few issues (remove SIZEOF macro + SUBLANG_ITALIAN...) See issue #2365 for more details.

janderwald at svn.reactos.org janderwald at svn.reactos.org
Thu Jul 26 16:48:48 CEST 2007


Author: janderwald
Date: Thu Jul 26 18:48:47 2007
New Revision: 27843

URL: http://svn.reactos.org/svn/reactos?rev=27843&view=rev
Log:
- update italian translation and a few code simplifications by Carlo Bramini (carlo dot bramix at libero dot it)
- fix a few issues (remove SIZEOF macro + SUBLANG_ITALIAN...)
See issue #2365 for more details.

Modified:
    trunk/reactos/base/applications/taskmgr/affinity.c
    trunk/reactos/base/applications/taskmgr/lang/it-IT.rc

Modified: trunk/reactos/base/applications/taskmgr/affinity.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/affinity.c?rev=27843&r1=27842&r2=27843&view=diff
==============================================================================
--- trunk/reactos/base/applications/taskmgr/affinity.c (original)
+++ trunk/reactos/base/applications/taskmgr/affinity.c Thu Jul 26 18:48:47 2007
@@ -27,7 +27,18 @@
 TCHAR         szTemp[256];
 TCHAR         szTempA[256];
 
-INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
+static const DWORD dwCpuTable[] = {
+    IDC_CPU0,   IDC_CPU1,   IDC_CPU2,   IDC_CPU3,
+    IDC_CPU4,   IDC_CPU5,   IDC_CPU6,   IDC_CPU7,
+    IDC_CPU8,   IDC_CPU9,   IDC_CPU10,  IDC_CPU11,
+    IDC_CPU12,  IDC_CPU13,  IDC_CPU14,  IDC_CPU15,
+    IDC_CPU16,  IDC_CPU17,  IDC_CPU18,  IDC_CPU19,
+    IDC_CPU20,  IDC_CPU21,  IDC_CPU22,  IDC_CPU23,
+    IDC_CPU24,  IDC_CPU25,  IDC_CPU26,  IDC_CPU27,
+    IDC_CPU28,  IDC_CPU29,  IDC_CPU30,  IDC_CPU31,
+};
+
+static INT_PTR CALLBACK AffinityDialogWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
 
 void ProcessPage_OnSetAffinity(void)
 {
@@ -50,8 +61,8 @@
         return;
     hProcessAffinityHandle = OpenProcess(PROCESS_QUERY_INFORMATION|PROCESS_SET_INFORMATION, FALSE, dwProcessId);
     if (!hProcessAffinityHandle) {
-        GetLastErrorText(strErrorText, 260);
-        LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256);
+        GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(TCHAR));
+        LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(TCHAR));
         MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP);
         return;
     }
@@ -68,6 +79,7 @@
     DWORD    dwProcessAffinityMask = 0;
     DWORD    dwSystemAffinityMask = 0;
     TCHAR    strErrorText[260];
+    BYTE     nCpu;
 
     switch (message) {
     case WM_INITDIALOG:
@@ -77,149 +89,25 @@
          * the number of CPUs present in the system
          */
         if (!GetProcessAffinityMask(hProcessAffinityHandle, &dwProcessAffinityMask, &dwSystemAffinityMask))    {
-            GetLastErrorText(strErrorText, 260);
+            GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(TCHAR));
             EndDialog(hDlg, 0);
-            LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256);
+            LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(TCHAR));
             MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP);
         }
 
-        /*
-         * Enable a checkbox for each processor present in the system
-         */
-        if (dwSystemAffinityMask & 0x00000001)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU0), TRUE);
-        if (dwSystemAffinityMask & 0x00000002)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU1), TRUE);
-        if (dwSystemAffinityMask & 0x00000004)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU2), TRUE);
-        if (dwSystemAffinityMask & 0x00000008)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU3), TRUE);
-        if (dwSystemAffinityMask & 0x00000010)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU4), TRUE);
-        if (dwSystemAffinityMask & 0x00000020)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU5), TRUE);
-        if (dwSystemAffinityMask & 0x00000040)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU6), TRUE);
-        if (dwSystemAffinityMask & 0x00000080)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU7), TRUE);
-        if (dwSystemAffinityMask & 0x00000100)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU8), TRUE);
-        if (dwSystemAffinityMask & 0x00000200)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU9), TRUE);
-        if (dwSystemAffinityMask & 0x00000400)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU10), TRUE);
-        if (dwSystemAffinityMask & 0x00000800)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU11), TRUE);
-        if (dwSystemAffinityMask & 0x00001000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU12), TRUE);
-        if (dwSystemAffinityMask & 0x00002000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU13), TRUE);
-        if (dwSystemAffinityMask & 0x00004000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU14), TRUE);
-        if (dwSystemAffinityMask & 0x00008000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU15), TRUE);
-        if (dwSystemAffinityMask & 0x00010000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU16), TRUE);
-        if (dwSystemAffinityMask & 0x00020000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU17), TRUE);
-        if (dwSystemAffinityMask & 0x00040000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU18), TRUE);
-        if (dwSystemAffinityMask & 0x00080000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU19), TRUE);
-        if (dwSystemAffinityMask & 0x00100000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU20), TRUE);
-        if (dwSystemAffinityMask & 0x00200000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU21), TRUE);
-        if (dwSystemAffinityMask & 0x00400000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU22), TRUE);
-        if (dwSystemAffinityMask & 0x00800000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU23), TRUE);
-        if (dwSystemAffinityMask & 0x01000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU24), TRUE);
-        if (dwSystemAffinityMask & 0x02000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU25), TRUE);
-        if (dwSystemAffinityMask & 0x04000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU26), TRUE);
-        if (dwSystemAffinityMask & 0x08000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU27), TRUE);
-        if (dwSystemAffinityMask & 0x10000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU28), TRUE);
-        if (dwSystemAffinityMask & 0x20000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU29), TRUE);
-        if (dwSystemAffinityMask & 0x40000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU30), TRUE);
-        if (dwSystemAffinityMask & 0x80000000)
-            EnableWindow(GetDlgItem(hDlg, IDC_CPU31), TRUE);
-
-
-        /*
-         * Check each checkbox that the current process
-         * has affinity with
-         */
-        if (dwProcessAffinityMask & 0x00000001)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000002)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000004)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000008)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000010)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000020)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000040)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000080)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000100)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000200)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000400)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00000800)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00001000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00002000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00004000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00008000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00010000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00020000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00040000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00080000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00100000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00200000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00400000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x00800000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x01000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x02000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x04000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x08000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x10000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x20000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x40000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_SETCHECK, BST_CHECKED, 0);
-        if (dwProcessAffinityMask & 0x80000000)
-            SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_SETCHECK, BST_CHECKED, 0);
+        for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) {
+            /*
+             * Enable a checkbox for each processor present in the system
+             */
+            if (dwSystemAffinityMask & (1 << nCpu))
+                EnableWindow(GetDlgItem(hDlg, dwCpuTable[nCpu]), TRUE);
+            /*
+             * Check each checkbox that the current process
+             * has affinity with
+             */
+            if (dwProcessAffinityMask & (1 << nCpu))
+                SendMessage(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_SETCHECK, BST_CHECKED, 0);
+        }
 
         return TRUE;
 
@@ -239,74 +127,14 @@
          * to adjust the process affinity mask
          */
         if (LOWORD(wParam) == IDOK) {
-            /*
-             * First we have to create a mask out of each
-             * checkbox that the user checked.
-             */
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU0), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000001;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU1), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000002;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU2), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000004;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU3), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000008;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU4), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000010;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU5), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000020;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU6), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000040;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU7), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000080;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU8), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000100;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU9), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000200;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU10), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000400;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU11), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00000800;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU12), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00001000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU13), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00002000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU14), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00004000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU15), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00008000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU16), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00010000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU17), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00020000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU18), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00040000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU19), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00080000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU20), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00100000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU21), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00200000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU22), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00400000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU23), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x00800000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU24), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x01000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU25), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x02000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU26), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x04000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU27), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x08000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU28), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x10000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU29), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x20000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU30), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x40000000;
-            if (SendMessage(GetDlgItem(hDlg, IDC_CPU31), BM_GETCHECK, 0, 0))
-                dwProcessAffinityMask |= 0x80000000;
+            for (nCpu=0; nCpu<sizeof(dwCpuTable) / sizeof(dwCpuTable[0]); nCpu++) {
+                /*
+                 * First we have to create a mask out of each
+                 * checkbox that the user checked.
+                 */
+                if (SendMessage(GetDlgItem(hDlg, dwCpuTable[nCpu]), BM_GETCHECK, 0, 0))
+                    dwProcessAffinityMask |= (1 << nCpu);
+            }
 
             /*
              * Make sure they are giving the process affinity
@@ -315,8 +143,8 @@
              * of it's cpu time.
              */
             if (!dwProcessAffinityMask) {
-                LoadString(hInst, IDS_MSG_PROCESSONEPRO, szTemp, 256);
-                LoadString(hInst, IDS_MSG_INVALIDOPTION, szTempA, 256);
+                LoadString(hInst, IDS_MSG_PROCESSONEPRO, szTemp, sizeof(szTemp) / sizeof(TCHAR));
+                LoadString(hInst, IDS_MSG_INVALIDOPTION, szTempA, sizeof(szTempA) / sizeof(TCHAR));
                 MessageBox(hDlg, szTemp, szTempA, MB_OK|MB_ICONSTOP);
                 return TRUE;
             }
@@ -325,9 +153,9 @@
              * Try to set the process affinity
              */
             if (!SetProcessAffinityMask(hProcessAffinityHandle, dwProcessAffinityMask)) {
-                GetLastErrorText(strErrorText, 260);
+                GetLastErrorText(strErrorText, sizeof(strErrorText) / sizeof(TCHAR));
                 EndDialog(hDlg, LOWORD(wParam));
-                LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, 256);
+                LoadString(hInst, IDS_MSG_ACCESSPROCESSAFF, szTemp, sizeof(szTemp) / sizeof(TCHAR));
                 MessageBox(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP);
             }
 

Modified: trunk/reactos/base/applications/taskmgr/lang/it-IT.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/lang/it-IT.rc?rev=27843&r1=27842&r2=27843&view=diff
==============================================================================
--- trunk/reactos/base/applications/taskmgr/lang/it-IT.rc (original)
+++ trunk/reactos/base/applications/taskmgr/lang/it-IT.rc Thu Jul 26 18:48:47 2007
@@ -3,7 +3,7 @@
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
 #ifdef _WIN32
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 #pragma code_page(1252)
 #endif //_WIN32
 
@@ -192,9 +192,9 @@
 BEGIN
     CONTROL         "List2",IDC_APPLIST,"SysListView32",LVS_REPORT |
                     LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177
-    PUSHBUTTON      "&Nuovo processo...",IDC_NEWTASK,187,189,53,14
-    PUSHBUTTON      "&Passa A",IDC_SWITCHTO,131,189,53,14,WS_DISABLED
-    PUSHBUTTON      "&Termina processo",IDC_ENDTASK,75,189,53,14,WS_DISABLED
+    PUSHBUTTON      "&Nuovo processo...",IDC_NEWTASK,172,188,68,14
+    PUSHBUTTON      "&Passa a",IDC_SWITCHTO,100,188,68,14,WS_DISABLED
+    PUSHBUTTON      "&Termina processo",IDC_ENDTASK,28,188,68,14,WS_DISABLED
 END
 
 IDD_PROCESS_PAGE DIALOG DISCARDABLE  0, 0, 247, 210
@@ -206,7 +206,7 @@
                     WS_BORDER | WS_TABSTOP,7,7,233,177
     PUSHBUTTON      "&Termina Processo",IDC_ENDPROCESS,171,189,69,14
     CONTROL         "&Mostra i processi di tutti gli utenti",IDC_SHOWALLPROCESSES,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,117,10
 END
 
 //IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210
@@ -218,11 +218,11 @@
     GROUPBOX        "Uso MEM",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT
     GROUPBOX        "Totali",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT
     GROUPBOX        "Carico scritture (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT
-    GROUPBOX        "Memoria fisica (K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT
-    GROUPBOX        "Memoria del Kernel (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT
-    LTEXT           "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8
-    LTEXT           "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8
-    LTEXT           "Processes",IDS_TOTALS_PROCESS_COUNT,12,149,34,8
+    GROUPBOX        "Memoria fisica (K)",IDC_PHYSICAL_MEMORY_FRAME,126,122,116,39,0,WS_EX_TRANSPARENT
+    GROUPBOX        "Memoria del Kernel (K)",IDC_KERNEL_MEMORY_FRAME,126,166,116,39,0,WS_EX_TRANSPARENT
+    LTEXT           "Handle",IDS_TOTALS_HANDLE_COUNT,12,131,27,8
+    LTEXT           "Thread",IDS_TOTALS_THREAD_COUNT,12,140,27,8
+    LTEXT           "Processi",IDS_TOTALS_PROCESS_COUNT,12,149,34,8
     EDITTEXT        IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     EDITTEXT        IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT |
@@ -230,7 +230,7 @@
     EDITTEXT        IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     LTEXT           "Totale",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8
-    LTEXT           "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8
+    LTEXT           "Limite",IDS_COMMIT_CHARGE_LIMIT,12,184,21,8
     LTEXT           "Picco",IDS_COMMIT_CHARGE_PEAK,12,193,34,8
     EDITTEXT        IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
@@ -238,18 +238,18 @@
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     EDITTEXT        IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
-    LTEXT           "Totale",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8
-    LTEXT           "Disponibile",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8
-    LTEXT           "Cache di sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8
+    LTEXT           "Totale",IDS_PHYSICAL_MEMORY_TOTAL,132,131,27,8
+    LTEXT           "Disponibile",IDS_PHYSICAL_MEMORY_AVAILABLE,132,140,35,8
+    LTEXT           "Cache sistema",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,132,149,52,8
     EDITTEXT        IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     EDITTEXT        IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     EDITTEXT        IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
-    LTEXT           "Totale",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8
-    LTEXT           "Paginata",IDS_KERNEL_MEMORY_PAGED,137,184,21,8
-    LTEXT           "Non Paginata",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8
+    LTEXT           "Totale",IDS_KERNEL_MEMORY_TOTAL,132,174,27,8
+    LTEXT           "Paginata",IDS_KERNEL_MEMORY_PAGED,132,184,31,8
+    LTEXT           "Non paginata",IDS_KERNEL_MEMORY_NONPAGED,132,193,48,8
     EDITTEXT        IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT |
                     ES_READONLY | ES_NUMBER | NOT WS_BORDER
     EDITTEXT        IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT |
@@ -364,17 +364,17 @@
     LTEXT           "Seleziona le colonne che saranno visibili nella pagina dei processi di Task Manager.",
                     IDC_STATIC,7,7,181,17
     CONTROL         "&Nome immagine",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX |
-                    WS_DISABLED | WS_TABSTOP,7,28,56,10
+                    WS_DISABLED | WS_TABSTOP,7,28,65,10
     CONTROL         "&PID (Process Identifier)",IDC_PID,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10
     CONTROL         "Uso &CPU",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,50,53,10
     CONTROL         "T&empo CPU",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,61,48,10
+                    WS_TABSTOP,7,61,53,10
     CONTROL         "Uso &Memoria",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,72,63,10
     CONTROL         "Incrementi uso Memoria",IDC_MEMORYUSAGEDELTA,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,83,89,10
     CONTROL         "Picco uso Memory",IDC_PEAKMEMORYUSAGE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10
     CONTROL         "Page &Faults",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX |
@@ -384,31 +384,31 @@
     CONTROL         "Letture I/O",IDC_IOREADS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,127,49,10
     CONTROL         "Letture I/O Bytes",IDC_IOREADBYTES,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,138,69,10
     CONTROL         "ID &Sessione",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,7,149,50,10
     CONTROL         "&Nome utente",IDC_USERNAME,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,7,160,51,10
-    CONTROL         "Incrementi Page F&ault",IDC_PAGEFAULTSDELTA,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10
+                    WS_TABSTOP,7,160,57,10
+    CONTROL         "Increm. Page F&ault",IDC_PAGEFAULTSDELTA,"Button",
+                    BS_AUTOCHECKBOX | WS_TABSTOP,107,28,77,10
     CONTROL         "Dimensione Memoria &Virtuale",IDC_VIRTUALMEMORYSIZE,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10
     CONTROL         "Pool Pa&ginato",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,107,50,53,10
+                    WS_TABSTOP,107,50,61,10
     CONTROL         "Pool N&on-paginato",IDC_NONPAGEDPOOL,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,107,61,73,10
     CONTROL         "P&riorità base",IDC_BASEPRIORITY,"Button",
                     BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10
     CONTROL         "Numero &Handle",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,107,83,59,10
+                    WS_TABSTOP,107,83,65,10
     CONTROL         "Numero &Thread",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,107,94,59,10
+                    WS_TABSTOP,107,94,65,10
     CONTROL         "Oggetti GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,105,55,10
     CONTROL         "Scritture I/O",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX |
-                    WS_TABSTOP,107,116,49,10
+                    WS_TABSTOP,107,116,53,10
     CONTROL         "Scritture I/O Byte",IDC_IOWRITEBYTES,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10
+                    BS_AUTOCHECKBOX | WS_TABSTOP,107,127,69,10
     CONTROL         "Altro I/O",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX |
                     WS_TABSTOP,107,138,46,10
     CONTROL         "Altro I/O  Bytes",IDC_IOOTHERBYTES,"Button",
@@ -684,3 +684,4 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
 
+




More information about the Ros-diffs mailing list