[ros-diffs] [ekohl] 62701: [SYSDM] - Improve the paging file management code. - Display no paging file and system managed paging file in the list. - Do not display the total paging file size because the calcul...

Author: ekohl
Date: Thu Apr 10 21:51:29 2014
New Revision: 62701

URL: http://svn.reactos.org/svn/reactos?rev=62701&view=rev
Log:
[SYSDM]
- Improve the paging file management code.
- Display no paging file and system managed paging file in the list.
- Do not display the total paging file size because the calculated value is rubbish. Will
be fixed next.

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/he-IL.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/sq-AL.rc
    trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc
    trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc
    trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc
    trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc
    trunk/reactos/dll/cpl/sysdm/precomp.h
    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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Въведете числена стойност за
върховия размер на страниращия файл."
     IDS_WARNINITIALRANGE "Началният размер на
страниращия файл не трябва да е по-малък от 2 МБ и
не трябва да надхвърля свободното пространство на избраното
устройство."
     IDS_WARNMAXIMUMRANGE "Върховият размер на страниращия файл не трябва да е
по-малък от началния и не трябва да надвишава
свободното пространство на избраното
устройство"
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -280,5 +280,7 @@
     IDS_WARNMAXIMUMSIZE "Zadejte číselnou hodnotu pro maximální velikost
stránkovacího souboru."
     IDS_WARNINITIALRANGE "Výchozí velikost stránkovacího souboru nesmí být
menší než 2 MB a nesmí překročit množství volného místa na zvolené diskové
jednotce."
     IDS_WARNMAXIMUMRANGE "Maximální velikost stránkovacího souboru nesmí být
menší než velikost výchozí a nesmí překročit množství volného místa na
zvolené diskové jednotce."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -284,5 +284,7 @@
     IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße
der Auslagerungsdatei an."
     IDS_WARNINITIALRANGE "Die Anfangsgröße der Auslagerungsdatei darf nicht
kleiner als 2 MB sein und darf den verfügbaren Speicherplatz auf dem gewählten Laufwerk
nicht überschreiten."
     IDS_WARNMAXIMUMRANGE "Die Maximalgröße der Auslagerungsdatei darf nicht
kleiner als die Anfangsgröße sein und darf den verfügbaren Speicherplatz auf dem
gewählten Laufwerk nicht überschreiten."
+    IDS_PAGEFILE_NONE "Keine"
+    IDS_PAGEFILE_SYSTEM "Systemverwaltet"
     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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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 Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Ingresar el tamaño máximo del archivo de
paginación."
     IDS_WARNINITIALRANGE "El tamaño inicial del archivo de paginación no puede ser
inferior a 2 MB y no puede exceder el espacio disponible en la unidad seleccionada."
     IDS_WARNMAXIMUMRANGE "El tamaño máximo del archivo de paginación no puede ser
inferior al tamaño inicial y no puede exceder el espacio disponible en la unidad
seleccionada."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/he-IL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/he-IL.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/he-IL.rc	[iso-8859-1] Thu Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Immettere la dimensione massima del file di paging."
     IDS_WARNINITIALRANGE "La dimensione iniziale del file di paging non può essere
inferiore a 2 MB e non può superare lo spazio disponibile nell'unità 
selezionata."
     IDS_WARNMAXIMUMRANGE "La dimensione massima del file di paging non può essere
inferiore a quella iniziale e non può superare lo spazio disponibile nell'unità 
selezionata."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -284,5 +284,7 @@
     IDS_WARNMAXIMUMSIZE "Wprowadź wielkość dla maksymalnego rozmiaru pliku
stronicowania."
     IDS_WARNINITIALRANGE "Początkowy rozmiar pliku stronicowania nie może być mniejszy niż 2MB i nie może
przekraczać dostępnej ilości miejsca w wybranym napędzie."
     IDS_WARNMAXIMUMRANGE "Maksymalny rozmiar pliku stronicowania nie może być
mniejszy niż jego rozmiar początkowy i nie może przekraczać dostępnej ilości miejsca w wybranym napędzie."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     IDS_DEVS "\nEkipa ReactOS\n\nKoordynator Projektu\n\nAleksey Bragin\n\nEkipa
Programistów\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\nInżynierowie Wydań\n\nColin Finck\nZ98\n\nEkipa WWW\n\nColin
Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEkipa PR\n\nMindflyer\nWierd_W\n\nPodziękowania
dla\n\nwszystkich współpracowników\nEkipy Wine\n\n"//FIXME
 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 Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Introduceți o valoare numerică pentru dimensiunea maximă
