Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 51618: [GDI FONT DRIVER] - Make use of debugging macros (TRACE, WARN, ASSERT) - Handle unaligned data in the TrueType tables (arm for example doesn't like accessing unaligned data) - Han...
by tkreuzer＠svn.reactos.org 07 May '11

07 May '11

Author: tkreuzer Date: Sat May 7 13:36:02 2011 New Revision: 51618 URL: http://svn.reactos.org/svn/reactos?rev=51618&view=rev Log: [GDI FONT DRIVER] - Make use of debugging macros (TRACE, WARN, ASSERT) - Handle unaligned data in the TrueType tables (arm for example doesn't like accessing unaligned data) - Handle ulFont in FtfdQueryTrueTypeTable - some interface cleanup Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c - copied, changed from r51589, branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h (with props) Removed: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/opentype.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/CMakeLists.txt branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c 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 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] Sat May 7 13:36:02 2011 @@ -7,7 +7,7 @@ enable.c font.c glyph.c - opentype.c + tttables.c rosglue.c ${CMAKE_CURRENT_BINARY_DIR}/ftfd.def) Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/enable.c [iso-8859-1] Sat May 7 13:36:02 2011 @@ -41,7 +41,7 @@ { FT_Error fterror; - DbgPrint("FtfdEnableDriver()\n"); + TRACE("FtfdEnableDriver()\n"); /* Check parameter */ if (cj < sizeof(DRVENABLEDATA)) @@ -53,7 +53,7 @@ fterror = FT_Init_FreeType(&gftlibrary); if (fterror) { - DbgPrint("an error occurred during library initialization: %ld.\n", fterror); + WARN("Failed to initialize freetype library: %ld.\n", fterror); return FALSE; } @@ -82,7 +82,7 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver) { - DbgPrint("FtfdEnablePDEV(hdev=%p)\n", hdev); + TRACE("FtfdEnablePDEV(hdev=%p)\n", hdev); /* Return a dummy DHPDEV */ return (PVOID)1; @@ -95,7 +95,7 @@ IN DHPDEV dhpdev, IN HDEV hdev) { - DbgPrint("FtfdCompletePDEV()\n"); + TRACE("FtfdCompletePDEV()\n"); /* Nothing to do */ } @@ -105,7 +105,7 @@ FtfdDisablePDEV( IN DHPDEV dhpdev) { - DbgPrint("FtfdDisablePDEV()\n"); + TRACE("FtfdDisablePDEV()\n"); /* Nothing to do */ } @@ -119,7 +119,7 @@ ULONG cjOut, PVOID pvOut) { - DbgPrint("FtfdEscape\n"); + TRACE("FtfdEscape\n"); __debugbreak(); return 0; } 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] Sat May 7 13:36:02 2011 @@ -30,7 +30,7 @@ goto done; allglyphs: - DbgPrint("using all glyphs\n"); + TRACE("using all glyphs\n"); /* Start over */ ulAccumCharWidth = 0; @@ -60,9 +60,11 @@ PFTFD_IFIMETRICS pifiex; PIFIMETRICS pifi; FT_Face ftface; + FT_Error fterror; + PS_FontInfoRec fontinfo; ULONG i; - DbgPrint("FtfdInitIfiMetrics()\n"); + TRACE("FtfdInitIfiMetrics()\n"); /* Get the freetype face pointer */ ftface = pface->ftface; @@ -90,9 +92,7 @@ } pifi->lEmbedId = 0; - pifi->lItalicAngle = 0; pifi->lCharBias = 0; - pifi->jWinPitchAndFamily = 0; // FIXME: generic way to get this? /* Set flags */ pifi->flInfo = FM_INFO_RETURNS_BITMAPS | FM_INFO_1BPP | FM_INFO_4BPP; @@ -138,9 +138,9 @@ pifi->fwdMacDescender = ftface->descender; pifi->fwdMacLineGap = 0; pifi->fwdAveCharWidth = 0; - pifi->fwdTypoAscender = pifi->fwdMacAscender; - pifi->fwdTypoDescender = pifi->fwdMacDescender; - pifi->fwdTypoLineGap = 0; + pifi->fwdTypoAscender = ftface->ascender; + pifi->fwdTypoDescender = ftface->descender; + pifi->fwdTypoLineGap = ftface->units_per_EM / 10; pifi->fwdMaxCharInc = ftface->max_advance_width; pifi->fwdCapHeight = 0; pifi->fwdXHeight = 0; @@ -195,6 +195,26 @@ pifi->panose.bMidline = PAN_ANY; pifi->panose.bXHeight = PAN_ANY; + /* Try to get type1 info from freetype */ + fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); + if (fterror == 0) + { + /* Set italic angle */ + pifi->lItalicAngle = fontinfo.italic_angle; + + /* Set pitch */ + if (fontinfo.is_fixed_pitch) + pifi->jWinPitchAndFamily = FIXED_PITCH; + else + pifi->jWinPitchAndFamily = VARIABLE_PITCH; + } + else + { + /* Set fallback values */ + pifi->lItalicAngle = 0; + pifi->jWinPitchAndFamily = 0; + } + EngMultiByteToUnicodeN(pifiex->awcFamilyName, LF_FACESIZE, NULL, @@ -214,7 +234,7 @@ strnlen(ftface->family_name, MAX_PATH)); /* Use OS/2 TrueType or OpenType tables */ - OtfGetIfiMetrics(pface, pifi); + FtfdGetWinMetrics(pface, pifi); if (pifi->fwdAveCharWidth == 0) pifi->fwdAveCharWidth = CalculateAveCharWidth(ftface); @@ -231,7 +251,7 @@ 4); - DbgPrint("Finished with the ifi: %p\n", pifi); + TRACE("Finished with the ifi: %p\n", pifi); //__debugbreak(); return TRUE; @@ -249,7 +269,7 @@ HGLYPH * phglyphs; WCHAR wcCurrent, wcPrev; - DbgPrint("FtfdInitGlyphSet()\n"); + TRACE("FtfdInitGlyphSet()\n"); /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) @@ -260,7 +280,7 @@ pGlyphSet = EngAllocMem(0, cjSize, TAG_GLYPHSET); if (!pGlyphSet) { - DbgPrint("EngAllocMem() failed.\n"); + WARN("EngAllocMem() failed.\n"); return NULL; } @@ -293,7 +313,7 @@ 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); + //TRACE("adding new run i=%ld, cRuns=%ld, wc=%x\n", i, cRuns, wcCurrent); } /* Get the next charcode and index */ @@ -301,7 +321,7 @@ wcCurrent = (WCHAR)FT_Get_Next_Char(ftface, wcCurrent, &index); } - DbgPrint("Done with font tree, %d runs\n", pGlyphSet->cRuns); + TRACE("Done with font tree, %d runs\n", pGlyphSet->cRuns); pface->pGlyphSet = pGlyphSet; return pGlyphSet; } @@ -310,7 +330,7 @@ FtfdInitKerningPairs( PFTFD_FACE pface) { - //DbgPrint("unimplemented\n"); + //WARN("unimplemented\n"); } static @@ -354,6 +374,7 @@ NTAPI FtfdCreateFace( PFTFD_FILE pfile, + ULONG iFace, FT_Face ftface) { PFTFD_FACE pface; @@ -365,11 +386,12 @@ pface = EngAllocMem(FL_ZERO_MEMORY, sizeof(FTFD_FACE), 'dftF'); if (!pface) { - DbgPrint("Couldn't allcate a face\n"); + WARN("Couldn't allcate a face\n"); return NULL; } pface->pfile = pfile; + pface->iFace = iFace; pface->ftface = ftface; pface->cGlyphs = ftface->num_glyphs; @@ -380,7 +402,7 @@ fterror = FT_Select_Charmap(ftface, FT_ENCODING_UNICODE); if (fterror) { - DbgPrint("ERROR: Could not load unicode charmap\n"); + WARN("Could not load unicode charmap\n"); return NULL; } @@ -456,19 +478,19 @@ FT_Face ftface; PFTFD_FILE pfile = NULL; - DbgPrint("FtfdLoadFontFile()\n"); + TRACE("FtfdLoadFontFile()\n"); /* Check parameters */ if (cFiles != 1) { - DbgPrint("ERROR: Only 1 File is allowed, got %ld!\n", cFiles); + WARN("Only 1 File is allowed, got %ld!\n", cFiles); return HFF_INVALID; } /* Map the font file */ if (!EngMapFontFileFD(*piFile, (PULONG*)&pvView, &cjView)) { - DbgPrint("ERROR: Could not map font file!\n"); + WARN("Could not map font file!\n"); return HFF_INVALID; } @@ -477,7 +499,7 @@ if (fterror) { /* Failure! */ - DbgPrint("ERROR: No faces found in file\n"); + WARN("No faces found in file\n"); goto error; } @@ -490,7 +512,7 @@ if (!pfile) { /* Failure! */ - DbgPrint("ERROR: EngAllocMem() failed.\n"); + WARN("EngAllocMem() failed.\n"); goto error; } @@ -502,10 +524,10 @@ pfile->ulFastCheckSum = ulFastCheckSum; /* Create a face */ - pfile->apface[0] = FtfdCreateFace(pfile, ftface); + pfile->apface[0] = FtfdCreateFace(pfile, 1, ftface); if (!pfile->apface[0]) { - DbgPrint("ERROR: FtfdCreateFace() failed.\n"); + WARN("FtfdCreateFace() failed.\n"); goto error; } @@ -519,16 +541,16 @@ fterror = FT_New_Memory_Face(gftlibrary, *ppvView, *pcjView, i, &ftface); if (fterror) { - DbgPrint("error\n"); + WARN("error\n"); __debugbreak(); goto error; } /* Store the face in the file structure */ - pfile->apface[i] = FtfdCreateFace(pfile, ftface); - } - - DbgPrint("Success! Returning %ld faces\n", cNumFaces); + pfile->apface[i] = FtfdCreateFace(pfile, i + 1, ftface); + } + + TRACE("Success! Returning %ld faces\n", cNumFaces); return (ULONG_PTR)pfile; error: @@ -552,12 +574,12 @@ PFTFD_FILE pfile = (PFTFD_FILE)diFile; PFTFD_FACE pface = pfile->apface[iFace - 1]; - DbgPrint("FtfdQueryFont()\n"); + TRACE("FtfdQueryFont()\n"); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) { - DbgPrint("ERROR: iFace > pfile->cNumFaces || !pid\n"); + WARN("iFace > pfile->cNumFaces || !pid\n"); return NULL; } @@ -580,12 +602,12 @@ PFTFD_FILE pfile = (PFTFD_FILE)diFile; PFTFD_FACE pface; - DbgPrint("FtfdQueryFontTree(iMode=%ld)\n", iMode); + TRACE("FtfdQueryFontTree(iMode=%ld)\n", iMode); /* Validate parameters */ if (iFace > pfile->cNumFaces || !pid) { - DbgPrint("ERROR: iFace > pfile->cNumFaces || !pid\n"); + WARN("iFace > pfile->cNumFaces || !pid\n"); return NULL; } @@ -603,7 +625,7 @@ return pface->pKerningPairs; default: - DbgPrint("ERROR: invalid iMode: %ld\n", iMode); + WARN("Invalid iMode: %ld\n", iMode); } return NULL; @@ -617,7 +639,7 @@ PFTFD_FILE pfile = (PFTFD_FILE)diFile; ULONG i; - DbgPrint("FtfdUnloadFontFile()\n"); + TRACE("FtfdUnloadFontFile()\n"); /* Cleanup faces */ for (i = 0; i < pfile->cNumFaces; i++) @@ -633,7 +655,6 @@ return TRUE; } - LONG APIENTRY @@ -645,7 +666,7 @@ { PFTFD_FILE pfile = (PFTFD_FILE)diFile; - DbgPrint("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); + TRACE("FtfdQueryFontFile(ulMode=%ld)\n", ulMode); switch (ulMode) { @@ -669,7 +690,7 @@ ULONG culCaps, ULONG *pulCaps) { - DbgPrint("FtfdQueryFontCaps()\n"); + TRACE("FtfdQueryFontCaps()\n"); /* We need room for 2 ULONGs */ if (culCaps < 2) @@ -684,101 +705,6 @@ return 2; } -LONG -APIENTRY -FtfdQueryTrueTypeTable( - ULONG_PTR diFile, - ULONG ulFont, - ULONG ulTag, - PTRDIFF dpStart, - ULONG cjBuf, - BYTE *pjBuf, - PBYTE *ppjTable, - ULONG *pcjTable) -{ - PFTFD_FILE pfile = (PFTFD_FILE)diFile; - PBYTE pjTable; - ULONG cjTable; - - DbgPrint("FtfdQueryTrueTypeTable\n"); - - /* 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; - } - - // FIXME: handle ulFont - - /* 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 table '%.4s'\n", (char*)&ulTag); - return FD_ERROR; - } - } - - /* Return requested pointers */ - if (ppjTable) *ppjTable = pjTable; - if (pcjTable) *pcjTable = cjTable; - - /* 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 -APIENTRY -FtfdGetTrueTypeFile( - ULONG_PTR diFile, - ULONG *pcj) -{ - PFTFD_FILE pfile = (PFTFD_FILE)diFile; - - DbgPrint("FtfdGetTrueTypeFile\n"); - - /* 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 VOID @@ -787,7 +713,7 @@ PVOID pv, ULONG_PTR id) { - DbgPrint("FtfdFree()\n"); + TRACE("FtfdFree()\n"); EngFreeMem(pv); } #endif 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] Sat May 7 13:36:02 2011 @@ -11,14 +11,32 @@ #include <winddi.h> #include <ft2build.h> +#include FT_FREETYPE_H #include <freetype/ftadvanc.h> #include <freetype/ftxf86.h> -#include FT_FREETYPE_H +#include <freetype/t1tables.h> extern FT_Library gftlibrary; #define TAG_GLYPHSET 'GlSt' #define TAG_IFIMETRICS 'Ifim' + +#if 1// DBG +#define ASSERT(x) \ + if(!(x)) \ + { \ + DbgPrint("Assertion '%s' failed at %s:%i\n", #x, __FILE__, __LINE__); \ + __debugbreak(); \ + } +#define TRACE DbgPrint +#define WARN DbgPrint +#define FATAL DbgPrint +#else +#define ASSERT(x) +#define TRACE(...) +#define WARN(...) +#define FATAL(...) +#endif /** Driver specific types *****************************************************/ @@ -60,6 +78,7 @@ { struct _FTFD_FILE *pfile; FT_Face ftface; + ULONG iFace; ULONG ulFontFormat; ULONG cGlyphs; ULONG cMappings; @@ -276,16 +295,19 @@ ULONG_PTR iFile, ULONG *pcj); -VOID +/* Private interface */ + +PVOID NTAPI -OtfGetIfiMetrics( +FtfdFindTrueTypeTable( + PVOID pvView, + ULONG cjView, + ULONG iFace, + ULONG ulTag, + PULONG pulLength); + +VOID +NTAPI +FtfdGetWinMetrics( 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] Sat May 7 13:36:02 2011 @@ -58,7 +58,7 @@ if (fterror) { /* Failure! */ - DbgPrint("Error creating face\n"); + WARN("Error creating face\n"); EngFreeMem(pfont); return NULL; } @@ -127,7 +127,7 @@ if (fterror) { /* Failure! */ - DbgPrint("Error setting face size\n"); + WARN("Error setting face size\n"); return NULL; } @@ -167,7 +167,7 @@ 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+32)/64); +TRACE("Created font with %ld (%ld)\n", yScale, (yScale+32)/64); //__debugbreak(); /* Set the pvProducer member of the fontobj */ @@ -203,14 +203,14 @@ FT_Face ftface = pfont->ftface; XFORMOBJ *pxo; - DbgPrint("FtfdQueryMaxExtents\n"); + TRACE("FtfdQueryMaxExtents\n"); if (pfddm) { if (cjSize < sizeof(FD_DEVICEMETRICS)) { /* Not enough space, fail */ - DbgPrint("ERROR: cjSize = %ld\n", cjSize); + WARN("cjSize = %ld\n", cjSize); return FD_ERROR; } @@ -283,7 +283,7 @@ fterror = FT_Load_Glyph(pfont->ftface, hg, 0); if (fterror) { - DbgPrint("FtfdLoadGlyph: couldn't load glyph 0x%lx\n", hg); + WARN("Couldn't load glyph 0x%lx\n", hg); pfont->hgSelected = -1; return FALSE; } @@ -400,7 +400,7 @@ cjBitmapSize = BITMAP_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4); if (cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj) > cjSize) { - DbgPrint("ERROR: buffer too small, got %ld, need %ld\n", + WARN("Buffer too small, got %ld, need %ld\n", cjSize, cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj)); __debugbreak(); return; @@ -411,9 +411,9 @@ //RtlCopyMemory(pgb->aj, ftglyph->bitmap.buffer, cjBitmapSize); - DbgPrint("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", - hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, - GLYPHBITS_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4)); + TRACE("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", + hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, + GLYPHBITS_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4)); } @@ -436,7 +436,7 @@ fterror = FT_Render_Glyph(pfont->ftface->glyph, FT_RENDER_MODE_NORMAL); if (fterror) { - DbgPrint("cound't render glyph\n"); + WARN("Cound't render glyph\n"); return FALSE; } @@ -458,13 +458,13 @@ { PFTFD_FONT pfont = FtfdGetFontInstance(pfo); - DbgPrint("FtfdQueryFontData, iMode=%ld, hg=%lx, pgd=%p, pv=%p, cjSize=%ld\n", - iMode, hg, pgd, pv, cjSize); + TRACE("FtfdQueryFontData, iMode=%ld, hg=%lx, pgd=%p, pv=%p, cjSize=%ld\n", + iMode, hg, pgd, pv, cjSize); switch (iMode) { case QFD_GLYPHANDBITMAP: - DbgPrint("QFD_GLYPHANDBITMAP\n"); + TRACE("QFD_GLYPHANDBITMAP\n"); /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 0)) return FD_ERROR; @@ -485,7 +485,7 @@ 4); case QFD_GLYPHANDOUTLINE: - DbgPrint("QFD_GLYPHANDOUTLINE\n"); + TRACE("QFD_GLYPHANDOUTLINE\n"); /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 1)) return FD_ERROR; @@ -505,19 +505,19 @@ return FtfdQueryMaxExtents(pfo, pv, cjSize); case QFD_TT_GRAY1_BITMAP: - DbgPrint("QFD_TT_GRAY1_BITMAP\n"); + TRACE("QFD_TT_GRAY1_BITMAP\n"); break; case QFD_TT_GRAY2_BITMAP: - DbgPrint("QFD_TT_GRAY2_BITMAP\n"); + TRACE("QFD_TT_GRAY2_BITMAP\n"); break; case QFD_TT_GRAY4_BITMAP: - DbgPrint("QFD_TT_GRAY4_BITMAP\n"); + TRACE("QFD_TT_GRAY4_BITMAP\n"); break; case QFD_TT_GRAY8_BITMAP: - DbgPrint("QFD_TT_GRAY8_BITMAP\n"); + TRACE("QFD_TT_GRAY8_BITMAP\n"); break; default: - DbgPrint("ERROR: Invalid iMode value: %lx\n", iMode); + WARN("Invalid iMode value: %lx\n", iMode); EngSetLastError(ERROR_INVALID_PARAMETER); return FD_ERROR; } @@ -534,12 +534,12 @@ FONTOBJ *pfo, ULONG iMode) { - DbgPrint("FtfdQueryGlyphAttrs\n"); + TRACE("FtfdQueryGlyphAttrs\n"); /* Verify parameters */ if (!pfo || iMode != FO_ATTR_MODE_ROTATE) { - DbgPrint("ERROR: invalid parameters: %p, %ld\n", pfo, iMode); + WARN("Invalid parameters: %p, %ld\n", pfo, iMode); return NULL; } @@ -567,7 +567,7 @@ FT_Error fterror; FT_Fixed advance; - DbgPrint("FtfdQueryAdvanceWidths\n"); + TRACE("FtfdQueryAdvanceWidths\n"); // FIXME: layout horizontal/vertical fl = (iMode == QAW_GETEASYWIDTHS) ? FT_ADVANCE_FLAG_FAST_ONLY : 0; @@ -581,7 +581,7 @@ fterror = FT_Get_Advance(ftface, (FT_UInt)phg[i], fl, &advance); if (fterror || advance > 0x0FFFF000) { - DbgPrint("ERROR: failed to query advance width hg=%lx, fl=0x%lx\n", + WARN("Failed to query advance width hg=%lx, fl=0x%lx\n", phg[i], fl); pusWidths[i] = 0xffff; bResult = FALSE; @@ -590,7 +590,7 @@ { /* Transform from 16.16 points to 28.4 pixels */ pusWidths[i] = (USHORT)((advance * 72 / pfo->sizLogResPpi.cx) >> 12); - //DbgPrint("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); + //TRACE("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); } } @@ -609,7 +609,7 @@ ULONG cjBuf, TTPOLYGONHEADER *ppoly) { - DbgPrint("FtfdQueryTrueTypeOutline\n"); + TRACE("FtfdQueryTrueTypeOutline\n"); __debugbreak(); return 0; } @@ -625,7 +625,7 @@ ULONG cjOut, PVOID pvOut) { - DbgPrint("FtfdFontManagement\n"); + TRACE("FtfdFontManagement\n"); __debugbreak(); return 0; } @@ -635,7 +635,7 @@ FtfdDestroyFont( FONTOBJ *pfo) { - DbgPrint("FtfdDestroyFont()\n"); + TRACE("FtfdDestroyFont()\n"); __debugbreak(); } Removed: 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 (removed) @@ -1,440 +1,0 @@ -/* - * PROJECT: ReactOS win32 subsystem - * LICENSE: GPL - See COPYING in the top level directory - * PURPOSE: OpenType support for GDI font driver based on freetype - * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) - * REFERENCES: http://www.microsoft.com/typography/otspec/ - * http://www.microsoft.com/typography/otspec/os2.htm - */ - -#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) - -typedef struct _OTF_TABLE_ENTRY -{ - ULONG ulTag; - ULONG ulCheckSum; - ULONG ulOffset; - ULONG ulLength; -} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; - -typedef struct _OTF_FILE_HEADER -{ - ULONG ulIdentifier; - USHORT usNumTables; - USHORT usSearchRange; - USHORT usEntrySelector; - USHORT usRangeshift; - - OTF_TABLE_ENTRY aTableEntries[1]; - -} OTF_FILE_HEADER, *POTF_FILE_HEADER; - -#include <pshpack1.h> -typedef struct _OTF_OS2_DATA -{ - USHORT version; // 0x0004 - SHORT xAvgCharWidth; - USHORT usWeightClass; - USHORT usWidthClass; - USHORT fsType; - SHORT ySubscriptXSize; - SHORT ySubscriptYSize; - SHORT ySubscriptXOffset; - SHORT ySubscriptYOffset; - SHORT ySuperscriptXSize; - SHORT ySuperscriptYSize; - SHORT ySuperscriptXOffset; - SHORT ySuperscriptYOffset; - SHORT yStrikeoutSize; - SHORT yStrikeoutPosition; - union // 0x30 - { - struct - { - BYTE jClassId; - BYTE jSubClassId; - }; - SHORT sFamilyClass; - }; - BYTE panose[10]; - ULONG ulUnicodeRange1; // Bits 0-31 - ULONG ulUnicodeRange2; // Bits 32-63 - ULONG ulUnicodeRange3; // Bits 64-95 - ULONG ulUnicodeRange4; // Bits 96-127 - CHAR achVendID[4]; - USHORT fsSelection; - USHORT usFirstCharIndex; - USHORT usLastCharIndex; - SHORT sTypoAscender; - SHORT sTypoDescender; - SHORT sTypoLineGap; - USHORT usWinAscent; - USHORT usWinDescent; - ULONG ulCodePageRange1; // Bits 0-31 - ULONG ulCodePageRange2; // Bits 32-63 - SHORT sxHeight; - SHORT sCapHeight; - USHORT usDefaultChar; - USHORT usBreakChar; - USHORT usMaxContext; -} 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, - PIFIMETRICS pifi) -{ - FT_Error fterror; - PS_FontInfoRec fontinfo; - - fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); - if (fterror) - { - DbgPrint("ERROR: Failed to retrieve font info\n"); - return FALSE; - } - - /* Try to find the font weight */ - if (strncpy(fontinfo.weight, "Normal", 7) == 0) - pifi->usWinWeight = FW_NORMAL; - // else if (..) - else - pifi->usWinWeight = FW_REGULAR; - - pifi->lItalicAngle = fontinfo.italic_angle; - - /* Clear lower 2 bits and set FIXED_PITCH or VARIABLE_PITCH */ - pifi->jWinPitchAndFamily &= ~3; - if (fontinfo.is_fixed_pitch) - pifi->jWinPitchAndFamily |= FIXED_PITCH; - else - pifi->jWinPitchAndFamily |= VARIABLE_PITCH; - - 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, - ULONG ulTag, - PULONG pulLength) -{ - POTF_FILE_HEADER pFileHeader = pvView; - ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; - - /* Verify the file header */ - if (pFileHeader->ulIdentifier != 'OTTO' && - pFileHeader->ulIdentifier != 'fctt' && - pFileHeader->ulIdentifier != 0x00000100) - { - DbgPrint("ERROR: Couldn't verify identifier: 0x%lx\n", - pFileHeader->ulIdentifier); - return NULL; - } - - /* Check if number of tables is ok */ - ulNumTables = SWAPW(pFileHeader->usNumTables); - ulLength = ulNumTables * sizeof(OTF_TABLE_ENTRY); - if (ulLength + sizeof(OTF_FILE_HEADER) > cjView) - { - DbgPrint("ERROR: Too many tables (%ld)\n", ulNumTables); - return NULL; - } - - /* Loop all tables */ - for (i = 0; i < ulNumTables; i++) - { - /* Compare the tag */ - if (pFileHeader->aTableEntries[i].ulTag == ulTag) - { - /* Get table offset and length */ - ulOffset = SWAPD(pFileHeader->aTableEntries[i].ulOffset); - ulLength = SWAPD(pFileHeader->aTableEntries[i].ulLength); - - /* Check if this is inside the file */ - if (ulOffset + ulLength > cjView || - ulOffset + ulLength < ulOffset) - { - DbgPrint("invalid table entry. %ld, %ld \n", ulOffset, ulLength); - 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; - } - } - - /* Not found */ - 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) -{ - switch (jClassId) - { - case 0: // Class ID = 0 No Classification - break; - - case 1: // Class ID = 1 Oldstyle Serifs - switch (jSubclassId) - { - case 0: // Subclass ID = 0 : No Classification - case 1: // Subclass ID = 1 : IBM Rounded Legibility - case 2: // Subclass ID = 2 : Garalde - case 3: // Subclass ID = 3 : Venetian - case 4: // Subclass ID = 4 : Modified Venetian - case 5: // Subclass ID = 5 : Dutch Modern - case 6: // Subclass ID = 6 : Dutch Traditional - case 7: // Subclass ID = 7 : Contemporary - case 8: // Subclass ID = 8 : Calligraphic - 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 - 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 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 - 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 0; -} - -VOID -NTAPI -OtfGetIfiMetrics( - PFTFD_FACE pface, - PIFIMETRICS pifi) -{ - PFTFD_FILE pfile = pface->pfile; - PVOID pvView = pfile->pvView; - POTF_OS2_DATA pOs2; - - /* Try to get type 1 info */ - OtfGetType1FontInfo(pface, pifi); - - /* Get the OS/2 table for the face */ - // FIXME: get the right table for the face, when multiple faces - pOs2 = OtfFindTable(pvView, pfile->cjView, '2/SO', NULL); - if (!pOs2) - { - DbgPrint("Couldn't find OS/2 table\n"); - return; - } - - //pifi->lEmbedId; - //pifi->lItalicAngle; - //pifi->lCharBias; - //pifi->jWinCharSet; - pifi->jWinPitchAndFamily &= 3; - pifi->jWinPitchAndFamily |= OtfGetWinFamily(pOs2->jClassId, pOs2->jSubClassId); - pifi->usWinWeight = SWAPW(pOs2->usWeightClass); - pifi->fsSelection = SWAPW(pOs2->fsSelection); - pifi->fsType = SWAPW(pOs2->fsType); - pifi->fwdWinAscender = SWAPW(pOs2->usWinAscent); - pifi->fwdWinDescender = SWAPW(pOs2->usWinDescent); - //pifi->fwdMacAscender; - //pifi->fwdMacDescender; - //pifi->fwdMacLineGap; - pifi->fwdTypoAscender = SWAPW(pOs2->sTypoAscender); - pifi->fwdTypoDescender = SWAPW(pOs2->sTypoDescender); - pifi->fwdTypoLineGap = SWAPW(pOs2->sTypoLineGap); - pifi->fwdAveCharWidth = SWAPW(pOs2->xAvgCharWidth); - pifi->fwdCapHeight = SWAPW(pOs2->sCapHeight); - pifi->fwdXHeight = SWAPW(pOs2->sxHeight); - pifi->fwdSubscriptXSize = SWAPW(pOs2->ySubscriptXSize); - pifi->fwdSubscriptYSize = SWAPW(pOs2->ySubscriptYSize); - pifi->fwdSubscriptXOffset = SWAPW(pOs2->ySubscriptXOffset); - pifi->fwdSubscriptYOffset = SWAPW(pOs2->ySubscriptYOffset); - pifi->fwdSuperscriptXSize = SWAPW(pOs2->ySuperscriptXSize); - pifi->fwdSuperscriptYSize = SWAPW(pOs2->ySuperscriptYSize); - pifi->fwdSuperscriptXOffset = SWAPW(pOs2->ySuperscriptXOffset); - pifi->fwdSuperscriptYOffset = SWAPW(pOs2->ySuperscriptYOffset); - //pifi->fwdUnderscoreSize; - //pifi->fwdUnderscorePosition; - pifi->fwdStrikeoutSize = SWAPW(pOs2->yStrikeoutSize); - pifi->fwdStrikeoutPosition = SWAPW(pOs2->yStrikeoutPosition); - pifi->wcFirstChar = SWAPW(pOs2->usFirstCharIndex); - pifi->wcLastChar = SWAPW(pOs2->usLastCharIndex); - pifi->wcDefaultChar = SWAPW(pOs2->usDefaultChar); - pifi->wcBreakChar = SWAPW(pOs2->usBreakChar); - *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; - //pifi->ulPanoseCulture; - pifi->panose = *(PANOSE*)pOs2->panose; - - /* Convert the special characters from unicode to ansi */ - EngUnicodeToMultiByteN(&pifi->chFirstChar, 4, NULL, &pifi->wcFirstChar, 3); - -} - Copied: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c (from r51589, 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/tttables.c [iso-8859-1] Sat May 7 13:36:02 2011 @@ -8,169 +8,98 @@ */ #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) - -typedef struct _OTF_TABLE_ENTRY -{ - ULONG ulTag; - ULONG ulCheckSum; - ULONG ulOffset; - ULONG ulLength; -} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; - -typedef struct _OTF_FILE_HEADER -{ - ULONG ulIdentifier; - USHORT usNumTables; - USHORT usSearchRange; - USHORT usEntrySelector; - USHORT usRangeshift; - - OTF_TABLE_ENTRY aTableEntries[1]; - -} OTF_FILE_HEADER, *POTF_FILE_HEADER; - -#include <pshpack1.h> -typedef struct _OTF_OS2_DATA -{ - USHORT version; // 0x0004 - SHORT xAvgCharWidth; - USHORT usWeightClass; - USHORT usWidthClass; - USHORT fsType; - SHORT ySubscriptXSize; - SHORT ySubscriptYSize; - SHORT ySubscriptXOffset; - SHORT ySubscriptYOffset; - SHORT ySuperscriptXSize; - SHORT ySuperscriptYSize; - SHORT ySuperscriptXOffset; - SHORT ySuperscriptYOffset; - SHORT yStrikeoutSize; - SHORT yStrikeoutPosition; - union // 0x30 - { - struct - { - BYTE jClassId; - BYTE jSubClassId; - }; - SHORT sFamilyClass; - }; - BYTE panose[10]; - ULONG ulUnicodeRange1; // Bits 0-31 - ULONG ulUnicodeRange2; // Bits 32-63 - ULONG ulUnicodeRange3; // Bits 64-95 - ULONG ulUnicodeRange4; // Bits 96-127 - CHAR achVendID[4]; - USHORT fsSelection; - USHORT usFirstCharIndex; - USHORT usLastCharIndex; - SHORT sTypoAscender; - SHORT sTypoDescender; - SHORT sTypoLineGap; - USHORT usWinAscent; - USHORT usWinDescent; - ULONG ulCodePageRange1; // Bits 0-31 - ULONG ulCodePageRange2; // Bits 32-63 - SHORT sxHeight; - SHORT sCapHeight; - USHORT usDefaultChar; - USHORT usBreakChar; - USHORT usMaxContext; -} OTF_OS2_DATA, *POTF_OS2_DATA; -#include <poppack.h> - +#include "tttables.h" + +ULONG test_GETD(PVOID pv) +{ + PUSHORT pus = pv; + return (ULONG)_byteswap_ushort(pus[0]) << 16 | _byteswap_ushort(pus[1]); +} + +static ULONG CalcTableChecksum(PVOID pvTable, ULONG cjTable) { PULONG pul = pvTable, pulEnd; ULONG ulCheckSum = 0L; + ASSERT(!((ULONG_PTR)pvTable & 3)); pulEnd = (PULONG)pvTable + (cjTable + 3) / sizeof(ULONG); - while (pul < pulEnd) ulCheckSum += SWAPD(*pul++); + while (pul < pulEnd) ulCheckSum += GETD(pul++); return ulCheckSum; } -BOOL -OtfGetType1FontInfo( - PFTFD_FACE pface, - PIFIMETRICS pifi) -{ - FT_Error fterror; - PS_FontInfoRec fontinfo; - - fterror = FT_Get_PS_Font_Info(pface->ftface, &fontinfo); - if (fterror) - { - DbgPrint("ERROR: Failed to retrieve font info\n"); - return FALSE; - } - - /* Try to find the font weight */ - if (strncpy(fontinfo.weight, "Normal", 7) == 0) - pifi->usWinWeight = FW_NORMAL; - // else if (..) - else - pifi->usWinWeight = FW_REGULAR; - - pifi->lItalicAngle = fontinfo.italic_angle; - - /* Clear lower 2 bits and set FIXED_PITCH or VARIABLE_PITCH */ - pifi->jWinPitchAndFamily &= ~3; - if (fontinfo.is_fixed_pitch) - pifi->jWinPitchAndFamily |= FIXED_PITCH; - else - pifi->jWinPitchAndFamily |= VARIABLE_PITCH; - - return TRUE; -} - -/*! \name OtfFindTable +/*! \name FtfdFindTrueTypeTable * \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 cjView - Size of the mapped font file + * \param iFace - 1-based index of the font in the 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; + * Can be NULL. * \return Pointer to the table if successful, NULL if unsuccessful. */ PVOID NTAPI -OtfFindTable( +FtfdFindTrueTypeTable( PVOID pvView, ULONG cjView, + ULONG ulFont, ULONG ulTag, PULONG pulLength) { - POTF_FILE_HEADER pFileHeader = pvView; + POTF_FILE_HEADER pFontHeader; + PTT_COLLECTION pCollection; ULONG i, ulOffset, ulLength, ulNumTables, ulCheckSum; - - /* Verify the file header */ - if (pFileHeader->ulIdentifier != 'OTTO' && - pFileHeader->ulIdentifier != 'fctt' && - pFileHeader->ulIdentifier != 0x00000100) - { - DbgPrint("ERROR: Couldn't verify identifier: 0x%lx\n", - pFileHeader->ulIdentifier); + ASSERT(ulFont > 0); + + /* Check if this is a font collection */ + pCollection = pvView; + if (pCollection->ulTTCTag == 'fctt') + { + /* Check if we have enough fonts in the file */ + if (ulFont > GETD(&pCollection->ulNumFonts)) + { + WARN("ulFont too big: %ld\n", ulFont); + return NULL; + } + + /* Get the offset of the font we want */ + ulOffset = GETD(&pCollection->aulOffsetTable[ulFont - 1]); + if (ulOffset >= cjView) + { + WARN("Font %ld is not inside the mapped region\n", ulFont); + return NULL; + } + + /* Update the font position and remaining view size */ + pvView = (PUCHAR)pvView + ulOffset; + cjView -= ulOffset; + } + else if (ulFont > 1) + { + // Shouldn't happen + __debugbreak(); + } + + /* Verify the font header */ + pFontHeader = pvView; + if (pFontHeader->ulIdentifier != 'OTTO' && + pFontHeader->ulIdentifier != 0x00000100) + { + WARN("Bad font header: 0x%lx\n", + pFontHeader->ulIdentifier); return NULL; } /* Check if number of tables is ok */ - ulNumTables = SWAPW(pFileHeader->usNumTables); + ulNumTables = GETW(&pFontHeader->usNumTables); ulLength = ulNumTables * sizeof(OTF_TABLE_ENTRY); if (ulLength + sizeof(OTF_FILE_HEADER) > cjView) { - DbgPrint("ERROR: Too many tables (%ld)\n", ulNumTables); + WARN("Too many tables (%ld)\n", ulNumTables); return NULL; } @@ -178,27 +107,29 @@ for (i = 0; i < ulNumTables; i++) { /* Compare the tag */ - if (pFileHeader->aTableEntries[i].ulTag == ulTag) + if (pFontHeader->aTableEntries[i].ulTag == ulTag) { /* Get table offset and length */ - ulOffset = SWAPD(pFileHeader->aTableEntries[i].ulOffset); - ulLength = SWAPD(pFileHeader->aTableEntries[i].ulLength); + ulOffset = GETD(&pFontHeader->aTableEntries[i].ulOffset); + ulLength = GETD(&pFontHeader->aTableEntries[i].ulLength); /* Check if this is inside the file */ if (ulOffset + ulLength > cjView || ulOffset + ulLength < ulOffset) { - DbgPrint("invalid table entry. %ld, %ld \n", ulOffset, ulLength); + WARN("Invalid table entry. %ld, %ld \n", ulOffset, ulLength); return NULL; } + /* Check the table's checksum */ ulCheckSum = CalcTableChecksum((PUCHAR)pvView + ulOffset, ulLength); - if (ulCheckSum != SWAPD(pFileHeader->aTableEntries[i].ulCheckSum)) - { - DbgPrint("Checksum mitmatch! %ld, %ld \n", ulOffset, ulLength); + if (ulCheckSum != GETD(&pFontHeader->aTableEntries[i].ulCheckSum)) + { + WARN("Checksum mitmatch! %ld, %ld \n", ulOffset, ulLength); return NULL; } + /* Return size and pointer to the table */ if (pulLength) *pulLength = ulLength; return (PUCHAR)pvView + ulOffset; } @@ -208,14 +139,15 @@ return NULL; } -/*! \name OtfGetWinFamily +/*! \name GetWinFamily * \brief Translates IBM font class IDs into a Windows family bitfield * \param jClassId * \param jSubclassId * \ref http://www.microsoft.com/typography/otspec/ibmfc.htm */ +static BYTE -OtfGetWinFamily(BYTE jClassId, BYTE jSubclassId) +GetWinFamily(BYTE jClassId, BYTE jSubclassId) { switch (jClassId) { @@ -373,7 +305,7 @@ VOID NTAPI -OtfGetIfiMetrics( +FtfdGetWinMetrics( PFTFD_FACE pface, PIFIMETRICS pifi) { @@ -381,15 +313,12 @@ PVOID pvView = pfile->pvView; POTF_OS2_DATA pOs2; - /* Try to get type 1 info */ - OtfGetType1FontInfo(pface, pifi); - /* Get the OS/2 table for the face */ // FIXME: get the right table for the face, when multiple faces - pOs2 = OtfFindTable(pvView, pfile->cjView, '2/SO', NULL); + pOs2 = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, '2/SO', NULL); if (!pOs2) { - DbgPrint("Couldn't find OS/2 table\n"); + WARN("Couldn't find OS/2 table\n"); return; } @@ -398,37 +327,37 @@ //pifi->lCharBias; //pifi->jWinCharSet; pifi->jWinPitchAndFamily &= 3; - pifi->jWinPitchAndFamily |= OtfGetWinFamily(pOs2->jClassId, pOs2->jSubClassId); - pifi->usWinWeight = SWAPW(pOs2->usWeightClass); - pifi->fsSelection = SWAPW(pOs2->fsSelection); - pifi->fsType = SWAPW(pOs2->fsType); - pifi->fwdWinAscender = SWAPW(pOs2->usWinAscent); - pifi->fwdWinDescender = SWAPW(pOs2->usWinDescent); + pifi->jWinPitchAndFamily |= GetWinFamily(pOs2->jClassId, pOs2->jSubClassId); + pifi->usWinWeight = GETW(&pOs2->usWeightClass); + pifi->fsSelection = GETW(&pOs2->fsSelection); + pifi->fsType = GETW(&pOs2->fsType); + pifi->fwdWinAscender = GETW(&pOs2->usWinAscent); + pifi->fwdWinDescender = GETW(&pOs2->usWinDescent); //pifi->fwdMacAscender; //pifi->fwdMacDescender; //pifi->fwdMacLineGap; - pifi->fwdTypoAscender = SWAPW(pOs2->sTypoAscender); - pifi->fwdTypoDescender = SWAPW(pOs2->sTypoDescender); - pifi->fwdTypoLineGap = SWAPW(pOs2->sTypoLineGap); - pifi->fwdAveCharWidth = SWAPW(pOs2->xAvgCharWidth); - pifi->fwdCapHeight = SWAPW(pOs2->sCapHeight); - pifi->fwdXHeight = SWAPW(pOs2->sxHeight); - pifi->fwdSubscriptXSize = SWAPW(pOs2->ySubscriptXSize); - pifi->fwdSubscriptYSize = SWAPW(pOs2->ySubscriptYSize); - pifi->fwdSubscriptXOffset = SWAPW(pOs2->ySubscriptXOffset); - pifi->fwdSubscriptYOffset = SWAPW(pOs2->ySubscriptYOffset); - pifi->fwdSuperscriptXSize = SWAPW(pOs2->ySuperscriptXSize); - pifi->fwdSuperscriptYSize = SWAPW(pOs2->ySuperscriptYSize); - pifi->fwdSuperscriptXOffset = SWAPW(pOs2->ySuperscriptXOffset); - pifi->fwdSuperscriptYOffset = SWAPW(pOs2->ySuperscriptYOffset); + pifi->fwdTypoAscender = GETW(&pOs2->sTypoAscender); + pifi->fwdTypoDescender = GETW(&pOs2->sTypoDescender); + pifi->fwdTypoLineGap = GETW(&pOs2->sTypoLineGap); + pifi->fwdAveCharWidth = GETW(&pOs2->xAvgCharWidth); + pifi->fwdCapHeight = GETW(&pOs2->sCapHeight); + pifi->fwdXHeight = GETW(&pOs2->sxHeight); + pifi->fwdSubscriptXSize = GETW(&pOs2->ySubscriptXSize); + pifi->fwdSubscriptYSize = GETW(&pOs2->ySubscriptYSize); + pifi->fwdSubscriptXOffset = GETW(&pOs2->ySubscriptXOffset); + pifi->fwdSubscriptYOffset = GETW(&pOs2->ySubscriptYOffset); + pifi->fwdSuperscriptXSize = GETW(&pOs2->ySuperscriptXSize); + pifi->fwdSuperscriptYSize = GETW(&pOs2->ySuperscriptYSize); + pifi->fwdSuperscriptXOffset = GETW(&pOs2->ySuperscriptXOffset); + pifi->fwdSuperscriptYOffset = GETW(&pOs2->ySuperscriptYOffset); //pifi->fwdUnderscoreSize; //pifi->fwdUnderscorePosition; - pifi->fwdStrikeoutSize = SWAPW(pOs2->yStrikeoutSize); - pifi->fwdStrikeoutPosition = SWAPW(pOs2->yStrikeoutPosition); - pifi->wcFirstChar = SWAPW(pOs2->usFirstCharIndex); - pifi->wcLastChar = SWAPW(pOs2->usLastCharIndex); - pifi->wcDefaultChar = SWAPW(pOs2->usDefaultChar); - pifi->wcBreakChar = SWAPW(pOs2->usBreakChar); + pifi->fwdStrikeoutSize = GETW(&pOs2->yStrikeoutSize); + pifi->fwdStrikeoutPosition = GETW(&pOs2->yStrikeoutPosition); + pifi->wcFirstChar = GETW(&pOs2->usFirstCharIndex); + pifi->wcLastChar = GETW(&pOs2->usLastCharIndex); + pifi->wcDefaultChar = GETW(&pOs2->usDefaultChar); + pifi->wcBreakChar = GETW(&pOs2->usBreakChar); *(DWORD*)pifi->achVendId = *(DWORD*)pOs2->achVendID; //pifi->ulPanoseCulture; pifi->panose = *(PANOSE*)pOs2->panose; @@ -438,3 +367,104 @@ } + +/** Public Interface **********************************************************/ + +LONG +APIENTRY +FtfdQueryTrueTypeTable( + ULONG_PTR diFile, + ULONG ulFont, + ULONG ulTag, + PTRDIFF dpStart, + ULONG cjBuf, + BYTE *pjBuf, + PBYTE *ppjTable, + ULONG *pcjTable) +{ + PFTFD_FILE pfile = (PFTFD_FILE)diFile; + PBYTE pjTable; + ULONG cjTable; + + TRACE("FtfdQueryTrueTypeTable\n"); + + /* Check if this file supports TrueType tables */ + if (pfile->ulFileFormat != FILEFMT_TTF && + pfile->ulFileFormat != FILEFMT_OTF) + { + WARN("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 = FtfdFindTrueTypeTable(pfile->pvView, + pfile->cjView, + ulFont, + ulTag, + &cjTable); + if (!pjTable) + { + WARN("Couldn't find table '%.4s'\n", (char*)&ulTag); + return FD_ERROR; + } + } + + /* Return requested pointers */ + if (ppjTable) *ppjTable = pjTable; + if (pcjTable) *pcjTable = cjTable; + + /* Check if we shall copy data */ + if (pjBuf) + { + /* Check if the offset is inside the table */ + if (dpStart < 0 || (ULONG_PTR)dpStart >= cjTable) + { + WARN("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 +APIENTRY +FtfdGetTrueTypeFile( + ULONG_PTR diFile, + ULONG *pcj) +{ + PFTFD_FILE pfile = (PFTFD_FILE)diFile; + + TRACE("FtfdGetTrueTypeFile\n"); + + /* Check if this file is TrueType */ + if (pfile->ulFileFormat != FILEFMT_TTF && + pfile->ulFileFormat != FILEFMT_OTF) + { + WARN("File format is not TrueType or Opentype\n"); + return NULL; + } + + /* Return the pointer and size */ + if (pcj) *pcj = pfile->cjView; + return pfile->pvView; +} + Added: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h (added) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Sat May 7 13:36:02 2011 @@ -1,0 +1,95 @@ + +/* We need these to access unaligned big endian data */ +FORCEINLINE +USHORT GETW(PVOID pv) +{ + PBYTE pj = pv; + return (((USHORT)pj[0]) << 8) | ((USHORT)pj[1]); +} + +FORCEINLINE +ULONG GETD(PVOID pv) +{ + PBYTE pj = pv; + return (((ULONG)pj[0]) << 24) | (((ULONG)pj[1]) << 16) | + (((ULONG)pj[2]) << 8) | ((ULONG)pj[3]); +} + +typedef struct _TT_COLLECTION +{ + ULONG ulTTCTag; + ULONG ulVersion; + ULONG ulNumFonts; + ULONG aulOffsetTable[1]; +} TT_COLLECTION, *PTT_COLLECTION; + +typedef struct _OTF_TABLE_ENTRY +{ + ULONG ulTag; + ULONG ulCheckSum; + ULONG ulOffset; + ULONG ulLength; +} OTF_TABLE_ENTRY, *POTF_TABLE_ENTRY; + +typedef struct _OTF_FILE_HEADER +{ + ULONG ulIdentifier; + USHORT usNumTables; + USHORT usSearchRange; + USHORT usEntrySelector; + USHORT usRangeshift; + + OTF_TABLE_ENTRY aTableEntries[1]; + +} OTF_FILE_HEADER, *POTF_FILE_HEADER; + +#include <pshpack1.h> +typedef struct _OTF_OS2_DATA +{ + USHORT version; // 0x0004 + SHORT xAvgCharWidth; + USHORT usWeightClass; + USHORT usWidthClass; + USHORT fsType; + SHORT ySubscriptXSize; + SHORT ySubscriptYSize; + SHORT ySubscriptXOffset; + SHORT ySubscriptYOffset; + SHORT ySuperscriptXSize; + SHORT ySuperscriptYSize; + SHORT ySuperscriptXOffset; + SHORT ySuperscriptYOffset; + SHORT yStrikeoutSize; + SHORT yStrikeoutPosition; + union // 0x30 + { + struct + { + BYTE jClassId; + BYTE jSubClassId; + }; + SHORT sFamilyClass; + }; + BYTE panose[10]; + ULONG ulUnicodeRange1; // Bits 0-31 + ULONG ulUnicodeRange2; // Bits 32-63 + ULONG ulUnicodeRange3; // Bits 64-95 + ULONG ulUnicodeRange4; // Bits 96-127 + CHAR achVendID[4]; + USHORT fsSelection; + USHORT usFirstCharIndex; + USHORT usLastCharIndex; + SHORT sTypoAscender; + SHORT sTypoDescender; + SHORT sTypoLineGap; + USHORT usWinAscent; + USHORT usWinDescent; + ULONG ulCodePageRange1; // Bits 0-31 + ULONG ulCodePageRange2; // Bits 32-63 + SHORT sxHeight; + SHORT sCapHeight; + USHORT usDefaultChar; + USHORT usBreakChar; + USHORT usMaxContext; +} OTF_OS2_DATA, *POTF_OS2_DATA; +#include <poppack.h> Propchange: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[spetreolle] 51617: [MSCONFIG] Fix typo in startuppage.h, this fixes build without compilation units.
by spetreolle＠svn.reactos.org 07 May '11

07 May '11

Author: spetreolle Date: Sat May 7 12:45:59 2011 New Revision: 51617 URL: http://svn.reactos.org/svn/reactos?rev=51617&view=rev Log: [MSCONFIG] Fix typo in startuppage.h, this fixes build without compilation units. Modified: trunk/reactos/base/applications/msconfig/startuppage.h Modified: trunk/reactos/base/applications/msconfig/startuppage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/startuppage.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/startuppage.h [iso-8859-1] Sat May 7 12:45:59 2011 @@ -2,7 +2,7 @@ #define _STARTUPPAGE_H_ extern HWND hStartupPage; -extern HWND hStartupPageListCtrl; +extern HWND hStartupListCtrl; INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);

1 0

[akhaldi] 51616: [KERNEL32/NLS] * Sync nls files to wine 1.3.19 * Escape some characters to fix MSVC build * Patch by Igor Paliychuk <mansonigor at gmail com>
by akhaldi＠svn.reactos.org 07 May '11

07 May '11

Author: akhaldi Date: Sat May 7 11:22:08 2011 New Revision: 51616 URL: http://svn.reactos.org/svn/reactos?rev=51616&view=rev Log: [KERNEL32/NLS] * Sync nls files to wine 1.3.19 * Escape some characters to fix MSVC build * Patch by Igor Paliychuk <mansonigor at gmail com> Modified: trunk/reactos/dll/win32/kernel32/nls/afk.nls trunk/reactos/dll/win32/kernel32/nls/ara.nls trunk/reactos/dll/win32/kernel32/nls/arb.nls trunk/reactos/dll/win32/kernel32/nls/are.nls trunk/reactos/dll/win32/kernel32/nls/arg.nls trunk/reactos/dll/win32/kernel32/nls/arh.nls trunk/reactos/dll/win32/kernel32/nls/ari.nls trunk/reactos/dll/win32/kernel32/nls/arj.nls trunk/reactos/dll/win32/kernel32/nls/ark.nls trunk/reactos/dll/win32/kernel32/nls/arl.nls trunk/reactos/dll/win32/kernel32/nls/arm.nls trunk/reactos/dll/win32/kernel32/nls/aro.nls trunk/reactos/dll/win32/kernel32/nls/arq.nls trunk/reactos/dll/win32/kernel32/nls/ars.nls trunk/reactos/dll/win32/kernel32/nls/art.nls trunk/reactos/dll/win32/kernel32/nls/aru.nls trunk/reactos/dll/win32/kernel32/nls/ary.nls trunk/reactos/dll/win32/kernel32/nls/aze.nls trunk/reactos/dll/win32/kernel32/nls/azl.nls trunk/reactos/dll/win32/kernel32/nls/bel.nls trunk/reactos/dll/win32/kernel32/nls/bgr.nls trunk/reactos/dll/win32/kernel32/nls/brf.nls trunk/reactos/dll/win32/kernel32/nls/cat.nls trunk/reactos/dll/win32/kernel32/nls/chs.nls trunk/reactos/dll/win32/kernel32/nls/cht.nls trunk/reactos/dll/win32/kernel32/nls/csy.nls trunk/reactos/dll/win32/kernel32/nls/cym.nls trunk/reactos/dll/win32/kernel32/nls/dan.nls trunk/reactos/dll/win32/kernel32/nls/dea.nls trunk/reactos/dll/win32/kernel32/nls/dec.nls trunk/reactos/dll/win32/kernel32/nls/del.nls trunk/reactos/dll/win32/kernel32/nls/des.nls trunk/reactos/dll/win32/kernel32/nls/deu.nls trunk/reactos/dll/win32/kernel32/nls/div.nls trunk/reactos/dll/win32/kernel32/nls/ell.nls trunk/reactos/dll/win32/kernel32/nls/ena.nls trunk/reactos/dll/win32/kernel32/nls/enb.nls trunk/reactos/dll/win32/kernel32/nls/enc.nls trunk/reactos/dll/win32/kernel32/nls/eng.nls trunk/reactos/dll/win32/kernel32/nls/eni.nls trunk/reactos/dll/win32/kernel32/nls/enj.nls trunk/reactos/dll/win32/kernel32/nls/enl.nls trunk/reactos/dll/win32/kernel32/nls/enp.nls trunk/reactos/dll/win32/kernel32/nls/ens.nls trunk/reactos/dll/win32/kernel32/nls/ent.nls trunk/reactos/dll/win32/kernel32/nls/enu.nls trunk/reactos/dll/win32/kernel32/nls/enw.nls trunk/reactos/dll/win32/kernel32/nls/enz.nls trunk/reactos/dll/win32/kernel32/nls/esa.nls trunk/reactos/dll/win32/kernel32/nls/esb.nls trunk/reactos/dll/win32/kernel32/nls/esc.nls trunk/reactos/dll/win32/kernel32/nls/esd.nls trunk/reactos/dll/win32/kernel32/nls/ese.nls trunk/reactos/dll/win32/kernel32/nls/esf.nls trunk/reactos/dll/win32/kernel32/nls/esg.nls trunk/reactos/dll/win32/kernel32/nls/esh.nls trunk/reactos/dll/win32/kernel32/nls/esi.nls trunk/reactos/dll/win32/kernel32/nls/esl.nls trunk/reactos/dll/win32/kernel32/nls/esm.nls trunk/reactos/dll/win32/kernel32/nls/esn.nls trunk/reactos/dll/win32/kernel32/nls/eso.nls trunk/reactos/dll/win32/kernel32/nls/esp.nls trunk/reactos/dll/win32/kernel32/nls/esr.nls trunk/reactos/dll/win32/kernel32/nls/ess.nls trunk/reactos/dll/win32/kernel32/nls/esu.nls trunk/reactos/dll/win32/kernel32/nls/esv.nls trunk/reactos/dll/win32/kernel32/nls/esy.nls trunk/reactos/dll/win32/kernel32/nls/esz.nls trunk/reactos/dll/win32/kernel32/nls/eti.nls trunk/reactos/dll/win32/kernel32/nls/euq.nls trunk/reactos/dll/win32/kernel32/nls/far.nls trunk/reactos/dll/win32/kernel32/nls/fin.nls trunk/reactos/dll/win32/kernel32/nls/fos.nls trunk/reactos/dll/win32/kernel32/nls/fra.nls trunk/reactos/dll/win32/kernel32/nls/frb.nls trunk/reactos/dll/win32/kernel32/nls/frc.nls trunk/reactos/dll/win32/kernel32/nls/frl.nls trunk/reactos/dll/win32/kernel32/nls/frm.nls trunk/reactos/dll/win32/kernel32/nls/frs.nls trunk/reactos/dll/win32/kernel32/nls/glc.nls trunk/reactos/dll/win32/kernel32/nls/guj.nls trunk/reactos/dll/win32/kernel32/nls/heb.nls trunk/reactos/dll/win32/kernel32/nls/hin.nls trunk/reactos/dll/win32/kernel32/nls/hrv.nls trunk/reactos/dll/win32/kernel32/nls/hun.nls trunk/reactos/dll/win32/kernel32/nls/hye.nls trunk/reactos/dll/win32/kernel32/nls/ind.nls trunk/reactos/dll/win32/kernel32/nls/isl.nls trunk/reactos/dll/win32/kernel32/nls/ita.nls trunk/reactos/dll/win32/kernel32/nls/its.nls trunk/reactos/dll/win32/kernel32/nls/jpn.nls trunk/reactos/dll/win32/kernel32/nls/kan.nls trunk/reactos/dll/win32/kernel32/nls/kat.nls trunk/reactos/dll/win32/kernel32/nls/kkz.nls trunk/reactos/dll/win32/kernel32/nls/knk.nls trunk/reactos/dll/win32/kernel32/nls/kor.nls trunk/reactos/dll/win32/kernel32/nls/kyr.nls trunk/reactos/dll/win32/kernel32/nls/lth.nls trunk/reactos/dll/win32/kernel32/nls/lvi.nls trunk/reactos/dll/win32/kernel32/nls/mar.nls trunk/reactos/dll/win32/kernel32/nls/mki.nls trunk/reactos/dll/win32/kernel32/nls/mon.nls trunk/reactos/dll/win32/kernel32/nls/msb.nls trunk/reactos/dll/win32/kernel32/nls/msl.nls trunk/reactos/dll/win32/kernel32/nls/nlb.nls trunk/reactos/dll/win32/kernel32/nls/nld.nls trunk/reactos/dll/win32/kernel32/nls/non.nls trunk/reactos/dll/win32/kernel32/nls/nor.nls trunk/reactos/dll/win32/kernel32/nls/pan.nls trunk/reactos/dll/win32/kernel32/nls/plk.nls trunk/reactos/dll/win32/kernel32/nls/ptb.nls trunk/reactos/dll/win32/kernel32/nls/ptg.nls trunk/reactos/dll/win32/kernel32/nls/rmc.nls trunk/reactos/dll/win32/kernel32/nls/rom.nls trunk/reactos/dll/win32/kernel32/nls/rus.nls trunk/reactos/dll/win32/kernel32/nls/san.nls trunk/reactos/dll/win32/kernel32/nls/sky.nls trunk/reactos/dll/win32/kernel32/nls/slv.nls trunk/reactos/dll/win32/kernel32/nls/sqi.nls trunk/reactos/dll/win32/kernel32/nls/srb.nls trunk/reactos/dll/win32/kernel32/nls/srl.nls trunk/reactos/dll/win32/kernel32/nls/sve.nls trunk/reactos/dll/win32/kernel32/nls/svf.nls trunk/reactos/dll/win32/kernel32/nls/swk.nls trunk/reactos/dll/win32/kernel32/nls/syr.nls trunk/reactos/dll/win32/kernel32/nls/tam.nls trunk/reactos/dll/win32/kernel32/nls/tel.nls trunk/reactos/dll/win32/kernel32/nls/tha.nls trunk/reactos/dll/win32/kernel32/nls/trk.nls trunk/reactos/dll/win32/kernel32/nls/ttt.nls trunk/reactos/dll/win32/kernel32/nls/ukr.nls trunk/reactos/dll/win32/kernel32/nls/urd.nls trunk/reactos/dll/win32/kernel32/nls/uzb.nls trunk/reactos/dll/win32/kernel32/nls/uzl.nls trunk/reactos/dll/win32/kernel32/nls/vit.nls trunk/reactos/dll/win32/kernel32/nls/zhh.nls trunk/reactos/dll/win32/kernel32/nls/zhi.nls trunk/reactos/dll/win32/kernel32/nls/zhm.nls trunk/reactos/include/psdk/winnls.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/nls/afk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/afk… Modified: trunk/reactos/dll/win32/kernel32/nls/ara.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ara… Modified: trunk/reactos/dll/win32/kernel32/nls/arb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arb… Modified: trunk/reactos/dll/win32/kernel32/nls/are.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/are… Modified: trunk/reactos/dll/win32/kernel32/nls/arg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arg… Modified: trunk/reactos/dll/win32/kernel32/nls/arh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arh… Modified: trunk/reactos/dll/win32/kernel32/nls/ari.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ari… Modified: trunk/reactos/dll/win32/kernel32/nls/arj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arj… Modified: trunk/reactos/dll/win32/kernel32/nls/ark.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ark… Modified: trunk/reactos/dll/win32/kernel32/nls/arl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arl… Modified: trunk/reactos/dll/win32/kernel32/nls/arm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arm… Modified: trunk/reactos/dll/win32/kernel32/nls/aro.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aro… Modified: trunk/reactos/dll/win32/kernel32/nls/arq.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/arq… Modified: trunk/reactos/dll/win32/kernel32/nls/ars.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ars… Modified: trunk/reactos/dll/win32/kernel32/nls/art.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/art… Modified: trunk/reactos/dll/win32/kernel32/nls/aru.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aru… Modified: trunk/reactos/dll/win32/kernel32/nls/ary.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ary… Modified: trunk/reactos/dll/win32/kernel32/nls/aze.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/aze… Modified: trunk/reactos/dll/win32/kernel32/nls/azl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/azl… Modified: trunk/reactos/dll/win32/kernel32/nls/bel.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/bel… Modified: trunk/reactos/dll/win32/kernel32/nls/bgr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/bgr… Modified: trunk/reactos/dll/win32/kernel32/nls/brf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/brf… Modified: trunk/reactos/dll/win32/kernel32/nls/cat.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cat… Modified: trunk/reactos/dll/win32/kernel32/nls/chs.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/chs… Modified: trunk/reactos/dll/win32/kernel32/nls/cht.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cht… Modified: trunk/reactos/dll/win32/kernel32/nls/csy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/csy… Modified: trunk/reactos/dll/win32/kernel32/nls/cym.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/cym… Modified: trunk/reactos/dll/win32/kernel32/nls/dan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dan… Modified: trunk/reactos/dll/win32/kernel32/nls/dea.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dea… Modified: trunk/reactos/dll/win32/kernel32/nls/dec.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/dec… Modified: trunk/reactos/dll/win32/kernel32/nls/del.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/del… Modified: trunk/reactos/dll/win32/kernel32/nls/des.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/des… Modified: trunk/reactos/dll/win32/kernel32/nls/deu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/deu… Modified: trunk/reactos/dll/win32/kernel32/nls/div.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/div… Modified: trunk/reactos/dll/win32/kernel32/nls/ell.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ell… Modified: trunk/reactos/dll/win32/kernel32/nls/ena.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ena… Modified: trunk/reactos/dll/win32/kernel32/nls/enb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enb… Modified: trunk/reactos/dll/win32/kernel32/nls/enc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enc… Modified: trunk/reactos/dll/win32/kernel32/nls/eng.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eng… Modified: trunk/reactos/dll/win32/kernel32/nls/eni.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eni… Modified: trunk/reactos/dll/win32/kernel32/nls/enj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enj… Modified: trunk/reactos/dll/win32/kernel32/nls/enl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enl… Modified: trunk/reactos/dll/win32/kernel32/nls/enp.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enp… Modified: trunk/reactos/dll/win32/kernel32/nls/ens.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ens… Modified: trunk/reactos/dll/win32/kernel32/nls/ent.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ent… Modified: trunk/reactos/dll/win32/kernel32/nls/enu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enu… Modified: trunk/reactos/dll/win32/kernel32/nls/enw.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enw… Modified: trunk/reactos/dll/win32/kernel32/nls/enz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/enz… Modified: trunk/reactos/dll/win32/kernel32/nls/esa.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esa… Modified: trunk/reactos/dll/win32/kernel32/nls/esb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esb… Modified: trunk/reactos/dll/win32/kernel32/nls/esc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esc… Modified: trunk/reactos/dll/win32/kernel32/nls/esd.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esd… Modified: trunk/reactos/dll/win32/kernel32/nls/ese.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ese… Modified: trunk/reactos/dll/win32/kernel32/nls/esf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esf… Modified: trunk/reactos/dll/win32/kernel32/nls/esg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esg… Modified: trunk/reactos/dll/win32/kernel32/nls/esh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esh… Modified: trunk/reactos/dll/win32/kernel32/nls/esi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esi… Modified: trunk/reactos/dll/win32/kernel32/nls/esl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esl… Modified: trunk/reactos/dll/win32/kernel32/nls/esm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esm… Modified: trunk/reactos/dll/win32/kernel32/nls/esn.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esn… Modified: trunk/reactos/dll/win32/kernel32/nls/eso.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eso… Modified: trunk/reactos/dll/win32/kernel32/nls/esp.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esp… Modified: trunk/reactos/dll/win32/kernel32/nls/esr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esr… Modified: trunk/reactos/dll/win32/kernel32/nls/ess.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ess… Modified: trunk/reactos/dll/win32/kernel32/nls/esu.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esu… Modified: trunk/reactos/dll/win32/kernel32/nls/esv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esv… Modified: trunk/reactos/dll/win32/kernel32/nls/esy.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esy… Modified: trunk/reactos/dll/win32/kernel32/nls/esz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esz… Modified: trunk/reactos/dll/win32/kernel32/nls/eti.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/eti… Modified: trunk/reactos/dll/win32/kernel32/nls/euq.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/euq… Modified: trunk/reactos/dll/win32/kernel32/nls/far.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/far… Modified: trunk/reactos/dll/win32/kernel32/nls/fin.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fin… Modified: trunk/reactos/dll/win32/kernel32/nls/fos.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fos… Modified: trunk/reactos/dll/win32/kernel32/nls/fra.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/fra… Modified: trunk/reactos/dll/win32/kernel32/nls/frb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frb… Modified: trunk/reactos/dll/win32/kernel32/nls/frc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frc… Modified: trunk/reactos/dll/win32/kernel32/nls/frl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frl… Modified: trunk/reactos/dll/win32/kernel32/nls/frm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frm… Modified: trunk/reactos/dll/win32/kernel32/nls/frs.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/frs… Modified: trunk/reactos/dll/win32/kernel32/nls/glc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/glc… Modified: trunk/reactos/dll/win32/kernel32/nls/guj.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/guj… Modified: trunk/reactos/dll/win32/kernel32/nls/heb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/heb… Modified: trunk/reactos/dll/win32/kernel32/nls/hin.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hin… Modified: trunk/reactos/dll/win32/kernel32/nls/hrv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hrv… Modified: trunk/reactos/dll/win32/kernel32/nls/hun.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hun… Modified: trunk/reactos/dll/win32/kernel32/nls/hye.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/hye… Modified: trunk/reactos/dll/win32/kernel32/nls/ind.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ind… Modified: trunk/reactos/dll/win32/kernel32/nls/isl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/isl… Modified: trunk/reactos/dll/win32/kernel32/nls/ita.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ita… Modified: trunk/reactos/dll/win32/kernel32/nls/its.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/its… Modified: trunk/reactos/dll/win32/kernel32/nls/jpn.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/jpn… Modified: trunk/reactos/dll/win32/kernel32/nls/kan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kan… Modified: trunk/reactos/dll/win32/kernel32/nls/kat.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kat… Modified: trunk/reactos/dll/win32/kernel32/nls/kkz.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kkz… Modified: trunk/reactos/dll/win32/kernel32/nls/knk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/knk… Modified: trunk/reactos/dll/win32/kernel32/nls/kor.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kor… Modified: trunk/reactos/dll/win32/kernel32/nls/kyr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/kyr… Modified: trunk/reactos/dll/win32/kernel32/nls/lth.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/lth… Modified: trunk/reactos/dll/win32/kernel32/nls/lvi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/lvi… Modified: trunk/reactos/dll/win32/kernel32/nls/mar.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mar… Modified: trunk/reactos/dll/win32/kernel32/nls/mki.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mki… Modified: trunk/reactos/dll/win32/kernel32/nls/mon.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/mon… Modified: trunk/reactos/dll/win32/kernel32/nls/msb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/msb… Modified: trunk/reactos/dll/win32/kernel32/nls/msl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/msl… Modified: trunk/reactos/dll/win32/kernel32/nls/nlb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/nlb… Modified: trunk/reactos/dll/win32/kernel32/nls/nld.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/nld… Modified: trunk/reactos/dll/win32/kernel32/nls/non.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/non… Modified: trunk/reactos/dll/win32/kernel32/nls/nor.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/nor… Modified: trunk/reactos/dll/win32/kernel32/nls/pan.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/pan… Modified: trunk/reactos/dll/win32/kernel32/nls/plk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/plk… Modified: trunk/reactos/dll/win32/kernel32/nls/ptb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ptb… Modified: trunk/reactos/dll/win32/kernel32/nls/ptg.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ptg… Modified: trunk/reactos/dll/win32/kernel32/nls/rmc.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rmc… Modified: trunk/reactos/dll/win32/kernel32/nls/rom.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rom… Modified: trunk/reactos/dll/win32/kernel32/nls/rus.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/rus… Modified: trunk/reactos/dll/win32/kernel32/nls/san.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/san… Modified: trunk/reactos/dll/win32/kernel32/nls/sky.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/sky… Modified: trunk/reactos/dll/win32/kernel32/nls/slv.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/slv… Modified: trunk/reactos/dll/win32/kernel32/nls/sqi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/sqi… Modified: trunk/reactos/dll/win32/kernel32/nls/srb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/srb… Modified: trunk/reactos/dll/win32/kernel32/nls/srl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/srl… Modified: trunk/reactos/dll/win32/kernel32/nls/sve.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/sve… Modified: trunk/reactos/dll/win32/kernel32/nls/svf.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/svf… Modified: trunk/reactos/dll/win32/kernel32/nls/swk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/swk… Modified: trunk/reactos/dll/win32/kernel32/nls/syr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/syr… Modified: trunk/reactos/dll/win32/kernel32/nls/tam.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tam… Modified: trunk/reactos/dll/win32/kernel32/nls/tel.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tel… Modified: trunk/reactos/dll/win32/kernel32/nls/tha.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/tha… Modified: trunk/reactos/dll/win32/kernel32/nls/trk.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/trk… Modified: trunk/reactos/dll/win32/kernel32/nls/ttt.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ttt… Modified: trunk/reactos/dll/win32/kernel32/nls/ukr.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/ukr… Modified: trunk/reactos/dll/win32/kernel32/nls/urd.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/urd… Modified: trunk/reactos/dll/win32/kernel32/nls/uzb.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/uzb… Modified: trunk/reactos/dll/win32/kernel32/nls/uzl.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/uzl… Modified: trunk/reactos/dll/win32/kernel32/nls/vit.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/vit… Modified: trunk/reactos/dll/win32/kernel32/nls/zhh.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhh… Modified: trunk/reactos/dll/win32/kernel32/nls/zhi.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhi… Modified: trunk/reactos/dll/win32/kernel32/nls/zhm.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/zhm… Modified: trunk/reactos/include/psdk/winnls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnls.h?rev=…

1 0

[jimtabor] 51615: [User32] - Add missing wine sync for system command sub functions.
by jimtabor＠svn.reactos.org 07 May '11

07 May '11

Author: jimtabor Date: Sat May 7 02:59:20 2011 New Revision: 51615 URL: http://svn.reactos.org/svn/reactos?rev=51615&view=rev Log: [User32] - Add missing wine sync for system command sub functions. Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/defwnd.c [iso-8859-1] Sat May 7 02:59:20 2011 @@ -293,8 +293,9 @@ pt.x = pt.y = 0; while(!hittest) { - if (GetMessageW(&msg, NULL, 0, 0) <= 0) - break; + if (!GetMessageW(&msg, NULL, 0, 0)) break; //return 0; + if (CallMsgFilterW( &msg, MSGF_SIZE )) continue; + switch(msg.message) { case WM_MOUSEMOVE: @@ -330,8 +331,13 @@ pt.y =(rectWindow.top+rectWindow.bottom)/2; break; case VK_RETURN: - case VK_ESCAPE: return 0; + case VK_ESCAPE: + return 0; } + default: + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + break; } } *capturePoint = pt; @@ -555,8 +561,8 @@ { int dx = 0, dy = 0; - if (GetMessageW(&msg, 0, 0, 0) <= 0) - break; + if (!GetMessageW(&msg, 0, 0, 0)) break; + if (CallMsgFilterW( &msg, MSGF_SIZE )) continue; /* Exit on button-up, Return, or Esc */ if ((msg.message == WM_LBUTTONUP) || @@ -572,7 +578,11 @@ } if ((msg.message != WM_KEYDOWN) && (msg.message != WM_MOUSEMOVE)) - continue; /* We are not interested in other messages */ + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + continue; /* We are not interested in other messages */ + } pt = msg.pt;

1 0

[gschneider] 51614: [paint] Fill the whole miniature window by using stretchblt
by gschneider＠svn.reactos.org 06 May '11

06 May '11

Author: gschneider Date: Fri May 6 22:02:29 2011 New Revision: 51614 URL: http://svn.reactos.org/svn/reactos?rev=51614&view=rev Log: [paint] Fill the whole miniature window by using stretchblt Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri May 6 22:02:29 2011 @@ -447,11 +447,11 @@ } else if (hwnd == hwndMiniature) { - long mclient[4]; + RECT mclient; HDC hdc; - GetClientRect(hwndMiniature, (LPRECT) &mclient); + GetClientRect(hwndMiniature, &mclient); hdc = GetDC(hwndMiniature); - BitBlt(hdc, 0, 0, imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); + StretchBlt(hdc, 0, 0, mclient.right, mclient.bottom, hDrawingDC, 0, 0, imgXRes, imgYRes, SRCCOPY); ReleaseDC(hwndMiniature, hdc); } break;

1 0

[tkreuzer] 51613: [GDI FONT DRIVER] - Fix values returned in FtfdQueryAdvanceWidths - Convert bitmap handling to 4bpp (need to investigate why my driver is assumed to return a 4bpp bitmap, while th...
by tkreuzer＠svn.reactos.org 06 May '11

06 May '11

Author: tkreuzer Date: Fri May 6 21:57:42 2011 New Revision: 51613 URL: http://svn.reactos.org/svn/reactos?rev=51613&view=rev Log: [GDI FONT DRIVER] - Fix values returned in FtfdQueryAdvanceWidths - Convert bitmap handling to 4bpp (need to investigate why my driver is assumed to return a 4bpp bitmap, while the original driver seems to provide a 1bpp one) - Fix values in FtfdQueryGlyphData - Implement FtfdQueryGlyphBits, returning a 4bpp bitmap - The driver is now capable of basically rendering fonts in 4bpp 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 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 21:57:42 2011 @@ -725,7 +725,7 @@ pjTable = OtfFindTable(pfile->pvView, pfile->cjView, ulTag, &cjTable); if (!pjTable) { - DbgPrint("Couldn't find the requested table\n"); + DbgPrint("Couldn't find table '%.4s'\n", (char*)&ulTag); 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] Fri May 6 21:57:42 2011 @@ -104,6 +104,7 @@ FT_Face ftface; FD_XFORM fdxQuantized; FTFD_DEVICEMETRICS metrics; + ULONG xScale; 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 21:57:42 2011 @@ -11,8 +11,11 @@ #define FLOATL_1 0x3f800000 +#define BITMAP_SIZE(cx, cy, bpp) \ + ((((((cx * bpp) + 7) >> 3) * cy) + 3) & ~3) + #define GLYPHBITS_SIZE(cx, cy, bpp) \ - (FIELD_OFFSET(GLYPHBITS, aj) + ((((cx * bpp) + 31) >> 5) * cy * 4)) + (FIELD_OFFSET(GLYPHBITS, aj) + BITMAP_SIZE(cx, cy, bpp)) PFTFD_FONT NTAPI @@ -62,6 +65,7 @@ pfont->ftface = ftface; + /* Get the XFORMOBJ from the font */ pxo = FONTOBJ_pxoGetXform(pfo); if (!pxo) { @@ -83,7 +87,7 @@ __debugbreak(); // FIXME: need to calculate scaling - /* initialize a matrix */ + /* Initialize a matrix */ ftmatrix.xx = 0x10000 * pface->ifiex.ifi.fwdUnitsPerEm * 72 / pfo->sizLogResPpi.cx; ftmatrix.xy = 0x00000000; @@ -163,7 +167,7 @@ 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); +DbgPrint("Created font with %ld (%ld)\n", yScale, (yScale+32)/64); //__debugbreak(); /* Set the pvProducer member of the fontobj */ @@ -197,7 +201,6 @@ PFTFD_FONT pfont = FtfdGetFontInstance(pfo); PFTFD_FACE pface = pfont->pface; FT_Face ftface = pfont->ftface; - ULONG cjMaxWidth, cjMaxBitmapSize; XFORMOBJ *pxo; DbgPrint("FtfdQueryMaxExtents\n"); @@ -232,7 +235,7 @@ else pfddm->lD = 0; - /* Copy the values from the font structure */ + /* Copy some values from the font structure */ pfddm->fxMaxAscender = pfont->metrics.ptfxMaxAscender.y; pfddm->fxMaxDescender = pfont->metrics.ptfxMaxDescender.y; pfddm->ptlUnderline1 = pfont->metrics.ptlUnderline1; @@ -242,14 +245,8 @@ 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; + pfddm->cjGlyphMax = GLYPHBITS_SIZE(pfddm->cxMax, pfddm->cyMax, 4); /* Copy the quantized matrix from the font structure */ pfddm->fdxQuantized = pfont->fdxQuantized; @@ -264,7 +261,7 @@ pfddm->lMinD = 0; } -__debugbreak(); +//__debugbreak(); /* Return the size of the structure */ return sizeof(FD_DEVICEMETRICS); @@ -315,8 +312,8 @@ if (1 /* layout horizontal */) { pgd->fxA = ftglyph->metrics.horiBearingX; - pgd->fxAB = pgd->fxA + ftglyph->metrics.width; - pgd->fxD = ftglyph->metrics.horiAdvance; + pgd->fxAB = pgd->fxA + ftglyph->metrics.width / 4; + pgd->fxD = ftglyph->metrics.horiAdvance / 4; } else { @@ -325,10 +322,10 @@ pgd->fxD = ftglyph->metrics.vertAdvance; } - pgd->fxInkTop = 0; pgd->fxInkBottom = 0; + pgd->fxInkTop = pgd->fxInkBottom + (ftglyph->bitmap.rows << 4); pgd->rclInk.left = ftglyph->bitmap_left; - pgd->rclInk.top = ftglyph->bitmap_top; + pgd->rclInk.top = -ftglyph->bitmap_top; pgd->rclInk.right = pgd->rclInk.left + ftglyph->bitmap.width; pgd->rclInk.bottom = pgd->rclInk.top + ftglyph->bitmap.rows; @@ -336,13 +333,52 @@ if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; - pgd->ptqD.x.LowPart = 0; - pgd->ptqD.x.HighPart = pgd->fxD; - pgd->ptqD.y.LowPart = 0; + pgd->ptqD.x.LowPart = 0x000000fd; + pgd->ptqD.x.HighPart = 0; + pgd->ptqD.y.LowPart = 0x000000a0; // 0x000000a0 pgd->ptqD.y.HighPart = 0; //pgd->ptqD.x.QuadPart = 0; //pgd->ptqD.y.QuadPart = 0; - +//__debugbreak(); +} + +VOID +FtfdCopyBitmap( + BYTE *pjDest, + FT_Bitmap *ftbitmap) +{ + ULONG ulRows, ulDstDelta, ulSrcDelta; + PBYTE pjDstLine, pjSrcLine; + + + pjDstLine = pjDest; + ulDstDelta = (ftbitmap->width*4 + 7) / 8; + + pjSrcLine = ftbitmap->buffer; + ulSrcDelta = abs(ftbitmap->pitch); + + ulRows = ftbitmap->rows; + while (ulRows--) + { + ULONG ulWidth = ulDstDelta; + BYTE j, *pjSrc; + + pjSrc = pjSrcLine; + while (ulWidth--) + { + /* Get the 1st pixel */ + j = (*pjSrc++) & 0xf0; + + /* Get the 2nd pixel */ + if (ulWidth > 0 || !(ftbitmap->width & 1)) + j |= (*pjSrc++) >> 4; + *pjDstLine++ = j; + } + + /* Go to the next line */ + //pjDstLine += ulDstDelta; + pjSrcLine += ulSrcDelta; + } } VOID @@ -354,13 +390,30 @@ { PFTFD_FONT pfont = pfo->pvProducer; FT_GlyphSlot ftglyph = pfont->ftface->glyph; - - pgb->ptlOrigin.x = 0; - pgb->ptlOrigin.y = 0; + ULONG cjBitmapSize; + + pgb->ptlOrigin.x = ftglyph->bitmap_left; + pgb->ptlOrigin.y = - ftglyph->bitmap_top; pgb->sizlBitmap.cx = ftglyph->bitmap.width; pgb->sizlBitmap.cy = ftglyph->bitmap.rows; - DbgPrint("QueryGlyphBits for hg=%lx, cjSize=%ld\n", hg, cjSize); + cjBitmapSize = BITMAP_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4); + if (cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj) > cjSize) + { + DbgPrint("ERROR: buffer too small, got %ld, need %ld\n", + cjSize, cjBitmapSize + FIELD_OFFSET(GLYPHBITS, aj)); + __debugbreak(); + return; + } + + /* Copy the bitmap */ + FtfdCopyBitmap(pgb->aj, &ftglyph->bitmap); + + //RtlCopyMemory(pgb->aj, ftglyph->bitmap.buffer, cjBitmapSize); + + DbgPrint("QueryGlyphBits hg=%lx, (%ld,%ld) cjSize=%ld, need %ld\n", + hg, pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, cjSize, + GLYPHBITS_SIZE(pgb->sizlBitmap.cx, pgb->sizlBitmap.cy, 4)); } @@ -372,6 +425,22 @@ ULONG cjSize) { +} + +BOOL +FtRenderGlyphBitmap( + PFTFD_FONT pfont) +{ + FT_Error fterror; + + fterror = FT_Render_Glyph(pfont->ftface->glyph, FT_RENDER_MODE_NORMAL); + if (fterror) + { + DbgPrint("cound't render glyph\n"); + return FALSE; + } + + return TRUE; } /** Public Interface **********************************************************/ @@ -400,6 +469,8 @@ /* Load the requested glyph */ if (!FtfdLoadGlyph(pfont, hg, 0)) return FD_ERROR; + if (!FtRenderGlyphBitmap(pfont)) return FD_ERROR; + if (pgd) FtfdQueryGlyphData(pfo, hg, pgd, pv); @@ -411,7 +482,7 @@ /* Return the size for a 1bpp bitmap */ return GLYPHBITS_SIZE(pfont->ftface->glyph->bitmap.width, pfont->ftface->glyph->bitmap.rows, - 1); + 4); case QFD_GLYPHANDOUTLINE: DbgPrint("QFD_GLYPHANDOUTLINE\n"); @@ -446,7 +517,7 @@ DbgPrint("QFD_TT_GRAY8_BITMAP\n"); break; default: - DbgPrint("Impossible iMode value: %lx\n", iMode); + DbgPrint("ERROR: Invalid iMode value: %lx\n", iMode); EngSetLastError(ERROR_INVALID_PARAMETER); return FD_ERROR; } @@ -517,8 +588,9 @@ } else { - //DbgPrint("Got advance width: hg=%lx, adv=%d\n", phg[i], advance >> 12); - pusWidths[i] = (USHORT)advance >> 12; + /* Transform from 16.16 points to 28.4 pixels */ + pusWidths[i] = (USHORT)((advance * 72 / pfo->sizLogResPpi.cx) >> 12); + //DbgPrint("Got advance width: hg=%lx, adv=%lx->%ld\n", phg[i], advance, pt.x); } }

1 0

[gschneider] 51612: [paint] Hide selection window and clear undo history when starting a new painting See issue #6226 for more details.
by gschneider＠svn.reactos.org 06 May '11

06 May '11

Author: gschneider Date: Fri May 6 18:32:45 2011 New Revision: 51612 URL: http://svn.reactos.org/svn/reactos?rev=51612&view=rev Log: [paint] Hide selection window and clear undo history when starting a new painting See issue #6226 for more details. Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri May 6 18:32:45 2011 @@ -721,6 +721,9 @@ SendMessage(hwnd, WM_CLOSE, wParam, lParam); break; case IDM_FILENEW: + ShowWindow(hSelection, SW_HIDE); + clearHistory(); + Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); SendMessage(hImageArea, WM_PAINT, 0, 0); break;

1 0

[gschneider] 51611: [paint] Implement cut function See issue #6224 for more details.
by gschneider＠svn.reactos.org 06 May '11

06 May '11

Author: gschneider Date: Fri May 6 18:00:41 2011 New Revision: 51611 URL: http://svn.reactos.org/svn/reactos?rev=51611&view=rev Log: [paint] Implement cut function See issue #6224 for more details. Modified: trunk/reactos/base/applications/mspaint/winproc.c Modified: trunk/reactos/base/applications/mspaint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/winproc.c [iso-8859-1] Fri May 6 18:00:41 2011 @@ -793,6 +793,12 @@ EmptyClipboard(); SetClipboardData(CF_BITMAP, CopyImage(hSelBm, IMAGE_BITMAP, 0, 0, LR_COPYRETURNORG)); CloseClipboard(); + break; + case IDM_EDITCUT: + /* Copy */ + SendMessage(hwnd, WM_COMMAND, IDM_EDITCOPY, 0); + /* Delete selection */ + SendMessage(hwnd, WM_COMMAND, IDM_EDITDELETESELECTION, 0); break; case IDM_EDITPASTE: OpenClipboard(hMainWnd);

1 0

[sserapion] 51610: [SECUR32] - Initial check in... - Using severely refactored wine secur32 as a basis, start implementing SSPI interface. - Can load SSP dlls. started working on SSP/AP routines. -...
by sserapion＠svn.reactos.org 06 May '11

06 May '11

Author: sserapion Date: Fri May 6 17:35:57 2011 New Revision: 51610 URL: http://svn.reactos.org/svn/reactos?rev=51610&view=rev Log: [SECUR32] - Initial check in... - Using severely refactored wine secur32 as a basis, start implementing SSPI interface. - Can load SSP dlls. started working on SSP/AP routines. - Still need to sort out many things. For more details see msdn SSPI: http://msdn.microsoft.com/en-us/library/aa380493%28v=vs.85%29.aspx SSP vs. SSP/AP : http://msdn.microsoft.com/en-us/library/aa380501%28v=vs.85%29.aspx Added: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c (with props) branches/sspi-bringup/reactos/dll/win32/secur32/secur32_priv.h (with props) branches/sspi-bringup/reactos/dll/win32/secur32/sspap.c (with props) branches/sspi-bringup/reactos/dll/win32/secur32/thunks.c (with props) branches/sspi-bringup/reactos/dll/win32/secur32/thunks.h (with props) branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c (with props) Modified: branches/sspi-bringup/reactos/dll/win32/secur32/dllmain.c branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h branches/sspi-bringup/reactos/dll/win32/secur32/secext.c branches/sspi-bringup/reactos/dll/win32/secur32/secur32.rbuild branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/sspi-bringup/reactos/dll/win32/secur32/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secext.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/secur32.spec URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/secur32_priv.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/sspap.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/sspi.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Modified: branches/sspi-bringup/reactos/dll/win32/secur32/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/thunks.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/thunks.h URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/… Added: branches/sspi-bringup/reactos/dll/win32/secur32/wrapper.c URL: http://svn.reactos.org/svn/reactos/branches/sspi-bringup/reactos/dll/win32/…

1 0

[janderwald] 51609: [USBSTOR] - Implement SCSI mode sense
by janderwald＠svn.reactos.org 06 May '11

06 May '11

Author: janderwald Date: Fri May 6 17:23:19 2011 New Revision: 51609 URL: http://svn.reactos.org/svn/reactos?rev=51609&view=rev Log: [USBSTOR] - Implement SCSI mode sense Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c branches/usb-bringup/drivers/usb/usbstor/scsi.c branches/usb-bringup/drivers/usb/usbstor/usbstor.h Modified: branches/usb-bringup/drivers/usb/usbstor/disk.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/disk.c [iso-8859-1] Fri May 6 17:23:19 2011 @@ -20,6 +20,7 @@ { PCDB pCDB; NTSTATUS Status; + ULONG TransferredLength; // // get SCSI command data block @@ -62,6 +63,35 @@ // store returned info length // Irp->IoStatus.Information = Request->DataTransferLength; + Request->SrbStatus = SRB_STATUS_SUCCESS; + } + else + { + // + // failed to retrieve capacity + // + Irp->IoStatus.Information = 0; + Request->SrbStatus = SRB_STATUS_ERROR; + } + } + else if (pCDB->MODE_SENSE.OperationCode == SCSIOP_MODE_SENSE) + { + DPRINT1("SCSIOP_MODE_SENSE DataTransferLength %lu\n", Request->DataTransferLength); + ASSERT(pCDB->MODE_SENSE.AllocationLength == Request->DataTransferLength); + ASSERT(Request->DataBuffer); + + // + // send mode sense command + // + Status = USBSTOR_SendModeSenseCmd(DeviceObject, Request, &TransferredLength); + DPRINT1("USBSTOR_SendModeSenseCmd Status %x BytesReturned %lu\n", Status, TransferredLength); + + if (NT_SUCCESS(Status)) + { + // + // store returned info length + // + Irp->IoStatus.Information = TransferredLength; Request->SrbStatus = SRB_STATUS_SUCCESS; } else Modified: branches/usb-bringup/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/scsi.c [iso-8859-1] Fri May 6 17:23:19 2011 @@ -435,7 +435,7 @@ } // - // initialize inquiry cmd + // initialize capacity cmd // RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); Cmd.Code = SCSIOP_INQUIRY; @@ -443,7 +443,7 @@ Cmd.AllocationLength = sizeof(UFI_INQUIRY_RESPONSE); // - // now send inquiry cmd + // now send capacity cmd // Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, sizeof(UFI_CAPACITY_RESPONSE), &OutControl); if (!NT_SUCCESS(Status)) @@ -523,3 +523,123 @@ return Status; } +NTSTATUS +USBSTOR_SendModeSenseCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength) +{ + UFI_SENSE_CMD Cmd; + CSW CSW; + NTSTATUS Status; + PVOID Response; + PPDO_DEVICE_EXTENSION PDODeviceExtension; + PCBW OutControl; + PCDB pCDB; + + // + // get SCSI command data block + // + pCDB = (PCDB)Request->Cdb; + + // + // get PDO device extension + // + PDODeviceExtension = (PPDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + // + // allocate sense response from non paged pool + // + Response = (PUFI_CAPACITY_RESPONSE)AllocateItem(NonPagedPool, Request->DataTransferLength); + if (!Response) + { + // + // no memory + // + return STATUS_INSUFFICIENT_RESOURCES; + } + + // + // initialize mode sense cmd + // + RtlZeroMemory(&Cmd, sizeof(UFI_INQUIRY_CMD)); + Cmd.Code = SCSIOP_MODE_SENSE; + Cmd.LUN = (PDODeviceExtension->LUN & MAX_LUN); + Cmd.PageCode = pCDB->MODE_SENSE.PageCode; + Cmd.PC = pCDB->MODE_SENSE.Pc; + Cmd.AllocationLength = pCDB->MODE_SENSE.AllocationLength; + + // + // now send mode sense cmd + // + Status = USBSTOR_SendCBW(DeviceObject, UFI_CAPACITY_CMD_LEN, (PUCHAR)&Cmd, Request->DataTransferLength, &OutControl); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendCBW failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // now send data block response + // + Status = USBSTOR_SendData(DeviceObject, Request->DataTransferLength, Response); + if (!NT_SUCCESS(Status)) + { + // + // failed to send CBW + // + DPRINT1("USBSTOR_SendCapacityCmd> USBSTOR_SendData failed with %x\n", Status); + FreeItem(Response); + ASSERT(FALSE); + return Status; + } + + // + // send csw + // + Status = USBSTOR_SendCSW(DeviceObject, OutControl, 512, &CSW); + + DPRINT1("------------------------\n"); + DPRINT1("CSW %p\n", &CSW); + DPRINT1("Signature %x\n", CSW.Signature); + DPRINT1("Tag %x\n", CSW.Tag); + DPRINT1("DataResidue %x\n", CSW.DataResidue); + DPRINT1("Status %x\n", CSW.Status); + + // + // FIXME: handle error + // + ASSERT(CSW.Status == 0); + ASSERT(CSW.DataResidue == 0); + + // + // calculate transfer length + // + *TransferBufferLength = Request->DataTransferLength - CSW.DataResidue; + + // + // copy buffer + // + RtlCopyMemory(Request->DataBuffer, Response, *TransferBufferLength); + + // + // free item + // + FreeItem(OutControl); + + // + // free response + // + FreeItem(Response); + + // + // done + // + return Status; +} + Modified: branches/usb-bringup/drivers/usb/usbstor/usbstor.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/usb/usbstor… ============================================================================== --- branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] (original) +++ branches/usb-bringup/drivers/usb/usbstor/usbstor.h [iso-8859-1] Fri May 6 17:23:19 2011 @@ -149,6 +149,22 @@ ULONG BlockLength; // block length in bytes }UFI_CAPACITY_RESPONSE, *PUFI_CAPACITY_RESPONSE; +//-------------------------------------------------------------------------------------------------------------------------------------------- +// +// UFI sense mode cmd +// +typedef struct +{ + UCHAR Code; // operation code + UCHAR LUN; // lun address + UCHAR PageCode:6; // page code selector + UCHAR PC:2; // type of parameters to be returned + UCHAR Reserved[4]; // reserved 0x00 + USHORT AllocationLength; // parameters length + UCHAR Reserved1[3]; +}UFI_SENSE_CMD, *PUFI_SENSE_CMD; + +C_ASSERT(sizeof(UFI_CAPACITY_CMD) == 12); //--------------------------------------------------------------------- // @@ -248,6 +264,12 @@ OUT PREAD_CAPACITY_DATA_EX CapacityDataEx, OUT PREAD_CAPACITY_DATA CapacityData); +NTSTATUS +USBSTOR_SendModeSenseCmd( + IN PDEVICE_OBJECT DeviceObject, + IN OUT PSCSI_REQUEST_BLOCK Request, + OUT PULONG TransferBufferLength); + //--------------------------------------------------------------------- // // disk.c routines @@ -261,3 +283,5 @@ USBSTOR_HandleDeviceControl( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs