Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[tkreuzer] 47542: [rbuild] - cleanup obsolete rbuild flags for amd64 - undefine WIN32 for amd64, only _WIN32 should be defined

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 17:50:19 2010 New Revision: 47542 URL: http://svn.reactos.org/svn/reactos?rev=47542&view=rev Log: [rbuild] - cleanup obsolete rbuild flags for amd64 - undefine WIN32 for amd64, only _WIN32 should be defined Modified: trunk/reactos/ReactOS-amd64.rbuild Modified: trunk/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4… ============================================================================== --- trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Thu Jun 3 17:50:19 2010 @@ -34,8 +34,8 @@   <compilerflag>-U_X86_</compilerflag> + <compilerflag>-UWIN32</compilerflag> <compilerflag>-Wno-format</compilerflag> - <compilerflag>-fno-leading-underscore</compilerflag> </group> <group linkerset="ld"> @@ -44,8 +44,6 @@ <linkerflag>-section-alignment=0x1000</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>-static</linkerflag> - <linkerflag>-fno-leading-underscore</linkerflag> - <linkerflag>-shared</linkerflag> <linkerflag>--exclude-all-symbols</linkerflag> </group>

14 years, 6 months

[ilardig] 47541: [SYSDM] - Update Italian and Spanish translations. - Add untranslated strings to the rest of the languages.

by ilardig＠svn.reactos.org

Author: ilardig Date: Thu Jun 3 17:09:08 2010 New Revision: 47541 URL: http://svn.reactos.org/svn/reactos?rev=47541&view=rev Log: [SYSDM] - Update Italian and Spanish translations. - Add untranslated strings to the rest of the languages. 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/el-GR.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 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 17:09:08 2010 @@ -287,4 +287,6 @@ 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 + 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." +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 17:09:08 2010 @@ -292,4 +292,6 @@ 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 + 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." +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 17:09:08 2010 @@ -126,4 +126,6 @@ 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_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." 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 17:09:08 2010 @@ -288,4 +288,6 @@ 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 + 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." +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 17:09:08 2010 @@ -288,6 +288,8 @@ IDS_USERPROFILE_STATUS "Estado" IDS_USERPROFILE_MODIFIED "Modificado" IDS_MESSAGEBOXTITLE "Applet de sistema del panel de control" - IDS_WARNINITIALSIZE "Ingresar el valor inicial del tamaño del archivo de paginación." - IDS_WARNMAXIMUMSIZE "Ingresar el valor máximo del tamaño del archivo de paginación." -END + IDS_WARNINITIALSIZE "Ingresar el tamaño inicial del archivo de paginación." + 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." +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 17:09:08 2010 @@ -290,4 +290,6 @@ 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 + 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." +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 17:09:08 2010 @@ -129,4 +129,6 @@ 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_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." 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 17:09:08 2010 @@ -284,4 +284,6 @@ 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 + 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." +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 17:09:08 2010 @@ -285,7 +285,9 @@ IDS_USERPROFILE_STATUS "Stato" IDS_USERPROFILE_MODIFIED "Modificato" IDS_MESSAGEBOXTITLE "Applet di sistema del pannello di controllo" - IDS_WARNINITIALSIZE "Immettere il valore per la dimensione iniziale del file di paging." - IDS_WARNMAXIMUMSIZE "Immettere il valore per la dimensione massima del file di paging." + IDS_WARNINITIALSIZE "Immettere la dimensione iniziale del file di paging." + 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_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 17:09:08 2010 @@ -287,4 +287,6 @@ 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 + 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." +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 17:09:08 2010 @@ -128,4 +128,6 @@ 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_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." 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 17:09:08 2010 @@ -286,4 +286,6 @@ 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 + 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." +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 17:09:08 2010 @@ -291,4 +291,6 @@ 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 + 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." +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 17:09:08 2010 @@ -287,6 +287,8 @@ 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_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." 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 17:09:08 2010 @@ -285,4 +285,6 @@ 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 + 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." +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 17:09:08 2010 @@ -293,4 +293,6 @@ 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 + 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." +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 17:09:08 2010 @@ -287,4 +287,6 @@ 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 + 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." +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 17:09:08 2010 @@ -293,4 +293,6 @@ 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 + 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." +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 17:09:08 2010 @@ -290,4 +290,6 @@ 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 + 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." +END

14 years, 6 months

[tkreuzer] 47540: [ACPICA] - Hack acwin64.h, don't assume msvc for win64

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 16:55:25 2010 New Revision: 47540 URL: http://svn.reactos.org/svn/reactos?rev=47540&view=rev Log: [ACPICA] - Hack acwin64.h, don't assume msvc for win64 Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h Modified: trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpica/in… ============================================================================== --- trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/acpi/acpica/include/platform/acwin64.h [iso-8859-1] Thu Jun 3 16:55:25 2010 @@ -118,10 +118,14 @@ /*! [Begin] no source code translation (Keep the include) */ -#include "acintel.h" +//#include "acintel.h" +// HACK +#define INT32 _ACPI_INT32 +#define UINT32 _ACPI_UINT32 + /*! [End] no source code translation !*/ -#define ACPI_MACHINE_WIDTH 64 +#define ACPI_MACHINE_WIDTH 64 #define ACPI_USE_STANDARD_HEADERS

