Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[greatlrd] 27989: fixing the langues show right, no more wrong langues show ; )

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 13:04:53 2007 New Revision: 27989 URL: http://svn.reactos.org/svn/reactos?rev=27989&view=rev Log: fixing the langues show right, no more wrong langues show ;) Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild Modified: trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/shdocvw.… ============================================================================== --- trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild (original) +++ trunk/reactos/dll/win32/shdocvw/shdocvw.rbuild Sun Jul 29 13:04:53 2007 @@ -1,4 +1,4 @@ -<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" usewrc="false" allowwarnings="true"> +<module name="shdocvw" type="win32dll" baseaddress="${BASEADDRESS_SHDOCVW}" installbase="system32" installname="shdocvw.dll" allowwarnings="true"> <autoregister infsection="OleControlDlls" type="Both" /> <importlibrary definition="shdocvw.spec.def" /> <include base="shdocvw">.</include>

17 years, 4 months

[greatlrd] 27988: fixing the langues show right, no more wrong langues show ; )

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 13:03:29 2007 New Revision: 27988 URL: http://svn.reactos.org/svn/reactos?rev=27988&view=rev Log: fixing the langues show right, no more wrong langues show ;) Modified: trunk/reactos/base/shell/cmd/cmd.rbuild Modified: trunk/reactos/base/shell/cmd/cmd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rbuild?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.rbuild (original) +++ trunk/reactos/base/shell/cmd/cmd.rbuild Sun Jul 29 13:03:29 2007 @@ -63,7 +63,7 @@ <file>window.c</file> </compilationunit> </module> -<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" usewrc="false"> +<module name="cmd" type="win32cui" installbase="system32" installname="cmd.exe" > <include base="ReactOS">include/reactos/wine</include> <include base="cmd">.</include> <define name="__USE_W32API" />

17 years, 4 months

[greatlrd] 27987: fixing the langues show right, no more wrong langues show ; )

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 13:02:29 2007 New Revision: 27987 URL: http://svn.reactos.org/svn/reactos?rev=27987&view=rev Log: fixing the langues show right, no more wrong langues show ;) Modified: trunk/reactos/base/system/expand/expand.rbuild Modified: trunk/reactos/base/system/expand/expand.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/expand/expand.… ============================================================================== --- trunk/reactos/base/system/expand/expand.rbuild (original) +++ trunk/reactos/base/system/expand/expand.rbuild Sun Jul 29 13:02:29 2007 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> -<module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false"> +<module name="expand" type="win32cui" installbase="system32" installname="expand.exe" > <include base="ReactOS">include/reactos/wine</include> <include base="expand">.</include> <define name="__USE_W32API" />

17 years, 4 months

[greatlrd] 27986: fixing the langues show right, no more germany in english ; )

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jul 29 12:58:24 2007 New Revision: 27986 URL: http://svn.reactos.org/svn/reactos?rev=27986&view=rev Log: fixing the langues show right, no more germany in english ;) Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Modified: trunk/reactos/dll/cpl/sysdm/sysdm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/sysdm.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/sysdm.rbuild (original) +++ trunk/reactos/dll/cpl/sysdm/sysdm.rbuild Sun Jul 29 12:58:24 2007 @@ -1,4 +1,4 @@ -<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" usewrc="false" unicode="yes"> +<module name="sysdm" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_SYSDM}" installbase="system32" installname="sysdm.cpl" unicode="yes"> <importlibrary definition="sysdm.def" /> <include base="sysdm">.</include> <define name="__REACTOS__" />

17 years, 4 months

[weiden] 27985: Handle error case more correctly

by weiden＠svn.reactos.org

