Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 14:37:20 2010 New Revision: 47532 URL: http://svn.reactos.org/svn/reactos?rev=47532&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/d… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/directx/dmusic/dmusic.rbuild [iso-8859-1] Thu Jun 3 14:37:20 2010 @@ -5,7 +5,6 @@ <importlibrary definition="dmusic.spec" /> <redefine name="_WIN32_WINNT">0x600</redefine> <define name="__WINESRC__" /> - <compilerflag>-Wno-format</compilerflag> <include base="dmusic">.</include> <include base="ReactOS">include/reactos/wine</include> <library>wine</library>

14 years, 6 months

[cgutman] 47531: [FREELDR] - Remove an overzealous API check and the work-around for it

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jun 3 10:09:42 2010 New Revision: 47531 URL: http://svn.reactos.org/svn/reactos?rev=47531&view=rev Log: [FREELDR] - Remove an overzealous API check and the work-around for it Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Thu Jun 3 10:09:42 2010 @@ -277,18 +277,6 @@ { DPRINTM(DPRINT_DISK, "Using cached value %s for drive 0x%x\n", LastSupported ? "TRUE" : "FALSE", DriveNumber); return LastSupported; - } - - // Some BIOSes report that extended disk access functions are not supported - // when booting from a CD (e.g. Phoenix BIOS v6.00PG and Insyde BIOS shipping - // with Intel Macs). Therefore we just return TRUE if we're booting from a CD - - // we can assume that all El Torito capable BIOSes support INT 13 extensions. - // We simply detect whether we're booting from CD by checking whether the drive - // number is >= 0x90. It's 0x90 on the Insyde BIOS, and 0x9F on most other BIOSes. - if (DriveNumber >= 0x90) - { - LastSupported = TRUE; - return TRUE; } LastDriveNumber = DriveNumber; @@ -338,15 +326,6 @@ return FALSE; } - if (!(RegsOut.w.cx & 0x0001)) - { - // CX = API subset support bitmap - // Bit 0, extended disk access functions (AH=42h-44h,47h,48h) supported - printf("Suspicious API subset support bitmap 0x%x on device 0x%lx\n", RegsOut.w.cx, DriveNumber); - LastSupported = FALSE; - return FALSE; - } - LastSupported = TRUE; return TRUE; }

14 years, 6 months

[cgutman] 47530: [FREELDR] - Verify that Int 13 extensions are supported before trying to use them

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Jun 3 09:48:35 2010 New Revision: 47530 URL: http://svn.reactos.org/svn/reactos?rev=47530&view=rev Log: [FREELDR] - Verify that Int 13 extensions are supported before trying to use them Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c [iso-8859-1] Thu Jun 3 09:48:35 2010 @@ -134,6 +134,9 @@ PUSHORT Ptr = (PUSHORT)(BIOSCALLBUFFER); DPRINTM(DPRINT_DISK, "DiskGetExtendedDriveParameters()\n"); + + if (!DiskInt13ExtensionsSupported(DriveNumber)) + return FALSE; // Initialize transfer buffer *Ptr = BufferSize;

14 years, 6 months

[mjmartin] 47529: [rtl] - len returned from mbstowcs is the required size of the destination string, so only allocate the needed size. - When doing the actual conversion pass in the size of the ansi string not the needed size of destination. - These changes were missed in 47527.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jun 3 09:08:07 2010 New Revision: 47529 URL: http://svn.reactos.org/svn/reactos?rev=47529&view=rev Log: [rtl] - len returned from mbstowcs is the required size of the destination string, so only allocate the needed size. - When doing the actual conversion pass in the size of the ansi string not the needed size of destination. - These changes were missed in 47527. Modified: trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=47529… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Thu Jun 3 09:08:07 2010 @@ -1578,6 +1578,7 @@ { /* let's assume utf-8 for now */ int len; + WCHAR *new_buff; _SEH2_TRY { @@ -1591,17 +1592,16 @@ _SEH2_END; DPRINT("len = %x\n", len); - WCHAR *new_buff; if (len == -1) { DPRINT1( "utf-8 conversion failed\n" ); return STATUS_SXS_CANT_GEN_ACTCTX; } - if (!(new_buff = RtlAllocateHeap( RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(WCHAR) ))) + if (!(new_buff = RtlAllocateHeap( RtlGetProcessHeap(), HEAP_ZERO_MEMORY, len))) return STATUS_NO_MEMORY; - mbstowcs( new_buff, buffer, len); + mbstowcs( new_buff, buffer, size); xmlbuf.ptr = new_buff; DPRINT("Buffer %S\n", new_buff); xmlbuf.end = xmlbuf.ptr + len;

