Ros-diffs May 2011

ros-diffs@reactos.org

26 participants
511 discussions

[tkreuzer] 51605: [GDI FONT DRIVER] - Don't return FM_INFO_RETURNS_OUTLINES, we don't support it yet - In FtfdCreateFontInstance distinguish between scaling transformation and generic transformatio...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri May 6 10:38:36 2011 New Revision: 51605 URL: http://svn.reactos.org/svn/reactos?rev=51605&view=rev Log: [GDI FONT DRIVER] - Don't return FM_INFO_RETURNS_OUTLINES, we don't support it yet - In FtfdCreateFontInstance distinguish between scaling transformation and generic transformations, handle the former - Calculate font size and a number of other coordinates in device space when instantiating a font - Return these transformed coordinates in FtfdQueryMaxExtents Modified: 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/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] Fri May 6 10:38:36 2011 @@ -107,7 +107,7 @@ if (pface->cRuns > 1) pifi->flInfo |= FM_INFO_NOT_CONTIGUOUS; if (pface->ulFontFormat != FMT_FNT) - pifi->flInfo |= FM_INFO_RETURNS_OUTLINES | FM_INFO_ARB_XFORMS; + pifi->flInfo |= /*FM_INFO_RETURNS_OUTLINES |*/ FM_INFO_ARB_XFORMS; pifi->flInfo |= FM_INFO_RIGHT_HANDED; // FIXME: how to determine? /* Font style */ @@ -734,7 +734,6 @@ if (ppjTable) *ppjTable = pjTable; if (pcjTable) *pcjTable = cjTable; - /* Check if we shall copy data */ if (pjBuf) { 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] Fri May 6 10:38:36 2011 @@ -80,12 +80,30 @@ PFTFD_FACE apface[1]; } FTFD_FILE, *PFTFD_FILE; +typedef union _FTFD_DEVICEMETRICS +{ + POINTL aptl[7]; + struct + { + POINTFIX ptfxMaxAscender; + POINTFIX ptfxMaxDescender; + POINTL ptlUnderline1; + POINTL ptlStrikeout; + POINTL ptlULThickness; + POINTL ptlSOThickness; + SIZEL sizlMax; + }; +} FTFD_DEVICEMETRICS; + typedef struct { FONTOBJ *pfo; PFTFD_FILE pfile; + PFTFD_FACE pface; ULONG iFace; FT_Face ftface; + FD_XFORM fdxQuantized; + FTFD_DEVICEMETRICS metrics; HGLYPH hgSelected; ULONG cjSelected; } FTFD_FONT, *PFTFD_FONT; 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] Fri May 6 10:38:36 2011 @@ -9,6 +9,8 @@ /** Private Interface *********************************************************/ +#define FLOATL_1 0x3f800000 + #define GLYPHBITS_SIZE(cx, cy, bpp) \ (FIELD_OFFSET(GLYPHBITS, aj) + ((((cx * bpp) + 31) >> 5) * cy * 4)) @@ -18,10 +20,17 @@ FONTOBJ *pfo) { PFTFD_FILE pfile = (PFTFD_FILE)pfo->iFile; + PFTFD_FACE pface = pfile->apface[pfo->iFace - 1]; PFTFD_FONT pfont; XFORMOBJ* pxo; + XFORML xform; + FLOATOBJ_XFORM foxform; FT_Error fterror; FT_Face ftface; + FT_Matrix ftmatrix; + ULONG iComplexity; + LONG xScale, yScale; + FTFD_DEVICEMETRICS *pmetrics; /* Allocate a font structure */ pfont = EngAllocMem(0, sizeof(FTFD_FONT), 0); @@ -34,6 +43,7 @@ pfont->pfo = pfo; pfont->pfile = pfile; pfont->iFace = pfo->iFace; + pfont->pface = pface; pfont->hgSelected = -1; /* Create a freetype face */ @@ -53,24 +63,108 @@ pfont->ftface = ftface; pxo = FONTOBJ_pxoGetXform(pfo); - - // divide into scaling and rotation / shearing - - fterror = FT_Set_Char_Size(ftface, - 0, - 16 * 64, - pfo->sizLogResPpi.cx, - pfo->sizLogResPpi.cy); - if (fterror) - { - /* Failure! */ - DbgPrint("Error setting face size\n"); - return NULL; - } - - /* Set non-orthogonal transformation */ - // FT_Set_Transform - + if (!pxo) + { + // unhandled yet + __debugbreak(); + } + + /* Get a FLOATOBJ_XFORM matrix */ + iComplexity = XFORMOBJ_iGetFloatObjXform(pxo, &foxform); + if (iComplexity == DDI_ERROR) + { + __debugbreak(); + } + + /* Check if there is rotation / shearing (cannot use iComplexity!?) */ + if (foxform.eM12.ul1 != 0 || foxform.eM12.ul2 != 0 || + foxform.eM21.ul1 != 0 || foxform.eM21.ul2 != 0) + { + __debugbreak(); + // FIXME: need to calculate scaling + + /* initialize a matrix */ + ftmatrix.xx = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / + pfo->sizLogResPpi.cx; + ftmatrix.xy = 0x00000000; + ftmatrix.yx = 0x00000000; + ftmatrix.yy = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / + pfo->sizLogResPpi.cy; + + /* Apply the XFORMOBJ to the matrix */ + XFORMOBJ_bApplyXform(pxo, XF_LTOL, 2, &ftmatrix, &ftmatrix); + + /* Set non-orthogonal transformation */ + // FT_Set_Transform + + } + else + { + /* The font sizes are calculated from the em height, multiplied with + * the diagonal matrix coefficients. Since the given xform translates + * into pixels and we need points (FT_Set_Char_Size allows higher + * precision than FT_Set_Pixel_Sizes), we multiply with 72 / dpi. + * The value is multiplied with 64 to yield a 26.6 fixed float. */ + xScale = 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cx; + FLOATOBJ_MulLong(&foxform.eM11, xScale); + yScale = 64 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cy; + FLOATOBJ_MulLong(&foxform.eM22, yScale); + + /* Get the final scaling values in 26.6 fixed float format */ + xScale = FLOATOBJ_GetLong(&foxform.eM11); + yScale = FLOATOBJ_GetLong(&foxform.eM22); + + /* Set the x and y character size for the font */ + fterror = FT_Set_Char_Size(ftface, + xScale, + yScale, + pfo->sizLogResPpi.cx, + pfo->sizLogResPpi.cy); + if (fterror) + { + /* Failure! */ + DbgPrint("Error setting face size\n"); + return NULL; + } + + } + + // FIXME: quantize to 16.16 fixpoint + XFORMOBJ_iGetXform(pxo, &xform); + pfont->fdxQuantized.eXX = xform.eM11; + pfont->fdxQuantized.eXY = xform.eM12; + pfont->fdxQuantized.eYX = xform.eM21; + pfont->fdxQuantized.eYY = xform.eM22; + + /* Prepare required coordinates in font space */ + pmetrics = &pfont->metrics; + pmetrics->ptfxMaxAscender.x = 0; + pmetrics->ptfxMaxAscender.y = ftface->bbox.yMax << 4; // FIXME: not exact + pmetrics->ptfxMaxDescender.x = 0; + pmetrics->ptfxMaxDescender.y = -ftface->bbox.yMin << 4; // FIXME: not exact + pmetrics->ptlUnderline1.x = 0; + pmetrics->ptlUnderline1.y = -pface->ifiex.ifi.fwdUnderscorePosition; + pmetrics->ptlStrikeout.x = 0; + pmetrics->ptlStrikeout.y = -pface->ifiex.ifi.fwdStrikeoutPosition;; + pmetrics->ptlULThickness.x = 0; + pmetrics->ptlULThickness.y = pface->ifiex.ifi.fwdUnderscoreSize; + pmetrics->ptlSOThickness.x = 0; + pmetrics->ptlSOThickness.y = pface->ifiex.ifi.fwdStrikeoutSize; + pmetrics->sizlMax.cx = ftface->bbox.xMax - ftface->bbox.xMin; + pmetrics->sizlMax.cy = ftface->bbox.yMax - ftface->bbox.yMin; + + /* Transform all coordinates into device space */ + if (!XFORMOBJ_bApplyXform(pxo, XF_LTOL, 7, pmetrics->aptl, pmetrics->aptl)) + { + __debugbreak(); + } + + /* Fixup some minimum values */ + if (pmetrics->ptlULThickness.y <= 0) pmetrics->ptlULThickness.y = 1; + if (pmetrics->ptlSOThickness.y <= 0) pmetrics->ptlSOThickness.y = 1; + +DbgPrint("Created font with %ld (%ld)\n", yScale, yScale/64); +//__debugbreak(); /* Set the pvProducer member of the fontobj */ pfo->pvProducer = pfont; @@ -93,8 +187,6 @@ return pfont; } -#define FLOATL_1 0x3f800000 - ULONG NTAPI FtfdQueryMaxExtents( @@ -103,7 +195,10 @@ ULONG cjSize) { PFTFD_FONT pfont = FtfdGetFontInstance(pfo); + PFTFD_FACE pface = pfont->pface; + FT_Face ftface = pfont->ftface; ULONG cjMaxWidth, cjMaxBitmapSize; + XFORMOBJ *pxo; DbgPrint("FtfdQueryMaxExtents\n"); @@ -116,57 +211,60 @@ return FD_ERROR; } - //xScale = pfont->xScale; - //yScale = pfont->yScale; - - /* Fill FD_DEVICEMETRICS */ + /* Get the XFORMOBJ */ + pxo = FONTOBJ_pxoGetXform(pfo); + + /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; + + /* Baseline vectors */ pfddm->pteBase.x = FLOATL_1; pfddm->pteBase.y = 0; pfddm->pteSide.x = 0; - pfddm->pteSide.y = FLOATL_1; - pfddm->ptlUnderline1.x = 0; - pfddm->ptlUnderline1.y = 1; - pfddm->ptlStrikeout.x = 0; - pfddm->ptlStrikeout.y = -4; - pfddm->ptlULThickness.x = 0; - pfddm->ptlULThickness.y = 1; - pfddm->ptlSOThickness.x = 0; - pfddm->ptlSOThickness.y = 1; + pfddm->pteSide.y = 0xbf800000; //-FLOATL_1; + + /* Transform the baseline vectors */ + //XFORMOBJ_bApplyXformToFloat(pxo, 2, &pfddm->pteBase); + + /* Fixed width advance */ + if (ftface->face_flags & FT_FACE_FLAG_FIXED_WIDTH) + pfddm->lD = ftface->max_advance_width; + else + pfddm->lD = 0; + + /* Copy the values from the font structure */ + pfddm->fxMaxAscender = pfont->metrics.ptfxMaxAscender.y; + pfddm->fxMaxDescender = pfont->metrics.ptfxMaxDescender.y; + pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; + pfddm->ptlStrikeout = pfont->metrics.ptlStrikeout; + pfddm->ptlULThickness = pfont->metrics.ptlULThickness; + pfddm->ptlSOThickness = pfont->metrics.ptlSOThickness; + pfddm->cxMax = pfont->metrics.sizlMax.cx; + pfddm->cyMax = pfont->metrics.sizlMax.cy; + + /* Calculate Width in bytes */ + cjMaxWidth = ((pfddm->cxMax + 7) >> 3); + + /* Calculate size of the bitmap, rounded to DWORDs */ + cjMaxBitmapSize = ((cjMaxWidth * pfddm->cyMax) + 3) & ~3; + + /* cjGlyphMax is the full size of the GLYPHBITS structure */ + pfddm->cjGlyphMax = FIELD_OFFSET(GLYPHBITS, aj) + cjMaxBitmapSize; + + /* Copy the quantized matrix from the font structure */ + pfddm->fdxQuantized = pfont->fdxQuantized; + + pfddm->lNonLinearExtLeading = 0x00000000; + pfddm->lNonLinearIntLeading = 0x00000010; + pfddm->lNonLinearMaxCharWidth = 0x80000000; + pfddm->lNonLinearAvgCharWidth = 0x80000000; + pfddm->lMinA = 0; pfddm->lMinC = 0; pfddm->lMinD = 0; - -#if 0 - if (pfont->ulAngle == 90 || pfont->ulAngle == 270) - { - pfddm->cxMax = xScale * GETVAL(pFontInfo->dfPixHeight); - pfddm->cyMax = yScale * GETVAL(pFontInfo->dfMaxWidth); - pfddm->fxMaxAscender = yScale * GETVAL(pFontInfo->dfAscent) << 4; - pfddm->fxMaxDescender = (pfddm->cyMax << 4) - pfddm->fxMaxAscender; - } - else - { - pfddm->cxMax = xScale * GETVAL(pFontInfo->dfMaxWidth); - pfddm->cyMax = yScale * GETVAL(pFontInfo->dfPixHeight); - pfddm->fxMaxAscender = yScale * GETVAL(pFontInfo->dfAscent) << 4; - pfddm->fxMaxDescender = (pfddm->cyMax << 4) - pfddm->fxMaxAscender; - } -#endif - - pfddm->lD = pfddm->cxMax; - - /* Calculate Width in bytes */ - cjMaxWidth = ((pfddm->cxMax + 7) >> 3); - - /* Calculate size of the bitmap, rounded to DWORDs */ - cjMaxBitmapSize = ((cjMaxWidth * pfddm->cyMax) + 3) & ~3; - - /* cjGlyphMax is the full size of the GLYPHBITS structure */ - pfddm->cjGlyphMax = FIELD_OFFSET(GLYPHBITS, aj) + cjMaxBitmapSize; - - /* NOTE: fdxQuantized and NonLinear... stay unchanged */ - } + } + +__debugbreak(); /* Return the size of the structure */ return sizeof(FD_DEVICEMETRICS); @@ -211,8 +309,6 @@ PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; -if (hg > 1) __debugbreak(); - pgd->gdf.pgb = pvGlyphData; pgd->hg = hg; @@ -247,9 +343,6 @@ //pgd->ptqD.x.QuadPart = 0; //pgd->ptqD.y.QuadPart = 0; - -if (hg > 1) __debugbreak(); - } VOID @@ -261,15 +354,14 @@ { PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; - -if (hg > 1) __debugbreak(); pgb->ptlOrigin.x = 0; pgb->ptlOrigin.y = 0; pgb->sizlBitmap.cx = ftglyph->bitmap.width; pgb->sizlBitmap.cy = ftglyph->bitmap.rows; -if (hg > 1) __debugbreak(); + DbgPrint("QueryGlyphBits for hg=%lx, cjSize=%ld\n", hg, cjSize); + } VOID @@ -425,7 +517,7 @@ } else { - DbgPrint("Got advance width: hg=%lx, adv=%d\n", phg[i], advance >> 12); + //DbgPrint("Got advance width: hg=%lx, adv=%d\n", phg[i], advance >> 12); pusWidths[i] = (USHORT)advance >> 12; } } 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] Fri May 6 10:38:36 2011 @@ -45,7 +45,7 @@ - FtfdCreateFontInstance: 80% - handle XFORM (create a matrix and set freetype xform) - FtfdGetFontInstance: 100% done -- FtfdQueryMaxExtents: 10% done +- FtfdQueryMaxExtents: 80% done - FtfdLoadGlyph: 80% done - hande accelerator flags for bitmap / outline

