Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 51794: [GDI FONT DRIVER] - Get font revision and lowest ppem from 'head' true type table - use font revision to create the unique name
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 17:40:41 2011 New Revision: 51794 URL: http://svn.reactos.org/svn/reactos?rev=51794&view=rev Log: [GDI FONT DRIVER] - Get font revision and lowest ppem from 'head' true type table - use font revision to create the unique name Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/ftfd.h branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/glyph.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h 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] Mon May 16 17:40:41 2011 @@ -51,6 +51,7 @@ } } + /* Return the average glyph width */ return (FWORD)(ulAccumCharWidth / cGlyphs); } @@ -85,7 +86,7 @@ pifi->dpCharSets = FIELD_OFFSET(FTFD_IFIMETRICS, ajCharSet); pifi->dpFontSim = 0; - /* Charsets */ + /* Initialize charsets */ pifi->jWinCharSet = ANSI_CHARSET; pifiex->ajCharSet[0] = pifi->jWinCharSet; for (i = 1; i < 16; i++) @@ -118,7 +119,7 @@ /* Font resolution */ pifi->fwdUnitsPerEm = ftface->units_per_EM; - pifi->fwdLowestPPEm = 3; // FIXME + pifi->fwdLowestPPEm = 3; /* Font metrics */ pifi->fwdMacAscender = ftface->ascender; @@ -242,15 +243,13 @@ strnlen(ftface->family_name, MAX_PATH)); /* Create a unique name */ - wcscpy(pifiex->awcUniqueName, L"1.000;ABCD;"); + wcscpy(pifiex->awcUniqueName, L"1.000;????;"); wcsncat(pifiex->awcUniqueName, pifiex->awcFamilyName, LF_FACESIZE); - pifiex->awcUniqueName[0] = L'1'; // + version? - pifiex->awcUniqueName[2] = L'0'; // + version? - EngMultiByteToUnicodeN(pifiex->awcUniqueName + 6, - 4, - NULL, - pifi->achVendId, - 4); + pifiex->awcUniqueName[0] = L'0' + HIWORD(pface->ulFontRevision) % 10; + pifiex->awcUniqueName[2] = L'0' + (LOWORD(pface->ulFontRevision) / 100) % 10; + pifiex->awcUniqueName[3] = L'0' + (LOWORD(pface->ulFontRevision) / 10) % 10; + pifiex->awcUniqueName[4] = L'0' + LOWORD(pface->ulFontRevision) % 10; + EngMultiByteToUnicodeN(pifiex->awcUniqueName+6, 4, NULL, pifi->achVendId, 4); //__debugbreak(); return TRUE; @@ -279,7 +278,6 @@ WARN("EngAllocMem() failed.\n"); return NULL; } - /* Calculate FD_GLYPHSET size (incl. HGLYPH array!) */ cjSize = FIELD_OFFSET(FD_GLYPHSET, awcrun) @@ -437,6 +435,7 @@ wcCurrent = (WCHAR)FT_Get_Next_Char(ftface, wcCurrent, &index); } + /* Save the last character */ pface->ifiex.ifi.wcLastChar = wcPrev; /* Initialize IFIMETRICS */ 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] Mon May 16 17:40:41 2011 @@ -93,6 +93,7 @@ ULONG cGlyphs; ULONG cMappings; ULONG cRuns; + ULONG ulFontRevision; PWCHAR pwcReverseTable; FD_GLYPHSET *pGlyphSet; FD_KERNINGPAIR *pKerningPairs; 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] Mon May 16 17:40:41 2011 @@ -263,10 +263,8 @@ { PFTFD_FONT pfont = pfo->pvProducer; - if (!pfont) - { - pfont = FtfdCreateFontInstance(pfo); - } + /* Create a font instance if neccessary */ + if (!pfont) pfont = FtfdCreateFontInstance(pfo); /* Return the font instance */ return pfont; @@ -302,7 +300,7 @@ /* Accelerator flags (ignored atm) */ pfddm->flRealizedType = 0; - /* Fixed width advance */ + /* Set fixed width advance */ if (FT_IS_FIXED_WIDTH(ftface)) pfddm->lD = ftface->max_advance_width; else @@ -362,7 +360,7 @@ /* Check if the glyph needs to be updated */ if (pfont->hgSelected != hg) { - /* Load the glypg into the freetype face slot */ + /* Load the glyph into the freetype face slot */ fterror = FT_Load_Glyph(pfont->ftface, hg, 0); if (fterror) { @@ -406,7 +404,7 @@ } /* D is the glyph advance width */ - pgd->fxD = ftglyph->advance.x / 4; // should be projected on the x-axis + pgd->fxD = ftglyph->advance.x / 4; // FIXME: should be projected on the x-axis /* This is the box in which the bitmap fits */ pgd->rclInk.left = ftglyph->bitmap_left; @@ -418,7 +416,7 @@ pgd->fxInkBottom = (-pgd->rclInk.bottom) << 4; pgd->fxInkTop = pgd->rclInk.top << 4; - /* Make the bitmap at least 1x1 pixel */ + /* Make the bitmap at least 1x1 pixel large */ if (ftglyph->bitmap.width == 0) pgd->rclInk.right++; if (ftglyph->bitmap.rows == 0) pgd->rclInk.bottom++; @@ -668,7 +666,7 @@ FT_Error fterror; FT_Fixed advance; - TRACE("FtfdQueryAdvanceWidths\n"); + //TRACE("FtfdQueryAdvanceWidths\n"); // FIXME: layout horizontal/vertical fl = (iMode == QAW_GETEASYWIDTHS) ? FT_ADVANCE_FLAG_FAST_ONLY : 0; Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Mon May 16 17:40:41 2011 @@ -312,13 +312,26 @@ { PFTFD_FILE pfile = pface->pfile; PVOID pvView = pfile->pvView; - PTT_OS2_DATA pOs2; + PTT_TABLE_OS2 pOs2; + PTT_TABLE_HEAD pHead; + + /* Get the head table for the face */ + pHead = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, 'daeh', NULL); + if (!pHead) + { + WARN("Couldn't find 'head' table\n"); + return FALSE; + } + + /* Get lowest PPEm */ + pifi->fwdLowestPPEm = GETW(&pHead->lowestRecPPEM); + pface->ulFontRevision = GETD(&pHead->fontRevision); /* Get the OS/2 table for the face */ pOs2 = FtfdFindTrueTypeTable(pvView, pfile->cjView, pface->iFace, '2/SO', NULL); if (!pOs2) { - WARN("Couldn't find OS/2 table\n"); + WARN("Couldn't find 'OS/2' table\n"); return FALSE; } Modified: 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 [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.h [iso-8859-1] Mon May 16 17:40:41 2011 @@ -66,7 +66,7 @@ SHORT glyphDataFormat; } TT_TABLE_HEAD, *PTT_TABLE_HEAD; -typedef struct _TT_OS2_DATA +typedef struct _TT_TABLE_OS2 { USHORT version; // // 0x00 SHORT xAvgCharWidth; @@ -113,7 +113,7 @@ USHORT usDefaultChar; USHORT usBreakChar; USHORT usMaxContext; -} TT_OS2_DATA, *PTT_OS2_DATA; +} TT_TABLE_OS2, *PTT_TABLE_OS2; typedef struct _TT_KERNPAIR {

