Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 58377: [GDIPLUS_WINETEST] CORE-6969 Adding a check to skip a test after failure instead of continuing with uninitialized memory. "Fixes" a crash when compiled with GCC 4.7.2
by tkreuzer＠svn.reactos.org 28 Feb '13

28 Feb '13

Author: tkreuzer Date: Thu Feb 28 09:38:08 2013 New Revision: 58377 URL: http://svn.reactos.org/svn/reactos?rev=58377&view=rev Log: [GDIPLUS_WINETEST] CORE-6969 Adding a check to skip a test after failure instead of continuing with uninitialized memory. "Fixes" a crash when compiled with GCC 4.7.2 Modified: trunk/rostests/winetests/gdiplus/image.c Modified: trunk/rostests/winetests/gdiplus/image.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdiplus/image.c… ============================================================================== --- trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdiplus/image.c [iso-8859-1] Thu Feb 28 09:38:08 2013 @@ -1473,6 +1473,7 @@ stat = GdipCreateMetafileFromWmf(hwmf, TRUE, (WmfPlaceableFileHeader*)wmfimage, (GpMetafile**)&img); expect(Ok, stat); + if (stat != Ok) return; // ReactOS stat = GdipGetImageBounds(img, &bounds, &unit); expect(Ok, stat);

1 0

[gadamopoulos] 58376: [win32k] - Do not set the current thread desktop automatically the first time CreateDesktop is called. The caller is supposed to call SetThreadDesktop to specify which desktop...
by gadamopoulos＠svn.reactos.org 27 Feb '13

27 Feb '13

Author: gadamopoulos Date: Wed Feb 27 17:18:21 2013 New Revision: 58376 URL: http://svn.reactos.org/svn/reactos?rev=58376&view=rev Log: [win32k] - Do not set the current thread desktop automatically the first time CreateDesktop is called. The caller is supposed to call SetThreadDesktop to specify which desktop should be used Modified: trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Wed Feb 27 17:18:21 2013 @@ -1294,8 +1294,6 @@ RETURN(NULL); } - if (!ptiCurrent->rpdesk) IntSetThreadDesktop(hdesk,FALSE); - /* Get the desktop window class. The thread desktop does not belong to any desktop * so the classes created there (including the desktop class) are allocated in the shared heap * It would cause problems if we used a class that belongs to the caller

1 0

[jgardou] 58375: [USP10] - sync to WINE-1.5.24 This gets wordpad performance to a bearable state when gdebug output is on
by jgardou＠svn.reactos.org 27 Feb '13

27 Feb '13

