-replace the ListView in swappage dialog with a ListBox

-fix some minor issues

svn path=/trunk/; revision=27980

diff --git a/reactos/dll/cpl/sysdm/lang/de-DE.rc b/reactos/dll/cpl/sysdm/lang/de-DE.rc
index 9a67d86..9d622d0 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/de-DE.rc
+++ b/reactos/dll/cpl/sysdm/lang/de-DE.rc
@@ -185,9 +185,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Laufwerk [Bezeichnung]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Auslagerungsdatei (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS
     GROUPBOX    "Größe der Auslagerungsdatei für das gewählte Laufwerk", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Laufwerk:", IDC_STATIC, 20, 80, 40, 8
     LTEXT       "", IDC_DRIVE, 105, 81, 100, 9

diff --git a/reactos/dll/cpl/sysdm/lang/en-US.rc b/reactos/dll/cpl/sysdm/lang/en-US.rc
index d097d7b..2c77322 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/en-US.rc
+++ b/reactos/dll/cpl/sysdm/lang/en-US.rc
@@ -177,9 +177,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Drive  [Volume Label]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Paging File Size (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS
     GROUPBOX    "Paging file size for selected drive", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Drive:", IDC_STATIC, 20, 80, 20, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9

diff --git a/reactos/dll/cpl/sysdm/lang/fr-FR.rc b/reactos/dll/cpl/sysdm/lang/fr-FR.rc
index 6bfdcee..a6f4b27 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/fr-FR.rc
+++ b/reactos/dll/cpl/sysdm/lang/fr-FR.rc
@@ -181,10 +181,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Lecteur  [Nom de Volume]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Taille de fichier swap (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
-    GROUPBOX    "Taille de fichier swap pour le disque sélectionné", IDC_DRIVEGROUP, 10, 70, 204, 104
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS    GROUPBOX    "Taille de fichier swap pour le disque sélectionné", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Lecteur :", IDC_STATIC, 20, 80, 30, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9
     LTEXT       "Espace disponible :", IDC_STATIC, 20, 92, 66, 9

diff --git a/reactos/dll/cpl/sysdm/lang/id-ID.rc b/reactos/dll/cpl/sysdm/lang/id-ID.rc
index 02b657e..c1168ce 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/id-ID.rc
+++ b/reactos/dll/cpl/sysdm/lang/id-ID.rc
@@ -177,10 +177,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Drive  [Label Volume]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Ukuran File Paging (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
-    GROUPBOX    "Ukuran file paging untuk drive yang dipilih", IDC_DRIVEGROUP, 10, 70, 204, 104
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS    GROUPBOX    "Ukuran file paging untuk drive yang dipilih", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Drive:", IDC_STATIC, 20, 80, 20, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9
     LTEXT       "Ruang tersedia:", IDC_STATIC, 20, 92, 56, 9

diff --git a/reactos/dll/cpl/sysdm/lang/it-IT.rc b/reactos/dll/cpl/sysdm/lang/it-IT.rc
index c9085be..69b7dd1 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/it-IT.rc
+++ b/reactos/dll/cpl/sysdm/lang/it-IT.rc
@@ -177,9 +177,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Disco  [Etichetta Volume]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Dimensione del file di paginazione (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS
     GROUPBOX    "Dimensione del file di paginazione per il disco selezionato", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Disco:", IDC_STATIC, 20, 80, 20, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9

diff --git a/reactos/dll/cpl/sysdm/lang/pl-PL.rc b/reactos/dll/cpl/sysdm/lang/pl-PL.rc
index 7e80384..c2d6c5b 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/pl-PL.rc
+++ b/reactos/dll/cpl/sysdm/lang/pl-PL.rc
@@ -183,10 +183,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "&Dysk [Etykieta woluminu]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Rozmiar pliku stronicowania (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
-    GROUPBOX    "Rozmiar pliku stronicowania dla wybranego dysku", IDC_DRIVEGROUP, 10, 70, 204, 104
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS    GROUPBOX    "Rozmiar pliku stronicowania dla wybranego dysku", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Dysk:", IDC_STATIC, 20, 80, 20, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9
     LTEXT       "Dostêpne miejsce:", IDC_STATIC, 20, 92, 56, 9

diff --git a/reactos/dll/cpl/sysdm/lang/ru-RU.rc b/reactos/dll/cpl/sysdm/lang/ru-RU.rc
index d329448..e145368 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/ru-RU.rc
+++ b/reactos/dll/cpl/sysdm/lang/ru-RU.rc
@@ -177,9 +177,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Äèñê [ìåòêà òîìà]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Ôàéë ïîäêà÷êè (MB)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS
     GROUPBOX    "Ðàçìåð ôàéëà ïîäêà÷êè äëÿ âûáðàííîãî äèñêà", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Äèñê:", IDC_STATIC, 20, 80, 20, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9

diff --git a/reactos/dll/cpl/sysdm/lang/uk-UA.rc b/reactos/dll/cpl/sysdm/lang/uk-UA.rc
index 9f49a23..1dcadcc 100644 (file)
--- a/reactos/dll/cpl/sysdm/lang/uk-UA.rc
+++ b/reactos/dll/cpl/sysdm/lang/uk-UA.rc
@@ -185,9 +185,7 @@ FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
     LTEXT       "Äèñê [ì³òêà òîìó]", IDC_STATIC, 12, 5, 96, 9
     LTEXT       "Ôàéë äîâàíòàæåííÿ (ÌÁ)", IDC_STATIC, 115, 5, 96, 9
-    CONTROL     "", IDC_PAGEFILELIST, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP,
-                      10, 16, 204, 52, WS_EX_CLIENTEDGE
-
+    LISTBOX     IDC_PAGEFILELIST, 10, 16, 204, 52, LBS_NOTIFY | LBS_USETABSTOPS
     GROUPBOX    "Ðîçì³ð ôàéëó äîâàíòàæåííÿ äëÿ âèáðàíîãî äèñêà", IDC_DRIVEGROUP, 10, 70, 204, 104
     LTEXT       "Äèñê:", IDC_STATIC, 20, 80, 20, 8
     LTEXT       "", IDC_DRIVE, 88, 81, 100, 9

diff --git a/reactos/dll/cpl/sysdm/precomp.h b/reactos/dll/cpl/sysdm/precomp.h
index 13ca9c2..b8138f5 100644 (file)
--- a/reactos/dll/cpl/sysdm/precomp.h
+++ b/reactos/dll/cpl/sysdm/precomp.h
@@ -58,7 +58,7 @@ typedef struct _PAGEFILE
 typedef struct _VIRTMEM
 {
     HWND   hSelf;
-    HWND   hListView;
+    HWND   hListBox;
     LPTSTR szPagingFiles;
     TCHAR  szDrive[10];
     INT    Count;

diff --git a/reactos/dll/cpl/sysdm/virtmem.c b/reactos/dll/cpl/sysdm/virtmem.c
index 4fadff5..b5224d4 100644 (file)
--- a/reactos/dll/cpl/sysdm/virtmem.c
+++ b/reactos/dll/cpl/sysdm/virtmem.c
@@ -89,8 +89,9 @@ ParseMemSettings(PVIRTMEM pVirtMem)
 {
     TCHAR szDrives[1024];    // all drives
     LPTSTR DrivePtr = szDrives;
-    TCHAR szDrive[MAX_PATH]; // single drive
+    TCHAR szDrive[4]; // single drive
     TCHAR szVolume[MAX_PATH];
+    TCHAR *szDisplayString;
     INT InitialSize = 0;
     INT MaxSize = 0;
     INT DriveLen;
@@ -99,9 +100,12 @@ ParseMemSettings(PVIRTMEM pVirtMem)
     DriveLen = GetLogicalDriveStrings(1023,
                                       szDrives);
 
+    szDisplayString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH * 2 + 70) * sizeof(TCHAR));
+    if (szDisplayString == NULL)
+        return;
+
     while (DriveLen != 0)
     {
-        LVITEM Item;
         INT Len;
 
         Len = lstrlen(DrivePtr) + 1;
@@ -134,12 +138,8 @@ ParseMemSettings(PVIRTMEM pVirtMem)
                 lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive);
             }
 
-            /* fill out the listview */
-            ZeroMemory(&Item, sizeof(Item));
-            Item.mask = LVIF_TEXT;
-            Item.iItem = ListView_GetItemCount(pVirtMem->hListView);
-            Item.pszText = szDrive;
-            (void)ListView_InsertItem(pVirtMem->hListView, &Item);
+            _tcscpy(szDisplayString, szDrive);
+            _tcscat(szDisplayString, _T("\t"));
 
             /* set a volume label if there is one */
             if (GetVolumeInformation(DrivePtr,
@@ -154,12 +154,8 @@ ParseMemSettings(PVIRTMEM pVirtMem)
                 if (szVolume[0] != _T('\0'))
                 {
                     TCHAR szVol[MAX_PATH + 2];
-
                     _stprintf(szVol, _T("[%s]"), szVolume);
-
-                    Item.iSubItem = 1;
-                    Item.pszText = szVol;
-                    (void)ListView_InsertItem(pVirtMem->hListView, &Item);
+                    _tcscat(szDisplayString, szVol);
                 }
             }
 
@@ -168,18 +164,19 @@ ParseMemSettings(PVIRTMEM pVirtMem)
                 TCHAR szSize[64];
 
                 _stprintf(szSize, _T("%i - %i"), InitialSize, MaxSize);
-
-                Item.iSubItem = 2;
-                Item.pszText = szSize;
-                (void)ListView_InsertItem(pVirtMem->hListView, &Item);
+                _tcscat(szDisplayString, _T("\t"));
+                _tcscat(szDisplayString, szSize);
             }
 
+            SendMessage(pVirtMem->hListBox, LB_ADDSTRING, (WPARAM)0, (LPARAM)szDisplayString);
             PgCnt++;
         }
 
         DrivePtr += Len;
     }
 
+    SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)0, (LPARAM)0);
+    HeapFree(GetProcessHeap(), 0, szDisplayString);
     pVirtMem->Count = PgCnt;
 }
 
