2 Jun
2010
2 Jun
'10
10:29 p.m.
Author: ekohl
Date: Thu Jun 3 00:29:19 2010
New Revision: 47525
URL: http://svn.reactos.org/svn/reactos?rev=47525&view=rev
Log:
[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!
Modified:
trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc
trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc
trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc
trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc
trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc
trunk/reactos/dll/cpl/sysdm/lang/en-US.rc
trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc
trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc
trunk/reactos/dll/cpl/sysdm/lang/hu-HU.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/ja-JP.rc
trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc
trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc
trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc
trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc
trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc
trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc
trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc
trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc
trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc
trunk/reactos/dll/cpl/sysdm/resource.h
trunk/reactos/dll/cpl/sysdm/virtmem.c
Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -284,4 +284,7 @@
IDS_USERPROFILE_TYPE "Âèä"
IDS_USERPROFILE_STATUS "Ñúñòîÿíèå"
IDS_USERPROFILE_MODIFIED "Èçìåíåí"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -289,4 +289,7 @@
IDS_USERPROFILE_TYPE "Typ"
IDS_USERPROFILE_STATUS "Status"
IDS_USERPROFILE_MODIFIED "Upraveno"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -123,4 +123,7 @@
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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -289,5 +289,8 @@
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
Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -285,4 +285,7 @@
IDS_USERPROFILE_TYPE "Ôýðïò"
IDS_USERPROFILE_STATUS "ÊáôÜóôáóç"
IDS_USERPROFILE_MODIFIED "ÔñïðïðïéÞèçêå"
-END
+ 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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -284,5 +284,8 @@
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
Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -287,4 +287,7 @@
IDS_USERPROFILE_TYPE "Tipo"
IDS_USERPROFILE_STATUS "Estado"
IDS_USERPROFILE_MODIFIED "Modificado"
-END
+ 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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -287,4 +287,7 @@
IDS_USERPROFILE_TYPE "Type"
IDS_USERPROFILE_STATUS "Statut"
IDS_USERPROFILE_MODIFIED "Modifié"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -126,4 +126,7 @@
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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -281,4 +281,7 @@
IDS_USERPROFILE_TYPE "Type"
IDS_USERPROFILE_STATUS "Status"
IDS_USERPROFILE_MODIFIED "Modified"
-END
+ 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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -284,5 +284,8 @@
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
Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -284,4 +284,7 @@
IDS_USERPROFILE_TYPE "íÞ"
IDS_USERPROFILE_STATUS "óÔ"
IDS_USERPROFILE_MODIFIED "ÏXú"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -125,5 +125,7 @@
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
Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -283,4 +283,7 @@
IDS_USERPROFILE_TYPE "Type"
IDS_USERPROFILE_STATUS "Status"
IDS_USERPROFILE_MODIFIED "Modifisert"
-END
+ 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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -288,4 +288,7 @@
IDS_USERPROFILE_TYPE "Typ"
IDS_USERPROFILE_STATUS "Stan"
IDS_USERPROFILE_MODIFIED "Zmodyfikowano"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -1,4 +1,4 @@
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
#pragma code_page(65001)
@@ -284,6 +284,9 @@
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)
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -282,4 +282,7 @@
IDS_USERPROFILE_TYPE "Òèï"
IDS_USERPROFILE_STATUS "Ñîñòîÿíèå"
IDS_USERPROFILE_MODIFIED "Èçìåíåí"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -290,4 +290,7 @@
IDS_USERPROFILE_TYPE "Typ"
IDS_USERPROFILE_STATUS "Stav"
IDS_USERPROFILE_MODIFIED "Modifikovaný"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -284,4 +284,7 @@
IDS_USERPROFILE_TYPE "Typ"
IDS_USERPROFILE_STATUS "Status"
IDS_USERPROFILE_MODIFIED "Ändrad"
-END
+ 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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -290,4 +290,7 @@
IDS_USERPROFILE_TYPE "Òèï"
IDS_USERPROFILE_STATUS "Ñòàí"
IDS_USERPROFILE_MODIFIED "Çì³íåíî"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -287,4 +287,7 @@
IDS_USERPROFILE_TYPE "ÀàÐÍ"
IDS_USERPROFILE_STATUS "״̬"
IDS_USERPROFILE_MODIFIED "ÐÞ¸Ä"
-END
+ 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
Modified: trunk/reactos/dll/cpl/sysdm/resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -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
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 [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Thu Jun 3 00:29:19 2010
@@ -220,7 +220,7 @@
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 @@
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 @@
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;
- }
-
- Value = GetDlgItemInt(pVirtMem->hSelf,
- IDC_MAXSIZE,
- &bTranslated,
- FALSE);
+ 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;
+ }
+
+ 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
{