Author: jgardou Date: Wed Feb 27 14:11:44 2013 New Revision: 58375 URL: http://svn.reactos.org/svn/reactos?rev=58375&view=rev Log: [USP10] - sync to WINE-1.5.24 This gets wordpad performance to a bearable state when gdebug output is on Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indic.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/dll/win32/usp10/usp10_internal.h trunk/reactos/dll/win32/usp10/usp10_ros.diff trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -41,16 +41,16 @@ * has been modified. */ -#include <config.h> - -//#include <stdarg.h> -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -//#include "winnls.h" -#include <usp10.h> -#include <wine/unicode.h> -#include <wine/debug.h> +#include "config.h" + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winnls.h" +#include "usp10.h" +#include "wine/unicode.h" +#include "wine/debug.h" #include "usp10_internal.h" @@ -872,11 +872,13 @@ reverse(pIndexs, ich); } - if (newlevel > 1) + if (newlevel >= 0) { ich = 0; for (; ich < cch; ich++) - if (plevel[ich] > level) + if (plevel[ich] < level) + break; + else if (plevel[ich] > level) ich += BIDI_ReorderL2vLevel(level + 1, pIndexs + ich, plevel + ich, cch - ich, fReverse) - 1; } Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <config.h> +#include "config.h" #include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wingdi.h> -//#include "winnls.h" -#include <usp10.h> -//#include "winternl.h" - -#include <wine/debug.h> +#include <stdio.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "winnls.h" +#include "usp10.h" +#include "winternl.h" + +#include "wine/debug.h" #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -132,7 +132,7 @@ case b_NL: case b_BK: if (i < count-1) else_break(&break_before[i+1],b_r); - else_break(&break_before[i],b_x); + else_break(&break_before[i],b_x); break; /* LB7 */ case b_SP: Modified: trunk/reactos/dll/win32/usp10/indic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indic.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/indic.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indic.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -18,20 +18,20 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * */ -#include <config.h> +#include "config.h" #include <stdarg.h> -//#include <stdio.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -//#include "winuser.h" -#include <wingdi.h> -//#include "winnls.h" -#include <usp10.h> -//#include "winternl.h" - -#include <wine/debug.h> +#include <stdio.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "winnls.h" +#include "usp10.h" +#include "winternl.h" + +#include "wine/debug.h" #include "usp10_internal.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… ============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -3,7 +3,7 @@ /* and from http://www.unicode.org/Public/6.0.0/ucd/IndicMatraCategory.txt */ /* DO NOT EDIT!! */ -//#include "wine/unicode.h" +#include "wine/unicode.h" const unsigned short indic_syllabic_table[2624] = { Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… ============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/6.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -//#include "wine/unicode.h" +#include "wine/unicode.h" const unsigned short wine_linebreak_table[6800] = { Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/6.0.0/ucd/BidiMirroring.txt */ /* DO NOT EDIT!! */ -#include <wine/unicode.h> +#include "wine/unicode.h" const WCHAR wine_mirror_map[3292] = { Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -21,17 +21,17 @@ #include <stdarg.h> #include <stdlib.h> -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -#include <usp10.h> -#include <winternl.h> +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "usp10.h" +#include "winternl.h" #include "usp10_internal.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -76,8 +76,6 @@ } CMAP_SegmentedCoverage; /* These are all structures needed for the GDEF table */ -#define GDEF_TAG MS_MAKE_TAG('G', 'D', 'E', 'F') - enum {BaseGlyph=1, LigatureGlyph, MarkGlyph, ComponentGlyph}; typedef struct { @@ -93,19 +91,19 @@ WORD StartGlyph; WORD GlyphCount; WORD ClassValueArray[1]; -} GDEF_ClassDefFormat1; +} OT_ClassDefFormat1; typedef struct { WORD Start; WORD End; WORD Class; -} GDEF_ClassRangeRecord; +} OT_ClassRangeRecord; typedef struct { WORD ClassFormat; WORD ClassRangeCount; - GDEF_ClassRangeRecord ClassRangeRecord[1]; -} GDEF_ClassDefFormat2; + OT_ClassRangeRecord ClassRangeRecord[1]; +} OT_ClassDefFormat2; /* These are all structures needed for the GSUB table */ @@ -352,6 +350,18 @@ } GPOS_PairPosFormat1; typedef struct { + WORD PosFormat; + WORD Coverage; + WORD ValueFormat1; + WORD ValueFormat2; + WORD ClassDef1; + WORD ClassDef2; + WORD Class1Count; + WORD Class2Count; + WORD Class1Record[1]; +} GPOS_PairPosFormat2; + +typedef struct { WORD SecondGlyph; WORD Value1[1]; WORD Value2[1]; @@ -361,6 +371,18 @@ WORD PairValueCount; GPOS_PairValueRecord PairValueRecord[1]; } GPOS_PairSet; + +typedef struct { + WORD EntryAnchor; + WORD ExitAnchor; +} GPOS_EntryExitRecord; + +typedef struct { + WORD PosFormat; + WORD Coverage; + WORD EntryExitCount; + GPOS_EntryExitRecord EntryExitRecord[1]; +} GPOS_CursivePosFormat1; typedef struct { WORD PosFormat; @@ -392,6 +414,29 @@ typedef struct { WORD PosFormat; + WORD MarkCoverage; + WORD LigatureCoverage; + WORD ClassCount; + WORD MarkArray; + WORD LigatureArray; +} GPOS_MarkLigPosFormat1; + +typedef struct { + WORD LigatureCount; + WORD LigatureAttach[1]; +} GPOS_LigatureArray; + +typedef struct { + WORD LigatureAnchor[1]; +} GPOS_ComponentRecord; + +typedef struct { + WORD ComponentCount; + GPOS_ComponentRecord ComponentRecord[1]; +} GPOS_LigatureAttach; + +typedef struct { + WORD PosFormat; WORD Mark1Coverage; WORD Mark2Coverage; WORD ClassCount; @@ -525,20 +570,13 @@ * GDEF **********/ -static WORD GDEF_get_glyph_class(const GDEF_Header *header, WORD glyph) -{ - int offset; +static WORD OT_get_glyph_class(const void *table, WORD glyph) +{ WORD class = 0; - const GDEF_ClassDefFormat1 *cf1; - - if (!header) - return 0; - - offset = GET_BE_WORD(header->GlyphClassDef); - if (!offset) - return 0; - - cf1 = (GDEF_ClassDefFormat1*)(((BYTE*)header)+offset); + const OT_ClassDefFormat1 *cf1 = table; + + if (!table) return 0; + if (GET_BE_WORD(cf1->ClassFormat) == 1) { if (glyph >= GET_BE_WORD(cf1->StartGlyph)) @@ -550,7 +588,7 @@ } else if (GET_BE_WORD(cf1->ClassFormat) == 2) { - const GDEF_ClassDefFormat2 *cf2 = (GDEF_ClassDefFormat2*)cf1; + const OT_ClassDefFormat2 *cf2 = table; int i, top; top = GET_BE_WORD(cf2->ClassRangeCount); for (i = 0; i < top; i++) @@ -569,25 +607,18 @@ return class; } -static VOID *load_gdef_table(HDC hdc) -{ - VOID* GDEF_Table = NULL; - int length = GetFontData(hdc, GDEF_TAG , 0, NULL, 0); - if (length != GDI_ERROR) - { - GDEF_Table = HeapAlloc(GetProcessHeap(),0,length); - GetFontData(hdc, GDEF_TAG , 0, GDEF_Table, length); - TRACE("Loaded GDEF table of %i bytes\n",length); - } - return GDEF_Table; -} - -void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) +void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) { int i; - - if (!psc->GDEF_Table) - psc->GDEF_Table = load_gdef_table(hdc); + void *glyph_class_table = NULL; + + if (psc->GDEF_Table) + { + const GDEF_Header *header = psc->GDEF_Table; + WORD offset = GET_BE_WORD( header->GlyphClassDef ); + if (offset) + glyph_class_table = (BYTE *)psc->GDEF_Table + offset; + } for (i = 0; i < cGlyphs; i++) { @@ -602,7 +633,7 @@ char_count++; } - class = GDEF_get_glyph_class(psc->GDEF_Table, pwGlyphs[i]); + class = OT_get_glyph_class( glyph_class_table, pwGlyphs[i] ); switch (class) { @@ -1023,7 +1054,8 @@ /********** * GPOS **********/ -static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset); +static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, + const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset); static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD ppem) { @@ -1110,14 +1142,14 @@ static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) { INT offset = 0; - if (ValueFormat & 0x0001) record->XPlacement = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0002) record->YPlacement = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0004) record->XAdvance = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0008) record->YAdvance = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0010) record->XPlaDevice = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0020) record->YPlaDevice = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0040) record->XAdvDevice = GET_BE_WORD(data[offset++]); - if (ValueFormat & 0x0080) record->YAdvDevice = GET_BE_WORD(data[offset++]); + if (ValueFormat & 0x0001) { if (data) record->XPlacement = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0002) { if (data) record->YPlacement = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0004) { if (data) record->XAdvance = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0008) { if (data) record->YAdvance = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0010) { if (data) record->XPlaDevice = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0020) { if (data) record->YPlaDevice = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0040) { if (data) record->XAdvDevice = GET_BE_WORD(data[offset]); offset++; } + if (ValueFormat & 0x0080) { if (data) record->YAdvDevice = GET_BE_WORD(data[offset]); offset++; } return offset; } @@ -1134,7 +1166,8 @@ if (ValueFormat & 0xFF00) FIXME("Unhandled Value Format %x\n",ValueFormat&0xFF00); } -static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) +static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { int j; @@ -1184,9 +1217,37 @@ } } -static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) +static void apply_pair_value( const void *pos_table, WORD val_fmt1, WORD val_fmt2, const WORD *pair, + INT ppem, POINT *adjust, POINT *advance ) +{ + GPOS_ValueRecord val_rec1 = {0,0,0,0,0,0,0,0}; + GPOS_ValueRecord val_rec2 = {0,0,0,0,0,0,0,0}; + INT size; + + size = GPOS_get_value_record( val_fmt1, pair, &val_rec1 ); + GPOS_get_value_record( val_fmt2, pair + size, &val_rec2 ); + + if (val_fmt1) + { + GPOS_get_value_record_offsets( pos_table, &val_rec1, val_fmt1, ppem, adjust, advance ); + TRACE( "Glyph 1 resulting cumulative offset is %i,%i design units\n", adjust[0].x, adjust[0].y ); + TRACE( "Glyph 1 resulting cumulative advance is %i,%i design units\n", advance[0].x, advance[0].y ); + } + if (val_fmt2) + { + GPOS_get_value_record_offsets( pos_table, &val_rec2, val_fmt2, ppem, adjust + 1, advance + 1 ); + TRACE( "Glyph 2 resulting cumulative offset is %i,%i design units\n", adjust[1].x, adjust[1].y ); + TRACE( "Glyph 2 resulting cumulative advance is %i,%i design units\n", advance[1].x, advance[1].y ); + } +} + +static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, LPPOINT ptAdjust, LPPOINT ptAdvance) { int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return glyph_index + 1; TRACE("Pair Adjustment Positioning Subtable\n"); @@ -1198,6 +1259,10 @@ if (GET_BE_WORD(ppf1->PosFormat) == 1) { int index; + WORD ValueFormat1 = GET_BE_WORD(ppf1->ValueFormat1); + WORD ValueFormat2 = GET_BE_WORD(ppf1->ValueFormat2); + INT val_fmt1_size = GPOS_get_value_record( ValueFormat1, NULL, NULL ); + INT val_fmt2_size = GPOS_get_value_record( ValueFormat2, NULL, NULL ); offset = GET_BE_WORD(ppf1->Coverage); index = GSUB_is_glyph_covered((const BYTE*)ppf1+offset, glyphs[glyph_index]); if (index != -1 && index < GET_BE_WORD(ppf1->PairSetCount)) @@ -1205,40 +1270,54 @@ int k; int pair_count; const GPOS_PairSet *ps; + const GPOS_PairValueRecord *pair_val_rec; offset = GET_BE_WORD(ppf1->PairSetOffset[index]); ps = (const GPOS_PairSet*)((const BYTE*)ppf1+offset); pair_count = GET_BE_WORD(ps->PairValueCount); + pair_val_rec = ps->PairValueRecord; for (k = 0; k < pair_count; k++) { - WORD second_glyph = GET_BE_WORD(ps->PairValueRecord[k].SecondGlyph); + WORD second_glyph = GET_BE_WORD(pair_val_rec->SecondGlyph); if (glyphs[glyph_index+write_dir] == second_glyph) { int next = 1; - GPOS_ValueRecord ValueRecord1 = {0,0,0,0,0,0,0,0}; - GPOS_ValueRecord ValueRecord2 = {0,0,0,0,0,0,0,0}; - WORD ValueFormat1 = GET_BE_WORD(ppf1->ValueFormat1); - WORD ValueFormat2 = GET_BE_WORD(ppf1->ValueFormat2); - TRACE("Format 1: Found Pair %x,%x\n",glyphs[glyph_index],glyphs[glyph_index+write_dir]); - - offset = GPOS_get_value_record(ValueFormat1, ps->PairValueRecord[k].Value1, &ValueRecord1); - GPOS_get_value_record(ValueFormat2, (WORD*)((const BYTE*)(ps->PairValueRecord[k].Value2)+offset), &ValueRecord2); - if (ValueFormat1) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord1, ValueFormat1, ppem, &ptAdjust[0], &ptAdvance[0]); - TRACE("Glyph 1 resulting cumulative offset is %i,%i design units\n",ptAdjust[0].x,ptAdjust[0].y); - TRACE("Glyph 1 resulting cumulative advance is %i,%i design units\n",ptAdvance[0].x,ptAdvance[0].y); - } - if (ValueFormat2) - { - GPOS_get_value_record_offsets((const BYTE*)ppf1, &ValueRecord2, ValueFormat2, ppem, &ptAdjust[1], &ptAdvance[1]); - TRACE("Glyph 2 resulting cumulative offset is %i,%i design units\n",ptAdjust[1].x,ptAdjust[1].y); - TRACE("Glyph 2 resulting cumulative advance is %i,%i design units\n",ptAdvance[1].x,ptAdvance[1].y); - next++; - } - if (next) - return glyph_index + next; + apply_pair_value( ppf1, ValueFormat1, ValueFormat2, pair_val_rec->Value1, ppem, ptAdjust, ptAdvance ); + if (ValueFormat2) next++; + return glyph_index + next; } + pair_val_rec = (const GPOS_PairValueRecord *)(pair_val_rec->Value1 + val_fmt1_size + val_fmt2_size); + } + } + } + else if (GET_BE_WORD(ppf1->PosFormat) == 2) + { + const GPOS_PairPosFormat2 *ppf2 = (const GPOS_PairPosFormat2*)((const BYTE*)look + offset); + int index; + WORD ValueFormat1 = GET_BE_WORD( ppf2->ValueFormat1 ); + WORD ValueFormat2 = GET_BE_WORD( ppf2->ValueFormat2 ); + INT val_fmt1_size = GPOS_get_value_record( ValueFormat1, NULL, NULL ); + INT val_fmt2_size = GPOS_get_value_record( ValueFormat2, NULL, NULL ); + WORD class1_count = GET_BE_WORD( ppf2->Class1Count ); + WORD class2_count = GET_BE_WORD( ppf2->Class2Count ); + + offset = GET_BE_WORD( ppf2->Coverage ); + index = GSUB_is_glyph_covered( (const BYTE*)ppf2 + offset, glyphs[glyph_index] ); + if (index != -1) + { + WORD class1, class2; + class1 = OT_get_glyph_class( (const BYTE *)ppf2 + GET_BE_WORD(ppf2->ClassDef1), glyphs[glyph_index] ); + class2 = OT_get_glyph_class( (const BYTE *)ppf2 + GET_BE_WORD(ppf2->ClassDef2), glyphs[glyph_index + write_dir] ); + if (class1 < class1_count && class2 < class2_count) + { + const WORD *pair_val = ppf2->Class1Record + (class1 * class2_count + class2) * (val_fmt1_size + val_fmt2_size); + int next = 1; + + TRACE( "Format 2: Found Pair %x,%x\n", glyphs[glyph_index], glyphs[glyph_index + write_dir] ); + + apply_pair_value( ppf2, ValueFormat1, ValueFormat2, pair_val, ppem, ptAdjust, ptAdvance ); + if (ValueFormat2) next++; + return glyph_index + next; } } } @@ -1248,9 +1327,63 @@ return glyph_index+1; } -static VOID GPOS_apply_MarkToBase(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT pt) +static VOID GPOS_apply_CursiveAttachment(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, LPPOINT pt) { int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return; + + TRACE("Cursive Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GPOS_CursivePosFormat1 *cpf1; + WORD offset = GET_BE_WORD(look->SubTable[j]); + cpf1 = (const GPOS_CursivePosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(cpf1->PosFormat) == 1) + { + int index_exit, index_entry; + offset = GET_BE_WORD( cpf1->Coverage ); + index_exit = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index]); + if (index_exit != -1 && cpf1->EntryExitRecord[index_exit].ExitAnchor!= 0) + { + index_entry = GSUB_is_glyph_covered((const BYTE*)cpf1+offset, glyphs[glyph_index+write_dir]); + if (index_entry != -1 && cpf1->EntryExitRecord[index_entry].EntryAnchor != 0) + { + POINT exit_pt, entry_pt; + offset = GET_BE_WORD(cpf1->EntryExitRecord[index_exit].ExitAnchor); + GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &exit_pt, ppem); + offset = GET_BE_WORD(cpf1->EntryExitRecord[index_entry].EntryAnchor); + GPOS_get_anchor_values((const BYTE*)cpf1 + offset, &entry_pt, ppem); + TRACE("Found linkage %x[%i,%i] %x[%i,%i]\n",glyphs[glyph_index], exit_pt.x,exit_pt.y, glyphs[glyph_index+write_dir], entry_pt.x, entry_pt.y); + pt->x = entry_pt.x - exit_pt.x; + pt->y = entry_pt.y - exit_pt.y; + return; + } + } + } + else + FIXME("Cursive Attachment Positioning: Format %i Unhandled\n",GET_BE_WORD(cpf1->PosFormat)); + } + return; +} + +static int GPOS_apply_MarkToBase(ScriptCache *psc, const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, INT glyph_count, INT ppem, LPPOINT pt) +{ + int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + void *glyph_class_table = NULL; + int rc = -1; + + if (psc->GDEF_Table) + { + const GDEF_Header *header = psc->GDEF_Table; + WORD offset = GET_BE_WORD( header->GlyphClassDef ); + if (offset) + glyph_class_table = (BYTE *)psc->GDEF_Table + offset; + } TRACE("MarkToBase Attachment Positioning Subtable\n"); @@ -1268,8 +1401,16 @@ if (mark_index != -1) { int base_index; + int base_glyph = glyph_index - write_dir; + + if (glyph_class_table) + { + while (OT_get_glyph_class(glyph_class_table, glyphs[base_glyph]) == MarkGlyph && base_glyph > 0 && base_glyph < glyph_count) + base_glyph -= write_dir; + } + offset = GET_BE_WORD(mbpf1->BaseCoverage); - base_index = GSUB_is_glyph_covered((const BYTE*)mbpf1+offset, glyphs[glyph_index - write_dir]); + base_index = GSUB_is_glyph_covered((const BYTE*)mbpf1+offset, glyphs[base_glyph]); if (base_index != -1) { const GPOS_MarkArray *ma; @@ -1281,13 +1422,13 @@ int baserecord_size; POINT base_pt; POINT mark_pt; - TRACE("Mark %x(%i) and base %x(%i)\n",glyphs[glyph_index], mark_index, glyphs[glyph_index - write_dir], base_index); + TRACE("Mark %x(%i) and base %x(%i)\n",glyphs[glyph_index], mark_index, glyphs[base_glyph], base_index); offset = GET_BE_WORD(mbpf1->MarkArray); ma = (const GPOS_MarkArray*)((const BYTE*)mbpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { ERR("Mark index exeeded mark count\n"); - return; + return -1; } mr = &ma->MarkRecord[mark_index]; mark_class = GET_BE_WORD(mr->Class); @@ -1305,17 +1446,115 @@ pt->x += base_pt.x - mark_pt.x; pt->y += base_pt.y - mark_pt.y; TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + rc = base_glyph; } } } else FIXME("Unhandled Mark To Base Format %i\n",GET_BE_WORD(mbpf1->PosFormat)); } -} - -static VOID GPOS_apply_MarkToMark(const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, LPPOINT pt) + return rc; +} + +static VOID GPOS_apply_MarkToLigature(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, LPPOINT pt) { int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + TRACE("MarkToLigature Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_MarkLigPosFormat1 *mlpf1; + offset = GET_BE_WORD(look->SubTable[j]); + mlpf1 = (const GPOS_MarkLigPosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(mlpf1->PosFormat) == 1) + { + int offset = GET_BE_WORD(mlpf1->MarkCoverage); + int mark_index; + mark_index = GSUB_is_glyph_covered((const BYTE*)mlpf1+offset, glyphs[glyph_index]); + if (mark_index != -1) + { + int ligature_index; + offset = GET_BE_WORD(mlpf1->LigatureCoverage); + ligature_index = GSUB_is_glyph_covered((const BYTE*)mlpf1+offset, glyphs[glyph_index - write_dir]); + if (ligature_index != -1) + { + const GPOS_MarkArray *ma; + const GPOS_MarkRecord *mr; + + const GPOS_LigatureArray *la; + const GPOS_LigatureAttach *lt; + int mark_class; + int class_count = GET_BE_WORD(mlpf1->ClassCount); + int component_count; + int component_size; + int i; + POINT ligature_pt; + POINT mark_pt; + + TRACE("Mark %x(%i) and ligature %x(%i)\n",glyphs[glyph_index], mark_index, glyphs[glyph_index - write_dir], ligature_index); + offset = GET_BE_WORD(mlpf1->MarkArray); + ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); + if (mark_index > GET_BE_WORD(ma->MarkCount)) + { + ERR("Mark index exeeded mark count\n"); + return; + } + mr = &ma->MarkRecord[mark_index]; + mark_class = GET_BE_WORD(mr->Class); + TRACE("Mark Class %i total classes %i\n",mark_class,class_count); + offset = GET_BE_WORD(mlpf1->LigatureArray); + la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); + if (ligature_index > GET_BE_WORD(la->LigatureCount)) + { + ERR("Ligature index exeeded ligature count\n"); + return; + } + offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); + lt = (const GPOS_LigatureAttach*)((const BYTE*)la + offset); + + component_count = GET_BE_WORD(lt->ComponentCount); + component_size = class_count * sizeof(WORD); + offset = 0; + for (i = 0; i < component_count && !offset; i++) + { + int k; + const GPOS_ComponentRecord *cr = (const GPOS_ComponentRecord*)((const BYTE*)lt->ComponentRecord + (component_size * i)); + for (k = 0; k < class_count && !offset; k++) + offset = GET_BE_WORD(cr->LigatureAnchor[k]); + cr = (const GPOS_ComponentRecord*)((const BYTE*)cr + component_size); + } + if (!offset) + { + ERR("Failed to find avalible ligature connection point\n"); + return; + } + + GPOS_get_anchor_values((const BYTE*)lt + offset, &ligature_pt, ppem); + offset = GET_BE_WORD(mr->MarkAnchor); + GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); + TRACE("Offset on ligature is %i,%i design units\n",ligature_pt.x,ligature_pt.y); + TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + pt->x += ligature_pt.x - mark_pt.x; + pt->y += ligature_pt.y - mark_pt.y; + TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + } + } + } + else + FIXME("Unhandled Mark To Ligature Format %i\n",GET_BE_WORD(mlpf1->PosFormat)); + } +} + +static BOOL GPOS_apply_MarkToMark(const OT_LookupTable *look, const SCRIPT_ANALYSIS *analysis, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, LPPOINT pt) +{ + int j; + BOOL rc = FALSE; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; TRACE("MarkToMark Attachment Positioning Subtable\n"); @@ -1352,7 +1591,7 @@ if (mark_index > GET_BE_WORD(ma->MarkCount)) { ERR("Mark index exeeded mark count\n"); - return; + return FALSE; } mr = &ma->MarkRecord[mark_index]; mark_class = GET_BE_WORD(mr->Class); @@ -1370,17 +1609,22 @@ pt->x += mark2_pt.x - mark_pt.x; pt->y += mark2_pt.y - mark_pt.y; TRACE("Resulting cumulative offset is %i,%i design units\n",pt->x,pt->y); + rc = TRUE; } } } else FIXME("Unhandled Mark To Mark Format %i\n",GET_BE_WORD(mmpf1->PosFormat)); } -} - -static INT GPOS_apply_ChainContextPos(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, INT ppem, GOFFSET *pGoffset) + return rc; +} + +static INT GPOS_apply_ChainContextPos(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, + const OT_LookupList *lookup, const OT_LookupTable *look, const WORD *glyphs, INT glyph_index, + INT glyph_count, INT ppem, GOFFSET *pGoffset) { int j; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; TRACE("Chaining Contextual Positioning Subtable\n"); @@ -1462,7 +1706,7 @@ int SequenceIndex = GET_BE_WORD(ccpf3_4->PosLookupRecord[k].SequenceIndex) * write_dir; TRACE("Position: %i -> %i %i\n",k, SequenceIndex, lookupIndex); - GPOS_apply_lookup(lpotm, lplogfont, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, write_dir, glyph_count, pGoffset); + GPOS_apply_lookup(psc, lpotm, lplogfont, analysis, piAdvance, lookup, lookupIndex, glyphs, glyph_index + SequenceIndex, glyph_count, pGoffset); } return glyph_index + indexGlyphs + GET_BE_WORD(ccpf3_3->LookaheadGlyphCount); } @@ -1474,7 +1718,7 @@ return glyph_index + 1; } -static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset) +static INT GPOS_apply_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, const OT_LookupList* lookup, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset) { int offset; const OT_LookupTable *look; @@ -1490,7 +1734,7 @@ double devX, devY; POINT adjust = {0,0}; POINT advance = {0,0}; - GPOS_apply_SingleAdjustment(look, glyphs, glyph_index, write_dir, glyph_count, ppem, &adjust, &advance); + GPOS_apply_SingleAdjustment(look, analysis, glyphs, glyph_index, glyph_count, ppem, &adjust, &advance); if (adjust.x || adjust.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust.x, adjust.y, &devX, &devY); @@ -1512,11 +1756,14 @@ POINT adjust[2]= {{0,0},{0,0}}; double devX, devY; int index; - index = GPOS_apply_PairAdjustment(look, glyphs, glyph_index, write_dir, glyph_count, ppem, adjust, advance); + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + int offset_sign = (analysis->fRTL && analysis->fLogicalOrder) ? -1 : 1; + + index = GPOS_apply_PairAdjustment(look, analysis, glyphs, glyph_index, glyph_count, ppem, adjust, advance); if (adjust[0].x || adjust[0].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[0].x, adjust[0].y, &devX, &devY); - pGoffset[glyph_index].du += round(devX); + pGoffset[glyph_index].du += round(devX) * offset_sign; pGoffset[glyph_index].dv += round(devY); } if (advance[0].x || advance[0].y) @@ -1527,7 +1774,7 @@ if (adjust[1].x || adjust[1].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[1].x, adjust[1].y, &devX, &devY); - pGoffset[glyph_index + write_dir].du += round(devX); + pGoffset[glyph_index + write_dir].du += round(devX) * offset_sign; pGoffset[glyph_index + write_dir].dv += round(devY); } if (advance[1].x || advance[1].y) @@ -1537,35 +1784,69 @@ } return index; } + case 3: + { + POINT desU = {0,0}; + double devX, devY; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + + GPOS_apply_CursiveAttachment(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); + if (desU.x || desU.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + /* Windows does not appear to apply X offsets here */ + pGoffset[glyph_index].dv = round(devY) + pGoffset[glyph_index+write_dir].dv; + } + break; + } case 4: { double devX, devY; POINT desU = {0,0}; - GPOS_apply_MarkToBase(look, glyphs, glyph_index, write_dir, glyph_count, ppem, &desU); - if (desU.x || desU.y) + int base_index = GPOS_apply_MarkToBase(psc, look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); + if (base_index != -1) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); - pGoffset[glyph_index].dv += round(devY); + if (!analysis->fRTL) pGoffset[glyph_index].du = round(devX) - piAdvance[base_index]; + else + { + if (analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du = round(devX); + } + pGoffset[glyph_index].dv = round(devY); } break; } - case 6: + case 5: { double devX, devY; POINT desU = {0,0}; - GPOS_apply_MarkToMark(look, glyphs, glyph_index, write_dir, glyph_count, ppem, &desU); + GPOS_apply_MarkToLigature(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index-1].du; - pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index-1].dv; + pGoffset[glyph_index].du = (round(devX) - piAdvance[glyph_index-1]); + pGoffset[glyph_index].dv = round(devY); } break; } + case 6: + { + double devX, devY; + POINT desU = {0,0}; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + if (GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU)) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du = round(devX) + pGoffset[glyph_index - write_dir].du; + pGoffset[glyph_index].dv = round(devY) + pGoffset[glyph_index - write_dir].dv; + } + break; + } case 8: { - return GPOS_apply_ChainContextPos(lpotm, lplogfont, piAdvance, lookup, look, glyphs, glyph_index, write_dir, glyph_count, ppem, pGoffset); + return GPOS_apply_ChainContextPos(psc, lpotm, lplogfont, analysis, piAdvance, lookup, look, glyphs, glyph_index, glyph_count, ppem, pGoffset); } default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); @@ -1573,12 +1854,12 @@ return glyph_index+1; } -INT OpenType_apply_GPOS_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, LPCVOID table, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset) -{ - const GPOS_Header *header = (const GPOS_Header *)table; +INT OpenType_apply_GPOS_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset) +{ + const GPOS_Header *header = (const GPOS_Header *)psc->GPOS_Table; const OT_LookupList *lookup = (const OT_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); - return GPOS_apply_lookup(lpotm, lplogfont, piAdvance, lookup, lookup_index, glyphs, glyph_index, write_dir, glyph_count, pGoffset); + return GPOS_apply_lookup(psc, lpotm, lplogfont, analysis, piAdvance, lookup, lookup_index, glyphs, glyph_index, glyph_count, pGoffset); } static void GSUB_initialize_script_cache(ScriptCache *psc) @@ -1617,6 +1898,9 @@ script = (const OT_ScriptList*)((const BYTE*)header + GET_BE_WORD(header->ScriptList)); count = GET_BE_WORD(script->ScriptCount); + if (!count) + return; + if (!psc->script_count) { psc->script_count = count; @@ -1660,10 +1944,11 @@ static void _initialize_script_cache(ScriptCache *psc) { - if (!psc->script_count) + if (!psc->scripts_initialized) { GSUB_initialize_script_cache(psc); GPOS_expand_script_cache(psc); + psc->scripts_initialized = TRUE; } } @@ -1748,6 +2033,10 @@ count = GET_BE_WORD(table->LangSysCount); TRACE("Deflang %p, LangCount %i\n",script->default_language.gpos_table, count); + + if (!count) + return; + if (!script->language_count) { int i; @@ -1791,10 +2080,11 @@ static void _initialize_language_cache(LoadedScript *script) { - if (!script->language_count) + if (!script->languages_initialized) { GSUB_initialize_language_cache(script); GPOS_expand_language_cache(script); + script->languages_initialized = TRUE; } } @@ -1893,6 +2183,7 @@ language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); for (j = 0; j < language->features[i].lookup_count; j++) language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + language->features[i].tableType = FEATURE_GSUB_TABLE; } } } @@ -1912,6 +2203,10 @@ feature_list = (const OT_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); TRACE("%i features\n",count); + + if (!count) + return; + if (!language->feature_count) { language->feature_count = count; @@ -1933,10 +2228,11 @@ language->features[i].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[i].lookup_count); for (j = 0; j < language->features[i].lookup_count; j++) language->features[i].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); - } - } - } - else if (count) + language->features[i].tableType = FEATURE_GPOS_TABLE; + } + } + } + else { language->features = HeapReAlloc(GetProcessHeap(),0,language->features, sizeof(LoadedFeature)*(language->feature_count + count)); @@ -1954,6 +2250,7 @@ language->features[idx].lookups = HeapAlloc(GetProcessHeap(),0,sizeof(WORD) * language->features[idx].lookup_count); for (j = 0; j < language->features[idx].lookup_count; j++) language->features[idx].lookups[j] = GET_BE_WORD(feature->LookupListIndex[j]); + language->features[idx].tableType = FEATURE_GPOS_TABLE; } language->feature_count += count; } @@ -1961,14 +2258,15 @@ static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language) { - if (!language->feature_count) + if (!language->features_initialized) { GSUB_initialize_feature_cache(psc->GSUB_Table, language); GPOS_expand_feature_cache(psc->GPOS_Table, language); - } -} - -HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) + language->features_initialized = TRUE; + } +} + +HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) { int i; HRESULT rc = S_OK; @@ -2019,7 +2317,15 @@ _initialize_feature_cache(psc, language); - *pcTags = language->feature_count; + if (tableType) + { + *pcTags = 0; + for (i = 0; i < language->feature_count; i++) + if (language->features[i].tableType == tableType) + *pcTags = (*pcTags)+1; + } + else + *pcTags = language->feature_count; if (!searchingFor && cMaxTags < *pcTags) rc = E_OUTOFMEMORY; @@ -2029,11 +2335,15 @@ for (i = 0; i < language->feature_count; i++) { if (i < cMaxTags) - pFeatureTags[i] = language->features[i].tag; + { + if (!tableType || language->features[i].tableType == tableType) + pFeatureTags[i] = language->features[i].tag; + } if (searchingFor) { - if (searchingFor == language->features[i].tag) + if ((searchingFor == language->features[i].tag) && + (!tableType || language->features[i].tableType == tableType)) { pFeatureTags[0] = language->features[i].tag; *pcTags = 1; Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -19,19 +19,19 @@ * */ #include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -#include <winbase.h> -#include <wingdi.h> -//#include "winuser.h" -//#include "winnls.h" -#include <usp10.h> -//#include "winternl.h" +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "usp10.h" +#include "winternl.h" #include "usp10_internal.h" -#include <wine/debug.h> +#include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -41,6 +41,7 @@ typedef VOID (*ContextualShapingProc)(HDC, ScriptCache*, SCRIPT_ANALYSIS*, WCHAR*, INT, WORD*, INT*, INT, WORD*); +static void ContextualShape_Control(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Arabic(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Hebrew(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); static void ContextualShape_Syriac(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust); @@ -63,7 +64,9 @@ typedef VOID (*ShapeCharGlyphPropProc)( HDC , ScriptCache*, SCRIPT_ANALYSIS*, const WCHAR*, const INT, const WORD*, const INT, WORD*, SCRIPT_CHARPROP*, SCRIPT_GLYPHPROP*); -static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp); +static void ShapeCharGlyphProp_Default( ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp); +static void ShapeCharGlyphProp_Control( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); +static void ShapeCharGlyphProp_Latin( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Hebrew( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Thai( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); @@ -142,6 +145,8 @@ static OPENTYPE_FEATURE_RECORD latin_features[] = { + { MS_MAKE_TAG('l','o','c','l'), 1}, + { MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('l','i','g','a'), 1}, { MS_MAKE_TAG('c','l','i','g'), 1}, }; @@ -182,6 +187,7 @@ static OPENTYPE_FEATURE_RECORD hebrew_features[] = { + { MS_MAKE_TAG('c','c','m','p'), 1}, { MS_MAKE_TAG('d','l','i','g'), 0}, }; @@ -450,14 +456,14 @@ static const ScriptShapeData ShapingData[] = { {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, - {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, + {{ standard_features, 2}, {NULL, 0}, NULL, 0, ContextualShape_Control, ShapeCharGlyphProp_Control}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, - {{ hebrew_features, 1}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, + {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, ShapeCharGlyphProp_Hebrew}, {{ syriac_features, 4}, {syriac_gpos_features, 3}, required_syriac_features, 0, ContextualShape_Syriac, ShapeCharGlyphProp_None}, {{ arabic_features, 6}, {arabic_gpos_features, 4}, required_arabic_features, 0, ContextualShape_Arabic, ShapeCharGlyphProp_Arabic}, {{ NULL, 0}, {NULL, 0}, NULL, 0, ContextualShape_Thaana, ShapeCharGlyphProp_None}, @@ -494,7 +500,7 @@ {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, ShapeCharGlyphProp_Malayalam}, {{ devanagari_features, 6}, {devanagari_gpos_features, 4}, required_telugu_features, MS_MAKE_TAG('m','l','m','2'), ContextualShape_Malayalam, NULL}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ standard_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ myanmar_features, 2}, {NULL, 0}, NULL, 0, NULL, NULL}, @@ -528,8 +534,8 @@ {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, {{ NULL, 0}, {NULL, 0}, NULL, 0, NULL, NULL}, - {{ hebrew_features, 1}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, - {{ latin_features, 2}, {latin_gpos_features, 3}, NULL, 0, NULL, NULL}, + {{ hebrew_features, 2}, {hebrew_gpos_features, 2}, NULL, 0, ContextualShape_Hebrew, NULL}, + {{ latin_features, 4}, {latin_gpos_features, 3}, NULL, 0, NULL, ShapeCharGlyphProp_Latin}, {{ thai_features, 1}, {thai_gpos_features, 3}, NULL, 0, ContextualShape_Thai, ShapeCharGlyphProp_Thai}, }; @@ -602,7 +608,7 @@ } } -static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const char* feat) +static LoadedFeature* load_OT_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, char tableType, const char* feat) { LoadedFeature *feature = NULL; @@ -611,7 +617,7 @@ int attempt = 2; OPENTYPE_TAG tags; OPENTYPE_TAG language; - OPENTYPE_TAG script; + OPENTYPE_TAG script = 0x00000000; int cTags; do @@ -623,13 +629,13 @@ language = MS_MAKE_TAG('d','f','l','t'); attempt--; - OpenType_GetFontFeatureTags(psc, script, language, FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature); + OpenType_GetFontFeatureTags(psc, script, language, FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); } while(attempt && !feature); /* try in the default (latin) table */ - if (!feature) - OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), 1, &tags, &cTags, &feature); + if (!feature && !script) + OpenType_GetFontFeatureTags(psc, MS_MAKE_TAG('l','a','t','n'), MS_MAKE_TAG('d','f','l','t'), FALSE, MS_MAKE_TAG(feat[0],feat[1],feat[2],feat[3]), tableType, 1, &tags, &cTags, &feature); } TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature); @@ -640,7 +646,7 @@ { LoadedFeature *feature; - feature = load_OT_feature(hdc, psa, psc, feat); + feature = load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, feat); if (!feature) return GSUB_E_NOFEATURE; @@ -672,6 +678,19 @@ TRACE("Loaded GPOS table of %i bytes\n",length); } return GPOS_Table; +} + +static VOID *load_gdef_table(HDC hdc) +{ + VOID* GDEF_Table = NULL; + int length = GetFontData(hdc, MS_MAKE_TAG('G', 'D', 'E', 'F'), 0, NULL, 0); + if (length != GDI_ERROR) + { + GDEF_Table = HeapAlloc(GetProcessHeap(),0,length); + GetFontData(hdc, MS_MAKE_TAG('G', 'D', 'E', 'F'), 0, GDEF_Table, length); + TRACE("Loaded GDEF table of %i bytes\n",length); + } + return GDEF_Table; } static VOID load_ot_tables(HDC hdc, ScriptCache *psc) @@ -680,6 +699,8 @@ psc->GSUB_Table = load_gsub_table(hdc); if (!psc->GPOS_Table) psc->GPOS_Table = load_gpos_table(hdc); + if (!psc->GDEF_Table) + psc->GDEF_Table = load_gdef_table(hdc); } INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) @@ -825,7 +846,7 @@ LoadedFeature *feature; int lookup_index; - feature = load_OT_feature(hdc, psa, psc, feat); + feature = load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, feat); if (!feature) return GSUB_E_NOFEATURE; @@ -859,7 +880,7 @@ return GSUB_E_NOFEATURE; } -static VOID GPOS_apply_feature(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, LPCVOID header, LoadedFeature *feature, const WORD *glyphs, INT write_dir, INT glyph_count, GOFFSET *pGoffset) +static VOID GPOS_apply_feature(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, LoadedFeature *feature, const WORD *glyphs, INT glyph_count, GOFFSET *pGoffset) { int i; @@ -868,7 +889,7 @@ { int j; for (j = 0; j < glyph_count; ) - j = OpenType_apply_GPOS_lookup(lpotm, lplogfont, piAdvance, header, feature->lookups[i], glyphs, j, write_dir, glyph_count, pGoffset); + j = OpenType_apply_GPOS_lookup(psc, lpotm, lplogfont, analysis, piAdvance, feature->lookups[i], glyphs, j, glyph_count, pGoffset); } } @@ -920,6 +941,23 @@ } HeapFree(GetProcessHeap(),0,context_type); +} + +static void ContextualShape_Control(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) +{ + int i; + for (i=0; i < cChars; i++) + { + switch (pwcChars[i]) + { + case 0x000D: pwOutGlyphs[i] = psc->sfp.wgBlank; break; + default: + if (pwcChars[i] < 0x1C) + pwOutGlyphs[i] = psc->sfp.wgDefault; + else + pwOutGlyphs[i] = psc->sfp.wgBlank; + } + } } static WCHAR neighbour_char(int i, int delta, const WCHAR* chars, INT cchLen) @@ -2020,17 +2058,17 @@ { int c; int overall_shift = 0; - LoadedFeature *locl = (modern)?load_OT_feature(hdc, psa, psc, "locl"):NULL; - LoadedFeature *nukt = load_OT_feature(hdc, psa, psc, "nukt"); - LoadedFeature *akhn = load_OT_feature(hdc, psa, psc, "akhn"); - LoadedFeature *rkrf = (modern)?load_OT_feature(hdc, psa, psc, "rkrf"):NULL; - LoadedFeature *pstf = load_OT_feature(hdc, psa, psc, "pstf"); - LoadedFeature *vatu = (!rkrf)?load_OT_feature(hdc, psa, psc, "vatu"):NULL; - LoadedFeature *cjct = (modern)?load_OT_feature(hdc, psa, psc, "cjct"):NULL; - BOOL rphf = (load_OT_feature(hdc, psa, psc, "rphf") != NULL); - BOOL pref = (load_OT_feature(hdc, psa, psc, "pref") != NULL); - BOOL blwf = (load_OT_feature(hdc, psa, psc, "blwf") != NULL); - BOOL half = (load_OT_feature(hdc, psa, psc, "half") != NULL); + LoadedFeature *locl = (modern)?load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "locl"):NULL; + LoadedFeature *nukt = load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "nukt"); + LoadedFeature *akhn = load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "akhn"); + LoadedFeature *rkrf = (modern)?load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "rkrf"):NULL; + LoadedFeature *pstf = load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "pstf"); + LoadedFeature *vatu = (!rkrf)?load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "vatu"):NULL; + LoadedFeature *cjct = (modern)?load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "cjct"):NULL; + BOOL rphf = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "rphf") != NULL); + BOOL pref = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "pref") != NULL); + BOOL blwf = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "blwf") != NULL); + BOOL half = (load_OT_feature(hdc, psa, psc, FEATURE_GSUB_TABLE, "half") != NULL); IndicSyllable glyph_indexs; for (c = 0; c < syllable_count; c++) @@ -2739,8 +2777,6 @@ else dirL = 1; - load_ot_tables(hdc, psc); - if (!psc->GSUB_Table) return; @@ -2783,7 +2819,7 @@ HeapFree(GetProcessHeap(),0,context_shape); } -static void ShapeCharGlyphProp_Default( HDC hdc, ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp) +static void ShapeCharGlyphProp_Default( ScriptCache* psc, SCRIPT_ANALYSIS* psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD* pwLogClust, SCRIPT_CHARPROP* pCharProp, SCRIPT_GLYPHPROP* pGlyphProp) { int i,k; @@ -2811,8 +2847,35 @@ pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_CHARACTER; } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); +} + +static void ShapeCharGlyphProp_Latin( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) +{ + int i; + + ShapeCharGlyphProp_Default( psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp); + + for (i = 0; i < cGlyphs; i++) + if (pGlyphProp[i].sva.fZeroWidth) + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; +} + +static void ShapeCharGlyphProp_Control( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) +{ + int i; + for (i = 0; i < cGlyphs; i++) + { + pGlyphProp[i].sva.fClusterStart = 1; + pGlyphProp[i].sva.fDiacritic = 0; + pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_BLANK; + + if (pwGlyphs[i] == psc->sfp.wgDefault) + pGlyphProp[i].sva.fZeroWidth = 0; + else + pGlyphProp[i].sva.fZeroWidth = 1; + } } static void ShapeCharGlyphProp_Arabic( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ) @@ -2920,7 +2983,7 @@ pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); HeapFree(GetProcessHeap(),0,spaces); } @@ -2951,7 +3014,7 @@ } } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -2972,7 +3035,7 @@ dirL = 1; } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); for (i = 0; i < cGlyphs; i++) { @@ -3040,7 +3103,7 @@ else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); } @@ -3071,7 +3134,7 @@ else pGlyphProp[i].sva.uJustification = SCRIPT_JUSTIFY_NONE; } - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); UpdateClustersFromGlyphProp(cGlyphs, cChars, pwLogClust, pGlyphProp); /* Tibeten script does not set sva.fDiacritic or sva.fZeroWidth */ @@ -3089,7 +3152,7 @@ { int i,k; - OpenType_GDEF_UpdateGlyphProps(hdc, psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); + OpenType_GDEF_UpdateGlyphProps(psc, pwGlyphs, cGlyphs, pwLogClust, cChars, pGlyphProp); for (i = 0; i < cGlyphs; i++) { int char_index[20]; @@ -3233,10 +3296,12 @@ void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) { + load_ot_tables(hdc, psc); + if (ShapingData[psa->eScript].charGlyphPropProc) ShapingData[psa->eScript].charGlyphPropProc(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp); else - ShapeCharGlyphProp_Default(hdc, psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp); + ShapeCharGlyphProp_Default(psc, psa, pwcChars, cChars, pwGlyphs, cGlyphs, pwLogClust, pCharProp, pGlyphProp); } void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) @@ -3284,7 +3349,6 @@ { const TEXTRANGE_PROPERTIES *rpRangeProperties; int i; - INT dirL; rpRangeProperties = &ShapingData[psa->eScript].defaultGPOSTextRange; @@ -3296,22 +3360,17 @@ if (!psc->GPOS_Table || !psc->otm) return; - if (!psa->fLogicalOrder && psa->fRTL) - dirL = -1; - else - dirL = 1; - for (i = 0; i < rpRangeProperties->cotfRecords; i++) { if (rpRangeProperties->potfRecords[i].lParameter > 0) { LoadedFeature *feature; - feature = load_OT_feature(hdc, psa, psc, (const char*)&rpRangeProperties->potfRecords[i].tagFeature); + feature = load_OT_feature(hdc, psa, psc, FEATURE_GPOS_TABLE, (const char*)&rpRangeProperties->potfRecords[i].tagFeature); if (!feature) continue; - GPOS_apply_feature(psc->otm, &psc->lf, piAdvance, psc->GPOS_Table, feature, pwGlyphs, dirL, cGlyphs, pGoffset); + GPOS_apply_feature(psc, psc->otm, &psc->lf, psa, piAdvance, feature, pwGlyphs, cGlyphs, pGoffset); } } } @@ -3330,7 +3389,7 @@ i = 0; while (ShapingData[psa->eScript].requiredFeatures[i]) { - feature = load_OT_feature(hdc, psa, psc, ShapingData[psa->eScript].requiredFeatures[i]); + feature = load_OT_feature(hdc, psa, psc, FEATURE_ALL_TABLES, ShapingData[psa->eScript].requiredFeatures[i]); if (feature) return S_OK; i++; @@ -3401,7 +3460,7 @@ filter = TRUE; } - hr = OpenType_GetFontFeatureTags(psc, tagScript, tagLangSys, filter, 0x00000000, cMaxTags, pFeatureTags, pcTags, NULL); + hr = OpenType_GetFontFeatureTags(psc, tagScript, tagLangSys, filter, 0x00000000, FEATURE_ALL_TABLES, cMaxTags, pFeatureTags, pcTags, NULL); if (FAILED(hr)) *pcTags = 0; Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/6.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -//#include "wine/unicode.h" +#include "wine/unicode.h" const unsigned short wine_shaping_table[2656] = { Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -25,20 +25,20 @@ */ #include <stdarg.h> -//#include <stdlib.h> - -#include <windef.h> -//#include "winbase.h" -#include <wingdi.h> -#include <winuser.h> -//#include "winnls.h" -#include <winreg.h> -#include <usp10.h> +#include <stdlib.h> + +#include "windef.h" +#include "winbase.h" +#include "wingdi.h" +#include "winuser.h" +#include "winnls.h" +#include "winreg.h" +#include "usp10.h" #include "usp10_internal.h" -#include <wine/debug.h> -#include <wine/unicode.h> +#include "wine/debug.h" +#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); @@ -513,7 +513,7 @@ {0x53, 0, 1, 1, 1, DEFAULT_CHARSET, 0, 0, 0, 0, 1, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}}, - {{Script_Khmer, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, + {{Script_Khmer_Numeric, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {0x53, 1, 1, 0, 0, DEFAULT_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, MS_MAKE_TAG('k','h','m','r'), {'D','a','u','n','P','e','n','h'}}, @@ -999,23 +999,6 @@ } /*********************************************************************** - * DllMain - * - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** * ScriptFreeCache (USP10.@) * * Free a script cache. @@ -1060,6 +1043,9 @@ heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features[k].lookups); heap_free(((ScriptCache *)*psc)->scripts[i].languages[j].features); } + for (j = 0; j < ((ScriptCache *)*psc)->scripts[i].default_language.feature_count; j++) + heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features[j].lookups); + heap_free(((ScriptCache *)*psc)->scripts[i].default_language.features); heap_free(((ScriptCache *)*psc)->scripts[i].languages); } heap_free(((ScriptCache *)*psc)->scripts); @@ -1270,28 +1256,11 @@ }; } -/*********************************************************************** - * ScriptItemizeOpenType (USP10.@) - * - * Split a Unicode string into shapeable parts. - * - * PARAMS - * pwcInChars [I] String to split. - * cInChars [I] Number of characters in pwcInChars. - * cMaxItems [I] Maximum number of items to return. - * psControl [I] Pointer to a SCRIPT_CONTROL structure. - * psState [I] Pointer to a SCRIPT_STATE structure. - * pItems [O] Buffer to receive SCRIPT_ITEM structures. - * pScriptTags [O] Buffer to receive OPENTYPE_TAGs. - * pcItems [O] Number of script items returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, OPENTYPE_TAG *pScriptTags, int *pcItems) + +static HRESULT _ItemizeInternal(const WCHAR *pwcInChars, int cInChars, + int cMaxItems, const SCRIPT_CONTROL *psControl, + const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, + OPENTYPE_TAG *pScriptTags, int *pcItems) { #define Numeric_space 0x0020 @@ -1346,8 +1315,36 @@ forceLevels = TRUE; /* Diacritical marks merge with other scripts */ - if (scripts[i] == Script_Diacritical && i > 0) - scripts[i] = scripts[i-1]; + if (scripts[i] == Script_Diacritical) + { + if (i > 0) + { + if (pScriptTags) + scripts[i] = scripts[i-1]; + else + { + int j; + BOOL asian = FALSE; + WORD first_script = scripts[i-1]; + for (j = i-1; j >= 0 && scripts[j] == first_script && pwcInChars[j] != Numeric_space; j--) + { + WORD original = scripts[j]; + if (original == Script_Ideograph || original == Script_Kana || original == Script_Yi || original == Script_CJK_Han || original == Script_Bopomofo) + { + asian = TRUE; + break; + } + if (original != Script_MathAlpha && scriptInformation[scripts[j]].props.fComplex) + break; + scripts[j] = scripts[i]; + if (original == Script_Punctuation2) + break; + } + if (scriptInformation[scripts[j]].props.fComplex || asian) + scripts[i] = scripts[j]; + } + } + } } for (i = 0; i < cInChars; i++) @@ -1496,7 +1493,8 @@ pItems[index].iCharPos = 0; pItems[index].a = scriptInformation[scripts[cnt]].a; - pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; + if (pScriptTags) + pScriptTags[index] = scriptInformation[scripts[cnt]].scriptTag; if (strength && strength[cnt] == BIDI_STRONG) str = strength[cnt]; @@ -1590,7 +1588,8 @@ memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); pItems[index].a = scriptInformation[New_Script].a; - pScriptTags[index] = scriptInformation[New_Script].scriptTag; + if (pScriptTags) + pScriptTags[index] = scriptInformation[New_Script].scriptTag; if (levels) { if (levels[cnt] == 0) @@ -1633,6 +1632,32 @@ } /*********************************************************************** + * ScriptItemizeOpenType (USP10.@) + * + * Split a Unicode string into shapeable parts. + * + * PARAMS + * pwcInChars [I] String to split. + * cInChars [I] Number of characters in pwcInChars. + * cMaxItems [I] Maximum number of items to return. + * psControl [I] Pointer to a SCRIPT_CONTROL structure. + * psState [I] Pointer to a SCRIPT_STATE structure. + * pItems [O] Buffer to receive SCRIPT_ITEM structures. + * pScriptTags [O] Buffer to receive OPENTYPE_TAGs. + * pcItems [O] Number of script items returned. + * + * RETURNS + * Success: S_OK + * Failure: Non-zero HRESULT value. + */ +HRESULT WINAPI ScriptItemizeOpenType(const WCHAR *pwcInChars, int cInChars, int cMaxItems, + const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, + SCRIPT_ITEM *pItems, OPENTYPE_TAG *pScriptTags, int *pcItems) +{ + return _ItemizeInternal(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, pScriptTags, pcItems); +} + +/*********************************************************************** * ScriptItemize (USP10.@) * * Split a Unicode string into shapeable parts. @@ -1654,15 +1679,7 @@ const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, SCRIPT_ITEM *pItems, int *pcItems) { - OPENTYPE_TAG *discarded_tags; - HRESULT res; - - discarded_tags = heap_alloc(cMaxItems * sizeof(OPENTYPE_TAG)); - if (!discarded_tags) - return E_OUTOFMEMORY; - res = ScriptItemizeOpenType(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, discarded_tags, pcItems); - heap_free(discarded_tags); - return res; + return _ItemizeInternal(pwcInChars, cInChars, cMaxItems, psControl, psState, pItems, NULL, pcItems); } static inline int getGivenTabWidth(ScriptCache *psc, SCRIPT_TABDEF *pTabdef, int charPos, int current_x) @@ -1847,7 +1864,7 @@ hr = ScriptItemize(pString, cString, num_items, &sControl, &sState, analysis->pItem, &analysis->numItems); - if FAILED(hr) + if (FAILED(hr)) { if (hr == E_OUTOFMEMORY) hr = E_INVALIDARG; @@ -1935,7 +1952,7 @@ if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && analysis->pItem[i].a.eScript == Script_Hangul) analysis->pItem[i].a.fNoGlyphIndex = TRUE; - if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex) + if ((dwFlags & SSA_LINK) && !analysis->glyphs[i].fallbackFont && !scriptInformation[analysis->pItem[i].a.eScript].props.fComplex && !analysis->pItem[i].a.fRTL) analysis->pItem[i].a.fNoGlyphIndex = TRUE; hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], @@ -3237,8 +3254,9 @@ const int *piJustify, const GOFFSET *pGoffset) { HRESULT hr = S_OK; - INT i; + INT i, dir = 1; INT *lpDx; + WORD *reordered_glyphs = (WORD *)pwGlyphs; TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, @@ -3253,67 +3271,50 @@ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); - - if (pGoffset) - { + if (!lpDx) return E_OUTOFMEMORY; + fuOptions |= ETO_PDY; + + if (psa->fRTL && psa->fLogicalOrder) + { + reordered_glyphs = heap_alloc( cGlyphs * sizeof(WORD) ); + if (!reordered_glyphs) + { + heap_free( lpDx ); + return E_OUTOFMEMORY; + } + for (i = 0; i < cGlyphs; i++) - if (!(fuOptions&ETO_PDY) && pGoffset[i].dv) - fuOptions |= ETO_PDY; - } + reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i]; + dir = -1; + } + for (i = 0; i < cGlyphs; i++) { - int idx = i; - if (fuOptions&ETO_PDY) - { - idx *=2; - lpDx[idx+1] = 0; - } - lpDx[idx] = piAdvance[i]; - } - if (pGoffset) - { - for (i = 1; i < cGlyphs; i++) - { - int idx = i; - int prev_idx = i-1; - if (fuOptions&ETO_PDY) + int orig_index = (dir > 0) ? i : cGlyphs - 1 - i; + lpDx[i * 2] = piAdvance[orig_index]; + lpDx[i * 2 + 1] = 0; + + if (pGoffset) + { + if (i == 0) { - idx*=2; - prev_idx = idx-2; + x += pGoffset[orig_index].du * dir; + y += pGoffset[orig_index].dv; } - lpDx[prev_idx] += pGoffset[i].du; - lpDx[idx] -= pGoffset[i].du; - if (fuOptions&ETO_PDY) + else { - lpDx[prev_idx+1] += pGoffset[i].dv; - lpDx[idx+1] -= pGoffset[i].dv; + lpDx[(i - 1) * 2] += pGoffset[orig_index].du * dir; + lpDx[(i - 1) * 2 + 1] += pGoffset[orig_index].dv; } - } - } - - if (psa->fRTL && psa->fLogicalOrder) - { - int i; - WORD *rtlGlyphs; - - rtlGlyphs = heap_alloc(cGlyphs * sizeof(WORD)); - if (!rtlGlyphs) - { - heap_free(lpDx); - return E_OUTOFMEMORY; - } - - for (i = 0; i < cGlyphs; i++) - rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; - - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, lpDx)) - hr = S_FALSE; - heap_free(rtlGlyphs); - } - else - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, lpDx)) - hr = S_FALSE; - + lpDx[i * 2] -= pGoffset[orig_index].du * dir; + lpDx[i * 2 + 1] -= pGoffset[orig_index].dv; + } + } + + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, reordered_glyphs, cGlyphs, lpDx)) + hr = S_FALSE; + + if (reordered_glyphs != pwGlyphs) heap_free( reordered_glyphs ); heap_free(lpDx); return hr; Modified: trunk/reactos/dll/win32/usp10/usp10_internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_inte… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_internal.h [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -128,8 +128,13 @@ #define GSUB_E_NOFEATURE -2 #define GSUB_E_NOGLYPH -1 +#define FEATURE_ALL_TABLES 0 +#define FEATURE_GSUB_TABLE 1 +#define FEATURE_GPOS_TABLE 2 + typedef struct { OPENTYPE_TAG tag; + CHAR tableType; LPCVOID feature; INT lookup_count; WORD *lookups; @@ -139,6 +144,7 @@ OPENTYPE_TAG tag; LPCVOID gsub_table; LPCVOID gpos_table; + BOOL features_initialized; INT feature_count; LoadedFeature *features; } LoadedLanguage; @@ -148,6 +154,7 @@ LPCVOID gsub_table; LPCVOID gpos_table; LoadedLanguage default_language; + BOOL languages_initialized; INT language_count; LoadedLanguage *languages; } LoadedScript; @@ -169,6 +176,7 @@ LPVOID CMAP_Table; LPVOID CMAP_format12_Table; LPVOID GPOS_Table; + BOOL scripts_initialized; INT script_count; LoadedScript *scripts; @@ -223,7 +231,7 @@ INT BIDI_ReorderL2vLevel(int level, int *pIndexs, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, WORD *pwLogClust) DECLSPEC_HIDDEN; void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, INT cChars, WORD *pwLogClust) DECLSPEC_HIDDEN; -void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ); +void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WORD* pwGlyphs, INT cGlyphs, int *piAdvance, GOFFSET *pGoffset ) DECLSPEC_HIDDEN; HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa) DECLSPEC_HIDDEN; void SHAPE_CharGlyphProp(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT SHAPE_does_GSUB_feature_apply_to_chars(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *chars, INT write_dir, INT count, const char* feature) DECLSPEC_HIDDEN; @@ -237,9 +245,9 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) DECLSPEC_HIDDEN; DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; -void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; +void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) DECLSPEC_HIDDEN; -INT OpenType_apply_GPOS_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, INT* piAdvance, LPCVOID table, INT lookup_index, const WORD *glyphs, INT glyph_index, INT write_dir, INT glyph_count, GOFFSET *pGoffset) DECLSPEC_HIDDEN; +INT OpenType_apply_GPOS_lookup(ScriptCache *psc, LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, const SCRIPT_ANALYSIS *analysis, INT* piAdvance, INT lookup_index, const WORD *glyphs, INT glyph_index, INT glyph_count, GOFFSET *pGoffset) DECLSPEC_HIDDEN; HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) DECLSPEC_HIDDEN; -HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN; +HRESULT OpenType_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG language_tag, BOOL filtered, OPENTYPE_TAG searchingFor, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN; Modified: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -2,7 +2,7 @@ =================================================================== --- usp10.c (revision 54504) +++ usp10.c (working copy) -@@ -3621,3 +3621,9 @@ +@@ -3746,3 +3746,9 @@ return SHAPE_GetFontFeatureTags(hdc, (ScriptCache *)*psc, psa, tagScript, tagLangSys, cMaxTags, pFeatureTags, pcTags); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Wed Feb 27 14:11:44 2013 @@ -179,7 +179,7 @@ reactos/dll/win32/updspapi # Synced to Wine-1.5.4 reactos/dll/win32/url # Synced to Wine-1.5.19 reactos/dll/win32/urlmon # Autosync -reactos/dll/win32/usp10 # Synced to Wine-1.5.19 +reactos/dll/win32/usp10 # Synced to Wine-1.5.24 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/version # Autosync reactos/dll/win32/wer # Autosync