13 years, 7 months

[ilardig] 51604: [SHELL32] Update Italian & Spanish translations.

by ilardig＠svn.reactos.org

Author: ilardig Date: Thu May 5 21:28:57 2011 New Revision: 51604 URL: http://svn.reactos.org/svn/reactos?rev=51604&view=rev Log: [SHELL32] Update Italian & Spanish translations. Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc 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 21:28:57 2011 @@ -774,6 +774,6 @@ 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." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Tipos de archivos" + IDS_COLUMN_EXTENSION "Extensiones" +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 21:28:57 2011 @@ -772,6 +772,6 @@ 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." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Tipi di file" + IDS_COLUMN_EXTENSION "Estensioni" +END

13 years, 7 months

[sserapion] 51603: - fix build after header changes

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu May 5 21:10:41 2011 New Revision: 51603 URL: http://svn.reactos.org/svn/reactos?rev=51603&view=rev Log: - fix build after header changes Modified: branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c Modified: branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/lsasrv/lsarpc.c [iso-8859-1] Thu May 5 21:10:41 2011 @@ -392,7 +392,7 @@ case PolicyModificationInformation: case PolicyAuditFullSetInformation: case PolicyAuditFullQueryInformation: - case PolicyEfsInformation: + case PolicyDnsDomainInformationInt: { FIXME("category not implemented\n"); return STATUS_UNSUCCESSFUL;

13 years, 7 months

[osiejka] 51602: [SHELL32] - Translation update

by osiejka＠svn.reactos.org

Author: osiejka Date: Thu May 5 21:09:37 2011 New Revision: 51602 URL: http://svn.reactos.org/svn/reactos?rev=51602&view=rev Log: [SHELL32] - Translation update Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc 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 21:09:37 2011 @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * * ReactOS shell32 fork translation updated by Caemyr - - * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010) + * - Olaf Siejka (Jan,Mar,Apr,Jul, Aug 2008; Apr, 2010, May 2011) * Use ReactOS forum PM or IRC to contact me * http://www.reactos.org * IRC: irc.freenode.net #reactos-pl; @@ -769,6 +769,6 @@ 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." - IDS_FILE_TYPES "FileTypes" - IDS_COLUMN_EXTENSION "Extensions" -END + IDS_FILE_TYPES "Typy plików" + IDS_COLUMN_EXTENSION "Rozszerzenia" +END

13 years, 7 months

[sserapion] 51601: -define necesary constants -remove all references to non-existant SECPKG_INTERFACE_VERSIONs

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu May 5 20:37:44 2011 New Revision: 51601 URL: http://svn.reactos.org/svn/reactos?rev=51601&view=rev Log: -define necesary constants -remove all references to non-existant SECPKG_INTERFACE_VERSIONs Modified: branches/sspi-bringup/rostests/winetests/msi/source.c branches/sspi-bringup/rostests/winetests/rpcrt4/server.c branches/sspi-bringup/rostests/winetests/schannel/main.c Modified: branches/sspi-bringup/rostests/winetests/msi/source.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/rostests/winetests… ============================================================================== --- branches/sspi-bringup/rostests/winetests/msi/source.c [iso-8859-1] (original) +++ branches/sspi-bringup/rostests/winetests/msi/source.c [iso-8859-1] Thu May 5 20:37:44 2011 @@ -27,6 +27,7 @@ #include <msidefs.h> #include <msi.h> #include <sddl.h> +#define SECURITY_WIN32 #include <secext.h> #include "wine/test.h" Modified: branches/sspi-bringup/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/rostests/winetests… ============================================================================== --- branches/sspi-bringup/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ branches/sspi-bringup/rostests/winetests/rpcrt4/server.c [iso-8859-1] Thu May 5 20:37:44 2011 @@ -19,6 +19,7 @@ */ #include <windows.h> +#define SECURITY_WIN32 #include <secext.h> #include <rpcdce.h> #include "wine/test.h" Modified: branches/sspi-bringup/rostests/winetests/schannel/main.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/rostests/winetests… ============================================================================== --- branches/sspi-bringup/rostests/winetests/schannel/main.c [iso-8859-1] (original) +++ branches/sspi-bringup/rostests/winetests/schannel/main.c [iso-8859-1] Thu May 5 20:37:44 2011 @@ -34,16 +34,12 @@ /* Helper macros to find the size of SECPKG_FUNCTION_TABLE */ #define SECPKG_FUNCTION_TABLE_SIZE_1 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ + SetExtendedInformation) +#define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetContextAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_2 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ +#define SECPKG_FUNCTION_TABLE_SIZE_3 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ SetCredentialsAttributes) -#define SECPKG_FUNCTION_TABLE_SIZE_3 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ - ChangeAccountPassword) -#define SECPKG_FUNCTION_TABLE_SIZE_4 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ - QueryMetaData) -#define SECPKG_FUNCTION_TABLE_SIZE_5 FIELD_OFFSET(SECPKG_FUNCTION_TABLE, \ - ValidateTargetInfo) -#define SECPKG_FUNCTION_TABLE_SIZE_6 sizeof(SECPKG_FUNCTION_TABLE) +#define SECPKG_FUNCTION_TABLE_SIZE_4 sizeof(SECPKG_FUNCTION_TABLE) static NTSTATUS (NTAPI *pSpLsaModeInitialize)(ULONG, PULONG, PSECPKG_FUNCTION_TABLE*, PULONG); @@ -137,10 +133,6 @@ size = SECPKG_FUNCTION_TABLE_SIZE_3; else if (Version == SECPKG_INTERFACE_VERSION_4) size = SECPKG_FUNCTION_TABLE_SIZE_4; - else if (Version == SECPKG_INTERFACE_VERSION_5) - size = SECPKG_FUNCTION_TABLE_SIZE_5; - else if (Version == SECPKG_INTERFACE_VERSION_6) - size = SECPKG_FUNCTION_TABLE_SIZE_6; else { ok(FALSE, "Unknown package version 0x%x\n", Version); return NULL;