Author: weiden Date: Sun Jul 29 12:16:50 2007 New Revision: 27985 URL: http://svn.reactos.org/svn/reactos?rev=27985&view=rev Log: Handle error case more correctly Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 12:16:50 2007 @@ -310,7 +310,7 @@ field to the previous value */ SetDlgItemInt(pVirtMem->hSelf, IDC_INITIALSIZE, - Value, + pVirtMem->Pagefile[Index].InitialValue, FALSE); } else @@ -326,7 +326,7 @@ field to the previous value */ SetDlgItemInt(pVirtMem->hSelf, IDC_MAXSIZE, - Value, + pVirtMem->Pagefile[Index].MaxValue, FALSE); } else

17 years, 4 months

[weiden] 27984: Simplify code by using dialog functions

by weiden＠svn.reactos.org

Author: weiden Date: Sun Jul 29 12:14:38 2007 New Revision: 27984 URL: http://svn.reactos.org/svn/reactos?rev=27984&view=rev Log: Simplify code by using dialog functions Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 12:14:38 2007 @@ -283,6 +283,8 @@ OnSet(PVIRTMEM pVirtMem) { INT Index; + UINT Value; + BOOL bTranslated; pVirtMem->bSave = TRUE; @@ -294,28 +296,41 @@ if(Index < pVirtMem->Count) { - TCHAR szText[255]; - /* check if custom settings are checked */ - if(SendDlgItemMessage(pVirtMem->hSelf, - IDC_CUSTOM, - BM_GETCHECK, - 0, - 0) == BST_CHECKED) - { - SendDlgItemMessage(pVirtMem->hSelf, - IDC_INITIALSIZE, - WM_GETTEXT, - 254, - (LPARAM)szText); - pVirtMem->Pagefile[Index].InitialValue = _ttoi(szText); - - SendDlgItemMessage(pVirtMem->hSelf, - IDC_MAXSIZE, - WM_GETTEXT, - 254, - (LPARAM)szText); - pVirtMem->Pagefile[Index].MaxValue = _ttoi(szText); + if(IsDlgButtonChecked(pVirtMem->hSelf, + IDC_CUSTOM) == BST_CHECKED) + { + Value = GetDlgItemInt(pVirtMem->hSelf, + IDC_INITIALSIZE, + &bTranslated, + FALSE); + if (!bTranslated) + { + /* FIXME: Show error message instead of setting the edit + field to the previous value */ + SetDlgItemInt(pVirtMem->hSelf, + IDC_INITIALSIZE, + Value, + FALSE); + } + else + pVirtMem->Pagefile[Index].InitialValue = Value; + + Value = GetDlgItemInt(pVirtMem->hSelf, + IDC_MAXSIZE, + &bTranslated, + FALSE); + if (!bTranslated) + { + /* FIXME: Show error message instead of setting the edit + field to the previous value */ + SetDlgItemInt(pVirtMem->hSelf, + IDC_MAXSIZE, + Value, + FALSE); + } + else + pVirtMem->Pagefile[Index].MaxValue = Value; } else { @@ -323,11 +338,8 @@ pVirtMem->Pagefile[Index].InitialValue = pVirtMem->Pagefile[Index].MaxValue = 0; // check to see if this drive is used for a paging file - if (SendDlgItemMessage(pVirtMem->hSelf, - IDC_NOPAGEFILE, - BM_GETCHECK, - 0, - 0) == BST_UNCHECKED) + if (IsDlgButtonChecked(pVirtMem->hSelf, + IDC_NOPAGEFILE) == BST_UNCHECKED) { pVirtMem->Pagefile[Index].bUsed = TRUE; } @@ -343,7 +355,6 @@ static BOOL OnSelChange(PVIRTMEM pVirtMem) { - TCHAR szCustVals[255]; INT Index; Index = (INT)SendDlgItemMessage(pVirtMem->hSelf, @@ -362,25 +373,19 @@ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE); - _itot(pVirtMem->Pagefile[Index].InitialValue , szCustVals, 10); - SendDlgItemMessage(pVirtMem->hSelf, - IDC_INITIALSIZE, - WM_SETTEXT, - 0, - (LPARAM)szCustVals); - - _itot(pVirtMem->Pagefile[Index].MaxValue, szCustVals, 10); - SendDlgItemMessage(pVirtMem->hSelf, - IDC_MAXSIZE, - WM_SETTEXT, - 0, - (LPARAM)szCustVals); - - SendDlgItemMessage(pVirtMem->hSelf, - IDC_CUSTOM, - BM_SETCHECK, - 1, - 0); + SetDlgItemInt(pVirtMem->hSelf, + IDC_INITIALSIZE, + pVirtMem->Pagefile[Index].InitialValue, + FALSE); + + SetDlgItemInt(pVirtMem->hSelf, + IDC_MAXSIZE, + pVirtMem->Pagefile[Index].MaxValue, + FALSE); + + CheckDlgButton(pVirtMem->hSelf, + IDC_CUSTOM, + BST_CHECKED); } else { @@ -391,19 +396,15 @@ /* is it system managed */ if(pVirtMem->Pagefile[Index].bUsed) { - SendDlgItemMessage(pVirtMem->hSelf, - IDC_SYSMANSIZE, - BM_SETCHECK, - 1, - 0); + CheckDlgButton(pVirtMem->hSelf, + IDC_SYSMANSIZE, + BST_CHECKED); } else { - SendDlgItemMessage(pVirtMem->hSelf, - IDC_NOPAGEFILE, - BM_SETCHECK, - 1, - 0); + CheckDlgButton(pVirtMem->hSelf, + IDC_NOPAGEFILE, + BST_CHECKED); } } }