1 0

[tkreuzer] 58374: [GDI32] Add a DPRINT
by tkreuzer＠svn.reactos.org 27 Feb '13

27 Feb '13

Author: tkreuzer Date: Wed Feb 27 13:53:28 2013 New Revision: 58374 URL: http://svn.reactos.org/svn/reactos?rev=58374&view=rev Log: [GDI32] Add a DPRINT Modified: trunk/reactos/win32ss/gdi/gdi32/misc/stubs.c Modified: trunk/reactos/win32ss/gdi/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/stu… ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/stubs.c [iso-8859-1] Wed Feb 27 13:53:28 2013 @@ -241,6 +241,8 @@ if (!size || mh_in->mtType != METAFILE_MEMORY || mh_in->mtVersion != 0x300 || mh_in->mtHeaderSize != sizeof(METAHEADER) / 2) { + DPRINT1("SetMetaFileBitsEx failed: %lu,%lu,0x&lx,%lu\n", + size, mh_in->mtType, mh_in->mtVersion, mh_in->mtHeaderSize); SetLastError(ERROR_INVALID_DATA); return 0; }

1 0

[akhaldi] 58373: [PSDK] * Annotate wingdi.h.
by akhaldi＠svn.reactos.org 26 Feb '13

26 Feb '13

Author: akhaldi Date: Tue Feb 26 18:23:45 2013 New Revision: 58373 URL: http://svn.reactos.org/svn/reactos?rev=58373&view=rev Log: [PSDK] * Annotate wingdi.h. Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Tue Feb 26 18:23:45 2013 @@ -1799,10 +1799,10 @@ #ifndef _LOGPALETTE_DEFINED #define _LOGPALETTE_DEFINED typedef struct tagLOGPALETTE { - WORD palVersion; - WORD palNumEntries; - PALETTEENTRY palPalEntry[1]; -} LOGPALETTE,*NPLOGPALETTE,*PLOGPALETTE,*LPLOGPALETTE; + WORD palVersion; + WORD palNumEntries; + _Field_size_opt_(palNumEntries) PALETTEENTRY palPalEntry[1]; +} LOGPALETTE, *NPLOGPALETTE, *PLOGPALETTE, *LPLOGPALETTE; #endif typedef struct tagEMRCREATEPALETTE { @@ -2871,8 +2871,22 @@ typedef BOOL (CALLBACK *ABORTPROC)(HDC,int); -typedef int (CALLBACK *MFENUMPROC)(HDC,HANDLETABLE*,METARECORD*,int,LPARAM); -typedef int (CALLBACK *ENHMFENUMPROC)(HDC,HANDLETABLE*,const ENHMETARECORD*,int,LPARAM); +typedef int +(CALLBACK *MFENUMPROC)( + _In_ HDC hdc, + _In_reads_(nObj) HANDLETABLE FAR* lpht, + _In_ METARECORD FAR* lpMR, + _In_ int nObj, + _In_opt_ LPARAM param); + +typedef int +(CALLBACK *ENHMFENUMPROC)( + _In_ HDC hdc, + _In_reads_(nHandles) HANDLETABLE FAR* lpht, + _In_ CONST ENHMETARECORD * lpmr, + _In_ int nHandles, + _In_opt_ LPARAM data); + typedef int (CALLBACK *ICMENUMPROCA)(LPSTR,LPARAM); typedef int (CALLBACK *ICMENUMPROCW)(LPWSTR,LPARAM); typedef UINT (CALLBACK *LPFNDEVMODE)(HWND,HMODULE,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,UINT); @@ -2884,130 +2898,303 @@ #define MAKEROP4(f,b) (DWORD)((((b)<<8)&0xFF000000)|(f)) #define PALETTEINDEX(i) ((0x01000000|(COLORREF)(WORD)(i))) #define PALETTERGB(r,g,b) (0x02000000|RGB(r,g,b)) -int WINAPI AbortDoc(HDC); -BOOL WINAPI AbortPath(HDC); +int WINAPI AbortDoc(_In_ HDC); +BOOL WINAPI AbortPath(_In_ HDC); int WINAPI AddFontResourceA(LPCSTR); int WINAPI AddFontResourceW(LPCWSTR); #if (_WIN32_WINNT >= 0x0500) -HANDLE WINAPI AddFontMemResourceEx(PVOID,DWORD,PVOID,DWORD *); -int WINAPI AddFontResourceExA(LPCSTR,DWORD,PVOID); -int WINAPI AddFontResourceExW(LPCWSTR,DWORD,PVOID); -#endif -BOOL WINAPI AngleArc(HDC,int,int,DWORD,FLOAT,FLOAT); -BOOL WINAPI AnimatePalette(HPALETTE,UINT,UINT,const PALETTEENTRY*); -BOOL WINAPI Arc(HDC,int,int,int,int,int,int,int,int); -BOOL WINAPI ArcTo(HDC,int,int,int,int,int,int,int,int); -BOOL WINAPI BeginPath(HDC); -BOOL WINAPI BitBlt(HDC,int,int,int,int,HDC,int,int,DWORD); -BOOL WINAPI CancelDC(HDC); -BOOL WINAPI CheckColorsInGamut(HDC,PVOID,PVOID,DWORD); -BOOL WINAPI Chord(HDC,int,int,int,int,int,int,int,int); -int WINAPI ChoosePixelFormat(HDC,CONST PIXELFORMATDESCRIPTOR*); -HENHMETAFILE WINAPI CloseEnhMetaFile(HDC); -BOOL WINAPI CloseFigure(HDC); -HMETAFILE WINAPI CloseMetaFile(HDC); -BOOL WINAPI ColorMatchToTarget(HDC,HDC,DWORD); -int WINAPI CombineRgn(HRGN,HRGN,HRGN,int); -BOOL WINAPI CombineTransform(LPXFORM,const XFORM*,const XFORM*); -HENHMETAFILE WINAPI CopyEnhMetaFileA(HENHMETAFILE,LPCSTR); -HENHMETAFILE WINAPI CopyEnhMetaFileW(HENHMETAFILE,LPCWSTR); -HMETAFILE WINAPI CopyMetaFileA(HMETAFILE,LPCSTR); -HMETAFILE WINAPI CopyMetaFileW(HMETAFILE,LPCWSTR); -HBITMAP WINAPI CreateBitmap(int,int,UINT,UINT,CONST VOID*); -HBITMAP WINAPI CreateBitmapIndirect(const BITMAP*); -HBRUSH WINAPI CreateBrushIndirect(const LOGBRUSH*); -HCOLORSPACE WINAPI CreateColorSpaceA(LPLOGCOLORSPACEA); -HCOLORSPACE WINAPI CreateColorSpaceW(LPLOGCOLORSPACEW); -HBITMAP WINAPI CreateCompatibleBitmap(HDC,int,int); -HDC WINAPI CreateCompatibleDC(HDC); -HDC WINAPI CreateDCA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*); -HDC WINAPI CreateDCW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); -HBITMAP WINAPI CreateDIBitmap(HDC,CONST BITMAPINFOHEADER*,DWORD,CONST VOID*,CONST BITMAPINFO*,UINT); -HBRUSH WINAPI CreateDIBPatternBrush(HGLOBAL,UINT); -HBRUSH WINAPI CreateDIBPatternBrushPt(CONST VOID*,UINT); -HBITMAP WINAPI CreateDIBSection(HDC,const BITMAPINFO*,UINT,PVOID*,HANDLE,DWORD); -HBITMAP WINAPI CreateDiscardableBitmap(HDC,int,int); -HRGN WINAPI CreateEllipticRgn(int,int,int,int); -HRGN WINAPI CreateEllipticRgnIndirect(LPCRECT); -HDC WINAPI CreateEnhMetaFileA(HDC,LPCSTR,LPCRECT,LPCSTR); -HDC WINAPI CreateEnhMetaFileW(HDC,LPCWSTR,LPCRECT,LPCWSTR); -HFONT WINAPI CreateFontA(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCSTR); -HFONT WINAPI CreateFontW(int,int,int,int,int,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPCWSTR); -HFONT WINAPI CreateFontIndirectA(const LOGFONTA*); -HFONT WINAPI CreateFontIndirectW(const LOGFONTW*); + +HANDLE +WINAPI +AddFontMemResourceEx( + _In_reads_bytes_(cjSize) PVOID pFileView, + _In_ DWORD cjSize, + _Reserved_ PVOID pvResrved, + _In_ DWORD* pNumFonts); + +int WINAPI AddFontResourceExA(_In_ LPCSTR, _In_ DWORD, _Reserved_ PVOID); +int WINAPI AddFontResourceExW(_In_ LPCWSTR, _In_ DWORD, _Reserved_ PVOID); + +#endif + +BOOL WINAPI AngleArc(_In_ HDC, _In_ int, _In_ int, _In_ DWORD, _In_ FLOAT, _In_ FLOAT); + +BOOL +WINAPI +AnimatePalette( + _In_ HPALETTE hPal, + _In_ UINT iStartIndex, + _In_ UINT cEntries, + _In_reads_(cEntries) CONST PALETTEENTRY *ppe); + +BOOL WINAPI Arc(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); +BOOL WINAPI ArcTo(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); +BOOL WINAPI BeginPath(_In_ HDC); +BOOL WINAPI BitBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_opt_ HDC, _In_ int, _In_ int, _In_ DWORD); +BOOL WINAPI CancelDC(_In_ HDC); + +BOOL +WINAPI +CheckColorsInGamut( + _In_ HDC hdc, + _In_reads_(nCount) LPVOID lpRGBTriple, + _Out_writes_bytes_(nCount) LPVOID dlpBuffer, + _In_ DWORD nCount); + +BOOL WINAPI Chord(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); +int WINAPI ChoosePixelFormat(_In_ HDC, _In_ CONST PIXELFORMATDESCRIPTOR*); +HENHMETAFILE WINAPI CloseEnhMetaFile(_In_ HDC); +BOOL WINAPI CloseFigure(_In_ HDC); +HMETAFILE WINAPI CloseMetaFile(_In_ HDC); +BOOL WINAPI ColorMatchToTarget(_In_ HDC, _In_ HDC, _In_ DWORD); +int WINAPI CombineRgn(_In_opt_ HRGN, _In_opt_ HRGN, _In_opt_ HRGN, _In_ int); +BOOL WINAPI CombineTransform(_Out_ LPXFORM, _In_ const XFORM*, _In_ const XFORM*); +HENHMETAFILE WINAPI CopyEnhMetaFileA(_In_ HENHMETAFILE, _In_opt_ LPCSTR); +HENHMETAFILE WINAPI CopyEnhMetaFileW(_In_ HENHMETAFILE, _In_opt_ LPCWSTR); +HMETAFILE WINAPI CopyMetaFileA(_In_ HMETAFILE, _In_opt_ LPCSTR); +HMETAFILE WINAPI CopyMetaFileW(_In_ HMETAFILE, _In_opt_ LPCWSTR); +HBITMAP WINAPI CreateBitmap(_In_ int, _In_ int, _In_ UINT, _In_ UINT, _In_opt_ CONST VOID*); +HBITMAP WINAPI CreateBitmapIndirect(_In_ const BITMAP*); +HBRUSH WINAPI CreateBrushIndirect(_In_ const LOGBRUSH*); +HCOLORSPACE WINAPI CreateColorSpaceA(_In_ LPLOGCOLORSPACEA); +HCOLORSPACE WINAPI CreateColorSpaceW(_In_ LPLOGCOLORSPACEW); +HBITMAP WINAPI CreateCompatibleBitmap(_In_ HDC, _In_ int, _In_ int); +HDC WINAPI CreateCompatibleDC(_In_opt_ HDC); +HDC WINAPI CreateDCA(_In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ const DEVMODEA*); +HDC WINAPI CreateDCW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ const DEVMODEW*); +HBITMAP WINAPI CreateDIBitmap(_In_ HDC, _In_opt_ CONST BITMAPINFOHEADER*, _In_ DWORD, _In_opt_ CONST VOID*, _In_opt_ CONST BITMAPINFO*, _In_ UINT); +HBRUSH WINAPI CreateDIBPatternBrush(_In_ HGLOBAL, _In_ UINT); +HBRUSH WINAPI CreateDIBPatternBrushPt(_In_ CONST VOID*, _In_ UINT); + +#define GDI_WIDTHBYTES(bits) ((DWORD)(((bits) + 31) & (~31)) / 8) +#define GDI_DIBWIDTHBYTES(bi) (DWORD)GDI_WIDTHBYTES((DWORD)(bi).biWidth * (DWORD)(bi).biBitCount) +#define GDI__DIBSIZE(bi) (GDI_DIBWIDTHBYTES(bi) * (DWORD)(bi).biHeight) +#define GDI_DIBSIZE(bi) ((bi).biHeight < 0 ? (-1) * (GDI__DIBSIZE(bi)) : GDI__DIBSIZE(bi)) + +_Success_(return != NULL) +HBITMAP +WINAPI +CreateDIBSection( + _In_opt_ HDC hdc, + _In_ const BITMAPINFO *pbmi, + _In_ UINT usage, + _When_((pbmi->bmiHeader.biBitCount != 0), _Outptr_result_bytebuffer_(GDI_DIBSIZE((pbmi->bmiHeader)))) + _When_((pbmi->bmiHeader.biBitCount == 0), _Outptr_result_bytebuffer_((pbmi->bmiHeader).biSizeImage)) + VOID **ppvBits, + _In_opt_ HANDLE hSection, + _In_ DWORD offset); + +HBITMAP WINAPI CreateDiscardableBitmap(_In_ HDC, _In_ int, _In_ int); +HRGN WINAPI CreateEllipticRgn(_In_ int, _In_ int, _In_ int, _In_ int); +HRGN WINAPI CreateEllipticRgnIndirect(_In_ LPCRECT); +HDC WINAPI CreateEnhMetaFileA(_In_opt_ HDC, _In_opt_ LPCSTR, _In_opt_ LPCRECT, _In_opt_ LPCSTR); +HDC WINAPI CreateEnhMetaFileW(_In_opt_ HDC, _In_opt_ LPCWSTR, _In_opt_ LPCRECT, _In_opt_ LPCWSTR); +HFONT WINAPI CreateFontA(_In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCSTR); +HFONT WINAPI CreateFontW(_In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_ DWORD, _In_opt_ LPCWSTR); +HFONT WINAPI CreateFontIndirectA(_In_ const LOGFONTA*); +HFONT WINAPI CreateFontIndirectW(_In_ const LOGFONTW*); HFONT WINAPI CreateFontIndirectExA(const ENUMLOGFONTEXDVA *); HFONT WINAPI CreateFontIndirectExW(const ENUMLOGFONTEXDVW *); -HPALETTE WINAPI CreateHalftonePalette(HDC); -HBRUSH WINAPI CreateHatchBrush(int,COLORREF); -HDC WINAPI CreateICA(LPCSTR,LPCSTR,LPCSTR,const DEVMODEA*); -HDC WINAPI CreateICW(LPCWSTR,LPCWSTR,LPCWSTR,const DEVMODEW*); -HDC WINAPI CreateMetaFileA(LPCSTR); -HDC WINAPI CreateMetaFileW(LPCWSTR); -HPALETTE WINAPI CreatePalette(const LOGPALETTE*); -HBRUSH WINAPI CreatePatternBrush(HBITMAP); -HPEN WINAPI CreatePen(int,int,COLORREF); -HPEN WINAPI CreatePenIndirect(const LOGPEN*); -HRGN WINAPI CreatePolygonRgn(const POINT*,int,int); -HRGN WINAPI CreatePolyPolygonRgn(const POINT*,const INT*,int,int); -HRGN WINAPI CreateRectRgn(int,int,int,int); -HRGN WINAPI CreateRectRgnIndirect(LPCRECT); -HRGN WINAPI CreateRoundRectRgn(int,int,int,int,int,int); -BOOL WINAPI CreateScalableFontResourceA(DWORD,LPCSTR,LPCSTR,LPCSTR); -BOOL WINAPI CreateScalableFontResourceW(DWORD,LPCWSTR,LPCWSTR,LPCWSTR); -HBRUSH WINAPI CreateSolidBrush(COLORREF); -BOOL WINAPI DeleteColorSpace(HCOLORSPACE); -BOOL WINAPI DeleteDC(HDC); -BOOL WINAPI DeleteEnhMetaFile(HENHMETAFILE); -BOOL WINAPI DeleteMetaFile(HMETAFILE); -BOOL WINAPI DeleteObject(HGDIOBJ); -int WINAPI DescribePixelFormat(HDC,int,UINT,LPPIXELFORMATDESCRIPTOR); -DWORD WINAPI DeviceCapabilitiesA(LPCSTR,LPCSTR,WORD,LPSTR,const DEVMODEA*); -DWORD WINAPI DeviceCapabilitiesW(LPCWSTR,LPCWSTR,WORD,LPWSTR,const DEVMODEW*); -BOOL WINAPI DPtoLP(HDC,LPPOINT,int); -int WINAPI DrawEscape(HDC,int,int,LPCSTR); -BOOL WINAPI Ellipse(HDC,int,int,int,int); -int WINAPI EndDoc(HDC); -int WINAPI EndPage(HDC); -BOOL WINAPI EndPath(HDC); -BOOL WINAPI EnumEnhMetaFile(HDC,HENHMETAFILE,ENHMFENUMPROC,PVOID,LPCRECT); -int WINAPI EnumFontFamiliesA(HDC,LPCSTR,FONTENUMPROCA,LPARAM); -int WINAPI EnumFontFamiliesW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM); -int WINAPI EnumFontFamiliesExA(HDC,PLOGFONTA,FONTENUMPROCA,LPARAM,DWORD); -int WINAPI EnumFontFamiliesExW(HDC,PLOGFONTW,FONTENUMPROCW,LPARAM,DWORD); -int WINAPI EnumFontsA(HDC,LPCSTR,FONTENUMPROCA,LPARAM); -int WINAPI EnumFontsW(HDC,LPCWSTR,FONTENUMPROCW,LPARAM); -int WINAPI EnumICMProfilesA(HDC,ICMENUMPROCA,LPARAM); -int WINAPI EnumICMProfilesW(HDC,ICMENUMPROCW,LPARAM); -BOOL WINAPI EnumMetaFile(HDC,HMETAFILE,MFENUMPROC,LPARAM); -int WINAPI EnumObjects(HDC,int,GOBJENUMPROC,LPARAM); -BOOL WINAPI EqualRgn(HRGN,HRGN); -int WINAPI Escape(HDC,int,int,LPCSTR,PVOID); -int WINAPI ExcludeClipRect(HDC,int,int,int,int); +HPALETTE WINAPI CreateHalftonePalette(_In_opt_ HDC); +HBRUSH WINAPI CreateHatchBrush(_In_ int, _In_ COLORREF); +HDC WINAPI CreateICA(_In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ LPCSTR, _In_opt_ const DEVMODEA*); +HDC WINAPI CreateICW(_In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ LPCWSTR, _In_opt_ const DEVMODEW*); +HDC WINAPI CreateMetaFileA(_In_opt_ LPCSTR); +HDC WINAPI CreateMetaFileW(_In_opt_ LPCWSTR); + +HPALETTE +WINAPI +CreatePalette( + _In_reads_(_Inexpressible_(2*sizeof(WORD) + plpal->palNumEntries * sizeof(PALETTEENTRY))) const LOGPALETTE*); + +HBRUSH WINAPI CreatePatternBrush(_In_ HBITMAP); +HPEN WINAPI CreatePen(_In_ int, _In_ int, _In_ COLORREF); +HPEN WINAPI CreatePenIndirect(_In_ const LOGPEN*); + +HRGN +WINAPI +CreatePolygonRgn( + _In_reads_(cPoint) const POINT *pptl, + _In_ int cPoint, + _In_ int iMode); + +HRGN +WINAPI +CreatePolyPolygonRgn( + _In_ const POINT *pptl, + _In_reads_(cPoly) const INT *pc, + _In_ int cPoly, + _In_ int iMode); + +HRGN WINAPI CreateRectRgn(_In_ int, _In_ int, _In_ int, _In_ int); +HRGN WINAPI CreateRectRgnIndirect(_In_ LPCRECT); +HRGN WINAPI CreateRoundRectRgn(_In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); +BOOL WINAPI CreateScalableFontResourceA(_In_ DWORD, _In_ LPCSTR, _In_ LPCSTR, _In_opt_ LPCSTR); +BOOL WINAPI CreateScalableFontResourceW(_In_ DWORD, _In_ LPCWSTR, _In_ LPCWSTR, _In_opt_ LPCWSTR); +HBRUSH WINAPI CreateSolidBrush(_In_ COLORREF); +BOOL WINAPI DeleteColorSpace(_In_ HCOLORSPACE); +BOOL WINAPI DeleteDC(_In_ HDC); +BOOL WINAPI DeleteEnhMetaFile(_In_opt_ HENHMETAFILE); +BOOL WINAPI DeleteMetaFile(_In_ HMETAFILE); +BOOL WINAPI DeleteObject(_In_ HGDIOBJ); + +int +WINAPI +DescribePixelFormat( + _In_ HDC hdc, + _In_ int iPixelFormat, + _In_ UINT nBytes, + _Out_writes_bytes_opt_(nBytes) LPPIXELFORMATDESCRIPTOR ppfd); + +DWORD +WINAPI +DeviceCapabilitiesA( + _In_ LPCSTR pDevice, + _In_opt_ LPCSTR pPort, + _In_ WORD fwCapability, + _Out_writes_opt_(_Inexpressible_(1)) LPSTR pOutput, + _In_opt_ const DEVMODEA *pDevMode); + +DWORD +WINAPI +DeviceCapabilitiesW( + _In_ LPCWSTR pDevice, + _In_opt_ LPCWSTR pPort, + _In_ WORD fwCapability, + _Out_writes_opt_(_Inexpressible_(1)) LPWSTR pOutput, + _In_opt_ const DEVMODEW *pDevMode); + +BOOL +WINAPI +DPtoLP( + _In_ HDC hdc, + _Inout_updates_(c) LPPOINT lppt, + _In_ int c); + +int +WINAPI +DrawEscape( + _In_ HDC hdc, + _In_ int iEscape, + _In_ int cjIn, + _In_reads_bytes_opt_(cjIn) LPCSTR lpIn); + +BOOL WINAPI Ellipse(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int); +int WINAPI EndDoc(_In_ HDC); +int WINAPI EndPage(_In_ HDC); +BOOL WINAPI EndPath(_In_ HDC); +BOOL WINAPI EnumEnhMetaFile(_In_opt_ HDC, _In_ HENHMETAFILE, _In_ ENHMFENUMPROC, _In_opt_ PVOID, _In_opt_ LPCRECT); +int WINAPI EnumFontFamiliesA(_In_ HDC, _In_opt_ LPCSTR, _In_ FONTENUMPROCA, _In_ LPARAM); +int WINAPI EnumFontFamiliesW(_In_ HDC, _In_opt_ LPCWSTR, _In_ FONTENUMPROCW, _In_ LPARAM); +int WINAPI EnumFontFamiliesExA(_In_ HDC, _In_ PLOGFONTA, _In_ FONTENUMPROCA, _In_ LPARAM, _In_ DWORD); +int WINAPI EnumFontFamiliesExW(_In_ HDC, _In_ PLOGFONTW, _In_ FONTENUMPROCW, _In_ LPARAM, _In_ DWORD); +int WINAPI EnumFontsA(_In_ HDC, _In_opt_ LPCSTR, _In_ FONTENUMPROCA, _In_ LPARAM); +int WINAPI EnumFontsW(_In_ HDC, _In_opt_ LPCWSTR, _In_ FONTENUMPROCW, _In_ LPARAM); +int WINAPI EnumICMProfilesA(_In_ HDC, _In_ ICMENUMPROCA, _In_opt_ LPARAM); +int WINAPI EnumICMProfilesW(_In_ HDC, _In_ ICMENUMPROCW, _In_opt_ LPARAM); +BOOL WINAPI EnumMetaFile(_In_ HDC, _In_ HMETAFILE, _In_ MFENUMPROC, _In_opt_ LPARAM); +int WINAPI EnumObjects(_In_ HDC, _In_ int, _In_ GOBJENUMPROC, _In_ LPARAM); +BOOL WINAPI EqualRgn(_In_ HRGN, _In_ HRGN); + +int +WINAPI +Escape( + _In_ HDC hdc, + _In_ int iEscape, + _In_ int cjIn, + _In_reads_bytes_opt_(cjIn) LPCSTR pvIn, + _Out_opt_ LPVOID pvOut); + +int WINAPI ExcludeClipRect(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int); int WINAPI ExcludeUpdateRgn(HDC,HWND); -HPEN WINAPI ExtCreatePen(DWORD,DWORD,const LOGBRUSH*,DWORD,const DWORD*); -HRGN WINAPI ExtCreateRegion(const XFORM*,DWORD,const RGNDATA*); -int WINAPI ExtEscape(HDC,int,int,LPCSTR,int,LPSTR); -BOOL WINAPI ExtFloodFill(HDC,int,int,COLORREF,UINT); -int WINAPI ExtSelectClipRgn(HDC,HRGN,int); -BOOL WINAPI ExtTextOutA(HDC,int,int,UINT,LPCRECT,LPCSTR,UINT,const INT*); -BOOL WINAPI ExtTextOutW(HDC,int,int,UINT,LPCRECT,LPCWSTR,UINT,const INT*); -BOOL WINAPI FillPath(HDC); + +HPEN +WINAPI +ExtCreatePen( + _In_ DWORD iPenStyle, + _In_ DWORD cWidth, + _In_ const LOGBRUSH *plbrush, + _In_ DWORD cStyle, + _In_reads_opt_(cStyle) const DWORD *pstyle); + +HRGN +WINAPI +ExtCreateRegion( + _In_opt_ const XFORM *lpx, + _In_ DWORD nCount, + _In_reads_bytes_(nCount) const RGNDATA *lpData); + +int +WINAPI +ExtEscape( + _In_ HDC hdc, + _In_ int iEscape, + _In_ int cjInput, + _In_reads_bytes_opt_(cjInput) LPCSTR lpInData, + _In_ int cjOutput, + _Out_writes_bytes_opt_(cjOutput) LPSTR lpOutData); + +BOOL WINAPI ExtFloodFill(_In_ HDC, _In_ int, _In_ int, _In_ COLORREF, _In_ UINT); +int WINAPI ExtSelectClipRgn(_In_ HDC, _In_opt_ HRGN, _In_ int); + +BOOL +WINAPI +ExtTextOutA( + _In_ HDC hdc, + _In_ int x, + _In_ int y, + _In_ UINT options, + _In_opt_ const RECT *lprect, + _In_reads_opt_(c) LPCSTR lpString, + _In_ UINT c, + _In_reads_opt_(c) const INT *lpDx); + +BOOL +WINAPI +ExtTextOutW( + _In_ HDC hdc, + _In_ int x, + _In_ int y, + _In_ UINT options, + _In_opt_ const RECT *lprect, + _In_reads_opt_(c) LPCWSTR lpString, + _In_ UINT c, + _In_reads_opt_(c) const INT *lpDx); + +BOOL WINAPI FillPath(_In_ HDC); int WINAPI FillRect(HDC,LPCRECT,HBRUSH); -int WINAPI FillRgn(HDC,HRGN,HBRUSH); -BOOL WINAPI FixBrushOrgEx(HDC,int,int,LPPOINT); -BOOL WINAPI FlattenPath(HDC); -BOOL WINAPI FloodFill(HDC,int,int,COLORREF); -BOOL WINAPI FrameRgn(HDC,HRGN,HBRUSH,INT,INT); -BOOL WINAPI GdiAlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); -BOOL WINAPI GdiComment(HDC,UINT,const BYTE*); +int WINAPI FillRgn(_In_ HDC, _In_ HRGN, _In_ HBRUSH); +BOOL WINAPI FixBrushOrgEx(_In_ HDC, _In_ int, _In_ int, _In_opt_ LPPOINT); +BOOL WINAPI FlattenPath(_In_ HDC); +BOOL WINAPI FloodFill(_In_ HDC, _In_ int, _In_ int, _In_ COLORREF); +BOOL WINAPI FrameRgn(_In_ HDC, _In_ HRGN, _In_ HBRUSH, _In_ int, _In_ int); +BOOL WINAPI GdiAlphaBlend(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ BLENDFUNCTION); + +BOOL +WINAPI +GdiComment( + _In_ HDC hdc, + _In_ UINT nSize, + _In_reads_bytes_(nSize) const BYTE *lpData); + DEVMODEW * WINAPI GdiConvertToDevmodeW(const DEVMODEA *); BOOL WINAPI GdiFlush(void); LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *); DWORD WINAPI GdiGetCodePage(HDC); DWORD WINAPI GdiGetBatchLimit(void); -DWORD WINAPI GdiSetBatchLimit(DWORD); -BOOL WINAPI GdiGradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG); -BOOL WINAPI GdiTransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT); +DWORD WINAPI GdiSetBatchLimit(_In_ DWORD); + +BOOL +WINAPI +GdiGradientFill( + _In_ HDC hdc, + _In_reads_(nVertex) PTRIVERTEX pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nCount, + _In_ ULONG ulMode); + +BOOL WINAPI GdiTransparentBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT); BOOL WINAPI GdiIsMetaFileDC(HDC); #define GetCValue(cmyk) ((BYTE)(cmyk)) #define GetMValue(cmyk) ((BYTE)((cmyk)>> 8)) @@ -3017,243 +3204,819 @@ #define GetRValue(c) ((BYTE)(c)) #define GetGValue(c) ((BYTE)(((WORD)(c))>>8)) #define GetBValue(c) ((BYTE)((c)>>16)) -int WINAPI GetArcDirection(HDC); -BOOL WINAPI GetAspectRatioFilterEx(HDC,LPSIZE); -LONG WINAPI GetBitmapBits(HBITMAP,LONG,PVOID); -BOOL WINAPI GetBitmapDimensionEx(HBITMAP,LPSIZE); -COLORREF WINAPI GetBkColor(HDC); -int WINAPI GetBkMode(HDC); -UINT WINAPI GetBoundsRect(HDC,LPRECT,UINT); -BOOL WINAPI GetBrushOrgEx(HDC,LPPOINT); -BOOL WINAPI GetCharABCWidthsA(HDC,UINT,UINT,LPABC); -BOOL WINAPI GetCharABCWidthsW(HDC,UINT,UINT,LPABC); -BOOL WINAPI GetCharABCWidthsFloatA(HDC,UINT,UINT,LPABCFLOAT); -BOOL WINAPI GetCharABCWidthsFloatW(HDC,UINT,UINT,LPABCFLOAT); -BOOL WINAPI GetCharABCWidthsI(HDC,UINT,UINT,LPWORD,LPABC); -DWORD WINAPI GetCharacterPlacementA(HDC,LPCSTR,int,int,LPGCP_RESULTSA,DWORD); -DWORD WINAPI GetCharacterPlacementW(HDC,LPCWSTR,int,int,LPGCP_RESULTSW,DWORD); -BOOL WINAPI GetCharWidth32A(HDC,UINT,UINT,LPINT); -BOOL WINAPI GetCharWidth32W(HDC,UINT,UINT,LPINT); -BOOL WINAPI GetCharWidthA(HDC,UINT,UINT,LPINT); -BOOL WINAPI GetCharWidthW(HDC,UINT,UINT,LPINT); -BOOL WINAPI GetCharWidthI(HDC,UINT,UINT,LPWORD,LPINT); -BOOL WINAPI GetCharWidthFloatA(HDC,UINT,UINT,PFLOAT); -BOOL WINAPI GetCharWidthFloatW(HDC,UINT,UINT,PFLOAT); -int WINAPI GetClipBox(HDC,LPRECT); -int WINAPI GetClipRgn(HDC,HRGN); -BOOL WINAPI GetColorAdjustment(HDC,LPCOLORADJUSTMENT); -HCOLORSPACE WINAPI GetColorSpace(HDC); -HGDIOBJ WINAPI GetCurrentObject(HDC,UINT); -BOOL WINAPI GetCurrentPositionEx(HDC,LPPOINT); +int WINAPI GetArcDirection(_In_ HDC); +BOOL WINAPI GetAspectRatioFilterEx(_In_ HDC, _Out_ LPSIZE); + +LONG +WINAPI +GetBitmapBits( + _In_ HBITMAP hbit, + _In_ LONG cb, + _Out_writes_bytes_(cb) LPVOID lpvBits); + +BOOL WINAPI GetBitmapDimensionEx(_In_ HBITMAP, _Out_ LPSIZE); +COLORREF WINAPI GetBkColor(_In_ HDC); +int WINAPI GetBkMode(_In_ HDC); +UINT WINAPI GetBoundsRect(_In_ HDC, _Out_ LPRECT, _In_ UINT); +BOOL WINAPI GetBrushOrgEx(_In_ HDC, _Out_ LPPOINT); + +BOOL +WINAPI +GetCharABCWidthsA( + _In_ HDC hdc, + _In_ UINT wFirst, + _In_ UINT wLast, + _Out_writes_(wLast - wFirst + 1) LPABC lpABC); + +BOOL +WINAPI +GetCharABCWidthsW( + _In_ HDC hdc, + _In_ UINT wFirst, + _In_ UINT wLast, + _Out_writes_(wLast - wFirst + 1) LPABC lpABC); + +BOOL +WINAPI +GetCharABCWidthsFloatA( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) LPABCFLOAT lpABC); + +BOOL +WINAPI +GetCharABCWidthsFloatW( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) LPABCFLOAT lpABC); + +BOOL +WINAPI +GetCharABCWidthsI( + _In_ HDC hdc, + _In_ UINT giFirst, + _In_ UINT cgi, + _In_reads_opt_(cgi) LPWORD pgi, + _Out_writes_(cgi) LPABC pabc); + +DWORD +WINAPI +GetCharacterPlacementA( + _In_ HDC hdc, + _In_reads_(nCount) LPCSTR lpString, + _In_ int nCount, + _In_ int nMexExtent, + _Inout_ LPGCP_RESULTSA lpResults, + _In_ DWORD dwFlags); + +DWORD +WINAPI +GetCharacterPlacementW( + _In_ HDC hdc, + _In_reads_(nCount) LPCWSTR lpString, + _In_ int nCount, + _In_ int nMexExtent, + _Inout_ LPGCP_RESULTSW lpResults, + _In_ DWORD dwFlags); + +BOOL +WINAPI +GetCharWidth32A( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) LPINT lpBuffer); + +BOOL +WINAPI +GetCharWidth32W( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) LPINT lpBuffer); + +BOOL +WINAPI +GetCharWidthA( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) LPINT lpBuffer); + +BOOL +WINAPI +GetCharWidthW( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) LPINT lpBuffer); + +BOOL +WINAPI +GetCharWidthI( + _In_ HDC hdc, + _In_ UINT giFirst, + _In_ UINT cgi, + _In_reads_opt_(cgi) LPWORD pgi, + _Out_writes_(cgi) LPINT piWidths); + +BOOL +WINAPI +GetCharWidthFloatA( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) PFLOAT lpBuffer); + +BOOL +WINAPI +GetCharWidthFloatW( + _In_ HDC hdc, + _In_ UINT iFirst, + _In_ UINT iLast, + _Out_writes_(iLast + 1 - iFirst) PFLOAT lpBuffer); + +int WINAPI GetClipBox(_In_ HDC, _Out_ LPRECT); +int WINAPI GetClipRgn(_In_ HDC, _In_ HRGN); +BOOL WINAPI GetColorAdjustment(_In_ HDC, _Out_ LPCOLORADJUSTMENT); +HCOLORSPACE WINAPI GetColorSpace(_In_ HDC); +HGDIOBJ WINAPI GetCurrentObject(_In_ HDC, _In_ UINT); +BOOL WINAPI GetCurrentPositionEx(_In_ HDC, _Out_ LPPOINT); HCURSOR WINAPI GetCursor(void); -BOOL WINAPI GetDCOrgEx(HDC,LPPOINT); +BOOL WINAPI GetDCOrgEx(_In_ HDC, _Out_ LPPOINT); #if (_WIN32_WINNT >= 0x0500) -COLORREF WINAPI GetDCBrushColor(HDC); -COLORREF WINAPI GetDCPenColor(HDC); -#endif -int WINAPI GetDeviceCaps(HDC,int); -BOOL WINAPI GetDeviceGammaRamp(HDC,PVOID); -UINT WINAPI GetDIBColorTable(HDC,UINT,UINT,RGBQUAD*); -int WINAPI GetDIBits(HDC,HBITMAP,UINT,UINT,PVOID,LPBITMAPINFO,UINT); -HENHMETAFILE WINAPI GetEnhMetaFileA(LPCSTR); -HENHMETAFILE WINAPI GetEnhMetaFileW(LPCWSTR); -UINT WINAPI GetEnhMetaFileBits(HENHMETAFILE,UINT,LPBYTE); -UINT WINAPI GetEnhMetaFileDescriptionA(HENHMETAFILE,UINT,LPSTR); -UINT WINAPI GetEnhMetaFileDescriptionW(HENHMETAFILE,UINT,LPWSTR); -UINT WINAPI GetEnhMetaFileHeader(HENHMETAFILE,UINT,LPENHMETAHEADER); -UINT WINAPI GetEnhMetaFilePaletteEntries(HENHMETAFILE,UINT,LPPALETTEENTRY); -UINT WINAPI GetEnhMetaFilePixelFormat(HENHMETAFILE,UINT,PIXELFORMATDESCRIPTOR*); -DWORD WINAPI GetFontData(HDC,DWORD,DWORD,PVOID,DWORD); -DWORD WINAPI GetFontLanguageInfo(HDC); +COLORREF WINAPI GetDCBrushColor(_In_ HDC); +COLORREF WINAPI GetDCPenColor(_In_ HDC); +#endif +int WINAPI GetDeviceCaps(_In_opt_ HDC, _In_ int); + +BOOL +WINAPI +GetDeviceGammaRamp( + _In_ HDC hdc, + _Out_writes_bytes_(3*256*2) LPVOID lpRamp); + +_Ret_range_(0,cEntries) +UINT +WINAPI +GetDIBColorTable( + _In_ HDC hdc, + _In_ UINT iStart, + _In_ UINT cEntries, + _Out_writes_to_(cEntries,return) RGBQUAD *prgbq); + +int +WINAPI +GetDIBits( + _In_ HDC hdc, + _In_ HBITMAP hbm, + _In_ UINT start, + _In_ UINT cLines, + _Out_opt_ LPVOID lpvBits, + _At_((LPBITMAPINFOHEADER)lpbmi, _Inout_) LPBITMAPINFO lpbmi, + _In_ UINT usage); + +HENHMETAFILE WINAPI GetEnhMetaFileA(_In_ LPCSTR); +HENHMETAFILE WINAPI GetEnhMetaFileW(_In_ LPCWSTR); + +UINT +WINAPI +GetEnhMetaFileBits( + _In_ HENHMETAFILE hEMF, + _In_ UINT nSize, + _Out_writes_bytes_opt_(nSize) LPBYTE lpData); + +UINT +WINAPI +GetEnhMetaFileDescriptionA( + _In_ HENHMETAFILE hemf, + _In_ UINT cchBuffer, + _Out_writes_opt_(cchBuffer) LPSTR lpDescription); + +UINT +WINAPI +GetEnhMetaFileDescriptionW( + _In_ HENHMETAFILE hemf, + _In_ UINT cchBuffer, + _Out_writes_opt_(cchBuffer) LPWSTR lpDescription); + +UINT +WINAPI +GetEnhMetaFileHeader( + _In_ HENHMETAFILE hemf, + _In_ UINT nSize, + _Out_writes_bytes_opt_(nSize) LPENHMETAHEADER lpEnhMetaHeader); + +UINT +WINAPI +GetEnhMetaFilePaletteEntries( + _In_ HENHMETAFILE hemf, + _In_ UINT nNumEntries, + _Out_writes_opt_(nNumEntries) LPPALETTEENTRY lpPaletteEntries); + +UINT +WINAPI +GetEnhMetaFilePixelFormat( + _In_ HENHMETAFILE hemf, + _In_ UINT cbBuffer, + _Out_writes_bytes_opt_(cbBuffer) PIXELFORMATDESCRIPTOR *ppfd); + +_Success_(return != GDI_ERROR) +DWORD +WINAPI +GetFontData( + _In_ HDC hdc, + _In_ DWORD dwTable, + _In_ DWORD dwOffset, + _Out_writes_bytes_to_opt_(cjBuffer, return) PVOID pvBuffer, + _In_ DWORD cjBuffer); + +DWORD WINAPI GetFontLanguageInfo(_In_ HDC); #if (_WIN32_WINNT >= 0x0500) -DWORD WINAPI GetFontUnicodeRanges(HDC,LPGLYPHSET); -#endif -DWORD WINAPI GetGlyphIndicesA(HDC,LPCSTR,INT,LPWORD,DWORD); -DWORD WINAPI GetGlyphIndicesW(HDC,LPCWSTR,INT,LPWORD,DWORD); -DWORD WINAPI GetGlyphOutlineA(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*); -DWORD WINAPI GetGlyphOutlineW(HDC,UINT,UINT,LPGLYPHMETRICS,DWORD,PVOID,const MAT2*); -int WINAPI GetGraphicsMode(HDC); -BOOL WINAPI GetICMProfileA(HDC,LPDWORD,LPSTR); -BOOL WINAPI GetICMProfileW(HDC,LPDWORD,LPWSTR); -DWORD WINAPI GetKerningPairsA(HDC,DWORD,LPKERNINGPAIR); -DWORD WINAPI GetKerningPairsW(HDC,DWORD,LPKERNINGPAIR); -BOOL WINAPI GetLogColorSpaceA(HCOLORSPACE,LPLOGCOLORSPACEA,DWORD); -BOOL WINAPI GetLogColorSpaceW(HCOLORSPACE,LPLOGCOLORSPACEW,DWORD); -int WINAPI GetMapMode(HDC); -HMETAFILE WINAPI GetMetaFileA(LPCSTR); -HMETAFILE WINAPI GetMetaFileW(LPCWSTR); -UINT WINAPI GetMetaFileBitsEx(HMETAFILE,UINT,PVOID); -int WINAPI GetMetaRgn(HDC,HRGN); -BOOL WINAPI GetMiterLimit(HDC,PFLOAT); -COLORREF WINAPI GetNearestColor(HDC,COLORREF); -UINT WINAPI GetNearestPaletteIndex(HPALETTE,COLORREF); -int WINAPI GetObjectA(HGDIOBJ,int,PVOID); -int WINAPI GetObjectW(HGDIOBJ,int,PVOID); -DWORD WINAPI GetObjectType(HGDIOBJ); -UINT WINAPI GetOutlineTextMetricsA(HDC,UINT,LPOUTLINETEXTMETRICA); -UINT WINAPI GetOutlineTextMetricsW(HDC,UINT,LPOUTLINETEXTMETRICW); -UINT WINAPI GetPaletteEntries(HPALETTE,UINT,UINT,LPPALETTEENTRY); -int WINAPI GetPath(HDC,LPPOINT,PBYTE,int); -COLORREF WINAPI GetPixel(HDC,int,int); -int WINAPI GetPixelFormat(HDC); -int WINAPI GetPolyFillMode(HDC); -BOOL WINAPI GetRasterizerCaps(LPRASTERIZER_STATUS,UINT); -int WINAPI GetRandomRgn (HDC,HRGN,INT); -DWORD WINAPI GetRegionData(HRGN,DWORD,LPRGNDATA); -int WINAPI GetRgnBox(HRGN,LPRECT); -int WINAPI GetROP2(HDC); -HGDIOBJ WINAPI GetStockObject(int); -int WINAPI GetStretchBltMode(HDC); -UINT WINAPI GetSystemPaletteEntries(HDC,UINT,UINT,LPPALETTEENTRY); -UINT WINAPI GetSystemPaletteUse(HDC); -UINT WINAPI GetTextAlign(HDC); -int WINAPI GetTextCharacterExtra(HDC); -int WINAPI GetTextCharset(HDC); -int WINAPI GetTextCharsetInfo(HDC,LPFONTSIGNATURE,DWORD); -COLORREF WINAPI GetTextColor(HDC); -BOOL WINAPI GetTextExtentExPointA(HDC,LPCSTR,int,int,LPINT,LPINT,LPSIZE); -BOOL WINAPI GetTextExtentExPointW(HDC,LPCWSTR,int,int,LPINT,LPINT,LPSIZE); -BOOL WINAPI GetTextExtentExPointI(HDC,LPWORD,int,int,LPINT,LPINT,LPSIZE); -BOOL WINAPI GetTextExtentPointA(HDC,LPCSTR,int,LPSIZE); -BOOL WINAPI GetTextExtentPointW(HDC,LPCWSTR,int,LPSIZE); -BOOL WINAPI GetTextExtentPointI(HDC,LPWORD,int,LPSIZE); -BOOL WINAPI GetTextExtentPoint32A(HDC,LPCSTR,int,LPSIZE); -BOOL WINAPI GetTextExtentPoint32W( HDC,LPCWSTR,int,LPSIZE); -int WINAPI GetTextFaceA(HDC,int,LPSTR); -int WINAPI GetTextFaceW(HDC,int,LPWSTR); -BOOL WINAPI GetTextMetricsA(HDC,LPTEXTMETRICA); -BOOL WINAPI GetTextMetricsW(HDC,LPTEXTMETRICW); +DWORD WINAPI GetFontUnicodeRanges(_In_ HDC, _Out_opt_ LPGLYPHSET); +#endif + +DWORD +WINAPI +GetGlyphIndicesA( + _In_ HDC hdc, + _In_reads_(c) LPCSTR lpstr, + _In_ int c, + _Out_writes_(c) LPWORD pgi, + _In_ DWORD fl); + +DWORD +WINAPI +GetGlyphIndicesW( + _In_ HDC hdc, + _In_reads_(c) LPCWSTR lpstr, + _In_ int c, + _Out_writes_(c) LPWORD pgi, + _In_ DWORD fl); + +DWORD +WINAPI +GetGlyphOutlineA( + _In_ HDC hdc, + _In_ UINT uChar, + _In_ UINT fuFormat, + _Out_ LPGLYPHMETRICS lpgm, + _In_ DWORD cjBuffer, + _Out_writes_bytes_opt_(cjBuffer) LPVOID pvBuffer, + _In_ CONST MAT2 *lpmat2); + +DWORD +WINAPI +GetGlyphOutlineW( + _In_ HDC hdc, + _In_ UINT uChar, + _In_ UINT fuFormat, + _Out_ LPGLYPHMETRICS lpgm, + _In_ DWORD cjBuffer, + _Out_writes_bytes_opt_(cjBuffer) LPVOID pvBuffer, + _In_ CONST MAT2 *lpmat2); + +int WINAPI GetGraphicsMode(_In_ HDC); + +BOOL +WINAPI +GetICMProfileA( + _In_ HDC hdc, + _Inout_ LPDWORD pBufSize, + _Out_writes_opt_(*pBufSize) LPSTR pszFilename); + +BOOL +WINAPI +GetICMProfileW( + _In_ HDC hdc, + _Inout_ LPDWORD pBufSize, + _Out_writes_opt_(*pBufSize) LPWSTR pszFilename); + +DWORD +WINAPI +GetKerningPairsA( + _In_ HDC hdc, + _In_ DWORD nPairs, + _Out_writes_to_opt_(nPairs, return) LPKERNINGPAIR lpKernPair); + +DWORD +WINAPI +GetKerningPairsW( + _In_ HDC hdc, + _In_ DWORD nPairs, + _Out_writes_to_opt_(nPairs, return) LPKERNINGPAIR lpKernPair); + +BOOL +WINAPI +GetLogColorSpaceA( + _In_ HCOLORSPACE hColorSpace, + _Out_writes_bytes_(nSize) LPLOGCOLORSPACEA lpBuffer, + _In_ DWORD nSize); + +BOOL +WINAPI +GetLogColorSpaceW( + _In_ HCOLORSPACE hColorSpace, + _Out_writes_bytes_(nSize) LPLOGCOLORSPACEW lpBuffer, + _In_ DWORD nSize); + +int WINAPI GetMapMode(_In_ HDC); +HMETAFILE WINAPI GetMetaFileA(_In_ LPCSTR); +HMETAFILE WINAPI GetMetaFileW(_In_ LPCWSTR); + +UINT +WINAPI +GetMetaFileBitsEx( + _In_ HMETAFILE hMF, + _In_ UINT cbBuffer, + _Out_writes_bytes_opt_(cbBuffer) LPVOID lpData); + +int WINAPI GetMetaRgn(_In_ HDC, _In_ HRGN); +BOOL WINAPI GetMiterLimit(_In_ HDC, _Out_ PFLOAT); +COLORREF WINAPI GetNearestColor(_In_ HDC, _In_ COLORREF); +UINT WINAPI GetNearestPaletteIndex(_In_ HPALETTE, _In_ COLORREF); + +int +WINAPI +GetObjectA( + _In_ HANDLE h, + _In_ int c, + _Out_writes_bytes_opt_(c) LPVOID pv); + +int +WINAPI +GetObjectW( + _In_ HANDLE h, + _In_ int c, + _Out_writes_bytes_opt_(c) LPVOID pv); + +DWORD WINAPI GetObjectType(_In_ HGDIOBJ); + +UINT +WINAPI +GetOutlineTextMetricsA( + _In_ HDC hdc, + _In_ UINT cjCopy, + _Out_writes_bytes_opt_(cjCopy) LPOUTLINETEXTMETRICA potm); + +UINT +WINAPI +GetOutlineTextMetricsW( + _In_ HDC hdc, + _In_ UINT cjCopy, + _Out_writes_bytes_opt_(cjCopy) LPOUTLINETEXTMETRICW potm); + +_Ret_range_(0,cEntries) +UINT +WINAPI +GetPaletteEntries( + _In_ HPALETTE hpal, + _In_ UINT iStart, + _In_ UINT cEntries, + _Out_writes_to_opt_(cEntries,return) LPPALETTEENTRY pPalEntries); + +int +WINAPI +GetPath( + _In_ HDC hdc, + _Out_writes_opt_(cpt) LPPOINT apt, + _Out_writes_opt_(cpt) LPBYTE aj, + int cpt); + +COLORREF WINAPI GetPixel(_In_ HDC, _In_ int, _In_ int); +int WINAPI GetPixelFormat(_In_ HDC); +int WINAPI GetPolyFillMode(_In_ HDC); + +BOOL +WINAPI +GetRasterizerCaps( + _Out_writes_bytes_(cjBytes) LPRASTERIZER_STATUS lpraststat, + _In_ UINT cjBytes); + +int WINAPI GetRandomRgn(_In_ HDC, _In_ HRGN, _In_ INT); + +DWORD +WINAPI +GetRegionData( + _In_ HRGN hrgn, + _In_ DWORD nCount, + _Out_writes_bytes_to_opt_(nCount, return) LPRGNDATA lpRgnData); + +int WINAPI GetRgnBox(_In_ HRGN, _Out_ LPRECT); +int WINAPI GetROP2(_In_ HDC); +HGDIOBJ WINAPI GetStockObject(_In_ int); +int WINAPI GetStretchBltMode(_In_ HDC); + +UINT +WINAPI +GetSystemPaletteEntries( + _In_ HDC hdc, + _In_ UINT iStart, + _In_ UINT cEntries, + _Out_writes_opt_(cEntries) LPPALETTEENTRY pPalEntries); + +UINT WINAPI GetSystemPaletteUse(_In_ HDC); +UINT WINAPI GetTextAlign(_In_ HDC); +int WINAPI GetTextCharacterExtra(_In_ HDC); +int WINAPI GetTextCharset(_In_ HDC); +int WINAPI GetTextCharsetInfo(_In_ HDC, _Out_opt_ LPFONTSIGNATURE, _In_ DWORD); +COLORREF WINAPI GetTextColor(_In_ HDC); + +BOOL +WINAPI +GetTextExtentExPointA( + _In_ HDC hdc, + _In_reads_(cchString) LPCSTR lpszString, + _In_ int cchString, + _In_ int nMaxExtent, + _Out_opt_ LPINT lpnFit, + _Out_writes_to_opt_ (cchString, *lpnFit) LPINT lpnDx, + _Out_ LPSIZE lpSize); + +BOOL +WINAPI +GetTextExtentExPointW( + _In_ HDC hdc, + _In_reads_(cchString) LPCWSTR lpszString, + _In_ int cchString, + _In_ int nMaxExtent, + _Out_opt_ LPINT lpnFit, + _Out_writes_to_opt_ (cchString, *lpnFit) LPINT lpnDx, + _Out_ LPSIZE lpSize); + +BOOL +WINAPI +GetTextExtentExPointI( + _In_ HDC hdc, + _In_reads_(cwchString) LPWORD lpwszString, + _In_ int cwchString, + _In_ int nMaxExtent, + _Out_opt_ LPINT lpnFit, + _Out_writes_to_opt_(cwchString, *lpnFit) LPINT lpnDx, + _Out_ LPSIZE lpSize); + +BOOL +WINAPI +GetTextExtentPointA( + _In_ HDC hdc, + _In_reads_(c) LPCSTR lpString, + _In_ int c, + _Out_ LPSIZE lpsz); + +BOOL +WINAPI +GetTextExtentPointW( + _In_ HDC hdc, + _In_reads_(c) LPCWSTR lpString, + _In_ int c, + _Out_ LPSIZE lpsz); + +BOOL +WINAPI +GetTextExtentPointI( + _In_ HDC hdc, + _In_reads_(cgi) LPWORD pgiIn, + _In_ int cgi, + _Out_ LPSIZE psize); + +BOOL +WINAPI +GetTextExtentPoint32A( + _In_ HDC hdc, + _In_reads_(c) LPCSTR lpString, + _In_ int c, + _Out_ LPSIZE psizl); + +BOOL +WINAPI +GetTextExtentPoint32W( + _In_ HDC hdc, + _In_reads_(c) LPCWSTR lpString, + _In_ int c, + _Out_ LPSIZE psizl); + +int +WINAPI +GetTextFaceA( + _In_ HDC hdc, + _In_ int c, + _Out_writes_to_opt_(c, return) LPSTR lpName); + +int +WINAPI +GetTextFaceW( + _In_ HDC hdc, + _In_ int c, + _Out_writes_to_opt_(c, return) LPWSTR lpName); + +BOOL WINAPI GetTextMetricsA(_In_ HDC, _Out_ LPTEXTMETRICA); +BOOL WINAPI GetTextMetricsW(_In_ HDC, _Out_ LPTEXTMETRICW); BOOL WINAPI GetTransform(HDC,DWORD,XFORM*); -BOOL WINAPI GetViewportExtEx(HDC,LPSIZE); -BOOL WINAPI GetViewportOrgEx(HDC,LPPOINT); -BOOL WINAPI GetWindowExtEx(HDC,LPSIZE); -BOOL WINAPI GetWindowOrgEx(HDC,LPPOINT); -UINT WINAPI GetWinMetaFileBits(HENHMETAFILE,UINT,LPBYTE,INT,HDC); -BOOL WINAPI GetWorldTransform(HDC,LPXFORM); -int WINAPI IntersectClipRect(HDC,int,int,int,int); -BOOL WINAPI InvertRgn(HDC,HRGN); -BOOL WINAPI LineDDA(int,int,int,int,LINEDDAPROC,LPARAM); -BOOL WINAPI LineTo(HDC,int,int); -BOOL WINAPI LPtoDP(HDC,LPPOINT,int); -BOOL WINAPI MaskBlt(HDC,int,int,int,int,HDC,int,int,HBITMAP,int,int,DWORD); -BOOL WINAPI ModifyWorldTransform(HDC,const XFORM*,DWORD); -BOOL WINAPI MoveToEx(HDC,int,int,LPPOINT); -int WINAPI OffsetClipRgn(HDC,int,int); -int WINAPI OffsetRgn(HRGN,int,int); -BOOL WINAPI OffsetViewportOrgEx(HDC,int,int,LPPOINT); -BOOL WINAPI OffsetWindowOrgEx(HDC,int,int,LPPOINT); -BOOL WINAPI PaintRgn(HDC,HRGN); -BOOL WINAPI PatBlt(HDC,int,int,int,int,DWORD); -HRGN WINAPI PathToRegion(HDC); -BOOL WINAPI Pie(HDC,int,int,int,int,int,int,int,int); -BOOL WINAPI PlayEnhMetaFile(HDC,HENHMETAFILE,LPCRECT); -BOOL WINAPI PlayEnhMetaFileRecord(HDC,LPHANDLETABLE,const ENHMETARECORD*,UINT); -BOOL WINAPI PlayMetaFile(HDC,HMETAFILE); -BOOL WINAPI PlayMetaFileRecord(HDC,LPHANDLETABLE,LPMETARECORD,UINT); -BOOL WINAPI PlgBlt(HDC,const POINT*,HDC,int,int,int,int,HBITMAP,int,int); -BOOL WINAPI PolyBezier(HDC,const POINT*,DWORD); -BOOL WINAPI PolyBezierTo(HDC,const POINT*,DWORD); -BOOL WINAPI PolyDraw(HDC,const POINT*,const BYTE*,int); -BOOL WINAPI Polygon(HDC,const POINT*,int); -BOOL WINAPI Polyline(HDC,const POINT*,int); -BOOL WINAPI PolylineTo(HDC,const POINT*,DWORD); -BOOL WINAPI PolyPolygon(HDC,const POINT*,const INT*,int); -BOOL WINAPI PolyPolyline(HDC,const POINT*,const DWORD*,DWORD); -BOOL WINAPI PolyTextOutA(HDC,const POLYTEXTA*,int); -BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,int); -BOOL WINAPI PtInRegion(HRGN,int,int); -BOOL WINAPI PtVisible(HDC,int,int); -UINT WINAPI RealizePalette(HDC); -BOOL WINAPI Rectangle(HDC,int,int,int,int); -BOOL WINAPI RectInRegion(HRGN,LPCRECT); -BOOL WINAPI RectVisible(HDC,LPCRECT); -BOOL WINAPI RemoveFontResourceA(LPCSTR); -BOOL WINAPI RemoveFontResourceW(LPCWSTR); +BOOL WINAPI GetViewportExtEx(_In_ HDC, _Out_ LPSIZE); +BOOL WINAPI GetViewportOrgEx(_In_ HDC, _Out_ LPPOINT); +BOOL WINAPI GetWindowExtEx(_In_ HDC, _Out_ LPSIZE); +BOOL WINAPI GetWindowOrgEx(_In_ HDC, _Out_ LPPOINT); + +UINT +WINAPI +GetWinMetaFileBits( + _In_ HENHMETAFILE hemf, + _In_ UINT cbData16, + _Out_writes_bytes_opt_(cbData16) LPBYTE pData16, + _In_ INT iMapMode, + _In_ HDC hdcRef); + +BOOL WINAPI GetWorldTransform(_In_ HDC, _Out_ LPXFORM); +int WINAPI IntersectClipRect(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int); +BOOL WINAPI InvertRgn(_In_ HDC, _In_ HRGN); +BOOL WINAPI LineDDA(_In_ int, _In_ int, _In_ int, _In_ int, _In_ LINEDDAPROC, _In_opt_ LPARAM); +BOOL WINAPI LineTo(_In_ HDC, _In_ int, _In_ int); + +BOOL +WINAPI +LPtoDP( + _In_ HDC hdc, + _Inout_updates_(c) LPPOINT lppt, + _In_ int c); + +BOOL WINAPI MaskBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ HBITMAP, _In_ int, _In_ int, _In_ DWORD); +BOOL WINAPI ModifyWorldTransform(_In_ HDC, _In_opt_ const XFORM*, _In_ DWORD); +BOOL WINAPI MoveToEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPPOINT); +int WINAPI OffsetClipRgn(_In_ HDC, _In_ int, _In_ int); +int WINAPI OffsetRgn(_In_ HRGN, _In_ int, _In_ int); +BOOL WINAPI OffsetViewportOrgEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPPOINT); +BOOL WINAPI OffsetWindowOrgEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPPOINT); +BOOL WINAPI PaintRgn(_In_ HDC, _In_ HRGN); +BOOL WINAPI PatBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ DWORD); +HRGN WINAPI PathToRegion(_In_ HDC); +BOOL WINAPI Pie(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); +BOOL WINAPI PlayEnhMetaFile(_In_ HDC, _In_ HENHMETAFILE, _In_ LPCRECT); + +BOOL +WINAPI +PlayEnhMetaFileRecord( + _In_ HDC hdc, + _In_reads_(cht) LPHANDLETABLE pht, + _In_ CONST ENHMETARECORD *pmr, + _In_ UINT cht); + +BOOL WINAPI PlayMetaFile(_In_ HDC, _In_ HMETAFILE); + +BOOL +WINAPI +PlayMetaFileRecord( + _In_ HDC hdc, + _In_reads_(noObjs) LPHANDLETABLE lpHandleTable, + _In_ LPMETARECORD lpMR, + _In_ UINT noObjs); + +BOOL +WINAPI +PlgBlt( + _In_ HDC hdcDest, + _In_reads_(3) const POINT *lpPoint, + _In_ HDC hdcSrc, + _In_ int xSrc, + _In_ int ySrc, + _In_ int width, + _In_ int height, + _In_opt_ HBITMAP hbmMask, + _In_ int xMask, + _In_ int yMask); + +BOOL +WINAPI +PolyBezier( + _In_ HDC hdc, + _In_reads_(cpt) const POINT *apt, + _In_ DWORD cpt); + +BOOL +WINAPI +PolyBezierTo( + _In_ HDC hdc, + _In_reads_(cpt) const POINT *apt, + _In_ DWORD cpt); + +BOOL +WINAPI +PolyDraw( + _In_ HDC hdc, + _In_reads_(cpt) const POINT * apt, + _In_reads_(cpt) const BYTE * aj, + _In_ int cpt); + +BOOL +WINAPI +Polygon( + _In_ HDC hdc, + _In_reads_(cpt) const POINT *apt, + _In_ int cpt); + +BOOL +WINAPI +Polyline( + _In_ HDC hdc, + _In_reads_(cpt) const POINT *apt, + _In_ int cpt); + +BOOL +WINAPI +PolylineTo( + _In_ HDC hdc, + _In_reads_(cpt) const POINT *apt, + _In_ DWORD cpt); + +BOOL +WINAPI +PolyPolygon( + _In_ HDC hdc, + _In_ const POINT *apt, + _In_reads_(csz) const INT *asz, + _In_ int csz); + +BOOL +WINAPI +PolyPolyline( + _In_ HDC hdc, + _In_ const POINT *apt, + _In_reads_(csz) const DWORD *asz, + _In_ DWORD csz); + +BOOL +WINAPI +PolyTextOutA( + _In_ HDC hdc, + _In_reads_(nstrings) const POLYTEXTA *ppt, + _In_ int nstrings); + +BOOL +WINAPI +PolyTextOutW( + _In_ HDC hdc, + _In_reads_(nstrings) const POLYTEXTW *ppt, + _In_ int nstrings); + +BOOL WINAPI PtInRegion(_In_ HRGN, _In_ int, _In_ int); +BOOL WINAPI PtVisible(_In_ HDC, _In_ int, _In_ int); +UINT WINAPI RealizePalette(_In_ HDC); +BOOL WINAPI Rectangle(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int); +BOOL WINAPI RectInRegion(_In_ HRGN, _In_ LPCRECT); +BOOL WINAPI RectVisible(_In_ HDC, _In_ LPCRECT); +BOOL WINAPI RemoveFontResourceA(_In_ LPCSTR); +BOOL WINAPI RemoveFontResourceW(_In_ LPCWSTR); #if (_WIN32_WINNT >= 0x0500) -BOOL WINAPI RemoveFontMemResourceEx(HANDLE); -BOOL WINAPI RemoveFontResourceExA(LPCSTR,DWORD,PVOID); -BOOL WINAPI RemoveFontResourceExW(LPCWSTR,DWORD,PVOID); -#endif -HDC WINAPI ResetDCA(HDC,const DEVMODEA*); -HDC WINAPI ResetDCW(HDC,const DEVMODEW*); -BOOL WINAPI ResizePalette(HPALETTE,UINT); -BOOL WINAPI RestoreDC(HDC,int); -BOOL WINAPI RoundRect(HDC,int,int,int,int,int,int); -int WINAPI SaveDC(HDC); -BOOL WINAPI ScaleViewportExtEx(HDC,int,int,int,int,LPSIZE); -BOOL WINAPI ScaleWindowExtEx(HDC,int,int,int,int,LPSIZE); -BOOL WINAPI SelectClipPath(HDC,int); -int WINAPI SelectClipRgn(HDC,HRGN); -HGDIOBJ WINAPI SelectObject(HDC,HGDIOBJ); -HPALETTE WINAPI SelectPalette(HDC,HPALETTE,BOOL); -int WINAPI SetAbortProc(HDC,ABORTPROC); -int WINAPI SetArcDirection(HDC,int); -LONG WINAPI SetBitmapBits(HBITMAP,DWORD,CONST VOID*); -BOOL WINAPI SetBitmapDimensionEx(HBITMAP,int,int,LPSIZE); -COLORREF WINAPI SetBkColor(HDC,COLORREF); -int WINAPI SetBkMode(HDC,int); -UINT WINAPI SetBoundsRect(HDC,LPCRECT,UINT); -BOOL WINAPI SetBrushOrgEx(HDC,int,int,LPPOINT); -BOOL WINAPI SetColorAdjustment(HDC,const COLORADJUSTMENT*); -HCOLORSPACE WINAPI SetColorSpace(HDC,HCOLORSPACE); +BOOL WINAPI RemoveFontMemResourceEx(_In_ HANDLE); +BOOL WINAPI RemoveFontResourceExA(_In_ LPCSTR, _In_ DWORD, _Reserved_ PVOID); +BOOL WINAPI RemoveFontResourceExW(_In_ LPCWSTR, _In_ DWORD, _Reserved_ PVOID); +#endif +HDC WINAPI ResetDCA(_In_ HDC, _In_ const DEVMODEA*); +HDC WINAPI ResetDCW(_In_ HDC, _In_ const DEVMODEW*); +BOOL WINAPI ResizePalette(_In_ HPALETTE, _In_ UINT); +BOOL WINAPI RestoreDC(_In_ HDC, _In_ int); +BOOL WINAPI RoundRect(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int); +int WINAPI SaveDC(_In_ HDC); +BOOL WINAPI ScaleViewportExtEx(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _Out_opt_ LPSIZE); +BOOL WINAPI ScaleWindowExtEx(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _Out_opt_ LPSIZE); +BOOL WINAPI SelectClipPath(_In_ HDC, _In_ int); +int WINAPI SelectClipRgn(_In_ HDC, _In_opt_ HRGN); +HGDIOBJ WINAPI SelectObject(_In_ HDC, _In_ HGDIOBJ); +HPALETTE WINAPI SelectPalette(_In_ HDC, _In_ HPALETTE, _In_ BOOL); +int WINAPI SetAbortProc(_In_ HDC, _In_ ABORTPROC); +int WINAPI SetArcDirection(_In_ HDC, _In_ int); + +LONG +WINAPI +SetBitmapBits( + _In_ HBITMAP hbm, + _In_ DWORD cb, + _In_reads_bytes_(cb) CONST VOID *pvBits); + +BOOL WINAPI SetBitmapDimensionEx(_In_ HBITMAP, _In_ int, _In_ int, _Out_opt_ LPSIZE); +COLORREF WINAPI SetBkColor(_In_ HDC, _In_ COLORREF); +int WINAPI SetBkMode(_In_ HDC, _In_ int); +UINT WINAPI SetBoundsRect(_In_ HDC, _In_opt_ LPCRECT, _In_ UINT); +BOOL WINAPI SetBrushOrgEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPPOINT); +BOOL WINAPI SetColorAdjustment(_In_ HDC, _In_ const COLORADJUSTMENT*); +HCOLORSPACE WINAPI SetColorSpace(_In_ HDC, _In_ HCOLORSPACE); #if (_WIN32_WINNT >= 0x0500) -COLORREF WINAPI SetDCBrushColor(HDC,COLORREF); -COLORREF WINAPI SetDCPenColor(HDC,COLORREF); -#endif -BOOL WINAPI SetDeviceGammaRamp(HDC,PVOID); -UINT WINAPI SetDIBColorTable(HDC,UINT,UINT,const RGBQUAD*); -int WINAPI SetDIBits(HDC,HBITMAP,UINT,UINT,CONST VOID*,CONST BITMAPINFO*,UINT); -int WINAPI SetDIBitsToDevice(HDC,int,int,DWORD,DWORD,int,int,UINT,UINT,CONST VOID*,CONST BITMAPINFO*,UINT); -HENHMETAFILE WINAPI SetEnhMetaFileBits(UINT,const BYTE*); -int WINAPI SetGraphicsMode(HDC,int); -int WINAPI SetICMMode(HDC,int); -BOOL WINAPI SetICMProfileA(HDC,LPSTR); -BOOL WINAPI SetICMProfileW(HDC,LPWSTR); -int WINAPI SetMapMode(HDC,int); -DWORD WINAPI SetMapperFlags(HDC,DWORD); +COLORREF WINAPI SetDCBrushColor(_In_ HDC, _In_ COLORREF); +COLORREF WINAPI SetDCPenColor(_In_ HDC, _In_ COLORREF); +#endif + +BOOL +WINAPI +SetDeviceGammaRamp( + _In_ HDC hdc, + _In_reads_bytes_(3*256*2) LPVOID lpRamp); + +UINT +WINAPI +SetDIBColorTable( + _In_ HDC hdc, + _In_ UINT iStart, + _In_ UINT cEntries, + _In_reads_(cEntries) const RGBQUAD *prgbq); + +int WINAPI SetDIBits(_In_opt_ HDC, _In_ HBITMAP, _In_ UINT, _In_ UINT, _In_ CONST VOID*, _In_ CONST BITMAPINFO*, _In_ UINT); +int WINAPI SetDIBitsToDevice(_In_ HDC, _In_ int, _In_ int, _In_ DWORD, _In_ DWORD, _In_ int, _In_ int, _In_ UINT, _In_ UINT, _In_ CONST VOID*, _In_ CONST BITMAPINFO*, _In_ UINT); + +HENHMETAFILE +WINAPI +SetEnhMetaFileBits( + _In_ UINT nSize, + _In_reads_bytes_(nSize) const BYTE * pb); + +int WINAPI SetGraphicsMode(_In_ HDC, _In_ int); +int WINAPI SetICMMode(_In_ HDC, _In_ int); +BOOL WINAPI SetICMProfileA(_In_ HDC, _In_ LPSTR); +BOOL WINAPI SetICMProfileW(_In_ HDC, _In_ LPWSTR); +int WINAPI SetMapMode(_In_ HDC, _In_ int); +DWORD WINAPI SetMapperFlags(_In_ HDC, _In_ DWORD); #if (_WIN32_WINNT >= 0x0500) -DWORD WINAPI SetLayout(HDC,DWORD); -DWORD WINAPI GetLayout(HDC); -#endif -HMETAFILE WINAPI SetMetaFileBitsEx(UINT,const BYTE *); -int WINAPI SetMetaRgn(HDC); -BOOL WINAPI SetMiterLimit(HDC,FLOAT,PFLOAT); -UINT WINAPI SetPaletteEntries(HPALETTE,UINT,UINT,const PALETTEENTRY*); -COLORREF WINAPI SetPixel(HDC,int,int,COLORREF); -BOOL WINAPI SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR*); -BOOL WINAPI SetPixelV(HDC,int,int,COLORREF); -int WINAPI SetPolyFillMode(HDC,int); -BOOL WINAPI SetRectRgn(HRGN,int,int,int,int); +DWORD WINAPI SetLayout(_In_ HDC, _In_ DWORD); +DWORD WINAPI GetLayout(_In_ HDC); +#endif + +HMETAFILE +WINAPI +SetMetaFileBitsEx( + _In_ UINT cbBuffer, + _In_reads_bytes_(cbBuffer) CONST BYTE *lpData); + +int WINAPI SetMetaRgn(_In_ HDC); +BOOL WINAPI SetMiterLimit(_In_ HDC, _In_ FLOAT, _Out_opt_ PFLOAT); + +UINT +WINAPI +SetPaletteEntries( + _In_ HPALETTE hpal, + _In_ UINT iStart, + _In_ UINT cEntries, + _In_reads_(cEntries) CONST PALETTEENTRY *pPalEntries); + +COLORREF WINAPI SetPixel(_In_ HDC, _In_ int, _In_ int, _In_ COLORREF); +BOOL WINAPI SetPixelFormat(_In_ HDC, _In_ int, _In_ const PIXELFORMATDESCRIPTOR*); +BOOL WINAPI SetPixelV(_In_ HDC, _In_ int, _In_ int, _In_ COLORREF); +int WINAPI SetPolyFillMode(_In_ HDC, _In_ int); +BOOL WINAPI SetRectRgn(_In_ HRGN, _In_ int, _In_ int, _In_ int, _In_ int); INT WINAPI SetRelAbs(HDC,INT); -int WINAPI SetROP2(HDC,int); -int WINAPI SetStretchBltMode(HDC,int); -UINT WINAPI SetSystemPaletteUse(HDC,UINT); -UINT WINAPI SetTextAlign(HDC,UINT); -int WINAPI SetTextCharacterExtra(HDC,int); -COLORREF WINAPI SetTextColor(HDC,COLORREF); -BOOL WINAPI SetTextJustification(HDC,int,int); -BOOL WINAPI SetViewportExtEx(HDC,int,int,LPSIZE); -BOOL WINAPI SetViewportOrgEx(HDC,int,int,LPPOINT); -BOOL WINAPI SetWindowExtEx(HDC,int,int,LPSIZE); -BOOL WINAPI SetWindowOrgEx(HDC,int,int,LPPOINT); -HENHMETAFILE WINAPI SetWinMetaFileBits(UINT,const BYTE*,HDC,const METAFILEPICT*); -BOOL WINAPI SetWorldTransform(HDC,const XFORM *); -int WINAPI StartDocA(HDC,const DOCINFOA*); -int WINAPI StartDocW(HDC,const DOCINFOW*); -int WINAPI StartPage(HDC); -BOOL WINAPI StretchBlt(HDC,int,int,int,int,HDC,int,int,int,int,DWORD); -int WINAPI StretchDIBits(HDC,int,int,int,int,int,int,int,int,const VOID *,const BITMAPINFO *,UINT,DWORD); -BOOL WINAPI StrokeAndFillPath(HDC); -BOOL WINAPI StrokePath(HDC); +int WINAPI SetROP2(_In_ HDC, _In_ int); +int WINAPI SetStretchBltMode(_In_ HDC, _In_ int); +UINT WINAPI SetSystemPaletteUse(_In_ HDC, _In_ UINT); +UINT WINAPI SetTextAlign(_In_ HDC, _In_ UINT); +int WINAPI SetTextCharacterExtra(_In_ HDC, _In_ int); +COLORREF WINAPI SetTextColor(_In_ HDC, _In_ COLORREF); +BOOL WINAPI SetTextJustification(_In_ HDC, _In_ int, _In_ int); +BOOL WINAPI SetViewportExtEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPSIZE); +BOOL WINAPI SetViewportOrgEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPPOINT); +BOOL WINAPI SetWindowExtEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPSIZE); +BOOL WINAPI SetWindowOrgEx(_In_ HDC, _In_ int, _In_ int, _Out_opt_ LPPOINT); + +HENHMETAFILE +WINAPI +SetWinMetaFileBits( + _In_ UINT nSize, + _In_reads_bytes_(nSize) const BYTE *lpMeta16Data, + _In_opt_ HDC hdcRef, + _In_opt_ const METAFILEPICT *lpMFP); + +BOOL WINAPI SetWorldTransform(_In_ HDC, _In_ const XFORM *); +int WINAPI StartDocA(_In_ HDC, _In_ const DOCINFOA*); +int WINAPI StartDocW(_In_ HDC, _In_ const DOCINFOW*); +int WINAPI StartPage(_In_ HDC); +BOOL WINAPI StretchBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_opt_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ DWORD); +int WINAPI StretchDIBits(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_ int, _In_opt_ const VOID *, _In_ const BITMAPINFO *, _In_ UINT, _In_ DWORD); +BOOL WINAPI StrokeAndFillPath(_In_ HDC); +BOOL WINAPI StrokePath(_In_ HDC); BOOL WINAPI SwapBuffers(HDC); -BOOL WINAPI TextOutA(HDC,int,int,LPCSTR,int); -BOOL WINAPI TextOutW(HDC,int,int,LPCWSTR,int); -BOOL WINAPI TranslateCharsetInfo(PDWORD,LPCHARSETINFO,DWORD); -BOOL WINAPI UnrealizeObject(HGDIOBJ); -BOOL WINAPI UpdateColors(HDC); -BOOL WINAPI UpdateICMRegKeyA(DWORD,LPSTR,LPSTR,UINT); -BOOL WINAPI UpdateICMRegKeyW(DWORD,LPWSTR,LPWSTR,UINT); -BOOL WINAPI WidenPath(HDC); + +BOOL +WINAPI +TextOutA( + _In_ HDC hdc, + _In_ int x, + _In_ int y, + _In_reads_(c) LPCSTR lpString, + _In_ int c); + +BOOL +WINAPI +TextOutW( + _In_ HDC hdc, + _In_ int x, + _In_ int y, + _In_reads_(c) LPCWSTR lpString, + _In_ int c); + +BOOL WINAPI TranslateCharsetInfo(_Inout_ PDWORD, _Out_ LPCHARSETINFO, _In_ DWORD); +BOOL WINAPI UnrealizeObject(_In_ HGDIOBJ); +BOOL WINAPI UpdateColors(_In_ HDC); +BOOL WINAPI UpdateICMRegKeyA(_Reserved_ DWORD, _In_ LPSTR, _In_ LPSTR, _In_ UINT); +BOOL WINAPI UpdateICMRegKeyW(_Reserved_ DWORD, _In_ LPWSTR, _In_ LPWSTR, _In_ UINT); +BOOL WINAPI WidenPath(_In_ HDC); BOOL WINAPI wglCopyContext(HGLRC,HGLRC,UINT); HGLRC WINAPI wglCreateContext(HDC); HGLRC WINAPI wglCreateLayerContext(HDC,int); @@ -3274,9 +4037,21 @@ BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT); #if (WINVER>= 0x0500) -BOOL WINAPI AlphaBlend(HDC,int,int,int,int,HDC,int,int,int,int,BLENDFUNCTION); -BOOL WINAPI GradientFill(HDC,PTRIVERTEX,ULONG,PVOID,ULONG,ULONG); -BOOL WINAPI TransparentBlt(HDC,int,int,int,int,HDC,int,int,int,int,UINT); + +BOOL WINAPI AlphaBlend(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ BLENDFUNCTION); + +BOOL +WINAPI +GradientFill( + _In_ HDC hdc, + _In_reads_(nVertex) PTRIVERTEX pVertex, + _In_ ULONG nVertex, + _In_ PVOID pMesh, + _In_ ULONG nMesh, + _In_ ULONG ulMode); + +BOOL WINAPI TransparentBlt(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ UINT); + #endif #ifdef UNICODE

