Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[gschneider] 51595: [libpng] Vincenzo Cotugno: update libpng to 1.52 See issue #6034 for more details.
by gschneider＠svn.reactos.org 05 May '11

05 May '11

Author: gschneider Date: Thu May 5 19:43:44 2011 New Revision: 51595 URL: http://svn.reactos.org/svn/reactos?rev=51595&view=rev Log: [libpng] Vincenzo Cotugno: update libpng to 1.52 See issue #6034 for more details. Added: trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt (with props) trunk/reactos/include/reactos/libs/libpng/pngdebug.h (with props) trunk/reactos/include/reactos/libs/libpng/pnginfo.h (with props) trunk/reactos/include/reactos/libs/libpng/pnglibconf.h (with props) trunk/reactos/include/reactos/libs/libpng/pngstruct.h (with props) Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE trunk/reactos/dll/3rdparty/libpng/docs/CHANGES trunk/reactos/dll/3rdparty/libpng/docs/INSTALL trunk/reactos/dll/3rdparty/libpng/docs/LICENSE trunk/reactos/dll/3rdparty/libpng/docs/README trunk/reactos/dll/3rdparty/libpng/docs/TODO trunk/reactos/dll/3rdparty/libpng/docs/example.c trunk/reactos/dll/3rdparty/libpng/png.c trunk/reactos/dll/3rdparty/libpng/pngerror.c trunk/reactos/dll/3rdparty/libpng/pngget.c trunk/reactos/dll/3rdparty/libpng/pngmem.c trunk/reactos/dll/3rdparty/libpng/pngpread.c trunk/reactos/dll/3rdparty/libpng/pngread.c trunk/reactos/dll/3rdparty/libpng/pngrio.c trunk/reactos/dll/3rdparty/libpng/pngrtran.c trunk/reactos/dll/3rdparty/libpng/pngrutil.c trunk/reactos/dll/3rdparty/libpng/pngset.c trunk/reactos/dll/3rdparty/libpng/pngtest.c trunk/reactos/dll/3rdparty/libpng/pngtrans.c trunk/reactos/dll/3rdparty/libpng/pngwio.c trunk/reactos/dll/3rdparty/libpng/pngwrite.c trunk/reactos/dll/3rdparty/libpng/pngwtran.c trunk/reactos/dll/3rdparty/libpng/pngwutil.c trunk/reactos/include/reactos/libs/libpng/png.h trunk/reactos/include/reactos/libs/libpng/pngconf.h trunk/reactos/include/reactos/libs/libpng/pngpriv.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libpng/docs/ANNOUNCE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/A… Modified: trunk/reactos/dll/3rdparty/libpng/docs/CHANGES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/C… Modified: trunk/reactos/dll/3rdparty/libpng/docs/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/I… Modified: trunk/reactos/dll/3rdparty/libpng/docs/LICENSE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/L… Modified: trunk/reactos/dll/3rdparty/libpng/docs/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/R… Modified: trunk/reactos/dll/3rdparty/libpng/docs/TODO URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/T… Modified: trunk/reactos/dll/3rdparty/libpng/docs/example.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/e… Added: trunk/reactos/dll/3rdparty/libpng/docs/libpng-manual.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/docs/l… Modified: trunk/reactos/dll/3rdparty/libpng/png.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/png.c?… Modified: trunk/reactos/dll/3rdparty/libpng/pngerror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngerr… Modified: trunk/reactos/dll/3rdparty/libpng/pngget.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngget… Modified: trunk/reactos/dll/3rdparty/libpng/pngmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngmem… Modified: trunk/reactos/dll/3rdparty/libpng/pngpread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngpre… Modified: trunk/reactos/dll/3rdparty/libpng/pngread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrea… Modified: trunk/reactos/dll/3rdparty/libpng/pngrio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrio… Modified: trunk/reactos/dll/3rdparty/libpng/pngrtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrtr… Modified: trunk/reactos/dll/3rdparty/libpng/pngrutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngrut… Modified: trunk/reactos/dll/3rdparty/libpng/pngset.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngset… Modified: trunk/reactos/dll/3rdparty/libpng/pngtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngtes… Modified: trunk/reactos/dll/3rdparty/libpng/pngtrans.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngtra… Modified: trunk/reactos/dll/3rdparty/libpng/pngwio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwio… Modified: trunk/reactos/dll/3rdparty/libpng/pngwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwri… Modified: trunk/reactos/dll/3rdparty/libpng/pngwtran.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwtr… Modified: trunk/reactos/dll/3rdparty/libpng/pngwutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libpng/pngwut… Modified: trunk/reactos/include/reactos/libs/libpng/png.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/include/reactos/libs/libpng/pngconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Added: trunk/reactos/include/reactos/libs/libpng/pngdebug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Added: trunk/reactos/include/reactos/libs/libpng/pnginfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Added: trunk/reactos/include/reactos/libs/libpng/pnglibconf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Modified: trunk/reactos/include/reactos/libs/libpng/pngpriv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn… Added: trunk/reactos/include/reactos/libs/libpng/pngstruct.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libpn…

1 0