14 years, 6 months

[tkreuzer] 47539: [RBUILD] - append stdcall decoration only for i386 target

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 16:49:47 2010 New Revision: 47539 URL: http://svn.reactos.org/svn/reactos?rev=47539&view=rev Log: [RBUILD] - append stdcall decoration only for i386 target Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Thu Jun 3 16:49:47 2010 @@ -1113,23 +1113,23 @@ switch ( type ) { case Kernel: - if (Environment::GetArch() == "arm") return "KiSystemStartup"; - return "KiSystemStartup@4"; + if (Environment::GetArch() == "i386") return "KiSystemStartup@4"; + return "KiSystemStartup"; case KeyboardLayout: case KernelModeDLL: case KernelModeDriver: - if (Environment::GetArch() == "arm") return "DriverEntry"; - return "DriverEntry@8"; + if (Environment::GetArch() == "i386") return "DriverEntry@8"; + return "DriverEntry"; case NativeDLL: - if (Environment::GetArch() == "arm") return "DllMainCRTStartup"; - return "DllMainCRTStartup@12"; + if (Environment::GetArch() == "i386") return "DllMainCRTStartup@12"; + return "DllMainCRTStartup"; case NativeCUI: - if (Environment::GetArch() == "arm") return "NtProcessStartup"; - return "NtProcessStartup@4"; + if (Environment::GetArch() == "i386") return "NtProcessStartup@4"; + return "NtProcessStartup"; case Win32DLL: case Win32OCX: - if (Environment::GetArch() == "arm") return "DllMain"; - return "DllMain@12"; + if (Environment::GetArch() == "i386") return "DllMain@12"; + return "DllMain"; case Win32CUI: case Test: return "mainCRTStartup";

14 years, 6 months

[tkreuzer] 47538: merge 46805 from amd64 branch: [RBUILD] Fix some parameters (starting with --, not with -)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 16:19:18 2010 New Revision: 47538 URL: http://svn.reactos.org/svn/reactos?rev=47538&view=rev Log: merge 46805 from amd64 branch: [RBUILD] Fix some parameters (starting with --, not with -) Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak Modified: trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/linkers/ld.mak [iso-8859-1] Thu Jun 3 16:19:18 2010 @@ -1,12 +1,12 @@ # -exclude-all-symbols disables autoexporting all symbols *if none were found* (either in a DEF file or using __declspec(dllexport) -LDFLAG_DLL:=-shared -exclude-all-symbols -LDFLAG_DRIVER:=-shared --subsystem=native -exclude-all-symbols -LDFLAG_NOSTDLIB:=-nostartfiles -nostdlib +LDFLAG_DLL:=--shared --exclude-all-symbols +LDFLAG_DRIVER:=--shared --subsystem=native --exclude-all-symbols +LDFLAG_NOSTDLIB:=--nostartfiles --nostdlib LDFLAG_CONSOLE:=--subsystem=console LDFLAG_WINDOWS:=--subsystem=windows LDFLAG_NATIVE:=--subsystem=native -LDFLAG_EXCLUDE_ALL_SYMBOLS=-exclude-all-symbols +LDFLAG_EXCLUDE_ALL_SYMBOLS=--exclude-all-symbols DLLTOOL_FLAGS=--kill-at ifeq ($(ARCH),amd64) DLLTOOL_FLAGS= --no-leading-underscore @@ -87,4 +87,4 @@ #~ #(module, def, deps, ldflags, libs, entry, base) #~ RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(5) $(value $(1)_LIBS) $(5),$(6),$(7)} #(module, def, deps, ldflags, libs, entry, base, extralibs) -RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)} +RBUILD_LINK_RULE=${call RBUILD_LINK,$(1),$(value $(1)_OBJS),$(3),$(4),$(value $(1)_TARGET),$(2),$(value $(1)_LIBS),$(6),$(7),$(5)}

14 years, 6 months