13 years, 7 months

[gschneider] 51600: [charmap] [eventvwr] [reactos] [syssetup] - Igor Paliychuk <mansonigor at gmail dot com>: Update RU and UA resources

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu May 5 20:36:07 2011 New Revision: 51600 URL: http://svn.reactos.org/svn/reactos?rev=51600&view=rev Log: [charmap] [eventvwr] [reactos] [syssetup] - Igor Paliychuk <mansonigor at gmail dot com>: Update RU and UA resources Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc trunk/reactos/base/applications/charmap/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc trunk/reactos/base/setup/reactos/lang/uk-UA.rc trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc Modified: trunk/reactos/base/applications/charmap/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/ru-RU.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -14,21 +14,21 @@ CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Âûáðàòü", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Êîïèðîâàòü", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Advanced view",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 + CONTROL "Ðàñøèðåííûé âèä",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Charset:",IDC_STATIC,8,8,48,8 + LTEXT "Íàáîð ñèìâîëîâ:",IDC_STATIC,8,8,55,8 COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:",IDC_STATIC,8,28,50,8 + LTEXT "Ãðóïïèðîâàòü çà:",IDC_STATIC,8,28,50,8 COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search",IDC_BUTTON_SEARCH,200,44,50,14 + PUSHBUTTON "Íàéòè",IDC_BUTTON_SEARCH,200,44,50,14 EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL - LTEXT "Search for:",IDC_STATIC,8,48,42,8 - LTEXT "Unicode:",IDC_STATIC,200,8,30,8 + LTEXT "Èñêàòü:",IDC_STATIC,8,48,42,8 + LTEXT "Þíèêîä:",IDC_STATIC,200,8,30,8 EDITTEXT IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL END @@ -47,5 +47,5 @@ BEGIN IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíî ðàñïðîñòðàíÿåìîé; Âû ìîæåòå ðàñïðîñòðàíÿòü åå ïîâòîðíî è (èëè) èçìåíÿòü, ñîáëþäàÿ óñëîâèÿ Îòêðûòîãî ëèöåíçèîííîãî ñîãëàøåíèÿ GNU, îïóáëèêîâàííîãî Ôîíäîì ñâîáîäíî ðàñïðîñòðàíÿåìîãî ïðîãðàììíîãî îáåñïå÷åíèÿ; ëèáî ðåäàêöèè 2 Ñîãëàøåíèÿ, ëèáî (íà âàøå óñìîòðåíèå) ëþáîé ðåäàêöèè, âûïóùåííîé ïîçæå.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ â íàäåæäå íà òî, ÷òî îíà îêàæåòñÿ ïîëåçíîé, íî ÁÅÇ ÊÀÊÈÕ-ËÈÁÎ ÃÀÐÀÍÒÈÉ, âêëþ÷àÿ ïîäðàçóìåâàåìóþ ãàðàíòèþ ÊÀ×ÅÑÒÂÀ ëèáî ÏÐÈÃÎÄÍÎÑÒÈ ÄËß ÎÏÐÅÄÅËÅÍÍÛÕ ÖÅËÅÉ. Ïîäðîáíîñòè ñîäåðæàòñÿ â Îòêðûòîì ëèöåíçèîííîì ñîãëàøåíèè GNU.\r\n\r\nÂìåñòå ñ ýòîé ïðîãðàììîé äîëæåí ðàñïðîñòðàíÿòüñÿ ýêçåìïëÿð Îòêðûòîãî ëèöåíçèîííîãî ñîãëàøåíèÿ GNU, åñëè îí îòñóòñòâóåò, ñîîáùèòå îá ýòîì â Ôîíä ñâîáîäíî ðàñïðîñòðàíÿåìîãî ïðîãðàììíîãî îáåñïå÷åíèÿ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "&Î ïðîãðàììå..." - IDS_TITLE "Character Map" + IDS_TITLE "Òàáëèöà ñèìâîëîâ" END Modified: trunk/reactos/base/applications/charmap/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/charmap/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -20,21 +20,21 @@ CONTROL "",IDC_TEXTBOX,RICHEDIT_CLASS,ES_AUTOHSCROLL | WS_BORDER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 74, 186, 114, 13 DEFPUSHBUTTON "Âèáðàòè", IDC_SELECT, 194, 186, 44, 13 PUSHBUTTON "Êîï³þâàòè", IDC_COPY, 242, 186, 44, 13, WS_DISABLED - CONTROL "Advanced view",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 + CONTROL "Ðîçøèðåíèé âèãëÿä",IDC_CHECK_ADVANCED,"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 8, 208, 95, 10 END IDD_ADVANCED DIALOGEX 0, 0, 292, 64 STYLE DS_SHELLFONT | WS_CHILD FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Charset:",IDC_STATIC,8,8,48,8 + LTEXT "Íàá³ð ñèìâîë³â:",IDC_STATIC,8,8,55,8 COMBOBOX IDC_COMBO_CHARSET,72,4,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Group by:",IDC_STATIC,8,28,50,8 + LTEXT "Ãðóïóâàòè çà:",IDC_STATIC,8,28,50,8 COMBOBOX IDC_COMBO_GROUPBY,72,24,116,80,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Search",IDC_BUTTON_SEARCH,200,44,50,14 + PUSHBUTTON "Çíàéòè",IDC_BUTTON_SEARCH,200,44,50,14 EDITTEXT IDC_EDIT_SEARCH,72,44,116,14,ES_AUTOHSCROLL - LTEXT "Search for:",IDC_STATIC,8,48,42,8 - LTEXT "Unicode:",IDC_STATIC,200,8,30,8 + LTEXT "Øóêàòè:",IDC_STATIC,8,48,42,8 + LTEXT "Þí³êîä:",IDC_STATIC,200,8,30,8 EDITTEXT IDC_EDIT_UNICODE,236,4,28,12,ES_AUTOHSCROLL END @@ -53,5 +53,5 @@ BEGIN IDS_LICENSE "Òàáëèöÿ ñèìâîë³â - â³ëüíå ïðîãðàìíå çàáåçïå÷åííÿ; Âè ìîæåòå ðîçïîâñþäæóâàòè ¿¿ òà çì³íþâàòè, äîòðèìóþ÷èñü óìîâè Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU, îïóáë³êîâàíî¿ Ôîíäîì â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ; àáî ðåäàêö³¿ 2 Óãîäè, àáî áóäü-ÿêî¿ ðåäàêö³¿, âèïóùåíî¿ ï³çí³øå.\r\n\r\nÖÿ ïðîãðàìà ðîçïîâñþäæóºòüñÿ â íàä³¿ íà òå, ùî âîíà âèÿâèòüñÿ êîðèñíîþ, àëå ÁÅÇ ÁÓÄÜ-ßÊÈÕ ÃÀÐÀÍÒ²É, âêëþ÷àþ÷è ÓßÂÍÎÞ ÃÀÐÀÍÒ²ªÞ ßÊÎÑÒ² àáî ÏÐÈÄÀÒÍÎÑÒ² äëÿ ïåâíèõ ö³ëåé. Ïîäðîáèö³ ì³ñòÿòüñÿ ó Â³äêðèò³é ë³öåíç³éí³é óãîä³ GNU.\r\n\r\nÐàçîì ç ö³ºþ ïðîãðàìîþ ïîâèíåí ïîøèðþâàòèñÿ ïðèì³ðíèê Â³äêðèòî¿ ë³öåíç³éíî¿ óãîäè GNU. ßêùî â³í â³äñóòí³é, ïîâ³äîìòå ïðî öå â Ôîíä â³ëüíîãî ïðîãðàìíîãî çàáåçïå÷åííÿ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." IDS_ABOUT "&Ïðî ïðîãðàìó..." - IDS_TITLE "Character Map" + IDS_TITLE "Òàáëèöÿ Cèìâîë³â" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/ru-RU.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -105,19 +105,19 @@ STRINGTABLE BEGIN - IDS_COLUMNTYPE "Type" - IDS_COLUMNDATE "Date" - IDS_COLUMNTIME "Time" - IDS_COLUMNSOURCE "Source" - IDS_COLUMNCATEGORY "Category" - IDS_COLUMNEVENT "Event" - IDS_COLUMNUSER "User" - IDS_COLUMNCOMPUTER "Computer" - IDS_COLUMNEVENTDATA "Event Data" + IDS_COLUMNTYPE "Òèï" + IDS_COLUMNDATE "Äàòà" + IDS_COLUMNTIME "Âðåìÿ" + IDS_COLUMNSOURCE "Èñòî÷íèê" + IDS_COLUMNCATEGORY "Êàòåãîðèÿ" + IDS_COLUMNEVENT "Ñîáûòèå" + IDS_COLUMNUSER "Ïîëüçîâàòåëü" + IDS_COLUMNCOMPUTER "Êîìïüþòåð" + IDS_COLUMNEVENTDATA "Äàííûå ñîáûòèÿ" END STRINGTABLE BEGIN - IDS_NONE "None" + IDS_NONE "Íåòó" IDS_NOT_AVAILABLE "N/A" END Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/eventvwr/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -43,7 +43,7 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON IDI_EVENTVWR,IDC_MYICON,14,9,21,20 - LTEXT "ReactOS Îãëÿäà÷ ïîä³é âåðñ³¿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Îãëÿäà÷ ïîä³é ReactOS âåðñ³¿ 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX LTEXT "Copyright (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,49,20,119,22 DEFPUSHBUTTON "OK",IDOK,90,48,42,16,WS_GROUP END @@ -118,6 +118,6 @@ STRINGTABLE BEGIN - IDS_NONE "None" + IDS_NONE "Íåìàº" IDS_NOT_AVAILABLE "N/A" END Modified: trunk/reactos/base/setup/reactos/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/uk… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -71,18 +71,18 @@ LTEXT "Äëÿ ïî÷àòêó âñòàíîâëåííÿ íàòèñí³òü Äàë³", IDC_STATIC, 10, 180 ,277, 20 END -IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 172, 90 STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Ñòâîðåííÿ ðîçä³ëó" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 - CONTROL "Ñòâîðèòè òà â³äôîðìàòóâàòè ðîçä³ë äèñêó",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,131,22,9,13 + CONTROL "Ñòâîðèòè òà â³äôîðìàòóâàòè ðîçä³ë",IDC_STATIC,"Button",BS_GROUPBOX,7,5,156,57 LTEXT "Ðîçì³ð:",IDC_STATIC, 13,24,27,9 - EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP - LTEXT "Ãá",IDC_UNIT, 117,24,14,9 - LTEXT "Ôàéëîâà ñèñòåìà:",IDC_STATIC,13,46,35,9 - CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + EDITTEXT IDC_PARTSIZE,79,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "Ãá",IDC_UNIT, 144,24,14,9 + LTEXT "Ôàéëîâà ñèñòåìà:",IDC_STATIC,13,46,65,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,79,42,79,50 PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP PUSHBUTTON "&Ñêàñóâàòè",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP END Modified: trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/uk… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/uk-UA.rc [iso-8859-1] Thu May 5 20:36:07 2011 @@ -194,7 +194,7 @@ IDS_CMT_CALC "Çàïóñòèòè Êàëüêóëÿòîð" IDS_CMT_CMD "Â³äêðèòè êîìàíäíèé ðÿäîê" IDS_CMT_DEVMGMT "Çàïóñòèòè Äèñïåò÷åð ïðèñòðî¿â" - IDS_CMT_EVENTVIEW "Çàïóñòèòè Ðåäàêòîð ïîä³é" + IDS_CMT_EVENTVIEW "Çàïóñòèòè Îãëÿäà÷ ïîä³é" IDS_CMT_EXPLORER "Çàïóñòèòè Ïðîâ³äíèê" IDS_CMT_MSCONFIG "Çàïóñòèòè Ïðîãðàìó êîíô³ãóðàö³¿ ñèñòåìè" IDS_CMT_NOTEPAD "Çàïóñòèòè Òåêñòîâèé ðåäàêòîð" @@ -258,7 +258,7 @@ IDS_SHORT_DEVICE "Äèñïåò÷åð ïðèñòðî¿â.lnk" IDS_SHORT_DOWNLOADER "Ìåíåäæåð ïðîãðàì ReactOS.lnk" IDS_SHORT_DXDIAG "Ä³àãíîñòèêà ReactX.lnk" - IDS_SHORT_EVENTVIEW "Ðåäàêòîð ïîä³é.lnk" + IDS_SHORT_EVENTVIEW "Îãëÿäà÷ ïîä³é.lnk" IDS_SHORT_EXPLORER "Ïðîâ³äíèê ReactOS.lnk" IDS_SHORT_KBSWITCH "Ïåðåìèêà÷ ðîçêëàäêè êëàâ³àòóðè.lnk" IDS_SHORT_MAGNIFY "Åêðàííà ëóïà.lnk"