1 0

[gschneider] 51793: [bootvid] Adam Kachwalla: use the BOOTCHAR_HEIGHT macro for defining the font height See issue #6259 for more details.
by gschneider＠svn.reactos.org 16 May '11

16 May '11

Author: gschneider Date: Mon May 16 17:29:27 2011 New Revision: 51793 URL: http://svn.reactos.org/svn/reactos?rev=51793&view=rev Log: [bootvid] Adam Kachwalla: use the BOOTCHAR_HEIGHT macro for defining the font height See issue #6259 for more details. Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c Modified: trunk/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/i386/… ============================================================================== --- trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] (original) +++ trunk/reactos/drivers/base/bootvid/i386/vga.c [iso-8859-1] Mon May 16 17:29:27 2011 @@ -739,7 +739,7 @@ NTAPI VidDisplayString(PUCHAR String) { - ULONG TopDelta = 14; + ULONG TopDelta = BOOTCHAR_HEIGHT + 1; /* Start looping the string */ while (*String)

1 0

[akhaldi] 51792: [CMAKE] * Fix the typo, fix the build.
by akhaldi＠svn.reactos.org 16 May '11

16 May '11

Author: akhaldi Date: Mon May 16 16:32:34 2011 New Revision: 51792 URL: http://svn.reactos.org/svn/reactos?rev=51792&view=rev Log: [CMAKE] * Fix the typo, fix the build. Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=51792&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon May 16 16:32:34 2011 @@ -37,7 +37,7 @@ include(config-arm.cmake) endif() -add_definitions(-D__REACTOS__ __ROS_CMAKE__) +add_definitions(-D__REACTOS__ -D__ROS_CMAKE__) if(NOT CMAKE_CROSSCOMPILING)

1 0

[tkreuzer] 51791: [CMAKE] Fix build of rossym
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 16:11:31 2011 New Revision: 51791 URL: http://svn.reactos.org/svn/reactos?rev=51791&view=rev Log: [CMAKE] Fix build of rossym Modified: trunk/reactos/CMakeLists.txt trunk/reactos/include/reactos/rossym.h Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=51791&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Mon May 16 16:11:31 2011 @@ -37,7 +37,7 @@ include(config-arm.cmake) endif() -add_definitions(-D__REACTOS__) +add_definitions(-D__REACTOS__ __ROS_CMAKE__) if(NOT CMAKE_CROSSCOMPILING) Modified: trunk/reactos/include/reactos/rossym.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/rossym.h?r… ============================================================================== --- trunk/reactos/include/reactos/rossym.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/rossym.h [iso-8859-1] Mon May 16 16:11:31 2011 @@ -33,7 +33,17 @@ BOOLEAN (*SeekFileProc)(PVOID FileContext, ULONG_PTR Position); } ROSSYM_CALLBACKS, *PROSSYM_CALLBACKS; +#ifdef __ROS_CMAKE__ +typedef struct _ROSSYM_OWN_FILECONTEXT { + BOOLEAN (*ReadFileProc)(PVOID FileContext, PVOID Buffer, ULONG Size); + BOOLEAN (*SeekFileProc)(PVOID FileContext, ULONG_PTR Position); +} ROSSYM_OWN_FILECONTEXT, *PROSSYM_OWN_FILECONTEXT; + +struct Dwarf; +typedef struct Dwarf *PROSSYM_INFO; +#else typedef struct _ROSSYM_INFO *PROSSYM_INFO; +#endif VOID RosSymInit(PROSSYM_CALLBACKS Callbacks); VOID RosSymInitKernelMode(VOID);

1 0

[tkreuzer] 51790: revert r51786
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 15:47:44 2011 New Revision: 51790 URL: http://svn.reactos.org/svn/reactos?rev=51790&view=rev Log: revert r51786 Added: trunk/reactos/include/host/config.h - copied unchanged from r51785, trunk/reactos/include/host/config.h trunk/reactos/include/host/debug.h - copied unchanged from r51785, trunk/reactos/include/host/debug.h trunk/reactos/include/host/guiddef.h - copied unchanged from r51785, trunk/reactos/include/host/guiddef.h Removed: trunk/reactos/include/host/_config.h trunk/reactos/include/host/_debug.h trunk/reactos/include/host/_guiddef.h Removed: trunk/reactos/include/host/_config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/_config.h?rev… ============================================================================== --- trunk/reactos/include/host/_config.h [iso-8859-1] (original) +++ trunk/reactos/include/host/_config.h (removed) @@ -1,145 +1,0 @@ -/* include/config.h. Generated by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -#include "reactos/buildno.h" - -#define __WINE_CONFIG_H - -#define HAVE_SPAWNVP 1 - -/* Define to 1 if you have the <float.h> header file. */ -#define HAVE_FLOAT_H 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if the system has the type `long long'. */ -#define HAVE_LONG_LONG 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if the system has the type `mode_t'. */ -#define HAVE_MODE_T 1 - -/* Define to 1 if the system has the type `size_t'. */ -#define HAVE_SIZE_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if the system has the type `ssize_t'. */ -#define HAVE_SSIZE_T 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#if !defined(_WIN32) && !defined(_WIN64) -#define HAVE_STRCASECMP 1 -#endif - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strncasecmp' function. */ -#if !defined(_WIN32) && !defined(_WIN64) -#define HAVE_STRNCASECMP 1 -#endif - -/* Define to 1 if you have the <tiffio.h> header file. */ -#define HAVE_TIFFIO_H 1 - -/* Define to 1 if you have the <sys/param.h> header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/time.h> header file. */ -#ifndef _MSC_VER - #define HAVE_SYS_TIME_H 1 -#endif - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the timezone variable */ -#define HAVE_TIMEZONE 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#if !defined(_MSC_VER) -#define HAVE_UNISTD_H 1 -#endif - -/* Define to 1 if you have the <utime.h> header file. */ -#define HAVE_UTIME_H 1 - -/* Define if we have va_copy */ -#define HAVE_VA_COPY 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `_snprintf' function. */ -#define HAVE__SNPRINTF 1 - -/* Define to 1 if you have the `_stricmp' function. */ -#if defined(_WIN32) || defined(_WIN64) -#define HAVE__STRICMP 1 -#endif - -/* Define to 1 if you have the `_strnicmp' function. */ -#if defined(_WIN32) || defined(_WIN64) -#define HAVE__STRNICMP 1 -#endif - -/* Define to 1 if you have the `_vsnprintf' function. */ -#define HAVE__VSNPRINTF 1 - -/* Define if we have __va_copy */ -#define HAVE___VA_COPY 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "ros-dev(a)reactos.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "ReactOS" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "ReactOS" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION KERNEL_VERSION_STR - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -#define YYTEXT_POINTER 1 - -#if defined(_MSC_VER) -#define inline __inline -#endif Removed: trunk/reactos/include/host/_debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/_debug.h?rev=… ============================================================================== --- trunk/reactos/include/host/_debug.h [iso-8859-1] (original) +++ trunk/reactos/include/host/_debug.h (removed) @@ -1,6 +1,0 @@ -#ifndef __WINE_DEBUG_H -#define __WINE_DEBUG_H - -/* This file is intentionally left blank */ - -#endif /* __WINE_DEBUG_H */ Removed: trunk/reactos/include/host/_guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/_guiddef.h?re… ============================================================================== --- trunk/reactos/include/host/_guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/host/_guiddef.h (removed) @@ -1,1 +1,0 @@ -#include "../psdk/guiddef.h"

1 0

[tkreuzer] 51789: [GDI FONT DRIVER] eleminate gotos
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 15:37:23 2011 New Revision: 51789 URL: http://svn.reactos.org/svn/reactos?rev=51789&view=rev Log: [GDI FONT DRIVER] eleminate gotos Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/font.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] Mon May 16 15:37:23 2011 @@ -22,34 +22,35 @@ { /* Load the glyph into the glyph slot */ fterror = FT_Load_Char(ftface, wc, FT_LOAD_NO_SCALE|FT_LOAD_NO_BITMAP); - if (fterror) goto allglyphs; + if (fterror) break; /* Calculate accumulative char width */ ulAccumCharWidth += ftface->glyph->metrics.width; cGlyphs++; } - goto done; - -allglyphs: - TRACE("using all glyphs\n"); - - /* Start over */ - ulAccumCharWidth = 0; - cGlyphs = 0; - - /* Loop all glyphs in the font */ - for (index = 0; index <= (UINT)ftface->num_glyphs; index++) - { - /* Load the glyph into the glyph slot */ - fterror = FT_Load_Glyph(ftface, index, FT_LOAD_NO_SCALE|FT_LOAD_NO_BITMAP); - if (fterror) continue; - - /* Calculate accumulative char width */ - ulAccumCharWidth += ftface->glyph->metrics.width; // FIXME: weighted - cGlyphs++; - } - -done: + + /* Check if an error occured */ + if (wc <= L'z') + { + TRACE("using all glyphs\n"); + + /* Start over */ + ulAccumCharWidth = 0; + cGlyphs = 0; + + /* Loop all glyphs in the font */ + for (index = 0; index <= (UINT)ftface->num_glyphs; index++) + { + /* Load the glyph into the glyph slot */ + fterror = FT_Load_Glyph(ftface, index, FT_LOAD_NO_SCALE|FT_LOAD_NO_BITMAP); + if (fterror) continue; + + /* Calculate accumulative char width */ + ulAccumCharWidth += ftface->glyph->metrics.width; // FIXME: weighted + cGlyphs++; + } + } + return (FWORD)(ulAccumCharWidth / cGlyphs); }

1 0

[tkreuzer] 51788: [GDI FONT DRIVER] Remove obsolete function
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 15:28:46 2011 New Revision: 51788 URL: http://svn.reactos.org/svn/reactos?rev=51788&view=rev Log: [GDI FONT DRIVER] Remove obsolete function Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c Modified: branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/GdiFontDriver/drivers… ============================================================================== --- branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] (original) +++ branches/GSoC_2011/GdiFontDriver/drivers/video/font/ftfd/tttables.c [iso-8859-1] Mon May 16 15:28:46 2011 @@ -363,50 +363,6 @@ return TRUE; } -ULONG -NTAPI -FtfdGetNumberOfKerningPairs( - PFTFD_FACE pface) -{ - PFTFD_FILE pfile = pface->pfile; - PTT_KERNING_TABLE pKerning; - PTT_KERNING_SUBTABLE pSubTable; - ULONG i, nPairs = 0; - -__debugbreak(); - - /* Get the kern table for the face */ - pKerning = FtfdFindTrueTypeTable(pfile->pvView, - pfile->cjView, - pface->iFace, - 'nrek', - NULL); - if (!pKerning) - { - WARN("Couldn't find kerning table\n"); - return 0; - } - - if (pKerning->usVersion != 0) - { - WARN("Found unknown version %lx\n", pKerning->usVersion); - return 0; - } - - /* Start with the first subtable */ - pSubTable = &pKerning->subtable; - - /* Loop all subtables */ - for (i = 0; i < pKerning->nTables; i++) - { - nPairs += GETW(&pSubTable->format0.nPairs); - pSubTable = (PVOID)((PCHAR)pSubTable + pSubTable->usLength); - } - - TRACE("Got %ld kerning pairs\n", nPairs); - return nPairs; -} - INT __cdecl CompareKernPair(

1 0

[tkreuzer] 51787: 2nd try to fix build
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 15:20:44 2011 New Revision: 51787 URL: http://svn.reactos.org/svn/reactos?rev=51787&view=rev Log: 2nd try to fix build Added: trunk/reactos/include/reactos/wine/_alloca.h - copied unchanged from r51783, trunk/reactos/include/reactos/wine/alloca.h trunk/reactos/include/reactos/wine/_math.h - copied unchanged from r51783, trunk/reactos/include/reactos/wine/math.h Removed: trunk/reactos/include/reactos/wine/alloca.h trunk/reactos/include/reactos/wine/math.h Removed: trunk/reactos/include/reactos/wine/alloca.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/alloc… ============================================================================== --- trunk/reactos/include/reactos/wine/alloca.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/alloca.h (removed) @@ -1,2 +1,0 @@ - -#include <malloc.h> Removed: trunk/reactos/include/reactos/wine/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/math.… ============================================================================== --- trunk/reactos/include/reactos/wine/math.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/math.h (removed) @@ -1,26 +1,0 @@ -#ifndef __WINE_MATH_H_ -#define __WINE_MATH_H_ - -#include <crt/math.h> - -#ifdef _MSC_VER -__forceinline float _NaN() -{ - unsigned long NaN = 0x7fc00000; - return *(float*)&NaN; -} -#define NAN _NaN() - -__forceinline float _Infinity() -{ - unsigned long Infinity = 0x7f800000; - return *(float*)&Infinity; -} -#define INFINITY _Infinity() - -#else -#define NAN (0.0f / 0.0f) -#define INFINITY (1.0F/0.0F) -#endif - -#endif /* __WINE_MATH_H_ */

1 0

[tkreuzer] 51786: try to fix build
by tkreuzer＠svn.reactos.org 16 May '11

16 May '11

Author: tkreuzer Date: Mon May 16 15:18:55 2011 New Revision: 51786 URL: http://svn.reactos.org/svn/reactos?rev=51786&view=rev Log: try to fix build Added: trunk/reactos/include/host/_config.h - copied unchanged from r51783, trunk/reactos/include/host/config.h trunk/reactos/include/host/_debug.h - copied unchanged from r51783, trunk/reactos/include/host/debug.h trunk/reactos/include/host/_guiddef.h - copied unchanged from r51783, trunk/reactos/include/host/guiddef.h Removed: trunk/reactos/include/host/config.h trunk/reactos/include/host/debug.h trunk/reactos/include/host/guiddef.h Removed: trunk/reactos/include/host/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/config.h?rev=… ============================================================================== --- trunk/reactos/include/host/config.h [iso-8859-1] (original) +++ trunk/reactos/include/host/config.h (removed) @@ -1,145 +1,0 @@ -/* include/config.h. Generated by configure. */ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -#include "reactos/buildno.h" - -#define __WINE_CONFIG_H - -#define HAVE_SPAWNVP 1 - -/* Define to 1 if you have the <float.h> header file. */ -#define HAVE_FLOAT_H 1 - -/* Define to 1 if you have the `getpagesize' function. */ -#define HAVE_GETPAGESIZE 1 - -/* Define to 1 if you have the <inttypes.h> header file. */ -#define HAVE_INTTYPES_H 1 - -/* Define to 1 if the system has the type `long long'. */ -#define HAVE_LONG_LONG 1 - -/* Define to 1 if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#define HAVE_MEMORY_H 1 - -/* Define to 1 if the system has the type `mode_t'. */ -#define HAVE_MODE_T 1 - -/* Define to 1 if the system has the type `size_t'. */ -#define HAVE_SIZE_T 1 - -/* Define to 1 if you have the `snprintf' function. */ -#define HAVE_SNPRINTF 1 - -/* Define to 1 if the system has the type `ssize_t'. */ -#define HAVE_SSIZE_T 1 - -/* Define to 1 if you have the <stdint.h> header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the <stdlib.h> header file. */ -#define HAVE_STDLIB_H 1 - -/* Define to 1 if you have the `strcasecmp' function. */ -#if !defined(_WIN32) && !defined(_WIN64) -#define HAVE_STRCASECMP 1 -#endif - -/* Define to 1 if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define to 1 if you have the <strings.h> header file. */ -#define HAVE_STRINGS_H 1 - -/* Define to 1 if you have the <string.h> header file. */ -#define HAVE_STRING_H 1 - -/* Define to 1 if you have the `strncasecmp' function. */ -#if !defined(_WIN32) && !defined(_WIN64) -#define HAVE_STRNCASECMP 1 -#endif - -/* Define to 1 if you have the <tiffio.h> header file. */ -#define HAVE_TIFFIO_H 1 - -/* Define to 1 if you have the <sys/param.h> header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/time.h> header file. */ -#ifndef _MSC_VER - #define HAVE_SYS_TIME_H 1 -#endif - -/* Define to 1 if you have the <sys/types.h> header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have the timezone variable */ -#define HAVE_TIMEZONE 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#if !defined(_MSC_VER) -#define HAVE_UNISTD_H 1 -#endif - -/* Define to 1 if you have the <utime.h> header file. */ -#define HAVE_UTIME_H 1 - -/* Define if we have va_copy */ -#define HAVE_VA_COPY 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -#define HAVE_VSNPRINTF 1 - -/* Define to 1 if you have the `_snprintf' function. */ -#define HAVE__SNPRINTF 1 - -/* Define to 1 if you have the `_stricmp' function. */ -#if defined(_WIN32) || defined(_WIN64) -#define HAVE__STRICMP 1 -#endif - -/* Define to 1 if you have the `_strnicmp' function. */ -#if defined(_WIN32) || defined(_WIN64) -#define HAVE__STRNICMP 1 -#endif - -/* Define to 1 if you have the `_vsnprintf' function. */ -#define HAVE__VSNPRINTF 1 - -/* Define if we have __va_copy */ -#define HAVE___VA_COPY 1 - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "ros-dev(a)reactos.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "ReactOS" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "ReactOS" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION KERNEL_VERSION_STR - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING PACKAGE_NAME " " PACKAGE_VERSION - -/* Define to 1 if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Define to 1 if the X Window System is missing or not being used. */ -#define X_DISPLAY_MISSING 1 - -/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a - `char[]'. */ -#define YYTEXT_POINTER 1 - -#if defined(_MSC_VER) -#define inline __inline -#endif Removed: trunk/reactos/include/host/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/debug.h?rev=5… ============================================================================== --- trunk/reactos/include/host/debug.h [iso-8859-1] (original) +++ trunk/reactos/include/host/debug.h (removed) @@ -1,6 +1,0 @@ -#ifndef __WINE_DEBUG_H -#define __WINE_DEBUG_H - -/* This file is intentionally left blank */ - -#endif /* __WINE_DEBUG_H */ Removed: trunk/reactos/include/host/guiddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/guiddef.h?rev… ============================================================================== --- trunk/reactos/include/host/guiddef.h [iso-8859-1] (original) +++ trunk/reactos/include/host/guiddef.h (removed) @@ -1,1 +1,0 @@ -#include "../psdk/guiddef.h"

1 0

[akhaldi] 51785: * Fix rbuild build.
by akhaldi＠svn.reactos.org 16 May '11

16 May '11

Author: akhaldi Date: Mon May 16 13:56:22 2011 New Revision: 51785 URL: http://svn.reactos.org/svn/reactos?rev=51785&view=rev Log: * Fix rbuild build. Modified: trunk/reactos/include/crt/math.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=517… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Mon May 16 13:56:22 2011 @@ -6,7 +6,7 @@ #ifndef _INC_MATH #define _INC_MATH -#include <crtdefs.h> +#include "crtdefs.h" struct exception;

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