[gschneider] 51594: [fonts] - Update Dejavu fonts & documentation to version 2.33 (by Jon Voris, bug #6106) - Update GNU FreeFonts & documentation to version 2010-09-19 (by Jon Voris, bug #6115) - ...
by gschneider＠svn.reactos.org 05 May '11

05 May '11

Author: gschneider Date: Thu May 5 18:30:18 2011 New Revision: 51594 URL: http://svn.reactos.org/svn/reactos?rev=51594&view=rev Log: [fonts] - Update Dejavu fonts & documentation to version 2.33 (by Jon Voris, bug #6106) - Update GNU FreeFonts & documentation to version 2010-09-19 (by Jon Voris, bug #6115) - Update 3rdparty version info including recent Freetype sync Added: trunk/reactos/media/fonts/doc/FreeFont_AUTHORS.txt (with props) trunk/reactos/media/fonts/doc/FreeFont_COPYING.txt (with props) trunk/reactos/media/fonts/doc/FreeFont_CREDITS.txt (with props) trunk/reactos/media/fonts/doc/FreeFont_ChangeLog.txt (with props) Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/media/fonts/DejaVuSans-Bold.ttf trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf trunk/reactos/media/fonts/DejaVuSans.ttf trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf trunk/reactos/media/fonts/DejaVuSansMono.ttf trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf trunk/reactos/media/fonts/DejaVuSerif.ttf trunk/reactos/media/fonts/FreeMono.ttf trunk/reactos/media/fonts/FreeMonoBold.ttf trunk/reactos/media/fonts/FreeMonoBoldOblique.ttf trunk/reactos/media/fonts/FreeMonoOblique.ttf trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt trunk/reactos/media/fonts/doc/DejaVu_README.txt trunk/reactos/media/fonts/doc/DejaVu_langcover.txt trunk/reactos/media/fonts/doc/DejaVu_status.txt trunk/reactos/media/fonts/doc/DejaVu_unicover.txt trunk/reactos/media/fonts/doc/FreeFont_readme.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… Modified: trunk/reactos/media/fonts/DejaVuSans-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Bol… Modified: trunk/reactos/media/fonts/DejaVuSans-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans-Obl… Modified: trunk/reactos/media/fonts/DejaVuSans.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSans.ttf… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-BoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono-Oblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSansMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSansMono… Modified: trunk/reactos/media/fonts/DejaVuSerif-Bold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-BoldItalic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-Bo… Modified: trunk/reactos/media/fonts/DejaVuSerif-Italic.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif-It… Modified: trunk/reactos/media/fonts/DejaVuSerif.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/DejaVuSerif.tt… Modified: trunk/reactos/media/fonts/FreeMono.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMono.ttf?r… Modified: trunk/reactos/media/fonts/FreeMonoBold.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMonoBold.t… Modified: trunk/reactos/media/fonts/FreeMonoBoldOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMonoBoldOb… Modified: trunk/reactos/media/fonts/FreeMonoOblique.ttf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/FreeMonoObliqu… Modified: trunk/reactos/media/fonts/doc/DejaVu_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_AUT… Modified: trunk/reactos/media/fonts/doc/DejaVu_NEWS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_NEW… Modified: trunk/reactos/media/fonts/doc/DejaVu_README.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_REA… Modified: trunk/reactos/media/fonts/doc/DejaVu_langcover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_lan… Modified: trunk/reactos/media/fonts/doc/DejaVu_status.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_sta… Modified: trunk/reactos/media/fonts/doc/DejaVu_unicover.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/DejaVu_uni… Added: trunk/reactos/media/fonts/doc/FreeFont_AUTHORS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_A… Added: trunk/reactos/media/fonts/doc/FreeFont_COPYING.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_C… Added: trunk/reactos/media/fonts/doc/FreeFont_CREDITS.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_C… Added: trunk/reactos/media/fonts/doc/FreeFont_ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_C… Modified: trunk/reactos/media/fonts/doc/FreeFont_readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/doc/FreeFont_r…

1 0

[gschneider] 51593: [ping] Return 1 if an error occurs during parameter parsing or socket setup See issue #6206 for more details.
by gschneider＠svn.reactos.org 05 May '11

05 May '11

Author: gschneider Date: Thu May 5 18:12:05 2011 New Revision: 51593 URL: http://svn.reactos.org/svn/reactos?rev=51593&view=rev Log: [ping] Return 1 if an error occurs during parameter parsing or socket setup See issue #6206 for more details. Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Thu May 5 18:12:05 2011 @@ -727,6 +727,10 @@ FormatOutput(IDS_MIN_MAX_AVERAGE, MinTime, MaxTime, AvgTime); } } + else + { + return 1; + } return 0; }

1 0

[gschneider] 51592: [shell32] Re-add spaces to German translation
by gschneider＠svn.reactos.org 05 May '11

05 May '11

Author: gschneider Date: Thu May 5 17:54:32 2011 New Revision: 51592 URL: http://svn.reactos.org/svn/reactos?rev=51592&view=rev Log: [shell32] Re-add spaces to German translation Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu May 5 17:54:32 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Anwendungsname", 14005, 100, 140, 40, 10 PUSHBUTTON "Än&dern...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "Umdie Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert.", 14007, 12, 155, 160, 30 + LTEXT "Um die Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert.", 14007, 12, 155, 160, 30 PUSHBUTTON "&Erweitert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -764,5 +764,5 @@ IDS_SHLEXEC_NOASSOC "Es ist kein Programm mit diesem Dateityp verknüpft." IDS_FILE_DETAILS "Details zum Dateityp '%s'" - IDS_FILE_DETAILSADV "Umdie Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert." -END + IDS_FILE_DETAILSADV "Um die Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert." +END

1 0

[gedmurphy] 51591: Create a branch for Samuel Serapion's SSPI work.
by gedmurphy＠svn.reactos.org 05 May '11

05 May '11

Author: gedmurphy Date: Thu May 5 16:58:16 2011 New Revision: 51591 URL: http://svn.reactos.org/svn/reactos?rev=51591&view=rev Log: Create a branch for Samuel Serapion's SSPI work. Added: branches/sspi-bringup/ - copied from r51590, trunk/

1 0

[tkreuzer] 51590: [GDI FONT DRIVER] - Fix buffer overflow checks in FtfdQueryTrueTypeTable and return the correct value - Implement FtfdGetTrueTypeFile
by tkreuzer＠svn.reactos.org 05 May '11

05 May '11

Author: tkreuzer Date: Thu May 5 15:45:08 2011 New Revision: 51590 URL: http://svn.reactos.org/svn/reactos?rev=51590&view=rev Log: [GDI FONT DRIVER] - Fix buffer overflow checks in FtfdQueryTrueTypeTable and return the correct value - Implement FtfdGetTrueTypeFile Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Thu May 5 15:45:08 2011 @@ -697,11 +697,10 @@ ULONG *pcjTable) { PFTFD_FILE pfile = (PFTFD_FILE)diFile; - PBYTE pjTable, pjData; + PBYTE pjTable; ULONG cjTable; DbgPrint("FtfdQueryTrueTypeTable\n"); - __debugbreak(); /* Check if this file supports TrueType tables */ if (pfile->ulFileFormat != FILEFMT_TTF && @@ -710,6 +709,8 @@ DbgPrint("File format doesn't support true type tables\n"); return FD_ERROR; } + + // FIXME: handle ulFont /* Check if the whole file is requested */ if (ulTag == 0) @@ -729,29 +730,32 @@ } } - // FIXME: handle ulFont - - /* Check for overflow and if the offset and size fit into the view */ - pjData = pjTable + dpStart; - if ( (pjData < pjTable) || (pjData + cjBuf < pjData) || - (pjData + cjBuf > (PBYTE)pfile->pvView + pfile->cjView) ) - { - DbgPrint("Overflow: dpStart=0x%lx, cjBuf=0x%lx\n", dpStart, cjBuf); - return FD_ERROR; - } - - /* Check if we shall copy data */ - if (pjBuf) - { - /* Copy the data to the buffer */ - RtlCopyMemory(pjBuf, pjTable + dpStart, cjBuf); - } - /* Return requested pointers */ if (ppjTable) *ppjTable = pjTable; if (pcjTable) *pcjTable = cjTable; - return FD_ERROR; + + /* Check if we shall copy data */ + if (pjBuf) + { + /* Check if the offset is inside the table */ + if (dpStart < 0 || (ULONG_PTR)dpStart >= cjTable) + { + DbgPrint("dpStart outside the table: %p\n", dpStart); + return FD_ERROR; + } + + /* Don't copy beyond the table end */ + cjTable -= dpStart; + + /* Don't copy more then the buffer can hold */ + if (cjBuf < cjTable) cjTable = cjBuf; + + /* Copy the data to the buffer */ + RtlCopyMemory(pjBuf, pjTable + dpStart, cjTable); + } + + return cjTable; } PVOID @@ -760,9 +764,21 @@ ULONG_PTR diFile, ULONG *pcj) { + PFTFD_FILE pfile = (PFTFD_FILE)diFile; + DbgPrint("FtfdGetTrueTypeFile\n"); - __debugbreak(); - return 0; + + /* Check if this file is TrueType */ + if (pfile->ulFileFormat != FILEFMT_TTF && + pfile->ulFileFormat != FILEFMT_OTF) + { + DbgPrint("File format is not TrueType or Opentype\n"); + return NULL; + } + + /* Return the pointer and size */ + if (pcj) *pcj = pfile->cjView; + return pfile->pvView; } #if 0 // not needed atm Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Thu May 5 15:45:08 2011 @@ -15,7 +15,7 @@ - implement QFF_DESCRIPTION, unimportant - FtfdQueryFontCaps: 100% done - FtfdQueryTrueTypeTable: 100% done -- FtfdGetTrueTypeFile: unimplemented +- FtfdGetTrueTypeFile: 100% done - FtfdQueryFontData: 10%, depends on FtfdLoadGlyph - QFD_MAXEXTENTS: dependes on FtfdQueryMaxExtents

1 0

[tkreuzer] 51589: [GDI FONT DRIVER] - Fix size of the buffer returned in FtfdInitGlyphSet - Fix counting of glyph runs - Handle checksums in OTF/TTF tables - Implement FtfdQueryTrueTypeTable - Dele...
by tkreuzer＠svn.reactos.org 05 May '11

05 May '11

Author: tkreuzer Date: Thu May 5 15:01:51 2011 New Revision: 51589 URL: http://svn.reactos.org/svn/reactos?rev=51589&view=rev Log: [GDI FONT DRIVER] - Fix size of the buffer returned in FtfdInitGlyphSet - Fix counting of glyph runs - Handle checksums in OTF/TTF tables - Implement FtfdQueryTrueTypeTable - Delete sprintf.c Removed: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/sprintf.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Thu May 5 15:01:51 2011 @@ -5,7 +5,6 @@ add_library(ftfd SHARED enable.c - file.c font.c glyph.c opentype.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c [iso-8859-1] Thu May 5 15:01:51 2011 @@ -230,8 +230,9 @@ pifi->achVendId, 4); + DbgPrint("Finished with the ifi: %p\n", pifi); - __debugbreak(); + //__debugbreak(); return TRUE; } @@ -244,17 +245,19 @@ FT_Face ftface = pface->ftface; FD_GLYPHSET *pGlyphSet; FT_UInt index; - ULONG i, j, cjSize; + ULONG i, cRuns, cjSize; HGLYPH * phglyphs; WCHAR wcCurrent, wcPrev; DbgPrint("FtfdInitGlyphSet()\n"); - /* Calculate FD_GLYPHSET size */ - cjSize = sizeof(FD_GLYPHSET) + (pface->cRuns - 1) * sizeof(WCRUN); + /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ + cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) + + pface->cRuns * sizeof(WCRUN) + + pface->cMappings * sizeof(HGLYPH); /* Allocate the FD_GLYPHSET structure plus an array of HGLYPHs */ - pGlyphSet = EngAllocMem(0, cjSize + pface->cMappings * sizeof(HGLYPH), TAG_GLYPHSET); + pGlyphSet = EngAllocMem(0, cjSize, TAG_GLYPHSET); if (!pGlyphSet) { DbgPrint("EngAllocMem() failed.\n"); @@ -272,7 +275,7 @@ /* Loop through all character mappings */ wcPrev = wcCurrent = (WCHAR)FT_Get_First_Char(ftface, &index); - for (i = 0, j = 0; i < pface->cMappings && index; i++) + for (i = 0, cRuns = 0; i < pface->cMappings && index; i++) { /* Use index as glyph handle */ phglyphs[i] = (HGLYPH)index; @@ -281,16 +284,16 @@ if (wcCurrent == wcPrev + 1) { /* Append to current WCRUN */ - pGlyphSet->awcrun[j].cGlyphs++; + pGlyphSet->awcrun[cRuns - 1].cGlyphs++; } else { /* Add a new WCRUN */ - pGlyphSet->awcrun[j].wcLow = wcCurrent; - pGlyphSet->awcrun[j].cGlyphs = 1; - pGlyphSet->awcrun[j].phg = &phglyphs[i]; - j++; - //DbgPrint("adding new run i=%ld, j=%ld, wc=%x\n", i, j, wcCurrent); + cRuns++; + pGlyphSet->awcrun[cRuns - 1].wcLow = wcCurrent; + pGlyphSet->awcrun[cRuns - 1].cGlyphs = 1; + pGlyphSet->awcrun[cRuns - 1].phg = &phglyphs[i]; + //DbgPrint("adding new run i=%ld, cRuns=%ld, wc=%x\n", i, cRuns, wcCurrent); } /* Get the next charcode and index */ @@ -693,8 +696,61 @@ PBYTE *ppjTable, ULONG *pcjTable) { + PFTFD_FILE pfile = (PFTFD_FILE)diFile; + PBYTE pjTable, pjData; + ULONG cjTable; + DbgPrint("FtfdQueryTrueTypeTable\n"); __debugbreak(); + + /* Check if this file supports TrueType tables */ + if (pfile->ulFileFormat != FILEFMT_TTF && + pfile->ulFileFormat != FILEFMT_OTF) + { + DbgPrint("File format doesn't support true type tables\n"); + return FD_ERROR; + } + + /* Check if the whole file is requested */ + if (ulTag == 0) + { + /* Requested the whole file */ + pjTable = pfile->pvView; + cjTable = pfile->cjView; + } + else + { + /* Search for the table */ + pjTable = OtfFindTable(pfile->pvView, pfile->cjView, ulTag, &cjTable); + if (!pjTable) + { + DbgPrint("Couldn't find the requested table\n"); + return FD_ERROR; + } + } + + // FIXME: handle ulFont + + /* Check for overflow and if the offset and size fit into the view */ + pjData = pjTable + dpStart; + if ( (pjData < pjTable) || (pjData + cjBuf < pjData) || + (pjData + cjBuf > (PBYTE)pfile->pvView + pfile->cjView) ) + { + DbgPrint("Overflow: dpStart=0x%lx, cjBuf=0x%lx\n", dpStart, cjBuf); + return FD_ERROR; + } + + /* Check if we shall copy data */ + if (pjBuf) + { + /* Copy the data to the buffer */ + RtlCopyMemory(pjBuf, pjTable + dpStart, cjBuf); + } + + /* Return requested pointers */ + if (ppjTable) *ppjTable = pjTable; + if (pcjTable) *pcjTable = cjTable; + return FD_ERROR; } Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h [iso-8859-1] Thu May 5 15:01:51 2011 @@ -262,3 +262,11 @@ OtfGetIfiMetrics( PFTFD_FACE pface, PIFIMETRICS pifi); + +PVOID +NTAPI +OtfFindTable( + PVOID pvView, + ULONG cjView, + ULONG ulTag, + PULONG pulLength); Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c [iso-8859-1] Thu May 5 15:01:51 2011 @@ -46,10 +46,15 @@ { /* Failure! */ DbgPrint("Error creating face\n"); + EngFreeMem(pfont); return NULL; } + pfont->ftface = ftface; + pxo = FONTOBJ_pxoGetXform(pfo); + + // divide into scaling and rotation / shearing fterror = FT_Set_Char_Size(ftface, 0, @@ -66,7 +71,6 @@ /* Set non-orthogonal transformation */ // FT_Set_Transform - pfont->ftface = ftface; /* Set the pvProducer member of the fontobj */ pfo->pvProducer = pfont; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c [iso-8859-1] Thu May 5 15:01:51 2011 @@ -9,6 +9,10 @@ #include "ftfd.h" #include <freetype/t1tables.h> + +// FIXME: we can have unaligned memory access, use: +#define GETW(px) = (((PUCHAR)px)[1] | ((PUCHAR)px)[0] << 8) +#define GETD(px) = (GETW((PUCHAR)px + 2) | GETW(px) << 16) #define SWAPW(x) _byteswap_ushort(x) #define SWAPD(x) _byteswap_ulong(x) @@ -51,7 +55,7 @@ SHORT ySuperscriptYOffset; SHORT yStrikeoutSize; SHORT yStrikeoutPosition; - union + union // 0x30 { struct { @@ -84,6 +88,19 @@ } OTF_OS2_DATA, *POTF_OS2_DATA; #include <poppack.h> +ULONG +CalcTableChecksum(PVOID pvTable, ULONG cjTable) +{ + PULONG pul = pvTable, pulEnd; + ULONG ulCheckSum = 0L; + + pulEnd = (PULONG)pvTable + (cjTable + 3) / sizeof(ULONG); + + while (pul < pulEnd) ulCheckSum += SWAPD(*pul++); + + return ulCheckSum; +} + BOOL OtfGetType1FontInfo( PFTFD_FACE pface, @@ -118,7 +135,17 @@ return TRUE; } +/*! \name OtfFindTable + * \brief Searches for a specific table in TrueType and OpenType font files + * \param pvView - The address where the font file is mapped + * \param vjView - Size of the mapped font file + * \param ulTag - Identifier tag of the table to search + * \param pulLength - Pointer to an ULONG that recieves the table length, + * Can be NULL; + * \return Pointer to the table if successful, NULL if unsuccessful. + */ PVOID +NTAPI OtfFindTable( PVOID pvView, ULONG cjView, @@ -126,7 +153,7 @@ PULONG pulLength) { POTF_FILE_HEADER pFileHeader = pvView; - ULONG i, ulOffset, ulLength, ulNumTables; + ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; /* Verify the file header */ if (pFileHeader->ulIdentifier != 'OTTO' && @@ -165,6 +192,13 @@ return NULL; } + ulCheckSum = CalcTableChecksum((PUCHAR)pvView + ulOffset, ulLength); + if (ulCheckSum != SWAPD(pFileHeader->aTableEntries[i].ulCheckSum)) + { + DbgPrint("Checksum mitmatch! %ld, %ld \n", ulOffset, ulLength); + return NULL; + } + if (pulLength) *pulLength = ulLength; return (PUCHAR)pvView + ulOffset; } @@ -174,15 +208,18 @@ return NULL; } +/*! \name OtfGetWinFamily + * \brief Translates IBM font class IDs into a Windows family bitfield + * \param jClassId + * \param jSubclassId + * \ref http://www.microsoft.com/typography/otspec/ibmfc.htm + */ BYTE OtfGetWinFamily(BYTE jClassId, BYTE jSubclassId) { - BYTE jFamily = 0; - switch (jClassId) { case 0: // Class ID = 0 No Classification - /* We rely on the already set value */ break; case 1: // Class ID = 1 Oldstyle Serifs @@ -197,37 +234,141 @@ case 6: // Subclass ID = 6 : Dutch Traditional case 7: // Subclass ID = 7 : Contemporary case 8: // Subclass ID = 8 : Calligraphic - jFamily = FF_SCRIPT; break; - - case 15: // Subclass ID = 15 : Miscellaneous - + case 15: // Subclass ID = 15 : Miscellaneous default: // Subclass ID = 9-14 : (reserved for future use) break; } + case 2: // Class ID = 2 Transitional Serifs + switch (jSubclassId) + { + case 15: return FF_ROMAN; // 15: Miscellaneous + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Direct Line + case 2: // Subclass ID = 2 : Script + default: // Subclass ID = 3-14 : (reserved for future use) + break; + } + case 3: // Class ID = 3 Modern Serifs + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Italian + case 2: // Subclass ID = 2 : Script + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 3-14 : (reserved for future use) + break; + } + case 4: // Class ID = 4 Clarendon Serifs + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Clarendon + case 2: // Subclass ID = 2 : Modern + case 3: // Subclass ID = 3 : Traditional + case 4: // Subclass ID = 4 : Newspaper + case 5: // Subclass ID = 5 : Stub Serif + case 6: // Subclass ID = 6 : Monotone + case 7: // Subclass ID = 7 : Typewriter + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 8-14: (reserved for future use) + break; + } + case 5: // Class ID = 5 Slab Serifs - case 6: // Class ID = 6 (reserved for future use) + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Monotone + case 2: // Subclass ID = 2 : Humanist + case 3: // Subclass ID = 3 : Geometric + case 4: // Subclass ID = 4 : Swiss + case 5: // Subclass ID = 5 : Typewriter + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 6-14 : (reserved for future use) + break; + } + case 7: // Class ID = 7 Freeform Serifs + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Modern + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 2-14 : (reserved for future use) + break; + } + case 8: // Class ID = 8 Sans Serif switch (jSubclassId) { - case 15: // Subclass ID = 15 : Miscellaneous - jFamily = FF_SWISS | FF_ROMAN; break; - default: - break; - } + case 0: return FF_SWISS; // 0: No Classification + case 5: return FF_SWISS; // 5: Neo-grotesque Gothic + case 15: return FF_SWISS|FF_ROMAN; // 15: Miscellaneous + + case 1: // Subclass ID = 1 : IBM Neo-grotesque Gothic + case 2: // Subclass ID = 2 : Humanist + case 3: // Subclass ID = 3 : Low-x Round Geometric + case 4: // Subclass ID = 4 : High-x Round Geometric + case 6: // Subclass ID = 6 : Modified Neo-grotesque Gothic + case 9: // Subclass ID = 9 : Typewriter Gothic + case 10: // Subclass ID = 10 : Matrix + default: // Subclass ID = 7-8, 11-14 : (reserved for future use) + break; + } + case 9: // Class ID = 9 Ornamentals + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Engraver + case 2: // Subclass ID = 2 : Black Letter + case 3: // Subclass ID = 3 : Decorative + case 4: // Subclass ID = 4 : Three Dimensional + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 5-14 : (reserved for future use) + break; + } + case 10: // Class ID = 10 Scripts - case 11: // Class ID = 11 (reserved for future use) + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 1: // Subclass ID = 1 : Uncial + case 2: // Subclass ID = 2 : Brush Joined + case 3: // Subclass ID = 3 : Formal Joined + case 4: // Subclass ID = 4 : Monotone Joined + case 5: // Subclass ID = 5 : Calligraphic + case 6: // Subclass ID = 6 : Brush Unjoined + case 7: // Subclass ID = 7 : Formal Unjoined + case 8: // Subclass ID = 8 : Monotone Unjoined + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 9-14 : (reserved for future use) + break; + } + case 12: // Class ID = 12 Symbolic + switch (jSubclassId) + { + case 0: // Subclass ID = 0 : No Classification + case 3: // Subclass ID = 3 : Mixed Serif + case 6: // Subclass ID = 6 : Oldstyle Serif + case 7: // Subclass ID = 7 : Neo-grotesque Sans Serif + case 15: // Subclass ID = 15 : Miscellaneous + default: // Subclass ID = 1-2,4-5,8-14 : (reserved for future use) + break; + } + case 13: // Class ID = 13 Reserved case 14: // Class ID = 14 Reserved + default: // Class ID = 6,11 (reserved for future use) break; } + __debugbreak(); - return jFamily; + return 0; } VOID @@ -259,11 +400,8 @@ pifi->jWinPitchAndFamily &= 3; pifi->jWinPitchAndFamily |= OtfGetWinFamily(pOs2->jClassId, pOs2->jSubClassId); pifi->usWinWeight = SWAPW(pOs2->usWeightClass); - //pifi->flInfo; pifi->fsSelection = SWAPW(pOs2->fsSelection); pifi->fsType = SWAPW(pOs2->fsType); - //pifi->fwdUnitsPerEm; - //pifi->fwdLowestPPEm; pifi->fwdWinAscender = SWAPW(pOs2->usWinAscent); pifi->fwdWinDescender = SWAPW(pOs2->usWinDescent); //pifi->fwdMacAscender; @@ -273,7 +411,6 @@ pifi->fwdTypoDescender = SWAPW(pOs2->sTypoDescender); pifi->fwdTypoLineGap = SWAPW(pOs2->sTypoLineGap); pifi->fwdAveCharWidth = SWAPW(pOs2->xAvgCharWidth); - //pifi->fwdMaxCharInc; pifi->fwdCapHeight = SWAPW(pOs2->sCapHeight); pifi->fwdXHeight = SWAPW(pOs2->sxHeight); pifi->fwdSubscriptXSize = SWAPW(pOs2->ySubscriptXSize); @@ -292,17 +429,12 @@ pifi->wcLastChar = SWAPW(pOs2->usLastCharIndex); pifi->wcDefaultChar = SWAPW(pOs2->usDefaultChar); pifi->wcBreakChar = SWAPW(pOs2->usBreakChar); - //pifi->chFirstChar = (CHAR)pifi->wcFirstChar; // FIXME: convert - //pifi->chLastChar = (CHAR)pifi->wcLastChar; - pifi->chDefaultChar = (CHAR)pifi->wcDefaultChar; - pifi->chBreakChar = (CHAR)pifi->wcBreakChar; - //pifi->ptlBaseline; - //pifi->ptlAspect; - //pifi->ptlCaret; - //pifi->rclFontBox; *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; - //pifi->cKerningPairs; //pifi->ulPanoseCulture; pifi->panose = *(PANOSE*)pOs2->panose; + + /* Convert the special characters from unicode to ansi */ + EngUnicodeToMultiByteN(&pifi->chFirstChar, 4, NULL, &pifi->wcFirstChar, 3); + } Removed: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/sprintf.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/sprintf.c (removed) @@ -1,742 +1,0 @@ -/* - * PROGRAMMERS: David Welch - * Eric Kohl - * - * TODO: - * - Verify the implementation of '%Z'. - */ - -/* - * linux/lib/vsprintf.c - * - * Copyright (C) 1991, 1992 Linus Torvalds - */ - -/* vsprintf.c -- Lars Wirzenius & Linus Torvalds. */ -/* - * Wirzenius wrote this portably, Torvalds fucked it up :-) - */ - -#define WIN32_NO_STATUS -#include <windows.h> -#include <ndk/ntndk.h> -#include <stdlib.h> -#include <stdio.h> - -#define ZEROPAD 1 /* pad with zero */ -#define SIGN 2 /* unsigned/signed long */ -#define PLUS 4 /* show plus */ -#define SPACE 8 /* space if plus */ -#define LEFT 16 /* left justified */ -#define SPECIAL 32 /* 0x */ -#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */ -#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */ -typedef struct { - unsigned int mantissal:32; - unsigned int mantissah:20; - unsigned int exponent:11; - unsigned int sign:1; -} double_t; - -static -__inline -int -_isinf(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah == 0 && x.x->mantissal == 0 )); -} - -static -__inline -int -_isnan(double __x) -{ - union - { - double* __x; - double_t* x; - } x; - x.__x = &__x; - return ( x.x->exponent == 0x7ff && ( x.x->mantissah != 0 || x.x->mantissal != 0 )); -} - - -static -__inline -int -do_div(long long *n, int base) -{ - int a; - a = ((unsigned long long) *n) % (unsigned) base; - *n = ((unsigned long long) *n) / (unsigned) base; - return a; -} - - -static int skip_atoi(const char **s) -{ - int i=0; - - while (isdigit(**s)) - i = i*10 + *((*s)++) - '0'; - return i; -} - - -static char * -number(char * buf, char * end, long long num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits; - const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; - const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base == 16) - size -= 2; - - } - i = 0; - if ((num == 0) && (precision !=0)) - tmp[i++] = '0'; - else while (num != 0) - tmp[i++] = digits[do_div(&num,base)]; - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - - if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) { - if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - - return buf; -} - -static char * -numberf(char * buf, char * end, double num, int base, int size, int precision, int type) -{ - char c,sign,tmp[66]; - const char *digits; - const char *small_digits = "0123456789abcdefghijklmnopqrstuvwxyz"; - const char *large_digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"; - int i; - long long x; - - /* FIXME - the float version of number is direcly copy of number - */ - - digits = (type & LARGE) ? large_digits : small_digits; - if (type & LEFT) - type &= ~ZEROPAD; - if (base < 2 || base > 36) - return 0; - c = (type & ZEROPAD) ? '0' : ' '; - sign = 0; - if (type & SIGN) { - if (num < 0) { - sign = '-'; - num = -num; - size--; - } else if (type & PLUS) { - sign = '+'; - size--; - } else if (type & SPACE) { - sign = ' '; - size--; - } - } - if (type & SPECIAL) { - if (base == 16) - size -= 2; - else if (base == 8) - size--; - } - i = 0; - if (num == 0) - tmp[i++] = '0'; - else while (num != 0) - { - x = num; - tmp[i++] = digits[do_div(&x,base)]; - num=x; - } - if (i > precision) - precision = i; - size -= precision; - if (!(type&(ZEROPAD+LEFT))) { - while(size-->0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - } - if (sign) { - if (buf <= end) - *buf = sign; - ++buf; - } - if (type & SPECIAL) { - if (base==8) { - if (buf <= end) - *buf = '0'; - ++buf; - } else if (base==16) { - if (buf <= end) - *buf = '0'; - ++buf; - if (buf <= end) - *buf = digits[33]; - ++buf; - } - } - if (!(type & LEFT)) { - while (size-- > 0) { - if (buf <= end) - *buf = c; - ++buf; - } - } - while (i < precision--) { - if (buf <= end) - *buf = '0'; - ++buf; - } - while (i-- > 0) { - if (buf <= end) - *buf = tmp[i]; - ++buf; - } - while (size-- > 0) { - if (buf <= end) - *buf = ' '; - ++buf; - } - return buf; -} - -static char* -string(char* buf, char* end, const char* s, int len, int field_width, int precision, int flags) -{ - int i; - char c; - - c = (flags & ZEROPAD) ? '0' : ' '; - - if (s == NULL) - { - s = "<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && s[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - ++buf; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = *s++; - ++buf; - } - while (len < field_width--) - { - if (buf <= end) - *buf = ' '; - ++buf; - } - return buf; -} - -static char* -stringw(char* buf, char* end, const wchar_t* sw, int len, int field_width, int precision, int flags) -{ - int i; - char c; - - c = (flags & ZEROPAD) ? '0' : ' '; - - if (sw == NULL) - { - sw = L"<NULL>"; - len = 6; - } - else - { - if (len == -1) - { - len = 0; - while ((unsigned int)len < (unsigned int)precision && sw[len]) - len++; - } - else - { - if ((unsigned int)len > (unsigned int)precision) - len = precision; - } - } - if (!(flags & LEFT)) - while (len < field_width--) - { - if (buf <= end) - *buf = c; - buf++; - } - for (i = 0; i < len; ++i) - { - if (buf <= end) - *buf = (unsigned char)(*sw++); - buf++; - } - while (len < field_width--) - { - if (buf <= end) - *buf = ' '; - buf++; - } - return buf; -} - -/* - * @implemented - */ -int __cdecl _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args) -{ - int len; - unsigned long long num; - double _double; - - int base; - char *str, *end; - const char *s; - const wchar_t *sw; - - int flags; /* flags to number() */ - - int field_width; /* width of output field */ - int precision; /* min. # of digits for integers; max - number of chars for from string */ - int qualifier; /* 'h', 'l', 'L', 'I' or 'w' for integer fields */ - - /* clear the string buffer with zero so we do not need NULL terment it at end */ - - str = buf; - end = buf + cnt - 1; - if (end < buf - 1) { - end = ((char *) -1); - cnt = end - buf + 1; - } - - for ( ; *fmt ; ++fmt) { - if (*fmt != '%') { - if (str <= end) - *str = *fmt; - ++str; - continue; - } - - /* process flags */ - flags = 0; - repeat: - ++fmt; /* this also skips first '%' */ - switch (*fmt) { - case '-': flags |= LEFT; goto repeat; - case '+': flags |= PLUS; goto repeat; - case ' ': flags |= SPACE; goto repeat; - case '#': flags |= SPECIAL; goto repeat; - case '0': flags |= ZEROPAD; goto repeat; - } - - /* get field width */ - field_width = -1; - if (isdigit(*fmt)) - field_width = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - field_width = va_arg(args, int); - if (field_width < 0) { - field_width = -field_width; - flags |= LEFT; - } - } - - /* get the precision */ - precision = -1; - if (*fmt == '.') { - ++fmt; - if (isdigit(*fmt)) - precision = skip_atoi(&fmt); - else if (*fmt == '*') { - ++fmt; - /* it's the next argument */ - precision = va_arg(args, int); - } - if (precision < 0) - precision = 0; - } - - /* get the conversion qualifier */ - qualifier = -1; - if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'w') { - qualifier = *fmt; - ++fmt; - } else if (*fmt == 'I' && *(fmt+1) == '6' && *(fmt+2) == '4') { - qualifier = *fmt; - fmt += 3; - } else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') { - qualifier = 'l'; - fmt += 3; - } else if (*fmt == 'F' && *(fmt+1) == 'p') { - fmt += 1; - flags |= REMOVEHEX; - } - - /* default base */ - base = 10; - - switch (*fmt) { - case 'c': /* finished */ - if (qualifier == 'l' || qualifier == 'w') { - wchar_t sw1[2]; - /* print unicode string */ - sw1[0] = (wchar_t) va_arg(args, int); - sw1[1] = 0; - str = stringw(str, end, (wchar_t *)&sw1, -1, field_width, precision, flags); - } else { - char s1[2]; - /* print ascii string */ - s1[0] = ( unsigned char) va_arg(args, int); - s1[1] = 0; - str = string(str, end, (char *)&s1, -1, field_width, precision, flags); - } - continue; - - case 'C': /* finished */ - if (!(flags & LEFT)) - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - if (qualifier == 'h') { - if (str <= end) - *str = (unsigned char) va_arg(args, int); - ++str; - } else { - if (str <= end) - *str = (unsigned char)(wchar_t) va_arg(args, int); - ++str; - } - while (--field_width > 0) { - if (str <= end) - *str = ' '; - ++str; - } - continue; - - case 's': /* finished */ - if (qualifier == 'l' || qualifier == 'w') { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } else { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } - continue; - - case 'S': - if (qualifier == 'h') { - /* print ascii string */ - s = va_arg(args, char *); - str = string(str, end, s, -1, field_width, precision, flags); - } else { - /* print unicode string */ - sw = va_arg(args, wchar_t *); - str = stringw(str, end, sw, -1, field_width, precision, flags); - } - continue; - - case 'Z': - if (qualifier == 'w') { - /* print counted unicode string */ - PUNICODE_STRING pus = va_arg(args, PUNICODE_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - sw = NULL; - len = -1; - } else { - sw = pus->Buffer; - len = pus->Length / sizeof(WCHAR); - } - str = stringw(str, end, sw, len, field_width, precision, flags); - } else { - /* print counted ascii string */ - PANSI_STRING pus = va_arg(args, PANSI_STRING); - if ((pus == NULL) || (pus->Buffer == NULL)) { - s = NULL; - len = -1; - } else { - s = pus->Buffer; - len = pus->Length; - } - str = string(str, end, s, len, field_width, precision, flags); - } - continue; - - case 'p': - if ((flags & LARGE) == 0) - flags |= LARGE; - - if (field_width == -1) { - field_width = 2 * sizeof(void *); - flags |= ZEROPAD; - } - str = number(str, end, - (ULONG_PTR) va_arg(args, void *), 16, - field_width, precision, flags); - continue; - - case 'n': - /* FIXME: What does C99 say about the overflow case here? */ - if (qualifier == 'l') { - long * ip = va_arg(args, long *); - *ip = (str - buf); - } else { - int * ip = va_arg(args, int *); - *ip = (str - buf); - } - continue; - - /* float number formats - set up the flags and "break" */ - case 'e': - case 'E': - case 'f': - case 'g': - case 'G': - _double = (double)va_arg(args, double); - if ( _isnan(_double) ) { - s = "Nan"; - len = 3; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else if ( _isinf(_double) < 0 ) { - s = "-Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else if ( _isinf(_double) > 0 ) { - s = "+Inf"; - len = 4; - while ( len > 0 ) { - if (str <= end) - *str = *s++; - ++str; - len --; - } - } else { - if ( precision == -1 ) - precision = 6; - str = numberf(str, end, (int)_double, base, field_width, precision, flags); - } - - continue; - - - /* integer number formats - set up the flags and "break" */ - case 'o': - base = 8; - break; - - case 'b': - base = 2; - break; - - case 'X': - flags |= LARGE; - case 'x': - base = 16; - break; - - case 'd': - case 'i': - flags |= SIGN; - case 'u': - break; - - default: - if (*fmt) { - if (str <= end) - *str = *fmt; - ++str; - } else - --fmt; - continue; - } - - if (qualifier == 'I') - num = va_arg(args, unsigned long long); - else if (qualifier == 'l') { - if (flags & SIGN) - num = va_arg(args, long); - else - num = va_arg(args, unsigned long); - } - else if (qualifier == 'h') { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - else { - if (flags & SIGN) - num = va_arg(args, int); - else - num = va_arg(args, unsigned int); - } - str = number(str, end, num, base, field_width, precision, flags); - } - if (str <= end) - *str = '\0'; - else if (cnt > 0) - /* don't write out a null byte if the buf size is zero */ - *end = '\0'; - return str-buf; -} - - -/* - * @implemented - */ -int sprintf(char * buf, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnprintf(buf,MAXLONG,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int _snprintf(char * buf, size_t cnt, const char *fmt, ...) -{ - va_list args; - int i; - - va_start(args, fmt); - i=_vsnprintf(buf,cnt,fmt,args); - va_end(args); - return i; -} - - -/* - * @implemented - */ -int __cdecl vsprintf(char *buf, const char *fmt, va_list args) -{ - return _vsnprintf(buf,MAXLONG,fmt,args); -} - -/* EOF */ Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/todo.txt [iso-8859-1] Thu May 5 15:01:51 2011 @@ -14,7 +14,7 @@ - FtfdQueryFontFile: 50% - implement QFF_DESCRIPTION, unimportant - FtfdQueryFontCaps: 100% done -- FtfdQueryTrueTypeTable: unimplemented +- FtfdQueryTrueTypeTable: 100% done - FtfdGetTrueTypeFile: unimplemented - FtfdQueryFontData: 10%, depends on FtfdLoadGlyph

1 0

[gedmurphy] 51588: Create a branch for Andrew Greens work on the new explorer and its associated shell work for the Google Summer of Code project
by gedmurphy＠svn.reactos.org 05 May '11

05 May '11

Author: gedmurphy Date: Thu May 5 13:14:39 2011 New Revision: 51588 URL: http://svn.reactos.org/svn/reactos?rev=51588&view=rev Log: Create a branch for Andrew Greens work on the new explorer and its associated shell work for the Google Summer of Code project Added: branches/GSoC_2011/NewExplorer/ (props changed) - copied from r51587, branches/cmake-bringup/ Propchange: branches/GSoC_2011/NewExplorer/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Thu May 5 13:14:39 2011 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/GSoC_2011/NewExplorer/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/GSoC_2011/NewExplorer/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/GSoC_2011/NewExplorer/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Thu May 5 13:14:39 2011 @@ -1,0 +1,16 @@ +*.iso +makefile.auto +makefile-*.auto +config-*.rbuild +obj-* +output-* +reactos +build* +*.patch +reactos.* +RosBE-Logs +*.sln +*.ncb +*.suo +versionreport.xml +config.rbuild Propchange: branches/GSoC_2011/NewExplorer/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu May 5 13:14:39 2011 @@ -1,0 +1,6 @@ +/branches/header-work:45691-47721 +/branches/reactos-yarotows:45219-46371,46373-48025,48027-49273 +/branches/reactx/reactos:49994-49995 +/branches/ros-amd64-bringup:36852 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34770,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,36393,36397,36443,36445,36475,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36990,36992,37019,37322-37323,37333-37334,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,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-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-41480,41483-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43852,43857-43858,43860,43905-43907,43952,43954,43965,43969,43979,43981,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,45430,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,46868,47472,47846-47847,47878,47882 +/trunk/reactos:48236-51543 Propchange: branches/GSoC_2011/NewExplorer/ ------------------------------------------------------------------------------ tsvn:logminsize = 10

1 0

[jimtabor] 51587: [User32|Win32k] - Standardize keyboard flags for the input thread and send input. Next round will update the rest of user32 defwnd.c, combo.c and appswitch.c. - Add the missing ke...
by jimtabor＠svn.reactos.org 05 May '11

05 May '11

Author: jimtabor Date: Thu May 5 12:43:31 2011 New Revision: 51587 URL: http://svn.reactos.org/svn/reactos?rev=51587&view=rev Log: [User32|Win32k] - Standardize keyboard flags for the input thread and send input. Next round will update the rest of user32 defwnd.c, combo.c and appswitch.c. - Add the missing keyboard flags needed for menu operations for in-user applications. - Setup a function to be used to get, set and clear queue flags of special use for User32 functions. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Thu May 5 12:43:31 2011 @@ -18,7 +18,7 @@ */ /* * PROJECT: ReactOS user32.dll - * FILE: lib/user32/windows/dialog.c + * FILE: dll/win32/user32/windows/dialog.c * PURPOSE: Input * PROGRAMMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Thomas Weidenmueller (w3seek(a)users.sourceforge.net) @@ -39,6 +39,7 @@ #define DF_END 0x0001 #define DF_OWNERENABLED 0x0002 +#define DF_DIALOGACTIVE 0x4000 #define DWLP_ROS_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR)) #define GETDLGINFO(hwnd) DIALOG_get_info(hwnd, FALSE) #define SETDLGINFO(hwnd, info) SetWindowLongPtrW((hwnd), DWLP_ROS_DIALOGINFO, (LONG_PTR)(info)) @@ -1131,6 +1132,7 @@ if (dlgInfo->hUserFont) DeleteObject( dlgInfo->hUserFont ); if (dlgInfo->hMenu) DestroyMenu( dlgInfo->hMenu ); HeapFree( GetProcessHeap(), 0, dlgInfo ); + NtUserSetThreadState(0,DF_DIALOGACTIVE); NtUserCallHwndParam( hwnd, 0, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); } /* Window clean-up */ @@ -1141,6 +1143,7 @@ return DefWindowProcA( hwnd, msg, wParam, lParam ); case WM_ACTIVATE: + NtUserSetThreadState(DF_DIALOGACTIVE,DF_DIALOGACTIVE); if (wParam) DEFDLG_RestoreFocus( hwnd ); else DEFDLG_SaveFocus( hwnd ); return 0; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Thu May 5 12:43:31 2011 @@ -769,7 +769,7 @@ (KeyInput.MakeCode == LastMakeCode)) { RepeatCount++; - lParam |= (1 << 30); + lParam |= (KF_REPEAT << 16); } else { @@ -782,7 +782,7 @@ { LastFlags = 0; LastMakeCode = 0; /* Should never match */ - lParam |= (1 << 30) | (1 << 31); + lParam |= (KF_UP << 16) | (KF_REPEAT << 16); } lParam |= RepeatCount; @@ -790,11 +790,11 @@ lParam |= (KeyInput.MakeCode & 0xff) << 16; if (KeyInput.Flags & KEY_E0) - lParam |= (1 << 24); + lParam |= (KF_EXTENDED << 16); if (ModifierState & MOD_ALT) { - lParam |= (1 << 29); // wine -> (HIWORD(lParam) & KEYDATA_ALT) #define KEYDATA_ALT 0x2000 + lParam |= (KF_ALTDOWN << 16); if (!(KeyInput.Flags & KEY_BREAK)) msg.message = WM_SYSKEYDOWN; @@ -821,6 +821,10 @@ { keyboardLayout = ((PTHREADINFO)FocusThread->Tcb.Win32Thread)->KeyboardLayout; } + if ( FocusQueue->QF_flags & QF_DIALOGACTIVE ) + lParam |= (KF_DLGMODE << 16); + if ( FocusQueue->MenuOwner )//FocusQueue->MenuState ) // MenuState needs a start flag... + lParam |= (KF_MENUMODE << 16); } if (!keyboardLayout) { @@ -1265,8 +1269,14 @@ Msg.wParam = wVk; flags = LOBYTE(ki->wScan); + FocusMessageQueue = IntGetFocusMessageQueue(); + if (ki->dwFlags & KEYEVENTF_EXTENDEDKEY) flags |= KF_EXTENDED; /* FIXME: set KF_DLGMODE and KF_MENUMODE when needed */ + if ( FocusMessageQueue && FocusMessageQueue->QF_flags & QF_DIALOGACTIVE ) + flags |= KF_DLGMODE; + if ( FocusMessageQueue && FocusMessageQueue->MenuOwner )//FocusMessageQueue->MenuState ) // MenuState needs a start flag... + flags |= KF_MENUMODE; /* strip left/right for menu, control, shift */ switch (wVk) @@ -1354,8 +1364,6 @@ Msg.lParam = MAKELPARAM(1 /* repeat count */, flags); } - FocusMessageQueue = IntGetFocusMessageQueue(); - Msg.hwnd = 0; if (FocusMessageQueue && (FocusMessageQueue->FocusWindow != (HWND)0)) @@ -1374,7 +1382,7 @@ KbdHookData.vkCode = vk_hook; KbdHookData.scanCode = ki->wScan; - KbdHookData.flags = flags >> 8; + KbdHookData.flags = (flags & (KF_EXTENDED | KF_ALTDOWN | KF_UP)) >> 8; if (Injected) KbdHookData.flags |= LLKHF_INJECTED; KbdHookData.time = Msg.time; KbdHookData.dwExtraInfo = ki->dwExtraInfo; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Thu May 5 12:43:31 2011 @@ -150,6 +150,32 @@ return ret; } +DWORD +APIENTRY +NtUserSetThreadState( + DWORD Set, + DWORD Flags) +{ + PTHREADINFO pti; + DWORD Ret = 0; + // Test the only flags user can change. + if (Set & ~(QF_FF10STATUS|QF_DIALOGACTIVE|QF_TABSWITCHING|QF_FMENUSTATUS|QF_FMENUSTATUSBREAK)) return 0; + if (Flags & ~(QF_FF10STATUS|QF_DIALOGACTIVE|QF_TABSWITCHING|QF_FMENUSTATUS|QF_FMENUSTATUSBREAK)) return 0; + UserEnterExclusive(); + pti = PsGetCurrentThreadWin32Thread(); + if (pti->MessageQueue) + { + Ret = pti->MessageQueue->QF_flags; // Get the queue flags. + if (Set) + pti->MessageQueue->QF_flags |= (Set&Flags); // Set the queue flags. + else + { + if (Flags) pti->MessageQueue->QF_flags &= ~Flags; // Clr the queue flags. + } + } + UserLeave(); + return Ret; +} UINT APIENTRY Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Thu May 5 12:43:31 2011 @@ -525,17 +525,6 @@ UserLeave(); return Ret; -} - -DWORD -APIENTRY -NtUserSetThreadState( - DWORD Unknown0, - DWORD Unknown1) -{ - UNIMPLEMENTED - - return 0; } DWORD

1 0

[ilardig] 51586: [shell32] Folder options: - Load text from language file. - Fill in the extension and description. Patch by Edijs Kolesnikovics <terminedijs at yahoo dot com> - Fix an Italian stri...
by ilardig＠svn.reactos.org 05 May '11

05 May '11

Author: ilardig Date: Thu May 5 12:06:34 2011 New Revision: 51586 URL: http://svn.reactos.org/svn/reactos?rev=51586&view=rev Log: [shell32] Folder options: - Load text from language file. - Fill in the extension and description. Patch by Edijs Kolesnikovics <terminedijs at yahoo dot com> - Fix an Italian string. See issue #6208 for more details. Modified: trunk/reactos/dll/win32/shell32/folder_options.c trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/en-US.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/ru-RU.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc trunk/reactos/dll/win32/shell32/shresdef.h Modified: trunk/reactos/dll/win32/shell32/folder_options.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folder_o… ============================================================================== --- trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folder_options.c [iso-8859-1] Thu May 5 12:06:34 2011 @@ -399,7 +399,7 @@ { LPNMLISTVIEW lppl; LVITEMW lvItem; - WCHAR Buffer[200], FormatBuffer[100]; + WCHAR Buffer[200], FormatBuffer[100]; //FIXME PFOLDER_FILE_TYPE_ENTRY pItem; OPENASINFO Info; @@ -451,6 +451,16 @@ swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1]); /* update dialog */ SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, 0, (LPARAM)Buffer); + + if (!LoadStringW(shell32_hInstance, IDS_FILE_DETAILSADV, FormatBuffer, sizeof(FormatBuffer) / sizeof(WCHAR))) + { + /* use default english format string */ + wcscpy(FormatBuffer, L"Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced."); + } + /* format buffer */ + swprintf(Buffer, FormatBuffer, &pItem->FileExtension[1], &pItem->FileDescription[0], &pItem->FileDescription[0]); + /* update dialog */ + SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, 0, (LPARAM)Buffer); } } break; Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -423,7 +423,7 @@ //ICON LTEXT "Èìå íà ïðèëîæåíèå", 14005, 100, 140, 40, 10 PUSHBUTTON "Ïðî&ìÿíà...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'.\nÇà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s'\nôàéëîâå, íàòèñíåòå Ðàçøèðåíè.", 14007, 12, 155, 160, 32 +LTEXT "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'. Çà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s' ôàéëîâå, íàòèñíåòå Ðàçøèðåíè.", 14007, 12, 155, 160, 32 PUSHBUTTON "Ðàç&øèðåíè", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -759,8 +759,11 @@ IDS_COPY_OF "Ïðåçàïèñ íà" IDS_SHLEXEC_NOASSOC "Íÿìà ïðèëîæåíèå çà Óèíäîóñ, íàñòðîåíî äà îòâàðÿ òîçè âèä ôàéëîâå." -END - - - - + + IDS_FILE_DETAILS "Ïîäðîáíîñòè çà ðàçøèðåíèå '%s" + IDS_FILE_DETAILSADV "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'. Çà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s' ôàéëîâå, íàòèñíåòå Ðàçøèðåíè." +END + + + + Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -412,7 +412,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Zmìnit...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Soubory s pøíponou '%s' jsou typu '%s'. Kliknutím\nna tlaèítko Pokroèilé lze zmìnit nastavení pro vechny\nsoubory '%s'.", 14007, 12, 155, 160, 30 +LTEXT "Soubory s pøíponou '%s' jsou typu '%s'. Kliknutím na tlaèítko Pokroèilé lze zmìnit nastavení pro vechny soubory '%s'.", 14007, 12, 155, 160, 30 PUSHBUTTON "&Pokroèilé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -745,4 +745,7 @@ IDS_COPY_OF "Kopie " IDS_SHLEXEC_NOASSOC "Pro otevøení tohoto souboru není nakonfigurován ádný program." -END + + IDS_FILE_DETAILS "Podrobnosti pro typ souborù '%s'" + IDS_FILE_DETAILSADV "Soubory s pøíponou '%s' jsou typu '%s'. Kliknutím na tlaèítko Pokroèilé lze zmìnit nastavení pro vechny soubory '%s'." +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -413,7 +413,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -747,4 +747,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Anwendungsname", 14005, 100, 140, 40, 10 PUSHBUTTON "Än&dern...", 14006, 180, 140, 50, 14, WS_TABSTOP - LTEXT "Um\ndie Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert.", 14007, 12, 155, 160, 30 + LTEXT "Umdie Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert.", 14007, 12, 155, 160, 30 PUSHBUTTON "&Erweitert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,4 +762,7 @@ IDS_COPY_OF "Kopie von" IDS_SHLEXEC_NOASSOC "Es ist kein Programm mit diesem Dateityp verknüpft." -END + + IDS_FILE_DETAILS "Details zum Dateityp '%s'" + IDS_FILE_DETAILSADV "Umdie Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert." +END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -759,4 +759,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -435,7 +435,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -769,4 +769,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -771,4 +771,7 @@ IDS_COPY_OF "Copia de" IDS_SHLEXEC_NOASSOC "No hay ningún programa configurado en ReactOS para abrir este tipo de archivo." -END + + IDS_FILE_DETAILS "Detalles para el tipo de archivo '%s'" + IDS_FILE_DETAILSADV "Los archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas." +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -428,7 +428,7 @@ //ICON LTEXT "Nom de l'application", 14005, 100, 140, 40, 10 PUSHBUTTON "&Modifier...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Les fichiers avec l'extension '%s' sont de type '%s'. Pour\nmodifier les paramètres qui concernent tous les fichiers '%s', cliquez\nsur Avancé.", 14007, 12, 155, 160, 30 +LTEXT "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramètres qui concernent tous les fichiers '%s', cliquez sur Avancé.", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,4 +762,7 @@ IDS_COPY_OF "Copie de" IDS_SHLEXEC_NOASSOC "Aucun programme Windows n'est configuré pour ouvrir ce type de fichier." -END + + IDS_FILE_DETAILS "Détails concernant l'extension '%s'" + IDS_FILE_DETAILSADV "Les fichiers avec l'extension '%s' sont de type '%s'. Pour modifier les paramètres qui concernent tous les fichiers '%s', cliquez sur Avancé." +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -129,7 +129,7 @@ LTEXT "Versione " KERNEL_VERSION_STR " (" KERNEL_VERSION_BUILD_STR ")", IDC_STATIC, 35, 65, 235, 10 LTEXT REACTOS_DEFAULT_STR_LEGAL_COPYRIGHT, IDC_STATIC, 35, 75, 210, 10 LTEXT "", IDC_SHELL_ABOUT_OTHERSTUFF, 35, 90, 180, 20 - LTEXT "Questa versione di ReactOS è registrata da:", IDC_STATIC, 35, 115, 180, 10 + LTEXT "Questa versione di ReactOS è registrata a nome di:", IDC_STATIC, 35, 115, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_USERNAME, 45, 125, 180, 10 LTEXT "", IDC_SHELL_ABOUT_REG_ORGNAME, 45, 135, 180, 10 LTEXT "", IDC_STATIC, 35, 147, 235, 1, SS_ETCHEDHORZ @@ -435,7 +435,7 @@ //ICON LTEXT "Nome", 14005, 100, 140, 40, 10 PUSHBUTTON "&Cambia...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "I files con estensione '%s' sono di tipo '%s'.\nPer cambiare le impostazioni che influenzano tutti i file '%s', cliccare\nAvanzate.", 14007, 12, 155, 160, 30 +LTEXT "I files con estensione '%s' sono di tipo '%s'. Per cambiare le impostazioni per tutti i file '%s', cliccare su Avanzate.", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vanzate", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -769,4 +769,7 @@ IDS_COPY_OF "Copia di" IDS_SHLEXEC_NOASSOC "Non c'è un programma configurato per aprire questo tipo di file." -END + + IDS_FILE_DETAILS "Dettagli per l'estensione '%s'" + IDS_FILE_DETAILSADV "I files con estensione '%s' sono di tipo '%s'. Per modificare le impostazioni per tutti i file '%s', cliccare su Avanzate." +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Av¼", 14005, 100, 140, 40, 10 PUSHBUTTON "ÏX(&C)...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B\n'%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ\nÚ×ÝèðNbNµÄ¾³¢B", 14007, 12, 155, 160, 30 +LTEXT "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B '%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ Ú×ÝèðNbNµÄ¾³¢B", 14007, 12, 155, 160, 30 PUSHBUTTON "Ú×Ýè(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -757,4 +757,8 @@ IDS_DEFAULT_CLUSTER_SIZE "ftHg AP[V TCY" IDS_COPY_OF "Rs[ `" -END + IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + + IDS_FILE_DETAILS "g£q '%s' ÌÚ×" + IDS_FILE_DETAILSADV "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B '%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ Ú×ÝèðNbNµÄ¾³¢B" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Er is geen Windows-programma geconfigureerd om dit soort bestanden te openen." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -425,7 +425,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Endre...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Filer med utvidelser '%s' er av typen '%s'. For å\nendre innstillingene som er av filen '%s', trykk på\navansert.", 14007, 12, 155, 160, 30 +LTEXT "Filer med utvidelser '%s' er av typen '%s'. For å endre innstillingene som er av filen '%s', trykk på avansert.", 14007, 12, 155, 160, 30 PUSHBUTTON "Av&ansert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Intet Windows-program er satt opp til å åpne denne filtypen." -END + + IDS_FILE_DETAILS "Detailjer for '%s' utvidelser" + IDS_FILE_DETAILSADV "Filer med utvidelser '%s' er av typen '%s'. For å endre innstillingene som er av filen '%s', trykk på avansert." +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -432,7 +432,7 @@ //ICON LTEXT "Nazwa Aplikacji", 14005, 100, 140, 40, 10 PUSHBUTTON "Z&mieñ", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Pliki z rozszerzeniem '%s' nale¿¹ do typu: '%s'. Aby\nzmieniæ ustawienia dotycz¹ce wszystkich plików '%s', wybierz\nZaawansowane.", 14007, 12, 155, 160, 30 +LTEXT "Pliki z rozszerzeniem '%s' nale¿¹ do typu: '%s'. Aby zmieniæ ustawienia dotycz¹ce wszystkich plików '%s', wybierz Zaawansowane.", 14007, 12, 155, 160, 30 PUSHBUTTON "Zaawa&nsowane", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -766,4 +766,7 @@ IDS_COPY_OF "Kopia" IDS_SHLEXEC_NOASSOC "¯aden program nie jest skonfigurowany, by otwieraæ pliki tego typu." -END + + IDS_FILE_DETAILS "Szczegó³y dla rozszerzenia '%s'" + IDS_FILE_DETAILSADV "Pliki z rozszerzeniem '%s' s¹ typu '%s'. Aby zmieniæ ustawienia, które dotycz¹ wszystkich plików '%s', kliknij przycisk Zaawansowane." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -426,7 +426,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -760,4 +760,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Nici un program Windows nu este configurat sa deschida fi?iere de acest tip." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Appnome", 14005, 100, 140, 40, 10 PUSHBUTTON "&Mudar...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ficheiros com extensão '%s' são do tipo '%s'. Para\nmudar definições que afectam todos '%s' ficheiros, click\nAvançado.", 14007, 12, 155, 160, 30 +LTEXT "Ficheiros com extensão '%s' são do tipo '%s'. Para mudar definições que afectam todos '%s' ficheiros, click Avançado.", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,7 @@ IDS_COPY_OF "Cópia de" IDS_SHLEXEC_NOASSOC "Não existe um programa Windows configurado para abrir este tipo de ficheiro." -END + + IDS_FILE_DETAILS "Detalhes para '%s' extensão" + IDS_FILE_DETAILSADV "Ficheiros com extensão '%s' são do tipo '%s'. Para mudar definições que afectam todos '%s' ficheiros, click Avançado." +END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -427,7 +427,7 @@ //ICON LTEXT "Nume ap.", 14005, 100, 140, 40, 10 PUSHBUTTON "&Schimbare", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "FiÈierele cu extensia '%s' sunt de tipul '%s'. \nPentru a schimbat setÄri care vor afecta\ntoate fiÈierele '%s', clic pe Avansat.", 14007, 12, 155, 160, 30 +LTEXT "FiÈierele cu extensia '%s' sunt de tipul '%s'. Pentru a schimbat setÄri care vor afecta toate fiÈierele '%s', clic pe Avansat.", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vansat", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -760,6 +760,9 @@ IDS_DEFAULT_CLUSTER_SIZE "MÄrime de alocare implicitÄ" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + + IDS_FILE_DETAILS "Detalii pentru extensia '%s'" + IDS_FILE_DETAILSADV "FiÈierele cu extensia '%s' sunt de tipul '%s'. Pentru a schimbat setÄri care vor afecta toate fiÈierele '%s', clic pe Avansat." END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Ïðèëîæåíèå:", 14005, 100, 142, 54, 10 PUSHBUTTON "&Èçìåíèòü...", 14006, 180, 140, 63, 14, WS_TABSTOP -LTEXT "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå ""Äîïîëíèòåëüíî"".", 14007, 12, 155, 162, 36 +LTEXT "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå 'Äîïîëíèòåëüíî'.", 14007, 12, 155, 162, 36 PUSHBUTTON "Äî&ïîëíèòåëüíî", 14008, 180, 175, 63, 14, WS_TABSTOP END @@ -757,4 +757,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Îïèñàíèå ðàñøèðåíèÿ '%s'" + IDS_FILE_DETAILSADV "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå 'Äîïîëíèòåëüíî'." +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -430,7 +430,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Zmeni...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -766,4 +766,7 @@ // There is no Windows program configured to open this type of file. IDS_SHLEXEC_NOASSOC "Neexistuje iadny program nakonfigurovaný tak, aby otváral tento typ súborov." // Na otváranie tohto typu súboru nie je nakonfigurovaný iadny program systému Windows. -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "Noben Okenski program ni nastavljen, da bi odpiral ta tip datotek." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -424,7 +424,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -758,4 +758,7 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -437,7 +437,7 @@ //ICON LTEXT "Äîäàòîê", 14005, 100, 140, 40, 10 PUSHBUTTON "&Çì³íèòè...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'.\nÙîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü\níà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó ""Äîäàòêîâî"".", 14007, 12, 155, 160, 30 +LTEXT "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'. Ùîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü íà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó 'Äîäàòêîâî'.", 14007, 12, 155, 160, 30 PUSHBUTTON "&Äîäàòêîâî", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -771,4 +771,7 @@ IDS_COPY_OF "Êîï³ÿ" IDS_SHLEXEC_NOASSOC "Íåìàº ïðîãðàìè Windows, ñêîíô³ãóðîâàíî¿ äëÿ â³äêðèòòÿ öüîãî òèïó ôàéë³â." -END + + IDS_FILE_DETAILS "Ïîäðîáèö³ äëÿ ðîçøèðåííÿ '%s'" + IDS_FILE_DETAILSADV "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'. Ùîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü íà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó 'Äîäàòêîâî'." +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -413,7 +413,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -746,5 +746,8 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." -END - + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." +END + Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Thu May 5 12:06:34 2011 @@ -425,7 +425,7 @@ //ICON LTEXT "Appname", 14005, 100, 140, 40, 10 PUSHBUTTON "&Change...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Files with extension '%s' are of type '%s'. To\nchange settings that affect all '%s' files, click\nAdvanced.", 14007, 12, 155, 160, 30 +LTEXT "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -759,6 +759,9 @@ IDS_COPY_OF "Copy of" IDS_SHLEXEC_NOASSOC "There is no Windows program configured to open this type of file." + + IDS_FILE_DETAILS "Details for '%s' extension" + IDS_FILE_DETAILSADV "Files with extension '%s' are of type '%s'. To change settings that affect all '%s' files, click Advanced." END #pragma code_page(default) Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Thu May 5 12:06:34 2011 @@ -141,6 +141,7 @@ #define IDS_SHLEXEC_NOASSOC 173 #define IDS_FILE_TYPES 174 #define IDS_FILE_DETAILS 175 +#define IDS_FILE_DETAILSADV 176 #define IDS_RUNDLG_ERROR 180 #define IDS_RUNDLG_BROWSE_ERROR 181

1 0

← Newer
1
...
41
42
43
44
45
46
47
...
52
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011