a fișierului de paginare."
     IDS_WARNINITIALRANGE "Dimensiunea inițială a fișierului de paginare trebuie
să fie încadrată între 2 Mo și spațiul liber disponibil al unității
selectate."
     IDS_WARNMAXIMUMRANGE "Dimensiunea maximă a fișierului de paginare trebuie să
fie încadrată între dimensiunea inițială și spațiul liber disponibil al unității
selectate."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     IDS_DEVS "\nEchipa ReactOS\n\nCoordonator de proiect\n\nAleksey Bragin\n\nEchipa
de dezvoltare\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\nIngineri de distribuție\n\nColin Finck\nZ98\n\nEchipa paginii
web\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nEchipa
multimedia\n\nMindflyer\nWierd_W\n\nmulțumiri adresate către\n\ntoți
Contribuitorii\nEchipa Wine\n\n"
 END

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 Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Введите числовое значение для
параметра максимальный размер файла
подкачки."
     IDS_WARNINITIALRANGE "Начальный размер файла
подкачки должен быть не меньше, чем 2 МБ и не
должен превышать свободного места на выбранном
диске."
     IDS_WARNMAXIMUMRANGE "Максимальный размер файла
подкачки должен быть не меньше, чем начальный
размер, который не должен превышать свободного
места на выбранном диске."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     IDS_DEVS "\nКоманда ReactOS\n\nКоординатор
проекта\n\nАлексей Брагин\n\nКоллектив
разработчиков\n\nАлексей Брагин\nЭндрю
Гринвуд\nАндрей Коротаев\nАрт Йеркс\nКристоф фон
Виттих\nКолин Финк\nДаниэль Раймер\nДмитрий
Чапышев\nЭрик Коль\nГед Мёрфи\nГрегор
Брюнмар\nЭрве Поссино\nДжеймс Тэбор\nДжеффри
Морлан\nЙоханнес Андервальд\nKJK::Гиперион\nМаартен
Босма\nМагнус Олсен\nМарк Пиулахс\nМаттиас Купфер\nМайк Норделл\nПитер Вард\nПьер
Швейцер\nСавелий Третьяков\nСтефан
Гинсберг\nСильвейн Петреоль\nТомас Блюмель\nТимо
Кройцер\n\nАлекс Ионеску\nФилип Навара\nГуннар
Далснес\nМартин Фукс\nРойс Митчелл III\nБрэндон
Тёрнер\nБрайан Палмер\nКаспер Хорнструп\nДэвид
Велч\nЭмануэль Алиберти\nГе ван Гельдорп\nГрегор
Анич\nДжейсон Филби\nЙенс Коллин\nМихаэль Вирт\nНатан Вудс\nРоберт Дикенсон\nРекс
Джоллифф\nVizzini\n\nРелиз-инженеры\n\nКолин
Финк\nЦзылян Гуо\n\nРазработка веб-сайта\n\nКолин
Финк\nЯн Блумквист Кинандер\nКлеменс
Фридл\nЦзылян Гуо\n\nГрафический
дизайн\n\nMindflyer\nWierd_W\n\nБлагодарности\n\nвсем
участникам проекта\nКоманде Wine\n\n"
 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 Apr 10 21:51:29 2014
@@ -283,5 +283,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/sq-AL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sq-AL.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/sq-AL.rc	[iso-8859-1] Thu Apr 10 21:51:29 2014
@@ -275,5 +275,7 @@
     IDS_WARNMAXIMUMSIZE "Futni një vlerë numerike për madhësinë maksimale e
faqeve të dokumentave."
     IDS_WARNINITIALRANGE "Madhësia fillestare e faqes së dokumentit nuk duhet të
jetë më e vogël se 2 MB dhe nuk duhet të kalojë hapësirën në dispozicion në
driver-in e përzgjedhur."
     IDS_WARNMAXIMUMRANGE "Madhësia maksimale e faqes së dokumenit nuk duhet të