13 years, 7 months

[sserapion] 51599: - define necessary constant for new headers. - remove usage of winternl.h from some rpcrt4 files. - remove all references to SECPKG_INTERFACE_VERSIONs that wine seems to have mad...

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu May 5 20:33:21 2011 New Revision: 51599 URL: http://svn.reactos.org/svn/reactos?rev=51599&view=rev Log: - define necessary constant for new headers. - remove usage of winternl.h from some rpcrt4 files. - remove all references to SECPKG_INTERFACE_VERSIONs that wine seems to have made-up since i cannot find them in any public headers. Modified: branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c branches/sspi-bringup/reactos/dll/win32/wininet/http.c branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c Modified: branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/base/syste… ============================================================================== --- branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/base/system/winlogon/winlogon.h [iso-8859-1] Thu May 5 20:33:21 2011 @@ -32,10 +32,7 @@ #include <windows.h> #include <userenv.h> #include <winwlx.h> -#include <cmfuncs.h> -#include <rtlfuncs.h> -#include <exfuncs.h> -#include <setypes.h> +#include <ntndk.h> #include <ntsecapi.h> #include <accctrl.h> #include <aclapi.h> Modified: branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -1007,11 +1007,11 @@ NTSTATUS WINAPI LsaSetForestTrustInformation( - LSA_HANDLE PolicyHandle, - PLSA_UNICODE_STRING TrustedDomainName, - PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, - BOOL CheckOnly, - PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) + IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING TrustedDomainName, + IN PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo, + IN BOOLEAN CheckOnly, + OUT PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo) { FIXME("(%p,%p,%p,%d,%p) stub\n", PolicyHandle, TrustedDomainName, ForestTrustInfo, CheckOnly, CollisionInfo); return STATUS_NOT_IMPLEMENTED; Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_assoc.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -22,9 +22,11 @@ #include <stdarg.h> #include <assert.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "rpc.h" #include "rpcndr.h" -#include "winternl.h" +#include <ndk/ntndk.h> #include "wine/unicode.h" #include "wine/debug.h" @@ -56,7 +58,7 @@ NDR_RUNDOWN rundown_routine; void *ctx_guard; UUID uuid; - RTL_RWLOCK rw_lock; + RTL_RESOURCE rw_lock; unsigned int refs; } RpcContextHandle; Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -26,11 +26,11 @@ #include <string.h> #include <assert.h> -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "winternl.h" +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> + #include "wine/unicode.h" #include "rpc.h" Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_binding.h [iso-8859-1] Thu May 5 20:33:21 2011 @@ -22,6 +22,7 @@ #define __WINE_RPC_BINDING_H #include "rpcndr.h" +#define SECURITY_WIN32 #include "security.h" #include "wine/list.h" Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -31,6 +31,11 @@ #include <assert.h> #include <stdlib.h> #include <sys/types.h> + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include <windows.h> +#include <ndk/ntndk.h> #if defined(__MINGW32__) || defined (_MSC_VER) # include <ws2tcpip.h> @@ -74,12 +79,6 @@ # define ioctlsocket ioctl #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ -#include "windef.h" -#include "winbase.h" -#include "winnls.h" -#include "winerror.h" -#include "wininet.h" -#include "winternl.h" #include "wine/unicode.h" #include "rpc.h" Modified: branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/rpcrt4/rpcrt4_main.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -37,12 +37,9 @@ #include "ntstatus.h" #define WIN32_NO_STATUS -#include "windef.h" -#include "winerror.h" -#include "winbase.h" -#include "winuser.h" -#include "winnt.h" -#include "winternl.h" +#include <windows.h> +#include <ndk/ntndk.h> + #include "iptypes.h" #include "iphlpapi.h" #include "wine/unicode.h" Modified: branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/lsamode.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -24,6 +24,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#define SECURITY_WIN32 #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" @@ -110,11 +111,6 @@ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ NULL, /* ChangeAccountPassword */ - NULL, /* QueryMetaData */ - NULL, /* ExchangeMetaData */ - NULL, /* GetCredUIContext */ - NULL, /* UpdateCredentials */ - NULL, /* ValidateTargetInfo */ }, { NULL, /* InitializePackage */ NULL, /* LsaLogonUser */ @@ -146,11 +142,6 @@ NULL, /* SetContextAttributes */ NULL, /* SetCredentialsAttributes */ NULL, /* ChangeAccountPassword */ - NULL, /* QueryMetaData */ - NULL, /* ExchangeMetaData */ - NULL, /* GetCredUIContext */ - NULL, /* UpdateCredentials */ - NULL, /* ValidateTargetInfo */ } }; @@ -162,7 +153,7 @@ { TRACE("(%u, %p, %p, %p)\n", LsaVersion, PackageVersion, ppTables, pcTables); - *PackageVersion = SECPKG_INTERFACE_VERSION_6; + *PackageVersion = SECPKG_INTERFACE_VERSION_4; *pcTables = 2; *ppTables = secPkgFunctionTable; Modified: branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/schannel.rbuild [iso-8859-1] Thu May 5 20:33:21 2011 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" allowwarnings="true"> +<module name="schannel" type="win32dll" baseaddress="${BASEADDRESS_SCHANNEL}" installbase="system32" installname="schannel.dll" unicode="yes" allowwarnings="true"> <importlibrary definition="schannel.spec" /> <include base="schannel">.</include> <include base="ReactOS">include/reactos/wine</include> Modified: branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/schannel/usermode.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -24,6 +24,7 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" +#define SECURITY_WIN32 #include "sspi.h" #include "ntsecapi.h" #include "ntsecpkg.h" Modified: branches/sspi-bringup/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/wininet/http.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -61,6 +61,7 @@ #define NO_SHLWAPI_STRFCNS #define NO_SHLWAPI_GDI #include "shlwapi.h" +#define SECURITY_WIN32 #include "sspi.h" #include "wincrypt.h" Modified: branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/wininet/wininet.rbuild [iso-8859-1] Thu May 5 20:33:21 2011 @@ -6,6 +6,7 @@ <importlibrary definition="wininet.spec" /> <include base="wininet">.</include> <include base="ReactOS">include/reactos/wine</include> + <include base="ReactOS">include/reactos/libs/zlib</include> <define name="__WINESRC__" /> <define name="_WINE" /> @@ -23,6 +24,7 @@ <library>crypt32</library> <library>ws2_32</library> <library>pseh</library> + <library>zlib</library> <file>cookie.c</file> <file>dialogs.c</file> <file>ftp.c</file> Modified: branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ws2_32/misc/stubs.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -889,9 +889,9 @@ getnameinfo(const struct sockaddr FAR * sa, socklen_t salen, char FAR * host, - DWORD hostlen, + socklen_t hostlen, char FAR * serv, - DWORD servlen, + socklen_t servlen, INT flags) { UNIMPLEMENTED Modified: branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… ============================================================================== --- branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] (original) +++ branches/sspi-bringup/reactos/dll/win32/ws2_32_new/src/addrinfo.c [iso-8859-1] Thu May 5 20:33:21 2011 @@ -902,9 +902,9 @@ getnameinfo(const struct sockaddr FAR *sa, socklen_t salen, char FAR *host, - DWORD hostlen, + socklen_t hostlen, char FAR *serv, - DWORD servlen, + socklen_t servlen, INT flags) { INT ErrorCode;