@@ -245,31 +242,10 @@ WritePageFileSettings(PVIRTMEM pVirtMem)
 
 
 static VOID
-SetListViewColumns(HWND hwndListView)
+SetListBoxColumns(HWND hwndListBox)
 {
-    RECT rect;
-    LV_COLUMN lvc;
-
-    GetClientRect(hwndListView, &rect);
-
-    (void)ListView_SetExtendedListViewStyle(hwndListView,
-                                            LVS_EX_FULLROWSELECT);
-
-    ZeroMemory(&lvc, sizeof(lvc));
-    lvc.mask = LVCF_SUBITEM | LVCF_WIDTH  | LVCF_FMT;
-    lvc.fmt = LVCFMT_LEFT;
-
-    lvc.cx = (INT)((rect.right - rect.left) * 0.1);
-    lvc.iSubItem = 0;
-    (void)ListView_InsertColumn(hwndListView, 0, &lvc);
-
-    lvc.cx = (INT)((rect.right - rect.left) * 0.3);
-    lvc.iSubItem = 1;
-    (void)ListView_InsertColumn(hwndListView, 1, &lvc);
-
-    lvc.cx = (INT)((rect.right - rect.left) * 0.6);
-    lvc.iSubItem = 2;
-    (void)ListView_InsertColumn(hwndListView, 2, &lvc);
+    INT tabs[2] = {30, 170};
+    SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)(LPINT) &tabs[0]);
 }
 
 
@@ -481,10 +457,10 @@ OnInitDialog(HWND hwnd)
     }
 
     pVirtMem->hSelf = hwnd;
-    pVirtMem->hListView = GetDlgItem(hwnd, IDC_PAGEFILELIST);
+    pVirtMem->hListBox = GetDlgItem(hwnd, IDC_PAGEFILELIST);
     pVirtMem->bSave = FALSE;
 
-    SetListViewColumns(pVirtMem->hListView);
+    SetListBoxColumns(pVirtMem->hListBox);
 
     /* Load the pagefile systems from the reg */
     if (ReadPageFileSettings(pVirtMem))