jetë më e vogël se madhësia e saj fillestare dhe nuk duhet të kalojë hapësirën në
dispozicion në driver-in e përzgjedhur."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/tr-TR.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/tr-TR.r…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/lang/tr-TR.rc	[iso-8859-1] Thu Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Sayfalama kütüğünün azamî büyüklüğünü
giriniz."
     IDS_WARNINITIALRANGE "Sayfalama kütüğünün başlangıç büyüklüğü, 2
MB'tan küçük, seçili sürücüdeki boşluğun büyüklüğünden büyük
olamaz."
     IDS_WARNMAXIMUMRANGE "Sayfalama kütüğünün azamî büyüklüğü,
başlangıç büyüklüğünden küçük, seçili sürücüdeki boşluğun
büyüklüğünden büyük olamaz."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     IDS_DEVS "\nReactOS Takımı\n\nTasarı Eş Güdümcüsü:\n\nAleksey
Bragin\n\nGeliştirme Takımı:\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\nSürüm Tasarlayıcıları:\n\nColin Finck\nZ98\n\nUmûmî Ağ Sitesi
Takımı:\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedya
Takımı:\n\nMindflyer\nWierd_W\n\nAyrıca, diğer tüm katkıda bulunanlara
teşekkürler:\nWine Takımı\n\n"
 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 Apr 10 21:51:29 2014
@@ -283,5 +283,7 @@
     IDS_WARNMAXIMUMSIZE "Введіть числове значення для
максимального розміру файлу довантаження."
     IDS_WARNINITIALRANGE "Початковий розмір файлу
довантаження не повинен бути меншим 2 Мб і не
повинен перевищувати об'єм вільного місця на
обраному диску."
     IDS_WARNMAXIMUMRANGE "Максимальний розмір файлу
довантаження не повинен бути меншим від
початкового та не повинен перевищувати об'єм
вільного місця на обраному диску."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/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 Apr 10 21:51:29 2014
@@ -277,5 +277,7 @@
     IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging
file."
     IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller
than 2 MB and must not exceed the available space on the selected drive."
     IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller
than its initial size and must not exceed the available space on the selected
drive."
+    IDS_PAGEFILE_NONE "none"
+    IDS_PAGEFILE_SYSTEM "system managed"
     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/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/precomp.h?re…