[tkreuzer] 47537: [NTOSKNRL] Add AVL tree code. Incomplete and unused yet.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 16:02:06 2010 New Revision: 47537 URL: http://svn.reactos.org/svn/reactos?rev=47537&view=rev Log: [NTOSKNRL] Add AVL tree code. Incomplete and unused yet. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmavl.c (with props) Added: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmavl.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmavl.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmavl.c [iso-8859-1] Thu Jun 3 16:02:06 2010 @@ -1,0 +1,373 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: ntoskrnl/mm/mmavl.c + * PURPOSE: AVL tree routines for the memory manager + * + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) + */ + +/* INCLUDES *******************************************************'**********/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +typedef struct _MMADDRESS_LIST +{ + ULONG_PTR StartVpn; + ULONG_PTR EndVpn; +} MMADDRESS_LIST, *PMMADDRESS_LIST; + +typedef struct _MMADDRESS_NODE +{ + union + { + LONG_PTR Balance : 2; + struct _MMADDRESS_NODE* Parent; + } u1; + struct _MMADDRESS_NODE* LeftChild; + struct _MMADDRESS_NODE* RightChild; + ULONG_PTR StartingVpn; + ULONG_PTR EndingVpn; +} MMADDRESS_NODE, *PMMADDRESS_NODE; + +typedef struct _MM_AVL_TABLE +{ + MMADDRESS_NODE BalancedRoot; + struct + { + ULONG_PTR DepthOfTree : 5; + ULONG_PTR Unused : 3; +#ifdef _WIN64 + ULONG_PTR NumberGenericTableElements : 56; +#else + ULONG_PTR NumberGenericTableElements : 24; +#endif + }; + PVOID NodeHint; + PVOID NodeFreeHint; +} MM_AVL_TABLE, *PMM_AVL_TABLE; + +enum +{ + BALANCED = 0, + LEFTHEAVY = -1, + RIGHTHEAVY = 1, + UNBALANCED = -2, +}; + +/* FUNCTIONS *****************************************************************/ + +PMMADDRESS_NODE +FORCEINLINE +MiAvlGetParent( + IN PMMADDRESS_NODE Node) +{ + return (PMMADDRESS_NODE)((ULONG_PTR)Node->u1.Parent & ~3); +} + +void +FORCEINLINE +MiAvlSetParent( + IN PMMADDRESS_NODE Node, + IN PMMADDRESS_NODE Parent) +{ + ULONG_PTR Balance; + + /* First mask everything except the balance */ + Balance =(ULONG_PTR)Node->u1.Parent & 3; + + Node->u1.Parent = (PMMADDRESS_NODE)(Balance | (ULONG_PTR)Parent); +} + +void +FORCEINLINE +MiAvlShiftBalanceLeft(PMMADDRESS_NODE Node) +{ + ULONG_PTR Balance = (ULONG_PTR)Node->u1.Parent; + Balance--; + Balance &= 3; + Node->u1.Parent = (PVOID)((ULONG_PTR)MiAvlGetParent(Node) | Balance); +} + +void +FORCEINLINE +MiAvlShiftBalanceRight(PMMADDRESS_NODE Node) +{ + ULONG_PTR Balance = (ULONG_PTR)Node->u1.Parent; + Balance++; + Balance &= 3; + Node->u1.Parent = (PVOID)((ULONG_PTR)MiAvlGetParent(Node) | Balance); +} + +PMMADDRESS_NODE +FORCEINLINE +MiAvlRotateRight( + PMMADDRESS_NODE OldParent, + PMMADDRESS_NODE OldLeftChild) +{ + PMMADDRESS_NODE NewParent, NewRightChild; + + /* The old left child becomes the new parent */ + NewParent = OldLeftChild; + + /* The old parent becomes the new right child */ + NewRightChild = OldParent; + + /* Move the former right child of the old left child over + to the right child */ + NewRightChild->LeftChild = OldLeftChild->RightChild; + + /* Set parent, keep balance, may change BalancedRoot.u1.Parent */ + MiAvlSetParent(NewRightChild->LeftChild, NewRightChild); + + /* Attach the new right child to the new parent */ + NewParent->RightChild = NewRightChild; + NewRightChild->u1.Parent = NewParent; + + return NewParent; +} + +PMMADDRESS_NODE +FORCEINLINE +MiAvlRotateLeft( + PMMADDRESS_NODE OldParent, + PMMADDRESS_NODE OldRightChild) +{ + PMMADDRESS_NODE NewParent, NewLeftChild; + + /* The old right child becomes the new parent */ + NewParent = OldRightChild; + + /* The old parent becomes the new left child */ + NewLeftChild = OldParent; + + /* Move the former left child of the old right child over + to the left child */ + NewLeftChild->RightChild = OldRightChild->LeftChild; + + /* Set parent, keep balance, may change BalancedRoot.u1.Parent */ + MiAvlSetParent(NewLeftChild->RightChild, NewLeftChild); + + /* Attach the new left child to the new parent */ + NewParent->LeftChild = NewLeftChild; + NewLeftChild->u1.Parent = NewParent; + + return NewParent; +} + +void +FORCEINLINE +MiAvlRebalance( + IN PMMADDRESS_NODE OldParent, + IN PMMADDRESS_NODE OldChild) +{ + PMMADDRESS_NODE NewParent, NewChild, GrandParent; + + /* Save grandparent for later */ + GrandParent = MiAvlGetParent(OldParent); + + if (OldChild == OldParent->LeftChild) + { + if (OldChild->u1.Balance == LEFTHEAVY) + { + /* left-left case */ + NewParent = MiAvlRotateRight(OldParent, OldChild); + } + else + { + /* left-right case */ + NewChild = MiAvlRotateLeft(OldChild, OldChild->RightChild); + NewParent = MiAvlRotateRight(OldParent, NewChild); + } + } + else /* (OldChild == OldParent->LeftChild) */ + { + if (OldChild->u1.Balance == RIGHTHEAVY) + { + /* right-right case */ + NewParent = MiAvlRotateLeft(OldParent, OldChild); + } + else + { + /* right-left case */ + NewChild = MiAvlRotateRight(OldChild, OldChild->LeftChild); + NewParent = MiAvlRotateLeft(OldParent, NewChild); + } + } + + /* Link to the grandparent */ + NewParent->u1.Parent = GrandParent; + ASSERT(NewParent->u1.Balance == BALANCED); + + /* If GrandParent is &BalancedRoot, then this will be true */ + if (OldParent == GrandParent->RightChild) + { + GrandParent->RightChild = NewParent; + } + else + { + GrandParent->LeftChild = NewParent; + } +} + +VOID +NTAPI +MiInitializeAvlTable( + IN PMM_AVL_TABLE AvlTable) +{ + /* Set all links to BalancedRoot. Nodes will be attached as RightChild */ + AvlTable->BalancedRoot.u1.Parent = &AvlTable->BalancedRoot; + AvlTable->BalancedRoot.LeftChild = &AvlTable->BalancedRoot; + AvlTable->BalancedRoot.RightChild = &AvlTable->BalancedRoot; + + /* Set all other members to 0 */ + AvlTable->BalancedRoot.StartingVpn = 0; + AvlTable->BalancedRoot.EndingVpn = 0; + AvlTable->DepthOfTree = 0; + AvlTable->Unused = 0; + AvlTable->NumberGenericTableElements = 0; + AvlTable->NodeHint = NULL; + AvlTable->NodeFreeHint = NULL; +} + +ULONG +NTAPI +MiInsertElementAvlTable( + IN PMM_AVL_TABLE AvlTable, + IN PMMADDRESS_NODE NewNode) +{ + PMMADDRESS_NODE BalancedRoot, CurrentNode, ParentNode; + ULONG Depth = 1; + + ASSERT(NewNode->StartingVpn <= NewNode->EndingVpn); + + BalancedRoot = &AvlTable->BalancedRoot; + ParentNode = CurrentNode = BalancedRoot->RightChild; + + /* First walk down the AVL tree to find a proper position */ + while (CurrentNode != BalancedRoot) + { + ParentNode = CurrentNode; + if (NewNode->EndingVpn < CurrentNode->StartingVpn) + { + /* Add the node at the left side */ + CurrentNode = CurrentNode->LeftChild; + } + else if (NewNode->StartingVpn > CurrentNode->EndingVpn) + { + /* Add the node at the right side */ + CurrentNode = CurrentNode->RightChild; + } + else + { + /* Clashing with current node, bail out */ + return 0; + } + + /* Going one node down... */ + Depth++; + } + + /* We have one element more now */ + AvlTable->NumberGenericTableElements++; + + /* We have a proper parent, attach the new node */ + NewNode->u1.Parent = ParentNode; + NewNode->LeftChild = BalancedRoot; + NewNode->RightChild = BalancedRoot; + if (NewNode->EndingVpn < ParentNode->StartingVpn) + { + /* Attach the node at the left side */ + ParentNode->LeftChild = NewNode; + MiAvlShiftBalanceLeft(ParentNode); + } + else /* (NewNode->StartingVpn > ParentNode->EndingVpn) */ + { + /* Attach the node at the right side */ + ParentNode->RightChild = NewNode; + MiAvlShiftBalanceRight(ParentNode); + } + + /* This is a trick to optimize the loop. We simplify the exit condition, + by making the BalancedRoot leftheavy. */ + BalancedRoot->u1.Balance = LEFTHEAVY; + + /* Walk the tree up again and rebalance */ + while (ParentNode->u1.Balance != BALANCED) + { + CurrentNode = ParentNode; + ParentNode = MiAvlGetParent(CurrentNode); + + /* Check on what side the current node is attached */ + if (CurrentNode == ParentNode->LeftChild) + { + /* Left depth was increased */ + MiAvlShiftBalanceLeft(ParentNode); + } + else + { + /* Right depth was increased */ + MiAvlShiftBalanceRight(ParentNode); + } + + /* Check if parent is unbalanced now */ + if (ParentNode->u1.Balance == UNBALANCED) + { + /* Rebalance it and bail out */ + MiAvlRebalance(ParentNode, CurrentNode); + // FIXME: depth changed + break; + } + } + + return Depth; +} + +void +NTAPI +MiRemoveElementAvlTable( + IN PMM_AVL_TABLE AvlTable, + IN PMMADDRESS_NODE Node) +{ + UNIMPLEMENTED; +} + + +PMMADDRESS_NODE +NTAPI +MiLookupElementAvlTable( + IN PMM_AVL_TABLE AvlTable, + ULONG_PTR Vpn) +{ + PMMADDRESS_NODE BalancedRoot, CurrentNode; + + BalancedRoot = &AvlTable->BalancedRoot; + CurrentNode = BalancedRoot->RightChild; + + /* Walk the AVL tree to find the node */ + do + { + if (Vpn < CurrentNode->StartingVpn) + { + /* Continue with the left child */ + CurrentNode = CurrentNode->LeftChild; + } + else if (Vpn > CurrentNode->EndingVpn) + { + /* Continue with the right child */ + CurrentNode = CurrentNode->RightChild; + } + else + { + /* Current node is the one */ + return CurrentNode; + } + } + while (CurrentNode != BalancedRoot); + + /* Didn't find anything */ + return NULL; +} + Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/mmavl.c ------------------------------------------------------------------------------ svn:eol-style = native