14 years, 6 months

[tkreuzer] 47528: reduce diff to trunk

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jun 3 02:29:24 2010 New Revision: 47528 URL: http://svn.reactos.org/svn/reactos?rev=47528&view=rev Log: reduce diff to trunk Modified: branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild Modified: branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/subsystems.rbuild [iso-8859-1] Thu Jun 3 02:29:24 2010 @@ -2,9 +2,9 @@ <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> <if property="ARCH" value="i386"> - <directory name="ntvdm"> - <xi:include href="ntvdm/ntvdm.rbuild" /> - </directory> +<directory name="ntvdm"> + <xi:include href="ntvdm/ntvdm.rbuild" /> +</directory> </if> <directory name="win32"> <xi:include href="win32/win32.rbuild" />

14 years, 6 months

[mjmartin] 47527: [crt] - mbstowcs: Fix incorrect size passed as the second parameter for call to RtlMultiByteToUnicodeN. Fixes loading assemblies when manifest is in a manifest file due to parsing failure.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu Jun 3 01:58:28 2010 New Revision: 47527 URL: http://svn.reactos.org/svn/reactos?rev=47527&view=rev Log: [crt] - mbstowcs: Fix incorrect size passed as the second parameter for call to RtlMultiByteToUnicodeN. Fixes loading assemblies when manifest is in a manifest file due to parsing failure. Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_nt.c [iso-8859-1] Thu Jun 3 01:58:28 2010 @@ -47,7 +47,7 @@ } Status = RtlMultiByteToUnicodeN (wcstr, - count, + count * sizeof(WCHAR), &Size, mbstr, Length);

14 years, 6 months

[ilardig] 47526: [SYSDM] - Update Italian and Spanish translations.

by ilardig＠svn.reactos.org

Author: ilardig Date: Thu Jun 3 00:49:27 2010 New Revision: 47526 URL: http://svn.reactos.org/svn/reactos?rev=47526&view=rev Log: [SYSDM] - Update Italian and Spanish translations. Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Thu Jun 3 00:49:27 2010 @@ -287,7 +287,7 @@ IDS_USERPROFILE_TYPE "Tipo" IDS_USERPROFILE_STATUS "Estado" IDS_USERPROFILE_MODIFIED "Modificado" - IDS_MESSAGEBOXTITLE "System control panel applet" - IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." - IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." -END + 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 Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Jun 3 00:49:27 2010 @@ -284,8 +284,8 @@ IDS_USERPROFILE_TYPE "Tipo" IDS_USERPROFILE_STATUS "Stato" IDS_USERPROFILE_MODIFIED "Modificato" - IDS_MESSAGEBOXTITLE "System control panel applet" - IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." - IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." + IDS_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_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

14 years, 6 months

[ekohl] 47525: [SYSDM] - Fix a bug in the creation of the 'PagingFiles' registry value. - Set paging file sizes only if both user defined sizes are valid numerical values and display a warning otherwise. - Translators: Please translate the message strings!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu Jun 3 00:29:19 2010 New Revision: 47525 URL: http://svn.reactos.org/svn/reactos?rev=47525&view=rev Log: [SYSDM] - Fix a bug in the creation of the 'PagingFiles' registry value. - Set paging file sizes only if both user defined sizes are valid numerical values and display a warning otherwise. - Translators: Please translate the message strings! Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc trunk/reactos/dll/cpl/sysdm/lang/en-US.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc trunk/reactos/dll/cpl/sysdm/resource.h trunk/reactos/dll/cpl/sysdm/virtmem.c Modified: trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/bg-BG.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/bg-BG.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -284,4 +284,7 @@ IDS_USERPROFILE_TYPE "Âèä" IDS_USERPROFILE_STATUS "Ñúñòîÿíèå" IDS_USERPROFILE_MODIFIED "Èçìåíåí" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/cs-CZ.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -289,4 +289,7 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Upraveno" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/da-DK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/da-DK.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -123,4 +123,7 @@ IDS_MINI_DUMP "Minidump(64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." END Modified: trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/de-DE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/de-DE.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -289,5 +289,8 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Geändert" + IDS_MESSAGEBOXTITLE "Systemsteuerungsoption ""System""" + IDS_WARNINITIALSIZE "Geben Sie einen numerischen Wert für die Anfangsgröße der Auslagerungsdatei an." + IDS_WARNMAXIMUMSIZE "Geben Sie einen numerischen Wert für die Maximalgröße der Auslagerungsdatei an." IDS_DEVS "\nReactOS Team\n\nProjektkoordinator\n\nAleksey Bragin\n\nEntwicklerteam\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Verantwortliche\n\nColin Finck\nZ98\n\nWebseitenteam\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedienteam\n\nMindflyer\nWierd_W\n\nweiterer Dank geht an\n\nalle Mitwirkenden\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/el-GR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/el-GR.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -285,4 +285,7 @@ IDS_USERPROFILE_TYPE "Ôýðïò" IDS_USERPROFILE_STATUS "ÊáôÜóôáóç" IDS_USERPROFILE_MODIFIED "ÔñïðïðïéÞèçêå" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/en-US.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/en-US.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -284,5 +284,8 @@ IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_DEVS "\nReactOS Team\n\nProject Coordinator\n\nAleksey Bragin\n\nDevelopment Team\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nfurther thanks go to\n\nall Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -287,4 +287,7 @@ IDS_USERPROFILE_TYPE "Tipo" IDS_USERPROFILE_STATUS "Estado" IDS_USERPROFILE_MODIFIED "Modificado" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/fr-FR.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/fr-FR.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -287,4 +287,7 @@ IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Statut" IDS_USERPROFILE_MODIFIED "Modifié" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/hu-HU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/hu-HU.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -126,4 +126,7 @@ IDS_MINI_DUMP "Minidump(64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." END Modified: trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/id-ID.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/id-ID.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -281,4 +281,7 @@ IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modified" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/it-IT.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/it-IT.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -284,5 +284,8 @@ IDS_USERPROFILE_TYPE "Tipo" IDS_USERPROFILE_STATUS "Stato" IDS_USERPROFILE_MODIFIED "Modificato" + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." IDS_DEVS "\nReactOS Team\n\nCoordinatore\n\nAleksey Bragin\n\nGruppo di sviluppo\n\nAleksey Bragin\nAndrew Greenwood\nAndrey Korotaev\nArt Yerkes\nChristoph von Wittich\nColin Finck\nDaniel Reimer\nDmitry Chapyshev\nEric Kohl\nGed Murphy\nGregor Brunmar\nHervé Poussineau\nJames Tabor\nJeffrey Morlan\nJohannes Anderwald\nKJK::Hyperion\nMaarten Bosma\nMagnus Olsen\nMarc Piulachs\nMatthias Kupfer\nMike Nordell\nPeter Ward\nPierre Schweitzer\nSaveliy Tretiakov\nStefan Ginsberg\nSylvain Petreolle\nThomas Blümel\nTimo Kreuzer \n\nAlex Ionescu\nFilip Navara\nGunnar Dalsnes\nMartin Fuchs\nRoyce Mitchell III\nBrandon Turner\nBrian Palmer\nCasper Hornstrup\nDavid Welch\nEmanuele Aliberti\nGé van Geldorp\nGregor Anich\nJason Filby\nJens Collin\nMichael Wirth\nNathan Woods\nRobert Dickenson\nRex Jolliff\nVizzini \n\nRelease Engineers\n\nColin Finck\nZ98\n\nWebsite Team\n\nColin Finck\nJaix Bly\nKlemens Friedl\nZ98\n\nMedia Team\n\nMindflyer\nWierd_W\n\nUlteriori ringraziamenti\n\na tutti i Contributers\nWine Team\n\n" END Modified: trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ja-JP.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ja-JP.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -284,4 +284,7 @@ IDS_USERPROFILE_TYPE "íÞ" IDS_USERPROFILE_STATUS "óÔ" IDS_USERPROFILE_MODIFIED "ÏXú" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/nl-NL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/nl-NL.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -125,5 +125,7 @@ IDS_MINI_DUMP "Minidump(64KB)" IDS_KERNEL_DUMP "Kernel dump" IDS_FULL_DUMP "Complete dump" - + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." END Modified: trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/no-NO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/no-NO.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -283,4 +283,7 @@ IDS_USERPROFILE_TYPE "Type" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Modifisert" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/pl-PL.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/pl-PL.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -288,4 +288,7 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Stan" IDS_USERPROFILE_MODIFIED "Zmodyfikowano" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -1,4 +1,4 @@ -LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +ï»¿LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL #pragma code_page(65001) @@ -284,6 +284,9 @@ IDS_USERPROFILE_TYPE "Tip" IDS_USERPROFILE_STATUS "Stare" IDS_USERPROFILE_MODIFIED "Modificat" + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." END #pragma code_page(default) Modified: trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ru-RU.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ru-RU.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -282,4 +282,7 @@ IDS_USERPROFILE_TYPE "Òèï" IDS_USERPROFILE_STATUS "Ñîñòîÿíèå" IDS_USERPROFILE_MODIFIED "Èçìåíåí" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sk-SK.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -290,4 +290,7 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Stav" IDS_USERPROFILE_MODIFIED "Modifikovaný" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/sv-SE.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/sv-SE.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -284,4 +284,7 @@ IDS_USERPROFILE_TYPE "Typ" IDS_USERPROFILE_STATUS "Status" IDS_USERPROFILE_MODIFIED "Ändrad" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/uk-UA.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/uk-UA.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -290,4 +290,7 @@ IDS_USERPROFILE_TYPE "Òèï" IDS_USERPROFILE_STATUS "Ñòàí" IDS_USERPROFILE_MODIFIED "Çì³íåíî" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/zh-CN.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/zh-CN.rc [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -287,4 +287,7 @@ IDS_USERPROFILE_TYPE "ÀàÐÍ" IDS_USERPROFILE_STATUS "×´Ì¬" IDS_USERPROFILE_MODIFIED "ÐÞ¸Ä" -END + IDS_MESSAGEBOXTITLE "System control panel applet" + IDS_WARNINITIALSIZE "Enter a numeric value for the initial size of the paging file." + IDS_WARNMAXIMUMSIZE "Enter a numeric value for the maximum size of the paging file." +END Modified: trunk/reactos/dll/cpl/sysdm/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/resource.h?r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/resource.h [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -32,6 +32,9 @@ #define IDS_USERPROFILE_STATUS 75 #define IDS_USERPROFILE_MODIFIED 76 +#define IDS_MESSAGEBOXTITLE 77 +#define IDS_WARNINITIALSIZE 78 +#define IDS_WARNMAXIMUMSIZE 79 /* propsheet - general */ #define IDD_PROPPAGEGENERAL 100 Modified: trunk/reactos/dll/cpl/sysdm/virtmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/virtmem.c?re… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/virtmem.c [iso-8859-1] Thu Jun 3 00:29:19 2010 @@ -220,7 +220,7 @@ pVirtMem->Pagefile[i].MaxValue); /* Add it to our overall registry string */ - lstrcat(szPagingFiles + nPos, szText); + lstrcpy(szPagingFiles + nPos, szText); /* Record the position where the next string will start */ nPos += (INT)lstrlen(szText) + 1; @@ -299,8 +299,11 @@ OnSet(PVIRTMEM pVirtMem) { INT Index; - UINT Value; + UINT InitValue; + UINT MaxValue; BOOL bTranslated; + TCHAR szTitle[64]; + TCHAR szMessage[256]; pVirtMem->bSave = TRUE; @@ -315,41 +318,61 @@ if (IsDlgButtonChecked(pVirtMem->hSelf, IDC_CUSTOM) == BST_CHECKED) { - Value = GetDlgItemInt(pVirtMem->hSelf, - IDC_INITIALSIZE, - &bTranslated, - FALSE); + InitValue = GetDlgItemInt(pVirtMem->hSelf, + IDC_INITIALSIZE, + &bTranslated, + FALSE); if (!bTranslated) { - /* FIXME: Show error message instead of setting the edit - field to the previous value */ - SetDlgItemInt(pVirtMem->hSelf, - IDC_INITIALSIZE, - pVirtMem->Pagefile[Index].InitialValue, - FALSE); - } - else - { - pVirtMem->Pagefile[Index].InitialValue = Value; - } - - Value = GetDlgItemInt(pVirtMem->hSelf, - IDC_MAXSIZE, - &bTranslated, - FALSE); + if (LoadString(hApplet, + IDS_MESSAGEBOXTITLE, + szTitle, + sizeof(szTitle) / sizeof(szTitle[0])) == 0) + _tcscpy(szTitle, _T("System control panel applet")); + + if (LoadString(hApplet, + IDS_WARNINITIALSIZE, + szMessage, + sizeof(szMessage) / sizeof(szMessage[0])) == 0) + _tcscpy(szMessage, _T("Enter a numeric value for the initial size of the paging file.")); + + MessageBox(NULL, + szMessage, + szTitle, + MB_ICONWARNING | MB_OK); + return; + } + + MaxValue = GetDlgItemInt(pVirtMem->hSelf, + IDC_MAXSIZE, + &bTranslated, + FALSE); if (!bTranslated) { - /* FIXME: Show error message instead of setting the edit - field to the previous value */ - SetDlgItemInt(pVirtMem->hSelf, - IDC_MAXSIZE, - pVirtMem->Pagefile[Index].MaxValue, - FALSE); - } - else - { - pVirtMem->Pagefile[Index].MaxValue = Value; - } + if (LoadString(hApplet, + IDS_MESSAGEBOXTITLE, + szTitle, + sizeof(szTitle) / sizeof(szTitle[0])) == 0) + _tcscpy(szTitle, _T("System control panel applet")); + + if (LoadString(hApplet, + IDS_WARNMAXIMUMSIZE, + szMessage, + sizeof(szMessage) / sizeof(szMessage[0])) == 0) + _tcscpy(szMessage, _T("Enter a numeric value for the maximum size of the paging file.")); + + MessageBox(NULL, + szMessage, + szTitle, + MB_ICONWARNING | MB_OK); + return; + } + + /* FIXME: Add more file size checks! */ + + pVirtMem->Pagefile[Index].InitialValue = InitValue; + pVirtMem->Pagefile[Index].MaxValue = MaxValue; + pVirtMem->Pagefile[Index].bUsed = TRUE; } else {