==============================================================================
--- trunk/reactos/dll/cpl/sysdm/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/sysdm/precomp.h	[iso-8859-1] Thu Apr 10 21:51:29 2014
@@ -51,6 +51,7 @@
 typedef struct _PAGEFILE
 {
     TCHAR  szDrive[3];
+    LPTSTR pszVolume;
     UINT   InitialSize;
     UINT   MaximumSize;
     UINT   FreeSize;

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 Apr 10 21:51:29 2014
@@ -37,6 +37,8 @@
 #define IDS_WARNMAXIMUMSIZE  79
 #define IDS_WARNINITIALRANGE 80
 #define IDS_WARNMAXIMUMRANGE 81
+#define IDS_PAGEFILE_NONE    82
+#define IDS_PAGEFILE_SYSTEM  83
 
 /* 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 Apr 10 21:51:29 2014
@@ -107,24 +107,18 @@
     TCHAR szDrives[1024];    // All drives
     LPTSTR DrivePtr = szDrives;
     TCHAR szDrive[3];        // Single drive
-    TCHAR szVolume[MAX_PATH];
-    TCHAR *szDisplayString;
-    INT InitialSize = 0;
-    INT MaximumSize = 0;
+    TCHAR szVolume[MAX_PATH + 1];
+    INT InitialSize;
+    INT MaximumSize;
     INT DriveLen;
     INT PgCnt = 0;
+    INT Len;
 
     DriveLen = GetLogicalDriveStrings(1023,
                                       szDrives);
 
-    szDisplayString = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH * 2 + 69) *
sizeof(TCHAR));
-    if (szDisplayString == NULL)
-        return;
-
     while (DriveLen != 0)
     {
-        INT Len;
-
         Len = lstrlen(DrivePtr) + 1;
         DriveLen -= Len;
 
@@ -135,68 +129,47 @@
 
         if (GetDriveType(DrivePtr) == DRIVE_FIXED)
         {
+            InitialSize = -1;
+            MaximumSize = -1;
+
             /* Does drive match the one in the registry ? */
             if (!_tcsncmp(pVirtMem->szPagingFiles, szDrive, 2))
             {
-                /* FIXME: We only check the first available pagefile in the reg */
                 GetPageFileSizes(pVirtMem->szPagingFiles,
                                  &InitialSize,
                                  &MaximumSize);
-
-                pVirtMem->Pagefile[PgCnt].InitialSize = InitialSize;
-                pVirtMem->Pagefile[PgCnt].MaximumSize = MaximumSize;
-                pVirtMem->Pagefile[PgCnt].bUsed = TRUE;
-                lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive);
-            }
-            else
-            {
-                pVirtMem->Pagefile[PgCnt].InitialSize = 0;
-                pVirtMem->Pagefile[PgCnt].MaximumSize = 0;
-                pVirtMem->Pagefile[PgCnt].bUsed = FALSE;
-                lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive);
-            }
-
-            _tcscpy(szDisplayString, szDrive);
-            _tcscat(szDisplayString, _T("\t"));
-
-            /* Set a volume label if there is one */
+            }
+
+            pVirtMem->Pagefile[PgCnt].InitialSize = InitialSize;
+            pVirtMem->Pagefile[PgCnt].MaximumSize = MaximumSize;
+            pVirtMem->Pagefile[PgCnt].bUsed = TRUE;
+            lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive);
+
+
+            /* Get the volume label if there is one */
             if (GetVolumeInformation(DrivePtr,
                                      szVolume,
-                                     255,
+                                     MAX_PATH + 1,
                                      NULL,
                                      NULL,
                                      NULL,
                                      NULL,
                                      0))
             {
-                if (szVolume[0] != _T('\0'))
-                {
-                    TCHAR szVol[MAX_PATH + 2];
-                    _stprintf(szVol, _T("[%s]"), szVolume);
-                    _tcscat(szDisplayString, szVol);
-                }
-            }
-
-            if ((InitialSize != 0) || (MaximumSize != 0))
-            {
-                TCHAR szSize[64];
-
-                _stprintf(szSize, _T("%i - %i"), InitialSize, MaximumSize);
-                _tcscat(szDisplayString, _T("\t"));
-                _tcscat(szDisplayString, szSize);
-            }
-
-            SendMessage(pVirtMem->hListBox, LB_ADDSTRING, (WPARAM)0,
(LPARAM)szDisplayString);
+                pVirtMem->Pagefile[PgCnt].pszVolume = HeapAlloc(GetProcessHeap(),
+                                                                0,
+                                                                (_tcslen(szVolume) + 1) *
sizeof(TCHAR));
+                if (pVirtMem->Pagefile[PgCnt].pszVolume != NULL)
+                    _tcscpy(pVirtMem->Pagefile[PgCnt].pszVolume, szVolume);
+            }
+
             PgCnt++;
         }
 
         DrivePtr += Len;
     }
 
-    SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)0, (LPARAM)0);
-    HeapFree(GetProcessHeap(), 0, szDisplayString);
     pVirtMem->Count = PgCnt;
-    OnSelChange(pVirtMem->hSelf, pVirtMem);
 }
 
 
@@ -211,9 +184,12 @@
 
     for (i = 0; i < pVirtMem->Count; ++i)
     {
-        if (pVirtMem->Pagefile[i].bUsed)
-        {
-            _stprintf(szText, _T("%s\\pagefile.sys %i %i"),
+        if (pVirtMem->Pagefile[i].bUsed &&
+            pVirtMem->Pagefile[i].InitialSize != -1 &&
+            pVirtMem->Pagefile[i].MaximumSize != -1)
+        {
+            _stprintf(szText,
+                      _T("%s\\pagefile.sys %i %i"),
                       pVirtMem->Pagefile[i].szDrive,
                       pVirtMem->Pagefile[i].InitialSize,
                       pVirtMem->Pagefile[i].MaximumSize);
@@ -261,9 +237,10 @@
 static VOID
 SetListBoxColumns(HWND hwndListBox)
 {
-    const INT tabs[2] = {30, 120};
-
-    SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)2, (LPARAM)&tabs[0]);
+    RECT rect = {0, 0, 103, 0};
+    MapDialogRect(hwndListBox, &rect);
+
+    SendMessage(hwndListBox, LB_SETTABSTOPS, (WPARAM)1, (LPARAM)&rect.right);
 }
 
 
@@ -291,6 +268,102 @@
     /* Enable the page file custom size boxes */
     EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE);
     EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE);
+}
+
+
+static VOID
+InitPagefileList(PVIRTMEM pVirtMem)
+{
+    TCHAR szDisplayString[256];
+    TCHAR szSize[64];
+    INT Index;
+    INT i;
+
+    for (i = 0; i < 26; i++)
+    {
+        if (pVirtMem->Pagefile[i].bUsed)
+        {
+            if ((pVirtMem->Pagefile[i].InitialSize == -1) &&
+                (pVirtMem->Pagefile[i].MaximumSize == -1))
+            {
+                LoadString(hApplet,
+                           IDS_PAGEFILE_NONE,
+                           szSize,
+                           sizeof(szSize) / sizeof(szSize[0]));
+            }
+            else if ((pVirtMem->Pagefile[i].InitialSize == 0) &&
+                     (pVirtMem->Pagefile[i].MaximumSize == 0))
+            {
+                LoadString(hApplet,
+                           IDS_PAGEFILE_SYSTEM,
+                           szSize,
+                           sizeof(szSize) / sizeof(szSize[0]));
+            }
+            else
+            {
+                _stprintf(szSize, _T("%d - %d"),
+                          pVirtMem->Pagefile[i].InitialSize,
+                          pVirtMem->Pagefile[i].MaximumSize);
+            }
+
+            _stprintf(szDisplayString,
+                      _T("%s  [%s]\t%s"),
+                      pVirtMem->Pagefile[i].szDrive,
+                      pVirtMem->Pagefile[i].pszVolume ?
pVirtMem->Pagefile[i].pszVolume : _T(""),
+                      szSize);
+
+            Index = SendMessage(pVirtMem->hListBox, LB_ADDSTRING, (WPARAM)0,
(LPARAM)szDisplayString);
+            SendMessage(pVirtMem->hListBox, LB_SETITEMDATA, Index, i);
+        }
+    }
+
+    SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)0, (LPARAM)0);
+
+    OnSelChange(pVirtMem->hSelf, pVirtMem);
+}
+
+
+static VOID
+UpdatePagefileEntry(PVIRTMEM pVirtMem,
+                    INT ListIndex,
+                    INT DriveIndex)
+{
+    TCHAR szDisplayString[256];
+    TCHAR szSize[64];
+
+    if ((pVirtMem->Pagefile[DriveIndex].InitialSize == -1) &&
+        (pVirtMem->Pagefile[DriveIndex].MaximumSize == -1))
+    {
+        LoadString(hApplet,
+                   IDS_PAGEFILE_NONE,
+                   szSize,
+                   sizeof(szSize) / sizeof(szSize[0]));
+    }
+    else if ((pVirtMem->Pagefile[DriveIndex].InitialSize == 0) &&
+             (pVirtMem->Pagefile[DriveIndex].MaximumSize == 0))
+    {
+        LoadString(hApplet,
+                   IDS_PAGEFILE_SYSTEM,
+                   szSize,
+                   sizeof(szSize) / sizeof(szSize[0]));
+    }
+    else
+    {
+        _stprintf(szSize,
+                  _T("%d - %d"),
+                  pVirtMem->Pagefile[DriveIndex].InitialSize,
+                  pVirtMem->Pagefile[DriveIndex].MaximumSize);
+    }
+
+    _stprintf(szDisplayString,
+              _T("%s  [%s]\t%s"),
+              pVirtMem->Pagefile[DriveIndex].szDrive,
+              pVirtMem->Pagefile[DriveIndex].pszVolume ?
pVirtMem->Pagefile[DriveIndex].pszVolume : L"",
+              szSize);
+
+    SendMessage(pVirtMem->hListBox, LB_DELETESTRING, (WPARAM)ListIndex, 0);
+    SendMessage(pVirtMem->hListBox, LB_INSERTSTRING, (WPARAM)ListIndex,
(LPARAM)szDisplayString);
+    SendMessage(pVirtMem->hListBox, LB_SETCURSEL, (WPARAM)ListIndex, 0);
 }
 
 