14 years, 6 months

[tkreuzer] 47536: [RBUILD] Revert 46791, we don't need it anymore since we have the new RosBE

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 15:52:40 2010 New Revision: 47536 URL: http://svn.reactos.org/svn/reactos?rev=47536&view=rev Log: [RBUILD] Revert 46791, we don't need it anymore since we have the new RosBE Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Thu Jun 3 15:52:40 2010 @@ -1568,18 +1568,9 @@ clean_files, backend->GetFullName ( *definitionFilename ).c_str () ); - if (Environment::GetArch() == "amd64") - { - fprintf ( fMakefile, - "\t${dlltool} --def %s --no-leading-underscore --output-lib $@\n", - backend->GetFullName ( *definitionFilename ).c_str () ); - } - else - { - fprintf ( fMakefile, - "\t${dlltool} --def %s --kill-at --output-lib $@\n", - backend->GetFullName ( *definitionFilename ).c_str () ); - } + fprintf ( fMakefile, + "\t${dlltool} --def %s --kill-at --output-lib $@\n", + backend->GetFullName ( *definitionFilename ).c_str () ); } else arRule1.Execute ( fMakefile, backend, module, archiveFilename, clean_files );

14 years, 6 months

[ekohl] 47535: [NTOSKRNL] NtDuplicateToken: If the called does not provide any desired access rights the duplicate token will inherit the granted rights of the original token.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 3 15:36:50 2010 New Revision: 47535 URL: http://svn.reactos.org/svn/reactos?rev=47535&view=rev Log: [NTOSKRNL] NtDuplicateToken: If the called does not provide any desired access rights the duplicate token will inherit the granted rights of the original token. Modified: trunk/reactos/ntoskrnl/se/token.c Modified: trunk/reactos/ntoskrnl/se/token.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/token.c?rev=47… ============================================================================== --- trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/token.c [iso-8859-1] Thu Jun 3 15:36:50 2010 @@ -1806,6 +1806,7 @@ PTOKEN NewToken; PSECURITY_QUALITY_OF_SERVICE CapturedSecurityQualityOfService; BOOLEAN QoSPresent; + OBJECT_HANDLE_INFORMATION HandleInformation; NTSTATUS Status; PAGED_CODE(); @@ -1843,7 +1844,7 @@ SepTokenObjectType, PreviousMode, (PVOID*)&Token, - NULL); + &HandleInformation); if (!NT_SUCCESS(Status)) { SepReleaseSecurityQualityOfService(CapturedSecurityQualityOfService, @@ -1884,7 +1885,7 @@ { Status = ObInsertObject((PVOID)NewToken, NULL, - DesiredAccess, + (DesiredAccess ? DesiredAccess : HandleInformation.GrantedAccess), 0, NULL, &hToken);

14 years, 6 months

[ekohl] 47534: [SYSDM] - Check the custom paging file sizes for being within useful limits and display warnings if these limit were exceeded. - Translators: Please translate the message strings!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 3 15:17:33 2010 New Revision: 47534 URL: http://svn.reactos.org/svn/reactos?rev=47534&view=rev Log: [SYSDM] - Check the custom paging file sizes for being within useful limits and display warnings if these limit were exceeded. - Translators: Please translate the message strings! Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.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/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 15:17:33 2010 @@ -202,7 +202,7 @@ LTEXT "", IDC_SPACEAVAIL, 105, 92, 104, 9 LTEXT "&Anfangsgröße (MB):", -1, 22, 118, 70, 9 LTEXT "Ma&ximale Größe (MB):", -1, 22, 131, 75, 9 - AUTORADIOBUTTON "&Benutzerdefinierte Größe", IDC_CUSTOM, 20, 105, 90, 9, WS_GROUP + AUTORADIOBUTTON "&Benutzerdefinierte Größe", IDC_CUSTOM, 20, 105, 95, 9, WS_GROUP AUTORADIOBUTTON "Größe wird vom &System verwaltet", IDC_SYSMANSIZE, 20, 145, 120, 9 AUTORADIOBUTTON "&Keine Auslagerungsdatei", IDC_NOPAGEFILE, 20, 158, 90, 9 EDITTEXT IDC_INITIALSIZE, 100, 114, 44, 13, NOT WS_BORDER, WS_EX_CLIENTEDGE @@ -292,5 +292,7 @@ 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_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_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/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 15:17:33 2010 @@ -287,5 +287,7 @@ 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_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_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 Jun 3 15:17:33 2010 @@ -50,8 +50,9 @@ typedef struct _PAGEFILE { TCHAR szDrive[3]; - INT InitialValue; - INT MaxValue; + INT InitialSize; + INT MaximumSize; + INT FreeSize; BOOL bUsed; } PAGEFILE, *PPAGEFILE; 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 15:17:33 2010 @@ -35,6 +35,8 @@ #define IDS_MESSAGEBOXTITLE 77 #define IDS_WARNINITIALSIZE 78 #define IDS_WARNMAXIMUMSIZE 79 +#define IDS_WARNINITIALRANGE 80 +#define IDS_WARNMAXIMUMRANGE 81 /* 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 15:17:33 2010 @@ -110,7 +110,7 @@ TCHAR szVolume[MAX_PATH]; TCHAR *szDisplayString; INT InitialSize = 0; - INT MaxSize = 0; + INT MaximumSize = 0; INT DriveLen; INT PgCnt = 0; @@ -141,17 +141,17 @@ /* FIXME: we only check the first available pagefile in the reg */ GetPageFileSizes(pVirtMem->szPagingFiles, &InitialSize, - &MaxSize); - - pVirtMem->Pagefile[PgCnt].InitialValue = InitialSize; - pVirtMem->Pagefile[PgCnt].MaxValue = MaxSize; + &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].InitialValue = 0; - pVirtMem->Pagefile[PgCnt].MaxValue = 0; + pVirtMem->Pagefile[PgCnt].InitialSize = 0; + pVirtMem->Pagefile[PgCnt].MaximumSize = 0; pVirtMem->Pagefile[PgCnt].bUsed = FALSE; lstrcpy(pVirtMem->Pagefile[PgCnt].szDrive, szDrive); } @@ -177,11 +177,11 @@ } } - if ((InitialSize != 0) || (MaxSize != 0)) + if ((InitialSize != 0) || (MaximumSize != 0)) { TCHAR szSize[64]; - _stprintf(szSize, _T("%i - %i"), InitialSize, MaxSize); + _stprintf(szSize, _T("%i - %i"), InitialSize, MaximumSize); _tcscat(szDisplayString, _T("\t")); _tcscat(szDisplayString, szSize); } @@ -216,8 +216,8 @@ { _stprintf(szText, _T("%s\\pagefile.sys %i %i"), pVirtMem->Pagefile[i].szDrive, - pVirtMem->Pagefile[i].InitialValue, - pVirtMem->Pagefile[i].MaxValue); + pVirtMem->Pagefile[i].InitialSize, + pVirtMem->Pagefile[i].MaximumSize); /* Add it to our overall registry string */ lstrcpy(szPagingFiles + nPos, szText); @@ -299,8 +299,8 @@ OnSet(PVIRTMEM pVirtMem) { INT Index; - UINT InitValue; - UINT MaxValue; + UINT InitialSize; + UINT MaximumSize; BOOL bTranslated; TCHAR szTitle[64]; TCHAR szMessage[256]; @@ -318,10 +318,10 @@ if (IsDlgButtonChecked(pVirtMem->hSelf, IDC_CUSTOM) == BST_CHECKED) { - InitValue = GetDlgItemInt(pVirtMem->hSelf, - IDC_INITIALSIZE, - &bTranslated, - FALSE); + InitialSize = GetDlgItemInt(pVirtMem->hSelf, + IDC_INITIALSIZE, + &bTranslated, + FALSE); if (!bTranslated) { if (LoadString(hApplet, @@ -343,10 +343,10 @@ return; } - MaxValue = GetDlgItemInt(pVirtMem->hSelf, - IDC_MAXSIZE, - &bTranslated, - FALSE); + MaximumSize = GetDlgItemInt(pVirtMem->hSelf, + IDC_MAXSIZE, + &bTranslated, + FALSE); if (!bTranslated) { if (LoadString(hApplet, @@ -368,16 +368,59 @@ return; } - /* FIXME: Add more file size checks! */ - - pVirtMem->Pagefile[Index].InitialValue = InitValue; - pVirtMem->Pagefile[Index].MaxValue = MaxValue; + /* Check the valid range of the inial size */ + if (InitialSize < 2 || + InitialSize > pVirtMem->Pagefile[Index].FreeSize) + { + if (LoadString(hApplet, + IDS_MESSAGEBOXTITLE, + szTitle, + sizeof(szTitle) / sizeof(szTitle[0])) == 0) + _tcscpy(szTitle, _T("System control panel applet")); + + LoadString(hApplet, + IDS_WARNINITIALRANGE, + szMessage, + sizeof(szMessage) / sizeof(szMessage[0])); + + MessageBox(NULL, + szMessage, + szTitle, + MB_ICONWARNING | MB_OK); + return; + } + + /* Check the valid range of the maximum size */ + if (MaximumSize < InitialSize || + MaximumSize > pVirtMem->Pagefile[Index].FreeSize) + { + if (LoadString(hApplet, + IDS_MESSAGEBOXTITLE, + szTitle, + sizeof(szTitle) / sizeof(szTitle[0])) == 0) + _tcscpy(szTitle, _T("System control panel applet")); + + LoadString(hApplet, + IDS_WARNMAXIMUMRANGE, + szMessage, + sizeof(szMessage) / sizeof(szMessage[0])); + + MessageBox(NULL, + szMessage, + szTitle, + MB_ICONWARNING | MB_OK); + return; + } + + pVirtMem->Pagefile[Index].InitialSize = InitialSize; + pVirtMem->Pagefile[Index].MaximumSize = MaximumSize; pVirtMem->Pagefile[Index].bUsed = TRUE; } else { /* set sizes to 0 */ - pVirtMem->Pagefile[Index].InitialValue = pVirtMem->Pagefile[Index].MaxValue = 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, @@ -420,12 +463,13 @@ if (GetDiskFreeSpaceEx(pVirtMem->Pagefile[Index].szDrive, NULL, NULL, &FreeBytes)) { + pVirtMem->Pagefile[Index].FreeSize = FreeBytes.QuadPart >> 20; _stprintf(szBuffer, _T("%I64u MB"), FreeBytes.QuadPart / (1024 * 1024)); SetDlgItemText(hwndDlg, IDC_SPACEAVAIL, szBuffer); } - if (pVirtMem->Pagefile[Index].InitialValue != 0 && - pVirtMem->Pagefile[Index].MaxValue != 0) + if (pVirtMem->Pagefile[Index].InitialSize != 0 && + pVirtMem->Pagefile[Index].MaximumSize != 0) { /* enable and fill the custom values */ EnableWindow(GetDlgItem(pVirtMem->hSelf, IDC_MAXSIZE), TRUE); @@ -433,12 +477,12 @@ SetDlgItemInt(pVirtMem->hSelf, IDC_INITIALSIZE, - pVirtMem->Pagefile[Index].InitialValue, + pVirtMem->Pagefile[Index].InitialSize, FALSE); SetDlgItemInt(pVirtMem->hSelf, IDC_MAXSIZE, - pVirtMem->Pagefile[Index].MaxValue, + pVirtMem->Pagefile[Index].MaximumSize, FALSE); CheckDlgButton(pVirtMem->hSelf, @@ -482,7 +526,7 @@ FileSize = 0; for (i = 0; i < 26; i++) { - FileSize += pVirtMem->Pagefile[i].InitialValue; + FileSize += pVirtMem->Pagefile[i].InitialSize; } _stprintf(szBuffer, _T("%u MB"), FileSize); SetDlgItemText(hwndDlg, IDC_CURRENT, szBuffer);