14 years, 6 months

[ilardig] 47524: [usetup] - The last error messages were swapped in some languages, spotted by Paolo Devoti. - Added the minimum required disk space also in the debug print. See issue #5440 for more details.

by ilardig＠svn.reactos.org

Author: ilardig Date: Thu Jun 3 00:28:37 2010 New Revision: 47524 URL: http://svn.reactos.org/svn/reactos?rev=47524&view=rev Log: [usetup] - The last error messages were swapped in some languages, spotted by Paolo Devoti. - Added the minimum required disk space also in the debug print. See issue #5440 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1418,7 +1418,7 @@ if( m < RequiredPartitionDiskSpace) { /* partition is too small so ask for another partion */ - DPRINT1("Partition too small"); + DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace); return FALSE; } else Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1484,15 +1484,15 @@ "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { + //ERROR_UPDATE_GEOID, + " áâà®©ª â ¥ ¬®¦ ¤ ãáâ ®¢¨ ®§ ç¨â¥«ï £¥®£à äáª®â® ¯®«®¦¥¨¥.\n" + "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * â¨á¥â¥ ª« ¢¨è, § ¤ ¯à®¤ê«¦¨â¥.", NULL - }, - { - //ERROR_UPDATE_GEOID, - " áâà®©ª â ¥ ¬®¦ ¤ ãáâ ®¢¨ ®§ ç¨â¥«ï £¥®£à äáª®â® ¯®«®¦¥¨¥.\n" - "ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà " }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1479,17 +1479,17 @@ "ENTER = Reiniciar el equipo" }, { + //ERROR_UPDATE_GEOID, + "El instalador no ha podido configurar el ID geogr fico.\n" + "ENTER = Reiniciar el equipo" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "No hay suficiente espacio disponible en la partici¢n seleccionada.\n" " * Presione una tecla para continuar.", NULL }, { - //ERROR_UPDATE_GEOID, - "El instalador no ha podido configurar el ID geogr fico.\n" - "ENTER = Reiniciar el equipo" - }, -{ NULL, NULL } Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1469,15 +1469,15 @@ "ENTER = Taaskivita arvuti" }, { + //ERROR_UPDATE_GEOID, + "Geograafilist asukohta ei ännestunud seadistada.\n" + "ENTER = Taaskivita arvuti" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Valitud partitsioonil pole piisavalt ruumi.\n" " * Vajuta suvalist klahvi, et jtkata.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Geograafilist asukohta ei ännestunud seadistada.\n" - "ENTER = Taaskivita arvuti" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1485,15 +1485,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1473,15 +1473,15 @@ "INVIO = Riavviare il computer" }, { + //ERROR_UPDATE_GEOID, + "Setup non ha potuto impostare l'id geografico.\n" + "INVIO = Riavviare il computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Lo spazio disponibile nella partizione selezionata insufficiente.\n" " * Premere un tasto qualsiasi per continuare.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup non ha potuto impostare l'id geografico.\n" - "INVIO = Riavviare il computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1482,15 +1482,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1500,15 +1500,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup kan de geografische positie niet instellen.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup kan de geografische positie niet instellen.\n" - "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1481,15 +1481,15 @@ "ENTER = Restart komputera" }, { + //ERROR_UPDATE_GEOID, + "Instalator nie m¢g ustawi lokalizacji geograficznej.\n" + "ENTER = Restart komputera" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Brak wystarczaj¥cej wolnej przestrzeni w wybranej partycji.\n" " * Nacinij dowolny klawisz aby kontynuowa.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Instalator nie m¢g ustawi lokalizacji geograficznej.\n" - "ENTER = Restart komputera" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1473,15 +1473,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1483,15 +1483,15 @@ "ENTER = Reçtart po¡taa" }, { + //ERROR_UPDATE_GEOID, + "Inçtal tor nemohol nastavi geo id.\n" + "ENTER = Reçtart po¡taa" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Inçtal tor nemohol nastavi geo id.\n" - "ENTER = Reçtart po¡taa" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1473,15 +1473,15 @@ "ENTER = Reboot computer" }, { + //ERROR_UPDATE_GEOID, + "Setup could not set the geo id.\n" + "ENTER = Reboot computer" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "Setup could not set the geo id.\n" - "ENTER = Reboot computer" }, { NULL, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Thu Jun 3 00:28:37 2010 @@ -1479,15 +1479,15 @@ "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { + //ERROR_UPDATE_GEOID, + "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ geo id.\n" + "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" + }, + { //ERROR_INSUFFICIENT_DISKSPACE, "Not enough free space in the selected partition.\n" " * Press any key to continue.", NULL - }, - { - //ERROR_UPDATE_GEOID, - "¥ ¢¤ «®áì ¢áâ ®¢¨â¨ geo id.\n" - "ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à" }, { NULL,

14 years, 6 months

[gadamopoulos] 47523: [win32k] - Fix detection of file type while generating vcxproj files

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Jun 2 20:14:53 2010 New Revision: 47523 URL: http://svn.reactos.org/svn/reactos?rev=47523&view=rev Log: [win32k] - Fix detection of file type while generating vcxproj files Modified: trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcxprojmaker.cpp [iso-8859-1] Wed Jun 2 20:14:53 2010 @@ -94,7 +94,7 @@ for( i = 0; i<files.size(); i++) { - std::string extension = GetExtension(files[i]); + std::string extension = ToLower(GetExtension(files[i])); if( extension == ".c" || extension == ".cpp") fprintf ( OUT, "\t\t<ClCompile Include=\"%s\" />\r\n", files[i].c_str());

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