13 years, 7 months

[ekohl] 51598: [EVENTLOG] Fix the calculation of the number of event records.

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 5 20:27:05 2011 New Revision: 51598 URL: http://svn.reactos.org/svn/reactos?rev=51598&view=rev Log: [EVENTLOG] Fix the calculation of the number of event records. Modified: trunk/reactos/base/services/eventlog/rpc.c Modified: trunk/reactos/base/services/eventlog/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/rpc… ============================================================================== --- trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] (original) +++ trunk/reactos/base/services/eventlog/rpc.c [iso-8859-1] Thu May 5 20:27:05 2011 @@ -199,7 +199,7 @@ DWORD *NumberOfRecords) { PLOGHANDLE lpLogHandle; - DWORD dwRecords; + PLOGFILE lpLogFile; lpLogHandle = ElfGetLogHandleEntryByHandle(LogHandle); if (!lpLogHandle) @@ -207,9 +207,13 @@ return STATUS_INVALID_HANDLE; } - dwRecords = lpLogHandle->LogFile->Header.CurrentRecordNumber; - - *NumberOfRecords = (dwRecords > 0) ? (dwRecords - 1) : 0; + lpLogFile = lpLogHandle->LogFile; + + if (lpLogFile->Header.OldestRecordNumber == 0) + *NumberOfRecords = 0; + else + *NumberOfRecords = lpLogFile->Header.CurrentRecordNumber - + lpLogFile->Header.OldestRecordNumber; return STATUS_SUCCESS; }

13 years, 7 months

[sserapion] 51597: replace broken wine headers with mingw-w64 ones and other assorted fixes.

by sserapion＠svn.reactos.org

Author: sserapion Date: Thu May 5 20:22:38 2011 New Revision: 51597 URL: http://svn.reactos.org/svn/reactos?rev=51597&view=rev Log: replace broken wine headers with mingw-w64 ones and other assorted fixes. Modified: branches/sspi-bringup/reactos/include/psdk/ntsecapi.h branches/sspi-bringup/reactos/include/psdk/ntsecpkg.h branches/sspi-bringup/reactos/include/psdk/rpcdce.h branches/sspi-bringup/reactos/include/psdk/schannel.h branches/sspi-bringup/reactos/include/psdk/secext.h branches/sspi-bringup/reactos/include/psdk/security.h branches/sspi-bringup/reactos/include/psdk/specstrings.h branches/sspi-bringup/reactos/include/psdk/sspi.h branches/sspi-bringup/reactos/include/psdk/subauth.h branches/sspi-bringup/reactos/include/psdk/wincred.h branches/sspi-bringup/reactos/include/psdk/ws2tcpip.h branches/sspi-bringup/reactos/include/reactos/idl/ms-dtyp.idl [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/sspi-bringup/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/ntsecpkg.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/schannel.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/secext.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/security.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/specstrings.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/sspi.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/subauth.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/wincred.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/ps… Modified: branches/sspi-bringup/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/include/re…

13 years, 7 months

[gschneider] 51596: [shell32] * Igor Paliychuk <mansonigor at gmail dot com>: - Remove duplicate string and add some missing resources - Increase buffer sizes in FolderOptionsFileTypesDlg - Update ...

by gschneider＠svn.reactos.org

Author: gschneider Date: Thu May 5 20:22:06 2011 New Revision: 51596 URL: http://svn.reactos.org/svn/reactos?rev=51596&view=rev Log: [shell32] * Igor Paliychuk <mansonigor at gmail dot com>: - Remove duplicate string and add some missing resources - Increase buffer sizes in FolderOptionsFileTypesDlg - Update RU and UA translations * Myself: update German translation 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 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 20:22:06 2011 @@ -399,7 +399,7 @@ { LPNMLISTVIEW lppl; LVITEMW lvItem; - WCHAR Buffer[200], FormatBuffer[100]; //FIXME + WCHAR Buffer[255], FormatBuffer[255]; PFOLDER_FILE_TYPE_ENTRY pItem; OPENASINFO Info; 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 20:22:06 2011 @@ -423,7 +423,7 @@ //ICON LTEXT "Èìå íà ïðèëîæåíèå", 14005, 100, 140, 40, 10 PUSHBUTTON "Ïðî&ìÿíà...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'. Çà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s' ôàéëîâå, íàòèñíåòå Ðàçøèðåíè.", 14007, 12, 155, 160, 32 +LTEXT "", 14007, 12, 155, 160, 32 PUSHBUTTON "Ðàç&øèðåíè", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,8 +762,10 @@ IDS_FILE_DETAILS "Ïîäðîáíîñòè çà ðàçøèðåíèå '%s" IDS_FILE_DETAILSADV "Ôàéëîâåòå ñ ðàçøèðåíèå '%s' ñà îò âèäà '%s'. Çà äà ïðîìåíèòå íàñòðîéêèòå, çà âñè÷êè '%s' ôàéëîâå, íàòèñíåòå Ðàçøèðåíè." -END - - - - + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 na tlaèítko Pokroèilé lze zmìnit nastavení pro vechny soubory '%s'.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "&Pokroèilé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -748,4 +748,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -750,4 +750,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 die Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert.", 14007, 12, 155, 160, 30 + LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "&Erweitert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -765,4 +765,6 @@ IDS_FILE_DETAILS "Details zum Dateityp '%s'" IDS_FILE_DETAILSADV "Um die Einstellungen, die alle Dateien des Typs '%s' betreffen zu ändern, klicken Sie auf Erweitert." -END + IDS_FILE_TYPES "Dateitypen" + IDS_COLUMN_EXTENSION "Erweiterungen" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,4 +762,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -772,4 +772,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 2011 @@ -437,7 +437,7 @@ //ICON LTEXT "Aplicación", 14005, 100, 140, 40, 10 PUSHBUTTON "Cam&biar...", 14006, 230, 140, 50, 14, WS_TABSTOP -LTEXT "Archivos con extensión '%s' son del tipo '%s'. Para cambiar la configuración de los archivos '%s', haga clic en Opciones avanzadas.", 14007, 12, 165, 220, 30 +LTEXT "", 14007, 12, 165, 220, 30 PUSHBUTTON "Opciones avanza&das", 14008, 190, 213, 90, 14, WS_TABSTOP END @@ -774,4 +774,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 modifier les paramètres qui concernent tous les fichiers '%s', cliquez sur Avancé.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vancé", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -765,4 +765,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -764,4 +764,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 2011 @@ -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'. Per cambiare le impostazioni per tutti i file '%s', cliccare su Avanzate.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vanzate", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -772,4 +772,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 '%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ Ú×ÝèðNbNµÄ¾³¢B", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ú×Ýè(&V)", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ IDS_FILE_DETAILS "g£q '%s' ÌÚ×" IDS_FILE_DETAILSADV "g£q '%s' Ìt@CÌíÞÍ'%s'Å·B '%s' Ìt@C·×ÄÉÎ·éÝèðÏX·éÉÍ Ú×ÝèðNbNµÄ¾³¢B" -END + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 å endre innstillingene som er av filen '%s', trykk på avansert.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Av&ansert", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -764,4 +764,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 zmieniæ ustawienia dotycz¹ce wszystkich plików '%s', wybierz Zaawansowane.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Zaawa&nsowane", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -769,4 +769,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -763,4 +763,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 mudar definições que afectam todos '%s' ficheiros, click Avançado.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vançado", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -764,4 +764,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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'. Pentru a schimbat setÄri care vor afecta toate fiÈierele '%s', clic pe Avansat.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "A&vansat", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -763,6 +763,8 @@ 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." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" 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 20:22:06 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 "", 14007, 12, 155, 162, 36 PUSHBUTTON "Äî&ïîëíèòåëüíî", 14008, 180, 175, 63, 14, WS_TABSTOP END @@ -760,4 +760,6 @@ IDS_FILE_DETAILS "Îïèñàíèå ðàñøèðåíèÿ '%s'" IDS_FILE_DETAILSADV "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå 'Äîïîëíèòåëüíî'." -END + IDS_FILE_TYPES "Òèïû ôàéëîâ" + IDS_COLUMN_EXTENSION "Ðàñøèðåíèÿ" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -769,4 +769,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -761,4 +761,6 @@ 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 + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 2011 @@ -437,7 +437,7 @@ //ICON LTEXT "Äîäàòîê", 14005, 100, 140, 40, 10 PUSHBUTTON "&Çì³íèòè...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'. Ùîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü íà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó 'Äîäàòêîâî'.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 40 PUSHBUTTON "&Äîäàòêîâî", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -774,4 +774,6 @@ IDS_FILE_DETAILS "Ïîäðîáèö³ äëÿ ðîçøèðåííÿ '%s'" IDS_FILE_DETAILSADV "Ôàéëè ç ðîçøèðåííÿì '%s' ìàþòü òèï '%s'. Ùîá çì³íèòè ïàðàìåòðè, ÿê³ âïëèâàòèìóòü íà âñ³ ôàéëè '%s', íàòèñí³òü êíîïêó 'Äîäàòêîâî'." -END + IDS_FILE_TYPES "Òèïè Ôàéë³â" + IDS_COLUMN_EXTENSION "Ðîçøèðåííÿ" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -749,5 +749,7 @@ 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 - + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" +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 20:22:06 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 change settings that affect all '%s' files, click Advanced.", 14007, 12, 155, 160, 30 +LTEXT "", 14007, 12, 155, 160, 30 PUSHBUTTON "Ad&vanced", 14008, 180, 175, 50, 14, WS_TABSTOP END @@ -762,6 +762,8 @@ 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." + IDS_FILE_TYPES "FileTypes" + IDS_COLUMN_EXTENSION "Extensions" END #pragma code_page(default)

13 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2011