14 years, 6 months

[tkreuzer] 47533: Merge 46523 from amd64 branch: - Fix assert macro - Add crt="MSVC" to a number of modules to resolve _assert

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 14:47:40 2010 New Revision: 47533 URL: http://svn.reactos.org/svn/reactos?rev=47533&view=rev Log: Merge 46523 from amd64 branch: - Fix assert macro - Add crt="MSVC" to a number of modules to resolve _assert Modified: trunk/reactos/ (props changed) trunk/reactos/dll/directx/qedit/qedit.rbuild trunk/reactos/dll/directx/quartz/quartz.rbuild trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild trunk/reactos/dll/win32/avifil32/avifil32.rbuild trunk/reactos/dll/win32/comctl32/comctl32.rbuild trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild trunk/reactos/dll/win32/mciwave/mciwave.rbuild trunk/reactos/dll/win32/msacm32/msacm32.rbuild trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild trunk/reactos/dll/win32/msrle32/msrle32.rbuild trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild trunk/reactos/dll/win32/ole32/ole32.rbuild trunk/reactos/dll/win32/riched20/riched20.rbuild trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild trunk/reactos/dll/win32/wintrust/wintrust.rbuild trunk/reactos/include/crt/assert.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jun 3 14:47:40 2010 @@ -1,3 +1,4 @@ /branches/header-work:45691-46463 +/branches/reactos-yarotows:46966 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46524,46526,46534-46535,46537-46539,46589 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40122-40123,40125,40128,40155,40247,40324,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589 Modified: trunk/reactos/dll/directx/qedit/qedit.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/qedit/qedit.rb… ============================================================================== --- trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/qedit/qedit.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true"> +<module name="qedit" type="win32dll" baseaddress="${BASEADDRESS_QEDIT}" installbase="system32" installname="qedit.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="qedit.spec" /> <include base="qedit">.</include> Modified: trunk/reactos/dll/directx/quartz/quartz.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/quartz/quartz.… ============================================================================== --- trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/quartz/quartz.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true"> +<module name="quartz" type="win32dll" baseaddress="${BASEADDRESS_QUARTZ}" installbase="system32" installname="quartz.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="quartz.spec" /> <include base="quartz">.</include> Modified: trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/ddraw/ddr… ============================================================================== --- trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/ddraw/ddraw.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> -<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true"> +<module name="ddraw" type="win32dll" installbase="system32" installname="ddraw.dll" allowwarnings ="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ddraw.spec" /> <include base="ddraw">.</include> Modified: trunk/reactos/dll/win32/avifil32/avifil32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avifil32/avifil3… ============================================================================== --- trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avifil32/avifil32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true"> +<module name="avifil32" type="win32dll" baseaddress="${BASEADDRESS_AVIFIL32}" installbase="system32" installname="avifil32.dll" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="avifil32.spec" /> <include base="avifil32">.</include> Modified: trunk/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/comctl32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true"> +<module name="comctl32" type="win32dll" baseaddress="${BASEADDRESS_COMCTL32}" installbase="system32" installname="comctl32.dll" unicode="yes" allowwarnings="true" crt="msvcrt"> <autoregister infsection="OleControlDlls" type="DllInstall" /> <importlibrary definition="comctl32.spec" /> <include base="comctl32">.</include> Modified: trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/comdlg3… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/comdlg32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true"> +<module name="comdlg32" type="win32dll" baseaddress="${BASEADDRESS_COMDLG32}" installbase="system32" installname="comdlg32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="comdlg32.spec" /> <include base="comdlg32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/imaadp32.acm/ima… ============================================================================== --- trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/imaadp32.acm/imaadp32.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="imaadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32" installname="imaadp32.acm" allowwarnings="true" entrypoint="0"> +<module name="imaadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_IMAADP32ACM}" installbase="system32" installname="imaadp32.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="imaadp32.acm.spec" /> <include base="imaadp32.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/inetmib1/inetmib… ============================================================================== --- trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/inetmib1/inetmib1.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true"> +<module name="inetmib1" type="win32dll" baseaddress="${BASEADDRESS_INETMIB1}" installbase="system32" installname="inetmib1.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="inetmib1.spec" /> <include base="inetmib1">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mciwave/mciwave.… ============================================================================== --- trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mciwave/mciwave.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="mciwave" type="win32dll" baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32" installname="mciwave.dll" allowwarnings="true" entrypoint="0"> +<module name="mciwave" type="win32dll" baseaddress="${BASEADDRESS_MCIWAVE}" installbase="system32" installname="mciwave.dll" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="mciwave.spec" /> <include base="mciwave">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/msacm32/msacm32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/msacm32.… ============================================================================== --- trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msacm32/msacm32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes"> +<module name="msacm32" type="win32dll" baseaddress="${BASEADDRESS_MSACM32}" installbase="system32" installname="msacm32.dll" unicode="yes" crt="msvcrt"> <importlibrary definition="msacm32.spec" /> <include base="msacm32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msadp32.acm/msad… ============================================================================== --- trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msadp32.acm/msadp32.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="msadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32" installname="msadp32.acm" allowwarnings="true" entrypoint="0"> +<module name="msadp32.acm" type="win32dll" baseaddress="${BASEADDRESS_MSADP32ACM}" installbase="system32" installname="msadp32.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="msadp32.acm.spec" /> <include base="msadp32.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msg711.acm/msg71… ============================================================================== --- trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msg711.acm/msg711.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="msg711.acm" type="win32dll" baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32" installname="msg711.acm" allowwarnings="true" entrypoint="0"> +<module name="msg711.acm" type="win32dll" baseaddress="${BASEADDRESS_MSG711ACM}" installbase="system32" installname="msg711.acm" allowwarnings="true" entrypoint="0" crt="msvcrt"> <importlibrary definition="msg711.acm.spec" /> <include base="msg711.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/msrle32/msrle32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msrle32/msrle32.… ============================================================================== --- trunk/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msrle32/msrle32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="msrle32" type="win32dll" baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32" installname="msrle32.dll" allowwarnings="true"> +<module name="msrle32" type="win32dll" baseaddress="${BASEADDRESS_MSRLE32}" installbase="system32" installname="msrle32.dll" allowwarnings="true" crt="msvcrt"> <importlibrary definition="msrle32.spec" /> <include base="msrle32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/odbccp32/odbccp3… ============================================================================== --- trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/odbccp32/odbccp32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0"> +<module name="odbccp32" type="win32dll" baseaddress="${BASEADDRESS_ODBCCP32}" installbase="system32" installname="odbccp32.dll" allowwarnings="true" entrypoint="0" crt="MSVCRT"> <importlibrary definition="odbccp32.spec" /> <include base="odbccp32">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/ole32/ole32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/ole32.rbui… ============================================================================== --- trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/ole32.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true"> +<module name="ole32" type="win32dll" baseaddress="${BASEADDRESS_OLE32}" installbase="system32" installname="ole32.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="ole32.spec" /> <include base="ole32">.</include> Modified: trunk/reactos/dll/win32/riched20/riched20.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/riched20/riched2… ============================================================================== --- trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/riched20/riched20.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <group> -<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true"> +<module name="riched20" type="win32dll" baseaddress="${BASEADDRESS_RICHED20}" installbase="system32" installname="riched20.dll" allowwarnings="true" crt="MSVCRT"> <importlibrary definition="riched20.spec" /> <include base="riched20">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winemp3.acm/wine… ============================================================================== --- trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winemp3.acm/winemp3.acm.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="winemp3.acm" type="win32dll" installbase="system32" installname="winemp3.acm" allowwarnings="true" entrypoint="0"> +<module name="winemp3.acm" type="win32dll" installbase="system32" installname="winemp3.acm" allowwarnings="true" entrypoint="0" crt="MSVCRT"> <importlibrary definition="winemp3.acm.spec" /> <include base="winemp3.acm">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: trunk/reactos/dll/win32/wintrust/wintrust.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wintrust/wintrus… ============================================================================== --- trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wintrust/wintrust.rbuild [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -1,4 +1,4 @@ -<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true"> +<module name="wintrust" type="win32dll" baseaddress="${BASEADDRESS_WINTRUST}" installbase="system32" installname="wintrust.dll" allowwarnings="true" crt="MSVCRT"> <autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <importlibrary definition="wintrust.spec" /> <include base="wintrust">.</include> Modified: trunk/reactos/include/crt/assert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/assert.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/assert.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/assert.h [iso-8859-1] Thu Jun 3 14:47:40 2010 @@ -28,8 +28,7 @@ #endif #ifndef assert -//#define assert(_Expression) (void)((!!(_Expression)) || (_assert(#_Expression,__FILE__,__LINE__),0)) -#define assert(_Expression) (void)((!!(_Expression)))// || (_wassert(_CRT_WIDE(#_Expression),_CRT_WIDE(__FILE__),__LINE__),0)) +#define assert(_Expression) (void)((!!(_Expression)) || (_assert(#_Expression,__FILE__,__LINE__),0)) #endif #ifndef wassert

14 years, 6 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010