@@ -303,6 +376,7 @@
     BOOL bTranslated;
     TCHAR szTitle[64];
     TCHAR szMessage[256];
+    INT DriveIndex = 0;
 
     pVirtMem->bSave = TRUE;
 
@@ -313,6 +387,12 @@
                                      0);
     if (Index >= 0 && Index < pVirtMem->Count)
     {
+        DriveIndex = SendDlgItemMessage(pVirtMem->hSelf,
+                                        IDC_PAGEFILELIST,
+                                        LB_GETITEMDATA,
+                                        0,
+                                        0);
+
         /* Check if custom settings are checked */
         if (IsDlgButtonChecked(pVirtMem->hSelf,
                                IDC_CUSTOM) == BST_CHECKED)
@@ -369,7 +449,7 @@
 
             /* Check the valid range of the inial size */
             if (InitialSize < 2 ||
-                InitialSize > pVirtMem->Pagefile[Index].FreeSize)
+                InitialSize > pVirtMem->Pagefile[DriveIndex].FreeSize)
             {
                 if (LoadString(hApplet,
                                IDS_MESSAGEBOXTITLE,
@@ -391,7 +471,7 @@
 
             /* Check the valid range of the maximum size */
             if (MaximumSize < InitialSize ||
-                MaximumSize > pVirtMem->Pagefile[Index].FreeSize)
+                MaximumSize > pVirtMem->Pagefile[DriveIndex].FreeSize)
             {
                 if (LoadString(hApplet,
                                IDS_MESSAGEBOXTITLE,
@@ -411,27 +491,26 @@
                 return;
             }
 
-            pVirtMem->Pagefile[Index].InitialSize = InitialSize;
-            pVirtMem->Pagefile[Index].MaximumSize = MaximumSize;
-            pVirtMem->Pagefile[Index].bUsed = TRUE;
+            pVirtMem->Pagefile[DriveIndex].InitialSize = InitialSize;
+            pVirtMem->Pagefile[DriveIndex].MaximumSize = MaximumSize;
+            pVirtMem->Pagefile[DriveIndex].bUsed = TRUE;
+        }
+        else if (IsDlgButtonChecked(pVirtMem->hSelf,
+                                    IDC_NOPAGEFILE) == BST_CHECKED)
+        {
+            /* Set sizes to -1 */
+            pVirtMem->Pagefile[DriveIndex].InitialSize = -1;
+            pVirtMem->Pagefile[DriveIndex].MaximumSize = -1;
+            pVirtMem->Pagefile[DriveIndex].bUsed = TRUE;
         }
         else
         {
-            /* Set sizes to 0 */
-            pVirtMem->Pagefile[Index].InitialSize = 0;
-            pVirtMem->Pagefile[Index].MaximumSize = 0;
-
-            // Check to see if this drive is used for a paging file
-            if (IsDlgButtonChecked(pVirtMem->hSelf,
-                                   IDC_NOPAGEFILE) == BST_UNCHECKED)
-            {
-                pVirtMem->Pagefile[Index].bUsed = TRUE;
-            }
-            else
-            {
-                pVirtMem->Pagefile[Index].bUsed = FALSE;
-            }
-        }
+            pVirtMem->Pagefile[DriveIndex].InitialSize = 0;
+            pVirtMem->Pagefile[DriveIndex].MaximumSize = 0;
+            pVirtMem->Pagefile[DriveIndex].bUsed = TRUE;
+        }
+
+        UpdatePagefileEntry(pVirtMem, Index, DriveIndex);
     }
 }
 
@@ -442,7 +521,7 @@
     TCHAR szBuffer[64];
     MEMORYSTATUSEX MemoryStatus;
     ULARGE_INTEGER FreeDiskSpace;
-    UINT i, FreeMemMb, PageFileSizeMb;
+    UINT /*i,*/ FreeMemMb /*, PageFileSizeMb*/;
     INT Index;
 
     Index = (INT)SendDlgItemMessage(hwndDlg,
@@ -465,9 +544,30 @@
             SetDlgItemText(hwndDlg, IDC_SPACEAVAIL, szBuffer);
         }
 