1 0

[akhaldi] 58372: [SAL] * Add _Field_size_opt_ annotation.
by akhaldi＠svn.reactos.org 26 Feb '13

26 Feb '13

Author: akhaldi Date: Tue Feb 26 18:22:36 2013 New Revision: 58372 URL: http://svn.reactos.org/svn/reactos?rev=58372&view=rev Log: [SAL] * Add _Field_size_opt_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=583… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Tue Feb 26 18:22:36 2013 @@ -600,6 +600,7 @@ //#define _Deref2_pre_readonly_ #define _Field_range_(min,max) _SAL2_NAME(_Field_range_) _Group_(_SA_annotes2(SAL_range,min,max)) #define _Field_size_(size) _SAL2_NAME(_Field_size_) _Group_(_Notnull_ _Writable_elements_(size)) +#define _Field_size_opt_(size) _SAL2_NAME(_Field_size_opt_) _Group_(_Maybenull_ _Writable_elements_(size)) #define _Field_size_bytes_(size) _SAL2_NAME(_Field_size_bytes_) _Group_(_Notnull_ _Writable_bytes_(size)) //#define _Field_size_bytes_full_(size) //#define _Field_size_bytes_full_opt_(size) @@ -608,7 +609,6 @@ #define _Field_size_bytes_part_opt_(size, count) _SAL2_NAME(_Field_size_bytes_part_opt_) _Group_(_Maybenull_ _Writable_bytes_(size) _Readable_bytes_(count)) //#define _Field_size_full_(size) //#define _Field_size_full_opt_(size) -//#define _Field_size_opt_(size) //#define _Field_size_part_(size, count) //#define _Field_size_part_opt_(size, count) //#define _Field_z_

1 0

[pschweitzer] 58371: [REGEDIT] Fix typo in French translation. Spotted on: http://reactos.org/forum/viewtopic.php?p=99232#p99232
by pschweitzer＠svn.reactos.org 26 Feb '13

26 Feb '13

Author: pschweitzer Date: Tue Feb 26 06:44:31 2013 New Revision: 58371 URL: http://svn.reactos.org/svn/reactos?rev=58371&view=rev Log: [REGEDIT] Fix typo in French translation. Spotted on: http://reactos.org/forum/viewtopic.php?p=99232#p99232 Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Tue Feb 26 06:44:31 2013 @@ -342,7 +342,7 @@ ID_EDIT_RENAME "Renomme la sÃ©lection" ID_EDIT_COPYKEYNAME "Copie le nom de la clÃ© sÃ©lectionnÃ©e vers le presse-papier" ID_EDIT_FIND "Recherche du texte dans une clÃ©, une valeur ou des donnÃ©es" - ID_EDIT_FINDNEXT "Recherche l'occurence suivante du texte de la derniÃ¨re recherche" + ID_EDIT_FINDNEXT "Recherche l'occurrence suivante du texte de la derniÃ¨re recherche" END STRINGTABLE DISCARDABLE

1 0

[tkreuzer] 58370: [FREELDR] Fix a typo in arm code that I introduced, spotted by Thomas.
by tkreuzer＠svn.reactos.org 25 Feb '13

25 Feb '13

Author: tkreuzer Date: Mon Feb 25 20:11:40 2013 New Revision: 58370 URL: http://svn.reactos.org/svn/reactos?rev=58370&view=rev Log: [FREELDR] Fix a typo in arm code that I introduced, spotted by Thomas. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Mon Feb 25 20:11:40 2013 @@ -104,7 +104,7 @@ ArmInitializeBootDevices(VOID) { /* Emulate old behavior */ - return ArmHwDetect != NULL; + return (ArmHwDetect() != NULL); } PCONFIGURATION_COMPONENT_DATA

1 0

[tkreuzer] 58369: [FREELDR] Get rid of reactos_arc_hardware_data, which wasn't used anyway. This frees up 16KB of memory. Don't reallocate the PARTIAL_RESOURE_LISTs in FldrCreateComponentKey, inste...
by tkreuzer＠svn.reactos.org 25 Feb '13

25 Feb '13

Author: tkreuzer Date: Mon Feb 25 20:07:17 2013 New Revision: 58369 URL: http://svn.reactos.org/svn/reactos?rev=58369&view=rev Log: [FREELDR] Get rid of reactos_arc_hardware_data, which wasn't used anyway. This frees up 16KB of memory. Don't reallocate the PARTIAL_RESOURE_LISTs in FldrCreateComponentKey, instead take over the ones passed by the caller. Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/arm/macharm.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -31,7 +31,6 @@ ARC_DISK_SIGNATURE reactos_arc_disk_info; ULONG reactos_disk_count; -CHAR reactos_arc_hardware_data[256]; ULONG SizeBits[] = { Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -355,8 +355,6 @@ &BusKey); (*BusNumber)++; - - MmHeapFree(PartialResourceList); } @@ -545,8 +543,6 @@ PartialResourceList, Size, &PeripheralKey); - - MmHeapFree(PartialResourceList); } } @@ -619,8 +615,6 @@ &ControllerKey); TRACE("Created key: DiskController\\0\n"); - MmHeapFree(PartialResourceList); - if (FloppyCount) DetectBiosFloppyPeripheral(ControllerKey); } @@ -690,8 +684,6 @@ PartialResourceList, Size, &SystemKey); - - MmHeapFree(PartialResourceList); return SystemKey; } @@ -739,7 +731,6 @@ Size, &DiskKey); } - } static @@ -917,12 +908,12 @@ DetectSerialPointerPeripheral(PCONFIGURATION_COMPONENT_DATA ControllerKey, PUCHAR Base) { - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; char Buffer[256]; CHAR Identifier[256]; PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG MouseType; - ULONG Length; + ULONG Size, Length; ULONG i; ULONG j; ULONG k; @@ -1043,10 +1034,13 @@ } /* Set 'Configuration Data' value */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 1; - PartialResourceList.Revision = 1; - PartialResourceList.Count = 0; + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + PartialResourceList = MmHeapAlloc(Size); + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; /* Create 'PointerPeripheral' key */ FldrCreateComponentKey(ControllerKey, @@ -1056,9 +1050,8 @@ 0x0, 0xFFFFFFFF, Identifier, - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + PartialResourceList, + Size, &PeripheralKey); TRACE("Created key: PointerPeripheral\\0\n"); @@ -1160,8 +1153,6 @@ Size, &ControllerKey); - MmHeapFree(PartialResourceList); - if (!Rs232PortInUse(UlongToPtr(Base))) { /* Detect serial mouse */ @@ -1257,8 +1248,6 @@ PartialResourceList, Size, &ControllerKey); - - MmHeapFree(PartialResourceList); ControllerNumber++; } @@ -1390,8 +1379,6 @@ Size, &PeripheralKey); TRACE("Created key: KeyboardPeripheral\\0\n"); - - MmHeapFree(PartialResourceList); } } @@ -1461,8 +1448,6 @@ &ControllerKey); TRACE("Created key: KeyboardController\\0\n"); - MmHeapFree(PartialResourceList); - DetectKeyboardPeripheral(ControllerKey); } @@ -1582,28 +1567,30 @@ VOID DetectPS2Mouse(PCONFIGURATION_COMPONENT_DATA BusKey) { - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCONFIGURATION_COMPONENT_DATA ControllerKey; PCONFIGURATION_COMPONENT_DATA PeripheralKey; + ULONG Size; if (DetectPS2AuxPort()) { TRACE("Detected PS2 port\n"); - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); + PartialResourceList = MmHeapAlloc(sizeof(CM_PARTIAL_RESOURCE_LIST)); + memset(PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Initialize resource descriptor */ - PartialResourceList.Version = 1; - PartialResourceList.Revision = 1; - PartialResourceList.Count = 1; + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 1; /* Set Interrupt */ - PartialResourceList.PartialDescriptors[0].Type = CmResourceTypeInterrupt; - PartialResourceList.PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; - PartialResourceList.PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; - PartialResourceList.PartialDescriptors[0].u.Interrupt.Level = 12; - PartialResourceList.PartialDescriptors[0].u.Interrupt.Vector = 12; - PartialResourceList.PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; + PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeInterrupt; + PartialResourceList->PartialDescriptors[0].ShareDisposition = CmResourceShareUndetermined; + PartialResourceList->PartialDescriptors[0].Flags = CM_RESOURCE_INTERRUPT_LATCHED; + PartialResourceList->PartialDescriptors[0].u.Interrupt.Level = 12; + PartialResourceList->PartialDescriptors[0].u.Interrupt.Vector = 12; + PartialResourceList->PartialDescriptors[0].u.Interrupt.Affinity = 0xFFFFFFFF; /* Create controller key */ FldrCreateComponentKey(BusKey, @@ -1613,7 +1600,7 @@ 0x0, 0xFFFFFFFF, NULL, - &PartialResourceList, + PartialResourceList, sizeof(CM_PARTIAL_RESOURCE_LIST), &ControllerKey); TRACE("Created key: PointerController\\0\n"); @@ -1623,10 +1610,13 @@ TRACE("Detected PS2 mouse\n"); /* Initialize resource descriptor */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 1; - PartialResourceList.Revision = 1; - PartialResourceList.Count = 0; + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); + PartialResourceList = MmHeapAlloc(Size); + memset(PartialResourceList, 0, Size); + PartialResourceList->Version = 1; + PartialResourceList->Revision = 1; + PartialResourceList->Count = 0; /* Create peripheral key */ FldrCreateComponentKey(ControllerKey, @@ -1636,9 +1626,8 @@ 0x0, 0xFFFFFFFF, "MICROSOFT PS2 MOUSE", - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + PartialResourceList, + Size, &PeripheralKey); TRACE("Created key: PointerPeripheral\\0\n"); } @@ -1731,8 +1720,6 @@ Size, &BusKey); - MmHeapFree(PartialResourceList); - /* Detect ISA/BIOS devices */ DetectBiosDisks(BusKey); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwacpi.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -115,8 +115,6 @@ /* Increment bus number */ (*BusNumber)++; - - MmHeapFree(PartialResourceList); } } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwapm.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -59,15 +59,20 @@ DetectApmBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) { PCONFIGURATION_COMPONENT_DATA BiosKey; - CM_PARTIAL_RESOURCE_LIST PartialResourceList; + PCM_PARTIAL_RESOURCE_LIST PartialResourceList; + ULONG Size; + + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); if (FindApmBios()) { /* Create 'Configuration Data' value */ - memset(&PartialResourceList, 0, sizeof(CM_PARTIAL_RESOURCE_LIST)); - PartialResourceList.Version = 0; - PartialResourceList.Revision = 0; - PartialResourceList.Count = 0; + PartialResourceList = MmHeapAlloc(Size); + memset(&PartialResourceList, 0, Size); + PartialResourceList->Version = 0; + PartialResourceList->Revision = 0; + PartialResourceList->Count = 0; /* Create new bus key */ FldrCreateComponentKey(SystemKey, @@ -77,9 +82,8 @@ 0x0, 0xFFFFFFFF, "APM", - &PartialResourceList, - sizeof(CM_PARTIAL_RESOURCE_LIST) - - sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR), + PartialResourceList, + Size, &BiosKey); /* Increment bus number */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -158,8 +158,6 @@ PartialResourceList, Size, &TableKey); - - MmHeapFree(PartialResourceList); } } @@ -204,8 +202,6 @@ /* Increment bus number */ (*BusNumber)++; - - MmHeapFree(PartialResourceList); DetectPciIrqRoutingTable(BiosKey); @@ -268,8 +264,6 @@ Size, &BusKey); - MmHeapFree(PartialResourceList); - /* Increment bus number */ (*BusNumber)++; } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -429,8 +429,6 @@ &ControllerKey); TRACE("Created key: DiskController\\0\n"); - MmHeapFree(PartialResourceList); - /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) { @@ -451,9 +449,6 @@ PartialResourceList, Size, &DiskKey); - - if (PartialResourceList) - MmHeapFree(PartialResourceList); } } @@ -497,8 +492,6 @@ /* Increment bus number */ (*BusNumber)++; - MmHeapFree(PartialResourceList); - /* Detect ISA/BIOS devices */ DetectBiosDisks(SystemKey, BusKey); Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -21,7 +21,6 @@ ARC_DISK_SIGNATURE reactos_arc_disk_info[32]; // ARC Disk Information ULONG reactos_disk_count = 0; -CHAR reactos_arc_hardware_data[HW_MAX_ARC_HEAP_SIZE] = {0}; CHAR reactos_arc_strings[32][256]; typedef Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/arm/hardware.h [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -24,8 +24,6 @@ OUT PCONFIGURATION_COMPONENT_DATA *SystemKey ); -#define HW_MAX_ARC_HEAP_SIZE 256 - extern PARM_BOARD_CONFIGURATION_BLOCK ArmBoardBlock; extern ULONG FirstLevelDcacheSize; extern ULONG FirstLevelDcacheFillSize; Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -23,12 +23,6 @@ #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - -// -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 // // ARC Component Configuration Routines Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/powerpc/hardware.h [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -26,12 +26,6 @@ #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) - -// -// Static heap for ARC Hardware Component Tree -// 16KB oughta be enough for anyone. -// -#define HW_MAX_ARC_HEAP_SIZE 16 * 1024 // // ARC Component Configuration Routines Modified: trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/archwsup.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -14,17 +14,7 @@ /* GLOBALS ********************************************************************/ -extern CHAR reactos_arc_hardware_data[]; -SIZE_T FldrpHwHeapLocation; PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot; - -BOOLEAN UseRealHeap = FALSE; - -VOID -NTAPI -FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size); /* FUNCTIONS ******************************************************************/ @@ -34,26 +24,8 @@ { PVOID Buffer; - if (UseRealHeap) - { - /* Allocate memory from generic bootloader heap */ - Buffer = MmHeapAlloc(Size); - } - else - { - /* Return a block of memory from the ARC Hardware Heap */ - Buffer = &reactos_arc_hardware_data[FldrpHwHeapLocation]; - - /* Increment the heap location */ - FldrpHwHeapLocation += Size; - if (FldrpHwHeapLocation > HW_MAX_ARC_HEAP_SIZE) Buffer = NULL; - } - - /* Clear it */ - if (Buffer) - RtlZeroMemory(Buffer, Size); - - /* Return the buffer */ + /* Allocate memory from generic bootloader heap */ + Buffer = MmHeapAlloc(Size); return Buffer; } @@ -65,10 +37,10 @@ SIZE_T IdentifierLength; PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; PCHAR Identifier; - + /* Allocate memory for the identifier */ IdentifierLength = strlen(IdentifierString) + 1; - Identifier = FldrpHwHeapAlloc(IdentifierLength); + Identifier = MmHeapAlloc(IdentifierLength); if (!Identifier) return; /* Copy the identifier */ @@ -84,11 +56,11 @@ FldrCreateSystemKey(OUT PCONFIGURATION_COMPONENT_DATA *SystemNode) { PCONFIGURATION_COMPONENT Component; - + /* Allocate the root */ - FldrArcHwTreeRoot = FldrpHwHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); + FldrArcHwTreeRoot = MmHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!FldrArcHwTreeRoot) return; - + /* Set it up */ Component = &FldrArcHwTreeRoot->ComponentEntry; Component->Class = SystemClass; @@ -101,7 +73,7 @@ Component->Revision = 0; Component->Key = 0; Component->AffinityMask = 0xFFFFFFFF; - + /* Return the node */ *SystemNode = FldrArcHwTreeRoot; } @@ -130,7 +102,7 @@ /* This is now the parent */ Parent = Sibling; } while ((Sibling = Sibling->Sibling)); - + /* Found the lowest sibling; mark us as its sibling too */ Parent->Sibling = Child; } @@ -153,16 +125,16 @@ PCONFIGURATION_COMPONENT Component; /* Allocate the node for this component */ - ComponentData = FldrpHwHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); + ComponentData = MmHeapAlloc(sizeof(CONFIGURATION_COMPONENT_DATA)); if (!ComponentData) return; - + /* Now save our parent */ ComponentData->Parent = SystemNode; - + /* Link us to the parent */ if (SystemNode) FldrLinkToParent(SystemNode, ComponentData); - + /* Set us up */ Component = &ComponentData->ComponentEntry; Component->Class = Class; @@ -170,36 +142,19 @@ Component->Flags = Flags; Component->Key = Key; Component->AffinityMask = Affinity; - + /* Set identifier */ if (IdentifierString) FldrSetIdentifier(ComponentData, IdentifierString); - + /* Set configuration data */ if (ResourceList) - FldrSetConfigurationData(ComponentData, ResourceList, Size); - + { + ComponentData->ConfigurationData = ResourceList; + ComponentData->ComponentEntry.ConfigurationDataLength = Size; + } + /* Return the child */ - *ComponentKey = ComponentData; + *ComponentKey = ComponentData; } -VOID -NTAPI -FldrSetConfigurationData(IN PCONFIGURATION_COMPONENT_DATA ComponentData, - IN PCM_PARTIAL_RESOURCE_LIST ResourceList, - IN ULONG Size) -{ - PCONFIGURATION_COMPONENT Component = &ComponentData->ComponentEntry; - PVOID ConfigurationData; - - /* Allocate a buffer from the hardware heap */ - ConfigurationData = FldrpHwHeapAlloc(Size); - if (!ConfigurationData) return; - - /* Copy component information */ - RtlCopyMemory(ConfigurationData, ResourceList, Size); - - /* Set component information */ - ComponentData->ConfigurationData = ConfigurationData; - Component->ConfigurationDataLength = Size; -} Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Mon Feb 25 20:07:17 2013 @@ -30,7 +30,6 @@ extern ULONG reactos_disk_count; extern ARC_DISK_SIGNATURE reactos_arc_disk_info[]; -extern BOOLEAN UseRealHeap; extern ULONG LoaderPagesSpanned; extern BOOLEAN AcpiPresent; @@ -582,7 +581,6 @@ SystemRoot = strstr(BootPath, "\\"); /* Detect hardware */ - UseRealHeap = TRUE; LoaderBlock->ConfigurationRoot = MachHwDetect(); if (OperatingSystemVersion == 0)

1 0

[gadamopoulos] 58368: Fix build for gcc
by gadamopoulos＠svn.reactos.org 24 Feb '13

24 Feb '13

Author: gadamopoulos Date: Sun Feb 24 21:38:48 2013 New Revision: 58368 URL: http://svn.reactos.org/svn/reactos?rev=58368&view=rev Log: Fix build for gcc Modified: trunk/reactos/dll/win32/msgina/gui.c Modified: trunk/reactos/dll/win32/msgina/gui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/gui.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/gui.c [iso-8859-1] Sun Feb 24 21:38:48 2013 @@ -67,7 +67,7 @@ if (!DuplicateHandle ( GetCurrentProcess(), msg->hDesktop, GetCurrentProcess(), - &hDesk, + (HANDLE*)&hDesk, 0, FALSE, DUPLICATE_SAME_ACCESS))

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