17 years, 4 months

[weiden] 27983: Fix buffer overflow on unicode builds introduced in r27982

by weiden＠svn.reactos.org

Author: weiden Date: Sun Jul 29 11:59:17 2007 New Revision: 27983 URL: http://svn.reactos.org/svn/reactos?rev=27983&view=rev Log: Fix buffer overflow on unicode builds introduced in r27982 Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 11:59:17 2007 @@ -98,7 +98,7 @@ INT DriveLen; INT PgCnt = 0; - ZeroMemory(&szDrives, sizeof(szDrives) * sizeof(TCHAR)); + ZeroMemory(szDrives, sizeof(szDrives)); DriveLen = GetLogicalDriveStrings(1023, szDrives); @@ -116,7 +116,7 @@ DrivePtr = _tcsupr(DrivePtr); /* copy the 'X:' portion */ - lstrcpyn(szDrive, DrivePtr, 3); + lstrcpyn(szDrive, DrivePtr, sizeof(szDrive) / sizeof(TCHAR)); if(GetDriveType(DrivePtr) == DRIVE_FIXED) { @@ -247,8 +247,8 @@ static VOID SetListBoxColumns(HWND hwndListBox) { - INT tabs[2] = {30, 170}; - SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)(LPINT) &tabs[0]); + const INT tabs[2] = {30, 170}; + SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)&tabs[0]); }

17 years, 4 months