-        if (pVirtMem->Pagefile[Index].InitialSize != 0 &&
-            pVirtMem->Pagefile[Index].MaximumSize != 0)
-        {
+        if (pVirtMem->Pagefile[Index].InitialSize == -1 &&
+            pVirtMem->Pagefile[Index].MaximumSize == -1)
+        {
+            /* No pagefile */
+
+            EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE);
+            EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE);
+
+            CheckDlgButton(pVirtMem->hSelf, IDC_NOPAGEFILE, BST_CHECKED);
+        }
+        else if (pVirtMem->Pagefile[Index].InitialSize == 0 &&
+                 pVirtMem->Pagefile[Index].MaximumSize == 0)
+        {
+            /* System managed size*/
+
+            EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE);
+            EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE);
+
+            CheckDlgButton(pVirtMem->hSelf, IDC_SYSMANSIZE, BST_CHECKED);
+        }
+        else
+        {
+            /* Custom size */
+
             /* Enable and fill the custom values */
             EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE);
             EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), TRUE);
@@ -486,26 +586,6 @@
                            IDC_CUSTOM,
                            BST_CHECKED);
         }
-        else
-        {
-            /* It's not a custom value */
-            EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), FALSE);
-            EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_INITIALSIZE), FALSE);
-
-            /* Is it system managed */
-            if (pVirtMem->Pagefile[Index].bUsed)
-            {
-                CheckDlgButton(pVirtMem->hSelf,
-                               IDC_SYSMANSIZE,
-                               BST_CHECKED);
-            }
-            else
-            {
-                CheckDlgButton(pVirtMem->hSelf,
-                               IDC_NOPAGEFILE,
-                               BST_CHECKED);
-            }
-        }
 
         /* Set minimum pagefile size */
         SetDlgItemText(hwndDlg, IDC_MINIMUM, _T("2 MB"));
@@ -520,6 +600,7 @@
         }
 
         /* Set current pagefile size */
+#if 0
         PageFileSizeMb = 0;
         for (i = 0; i < 26; i++)
         {
@@ -527,6 +608,7 @@
         }
         _stprintf(szBuffer, _T("%u MB"), PageFileSizeMb);
         SetDlgItemText(hwndDlg, IDC_CURRENT, szBuffer);
+#endif
     }
 
     return TRUE;
@@ -546,18 +628,46 @@
 static VOID
 OnInitDialog(HWND hwnd, PVIRTMEM pVirtMem)
 {
+    INT i;
+
     pVirtMem->hSelf = hwnd;
     pVirtMem->hListBox = GetDlgItem(hwnd, IDC_PAGEFILELIST);
     pVirtMem->bSave = FALSE;
 
     SetListBoxColumns(pVirtMem->hListBox);
 
+    for (i = 0; i < 26; i++)
+    {
+        pVirtMem->Pagefile[i].bUsed = FALSE;
+        pVirtMem->Pagefile[i].InitialSize = -1;
+        pVirtMem->Pagefile[i].MaximumSize = -1;
+    }
+
     /* Load the pagefile systems from the reg */
-    if (ReadPageFileSettings(pVirtMem))
-    {
-        /* Parse our settings and set up dialog */
-        ParseMemSettings(pVirtMem);
-    }
+    ReadPageFileSettings(pVirtMem);
+
+    /* Parse our settings and set up dialog */
+    ParseMemSettings(pVirtMem);
+
+    InitPagefileList(pVirtMem);
+}
+
+
+static VOID
+OnDestroy(PVIRTMEM pVirtMem)
+{
+    INT i;
+
+    for (i = 0; i < 26; i++)
+    {
+        if (pVirtMem->Pagefile[i].pszVolume != NULL)
+            HeapFree(GetProcessHeap(), 0, pVirtMem->Pagefile[i].pszVolume);
+    }
+
+    if (pVirtMem->szPagingFiles)
+        HeapFree(GetProcessHeap(), 0, pVirtMem->szPagingFiles);
+
+    HeapFree(GetProcessHeap(), 0, pVirtMem);
 }
 
 
@@ -589,10 +699,7 @@
             break;
 
         case WM_DESTROY:
-            if (pVirtMem->szPagingFiles)
-                HeapFree(GetProcessHeap(), 0,
-                         pVirtMem->szPagingFiles);
-            HeapFree(GetProcessHeap(), 0, pVirtMem);
+            OnDestroy(pVirtMem);
             break;
 
         case WM_COMMAND: