[SYSDM]

- Fix a bug in the creation of the 'PagingFiles' registry value. - Set paging file sizes only if both user defined sizes are valid numerical values and display a warning otherwise. - Translators: Please translate the message strings! svn path=/trunk/; revision=47525
2024-12-28 18:15:11 +00:00 · 2010-06-02 22:29:19 +00:00 · 2010-06-02 22:29:19 +00:00 · 23e08cb25e
commit 23e08cb25e
parent 4fad7fd616
23 changed files with 120 additions and 32 deletions
--- a/reactos/dll/cpl/sysdm/lang/bg-BG.rc
+++ b/reactos/dll/cpl/sysdm/lang/bg-BG.rc
@ -284,4 +284,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Âčä"
    IDS_USERPROFILE_STATUS "Ńúńňî˙íčĺ"
    IDS_USERPROFILE_MODIFIED "Čçěĺíĺí"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/cs-CZ.rc
+++ b/reactos/dll/cpl/sysdm/lang/cs-CZ.rc
@ -289,4 +289,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Typ"
    IDS_USERPROFILE_STATUS "Status"
    IDS_USERPROFILE_MODIFIED "Upraveno"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/da-DK.rc
+++ b/reactos/dll/cpl/sysdm/lang/da-DK.rc
@ -123,4 +123,7 @@ BEGIN
    IDS_MINI_DUMP "Minidump(64KB)"
    IDS_KERNEL_DUMP "Kernel dump"
    IDS_FULL_DUMP "Complete dump"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/de-DE.rc
+++ b/reactos/dll/cpl/sysdm/lang/de-DE.rc
@ -289,5 +289,8 @@ BEGIN
    IDS_USERPROFILE_TYPE "Typ"
    IDS_USERPROFILE_STATUS "Status"
    IDS_USERPROFILE_MODIFIED "Geändert"
+    IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System"""
+    IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an."
+    IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an."
    IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n"
 END
--- a/reactos/dll/cpl/sysdm/lang/el-GR.rc
+++ b/reactos/dll/cpl/sysdm/lang/el-GR.rc
@ -285,4 +285,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Ôýđďň"
    IDS_USERPROFILE_STATUS "ĘáôÜóôáóç"
    IDS_USERPROFILE_MODIFIED "ÔńďđďđďéŢčçęĺ"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/en-US.rc
+++ b/reactos/dll/cpl/sysdm/lang/en-US.rc
@ -284,5 +284,8 @@ BEGIN
    IDS_USERPROFILE_TYPE "Type"
    IDS_USERPROFILE_STATUS "Status"
    IDS_USERPROFILE_MODIFIED "Modified"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
    IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n"
 END
--- a/reactos/dll/cpl/sysdm/lang/es-ES.rc
+++ b/reactos/dll/cpl/sysdm/lang/es-ES.rc
@ -287,4 +287,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Tipo"
    IDS_USERPROFILE_STATUS "Estado"
    IDS_USERPROFILE_MODIFIED "Modificado"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/fr-FR.rc
+++ b/reactos/dll/cpl/sysdm/lang/fr-FR.rc
@ -287,4 +287,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Type"
    IDS_USERPROFILE_STATUS "Statut"
    IDS_USERPROFILE_MODIFIED "Modifié"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/hu-HU.rc
+++ b/reactos/dll/cpl/sysdm/lang/hu-HU.rc
@ -126,4 +126,7 @@ BEGIN
    IDS_MINI_DUMP "Minidump(64KB)"
    IDS_KERNEL_DUMP "Kernel dump"
    IDS_FULL_DUMP "Complete dump"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/id-ID.rc
+++ b/reactos/dll/cpl/sysdm/lang/id-ID.rc
@ -281,4 +281,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Type"
    IDS_USERPROFILE_STATUS "Status"
    IDS_USERPROFILE_MODIFIED "Modified"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/it-IT.rc
+++ b/reactos/dll/cpl/sysdm/lang/it-IT.rc
@ -284,5 +284,8 @@ BEGIN
    IDS_USERPROFILE_TYPE "Tipo"
    IDS_USERPROFILE_STATUS "Stato"
    IDS_USERPROFILE_MODIFIED "Modificato"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
    IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nUlteriori ringraziamenti\n\na tutti i Contributers\nWine Team\n\n"
 END
--- a/reactos/dll/cpl/sysdm/lang/ja-JP.rc
+++ b/reactos/dll/cpl/sysdm/lang/ja-JP.rc
@ -284,4 +284,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "種類"
    IDS_USERPROFILE_STATUS "状態"
    IDS_USERPROFILE_MODIFIED "変更日"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/nl-NL.rc
+++ b/reactos/dll/cpl/sysdm/lang/nl-NL.rc
@ -125,5 +125,7 @@ BEGIN
    IDS_MINI_DUMP "Minidump(64KB)"
    IDS_KERNEL_DUMP "Kernel dump"
    IDS_FULL_DUMP "Complete dump"
-
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/no-NO.rc
+++ b/reactos/dll/cpl/sysdm/lang/no-NO.rc
@ -283,4 +283,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Type"
    IDS_USERPROFILE_STATUS "Status"
    IDS_USERPROFILE_MODIFIED "Modifisert"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/pl-PL.rc
+++ b/reactos/dll/cpl/sysdm/lang/pl-PL.rc
@ -288,4 +288,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Typ"
    IDS_USERPROFILE_STATUS "Stan"
    IDS_USERPROFILE_MODIFIED "Zmodyfikowano"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/ro-RO.rc
+++ b/reactos/dll/cpl/sysdm/lang/ro-RO.rc
@ -1,4 +1,4 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL

 #pragma code_page(65001)

@ -284,6 +284,9 @@ BEGIN
    IDS_USERPROFILE_TYPE "Tip"
    IDS_USERPROFILE_STATUS "Stare"
    IDS_USERPROFILE_MODIFIED "Modificat"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END

 #pragma code_page(default)
--- a/reactos/dll/cpl/sysdm/lang/ru-RU.rc
+++ b/reactos/dll/cpl/sysdm/lang/ru-RU.rc
@ -282,4 +282,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Ňčď"
    IDS_USERPROFILE_STATUS "Ńîńňî˙íčĺ"
    IDS_USERPROFILE_MODIFIED "Čçěĺíĺí"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/sk-SK.rc
+++ b/reactos/dll/cpl/sysdm/lang/sk-SK.rc
@ -290,4 +290,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Typ"
    IDS_USERPROFILE_STATUS "Stav"
    IDS_USERPROFILE_MODIFIED "Modifikovaný"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/sv-SE.rc
+++ b/reactos/dll/cpl/sysdm/lang/sv-SE.rc
@ -284,4 +284,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Typ"
    IDS_USERPROFILE_STATUS "Status"
    IDS_USERPROFILE_MODIFIED "Ändrad"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/uk-UA.rc
+++ b/reactos/dll/cpl/sysdm/lang/uk-UA.rc
@ -290,4 +290,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "Ňčď"
    IDS_USERPROFILE_STATUS "Ńňŕí"
    IDS_USERPROFILE_MODIFIED "Çěłíĺíî"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/lang/zh-CN.rc
+++ b/reactos/dll/cpl/sysdm/lang/zh-CN.rc
@ -287,4 +287,7 @@ BEGIN
    IDS_USERPROFILE_TYPE "ŔŕĐÍ"
    IDS_USERPROFILE_STATUS "×´ĚŹ"
    IDS_USERPROFILE_MODIFIED "ĐŢ¸Ä"
+    IDS_MESSAGEBOXTITLE "System control panel applet"
+    IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file."
+    IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file."
 END
--- a/reactos/dll/cpl/sysdm/resource.h
+++ b/reactos/dll/cpl/sysdm/resource.h
@ -32,6 +32,9 @@
 #define IDS_USERPROFILE_STATUS          75
 #define IDS_USERPROFILE_MODIFIED        76

+#define IDS_MESSAGEBOXTITLE             77
+#define IDS_WARNINITIALSIZE             78
+#define IDS_WARNMAXIMUMSIZE             79

 /* propsheet - general */
 #define IDD_PROPPAGEGENERAL             100
--- a/reactos/dll/cpl/sysdm/virtmem.c
+++ b/reactos/dll/cpl/sysdm/virtmem.c
@ -220,7 +220,7 @@ WritePageFileSettings(PVIRTMEM pVirtMem)
                      pVirtMem->Pagefile[i].MaxValue);

            /* Add it to our overall registry string */
-            lstrcat(szPagingFiles + nPos, szText);
+            lstrcpy(szPagingFiles + nPos, szText);

            /* Record the position where the next string will start */
            nPos += (INT)lstrlen(szText) + 1;
@ -299,8 +299,11 @@ static VOID
 OnSet(PVIRTMEM pVirtMem)
 {
    INT Index;
-    UINT Value;
+    UINT InitValue;
+    UINT MaxValue;
    BOOL bTranslated;
+    TCHAR szTitle[64];
+    TCHAR szMessage[256];

    pVirtMem->bSave = TRUE;

@ -315,41 +318,61 @@ OnSet(PVIRTMEM pVirtMem)
        if (IsDlgButtonChecked(pVirtMem->hSelf,
                               IDC_CUSTOM) == BST_CHECKED)
        {
-            Value = GetDlgItemInt(pVirtMem->hSelf,
-                                  IDC_INITIALSIZE,
-                                  &bTranslated,
-                                  FALSE);
+            InitValue = 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,
-                              pVirtMem->Pagefile[Index].InitialValue,
-                              FALSE);
-            }
-            else
-            {
-                pVirtMem->Pagefile[Index].InitialValue = Value;
+                if (LoadString(hApplet,
+                               IDS_MESSAGEBOXTITLE,
+                               szTitle,
+                               sizeof(szTitle) / sizeof(szTitle[0])) == 0)
+                    _tcscpy(szTitle, _T("System control panel applet"));
+
+                if (LoadString(hApplet,
+                               IDS_WARNINITIALSIZE,
+                               szMessage,
+                               sizeof(szMessage) / sizeof(szMessage[0])) == 0)
+                    _tcscpy(szMessage, _T("Enter a numeric value for the initial size of the paging file."));
+
+                MessageBox(NULL,
+                           szMessage,
+                           szTitle,
+                           MB_ICONWARNING | MB_OK);
+                return;
            }

-            Value = GetDlgItemInt(pVirtMem->hSelf,
-                                  IDC_MAXSIZE,
-                                  &bTranslated,
-                                  FALSE);
+            MaxValue = 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,
-                              pVirtMem->Pagefile[Index].MaxValue,
-                              FALSE);
-            }
-            else
-            {
-                pVirtMem->Pagefile[Index].MaxValue = Value;
+                if (LoadString(hApplet,
+                               IDS_MESSAGEBOXTITLE,
+                               szTitle,
+                               sizeof(szTitle) / sizeof(szTitle[0])) == 0)
+                    _tcscpy(szTitle, _T("System control panel applet"));
+
+                if (LoadString(hApplet,
+                               IDS_WARNMAXIMUMSIZE,
+                               szMessage,
+                               sizeof(szMessage) / sizeof(szMessage[0])) == 0)
+                    _tcscpy(szMessage, _T("Enter a numeric value for the maximum size of the paging file."));
+
+                MessageBox(NULL,
+                           szMessage,
+                           szTitle,
+                           MB_ICONWARNING | MB_OK);
+                return;
            }
+
+            /* FIXME: Add more file size checks! */
+
+            pVirtMem->Pagefile[Index].InitialValue = InitValue;
+            pVirtMem->Pagefile[Index].MaxValue = MaxValue;
+            pVirtMem->Pagefile[Index].bUsed = TRUE;
        }
        else
        {