[cwittich] 27982: fix a crash and the selchange notification code

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 04:27:08 2007 New Revision: 27982 URL: http://svn.reactos.org/svn/reactos?rev=27982&view=rev Log: fix a crash and the selchange notification code Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 04:27:08 2007 @@ -9,6 +9,7 @@ #include "precomp.h" +static BOOL OnSelChange(PVIRTMEM pVirtMem); static LPCTSTR lpKey = _T("SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Memory Management"); static BOOL @@ -89,7 +90,7 @@ { TCHAR szDrives[1024]; // all drives LPTSTR DrivePtr = szDrives; - TCHAR szDrive[4]; // single drive + TCHAR szDrive[3]; // single drive TCHAR szVolume[MAX_PATH]; TCHAR *szDisplayString; INT InitialSize = 0; @@ -97,10 +98,11 @@ INT DriveLen; INT PgCnt = 0; + ZeroMemory(&szDrives, sizeof(szDrives) * sizeof(TCHAR)); DriveLen = GetLogicalDriveStrings(1023, szDrives); - szDisplayString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH * 2 + 70) * sizeof(TCHAR)); + szDisplayString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH * 2 + 69) * sizeof(TCHAR)); if (szDisplayString == NULL) return; @@ -178,6 +180,7 @@ SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)0, (LPARAM)0); HeapFree(GetProcessHeap(), 0, szDisplayString); pVirtMem->Count = PgCnt; + OnSelChange(pVirtMem); } @@ -338,13 +341,10 @@ static BOOL -OnSelChange(PVIRTMEM pVirtMem, - LPNMLISTVIEW pnmv) +OnSelChange(PVIRTMEM pVirtMem) { TCHAR szCustVals[255]; INT Index; - - UNREFERENCED_PARAMETER(pnmv); Index = (INT)SendDlgItemMessage(pVirtMem->hSelf, IDC_PAGEFILELIST, @@ -519,25 +519,18 @@ case IDC_SET: OnSet(pVirtMem); return TRUE; + + case IDC_PAGEFILELIST: + switch HIWORD(wParam) + { + case LBN_SELCHANGE: + OnSelChange(pVirtMem); + return TRUE; + } + break; } } break; - - case WM_NOTIFY: - { - LPNMHDR pnmhdr = (LPNMHDR)lParam; - - switch (pnmhdr->code) - { - case LVN_ITEMCHANGED: - { - LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; - - OnSelChange(pVirtMem, pnmv); - } - } - } - break; } return FALSE;

17 years, 4 months

[cwittich] 27981: fix crash on linux systems when an invalid backend is specified

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 03:38:59 2007 New Revision: 27981 URL: http://svn.reactos.org/svn/reactos?rev=27981&view=rev Log: fix crash on linux systems when an invalid backend is specified Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Sun Jul 29 03:38:59 2007 @@ -109,6 +109,7 @@ head (NULL), configuration (configuration) { + _backend = NULL; ReadXml(); }

17 years, 4 months

[cwittich] 27980: -replace the ListView in swappage dialog with a ListBox -fix some minor issues

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun Jul 29 02:34:42 2007 New Revision: 27980 URL: http://svn.reactos.org/svn/reactos?rev=27980&view=rev Log: -replace the ListView in swappage dialog with a ListBox -fix some minor issues Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/precomp.h trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc Sun Jul 29 02:34:42 2007 @@ -185,9 +185,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc Sun Jul 29 02:34:42 2007 @@ -177,9 +177,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc Sun Jul 29 02:34:42 2007 @@ -181,10 +181,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc Sun Jul 29 02:34:42 2007 @@ -177,10 +177,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc Sun Jul 29 02:34:42 2007 @@ -177,9 +177,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc Sun Jul 29 02:34:42 2007 @@ -183,10 +183,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc Sun Jul 29 02:34:42 2007 @@ -177,9 +177,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc Sun Jul 29 02:34:42 2007 @@ -185,9 +185,7 @@ 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 Modified: trunk/reactos/dll/cpl/sysdm/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/precomp.h (original) +++ trunk/reactos/dll/cpl/sysdm/precomp.h Sun Jul 29 02:34:42 2007 @@ -58,7 +58,7 @@ typedef struct _VIRTMEM { HWND hSelf; - HWND hListView; + HWND hListBox; LPTSTR szPagingFiles; TCHAR szDrive[10]; INT Count; Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c Sun Jul 29 02:34:42 2007 @@ -89,8 +89,9 @@ { 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ static VOID -SetListViewColumns(HWND hwndListView) -{ - 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); +SetListBoxColumns(HWND hwndListBox) +{ + INT tabs[2] = {30, 170}; + SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)(LPINT) &tabs[0]); } @@ -481,10 +457,10 @@ } 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))

17 years, 4 months

← Newer
1
...
5
6
7
8
9
10
11
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007