July 2012 - Wine-Commits - list.winehq.org

Aric Stewart : usp10: Implement GPOS Anchor formats.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 69351a9cea4f48fe7e4f907bad89d5714094f6fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=69351a9cea4f48fe7e4f907ba… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:53 2012 -0500 usp10: Implement GPOS Anchor formats. --- dlls/usp10/opentype.c | 98 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b875594..8434789 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -286,6 +286,34 @@ typedef struct { WORD LookupList; } GPOS_Header; +typedef struct { + WORD StartSize; + WORD EndSize; + WORD DeltaFormat; + WORD DeltaValue[1]; +} OT_DeviceTable; + +typedef struct { + WORD AnchorFormat; + WORD XCoordinate; + WORD YCoordinate; +} GPOS_AnchorFormat1; + +typedef struct { + WORD AnchorFormat; + WORD XCoordinate; + WORD YCoordinate; + WORD AnchorPoint; +} GPOS_AnchorFormat2; + +typedef struct { + WORD AnchorFormat; + WORD XCoordinate; + WORD YCoordinate; + WORD XDeviceTable; + WORD YDeviceTable; +} GPOS_AnchorFormat3; + /********** * CMAP **********/ @@ -872,6 +900,76 @@ INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, IN /********** * GPOS **********/ +static INT GPOS_get_device_table_value(const OT_DeviceTable *DeviceTable, WORD ppem) +{ + static const WORD mask[3] = {3,0xf,0xff}; + if (DeviceTable && ppem >= GET_BE_WORD(DeviceTable->StartSize) && ppem <= GET_BE_WORD(DeviceTable->EndSize)) + { + int format = GET_BE_WORD(DeviceTable->DeltaFormat); + int index = ppem - GET_BE_WORD(DeviceTable->StartSize); + int value; + TRACE("device table, format %i, index %i\n",format, index); + index = index << format; + value = (DeviceTable->DeltaValue[index/sizeof(WORD)] << (index%sizeof(WORD)))&mask[format-1]; + TRACE("offset %i, value %i\n",index, value); + if (value > mask[format-1]/2) + value = -1 * ((mask[format-1]+1) - value); + return value; + } + return 0; +} + +static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem) +{ + const GPOS_AnchorFormat1* anchor1 = (const GPOS_AnchorFormat1*)table; + + switch (GET_BE_WORD(anchor1->AnchorFormat)) + { + case 1: + { + TRACE("Anchor Format 1\n"); + pt->x = (short)GET_BE_WORD(anchor1->XCoordinate); + pt->y = (short)GET_BE_WORD(anchor1->YCoordinate); + break; + } + case 2: + { + const GPOS_AnchorFormat2* anchor2 = (const GPOS_AnchorFormat2*)table; + TRACE("Anchor Format 2\n"); + pt->x = (short)GET_BE_WORD(anchor2->XCoordinate); + pt->y = (short)GET_BE_WORD(anchor2->YCoordinate); + break; + } + case 3: + { + int offset; + const GPOS_AnchorFormat3* anchor3 = (const GPOS_AnchorFormat3*)table; + TRACE("Anchor Format 3\n"); + pt->x = (short)GET_BE_WORD(anchor3->XCoordinate); + pt->y = (short)GET_BE_WORD(anchor3->YCoordinate); + offset = GET_BE_WORD(anchor3->XDeviceTable); + TRACE("ppem %i\n",ppem); + if (offset) + { + const OT_DeviceTable* DeviceTableX = NULL; + DeviceTableX = (const OT_DeviceTable*)((const BYTE*)anchor3 + offset); + pt->x += GPOS_get_device_table_value(DeviceTableX, ppem); + } + offset = GET_BE_WORD(anchor3->YDeviceTable); + if (offset) + { + const OT_DeviceTable* DeviceTableY = NULL; + DeviceTableY = (const OT_DeviceTable*)((const BYTE*)anchor3 + offset); + pt->y += GPOS_get_device_table_value(DeviceTableY, ppem); + } + break; + } + default: + ERR("Unknown Anchor Format %i\n",GET_BE_WORD(anchor1->AnchorFormat)); + pt->x = 0; + pt->y = 0; + } +} 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) {

1 0

Aric Stewart : usp10: Add GPOS features to scripts as defined by VOLT.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: f70864b827a96a1d0549958b927b3e553c51ec07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f70864b827a96a1d0549958b9… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:57 2012 -0500 usp10: Add GPOS features to scripts as defined by VOLT. --- dlls/usp10/shape.c | 147 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 102 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f70864b827a96a1d05499…

1 0

Aric Stewart : usp10: Handle GPOS ValueRecords.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 1dc148d7cc0a95815c350edbf026bfe3e5258989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc148d7cc0a95815c350edbf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:24:09 2012 -0500 usp10: Handle GPOS ValueRecords. --- dlls/usp10/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 093dab7..70d0da7 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -315,6 +315,17 @@ typedef struct { } GPOS_AnchorFormat3; typedef struct { + WORD XPlacement; + WORD YPlacement; + WORD XAdvance; + WORD YAdvance; + WORD XPlaDevice; + WORD YPlaDevice; + WORD XAdvDevice; + WORD YAdvDevice; +} GPOS_ValueRecord; + +typedef struct { WORD PosFormat; WORD MarkCoverage; WORD BaseCoverage; @@ -1010,6 +1021,33 @@ static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLO FIXME("Font with lfWidth set no handled properly\n"); } +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++]); + return offset; +} + +static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *ValueRecord, WORD ValueFormat, INT ppem, LPPOINT ptPlacement, LPPOINT ptAdvance) +{ + if (ValueFormat & 0x0001) ptPlacement->x += (short)ValueRecord->XPlacement; + if (ValueFormat & 0x0002) ptPlacement->y += (short)ValueRecord->YPlacement; + if (ValueFormat & 0x0004) ptAdvance->x += (short)ValueRecord->XAdvance; + if (ValueFormat & 0x0008) ptAdvance->y += (short)ValueRecord->YAdvance; + if (ValueFormat & 0x0010) ptPlacement->x += GPOS_get_device_table_value((const OT_DeviceTable*)(head + ValueRecord->XPlaDevice), ppem); + if (ValueFormat & 0x0020) ptPlacement->y += GPOS_get_device_table_value((const OT_DeviceTable*)(head + ValueRecord->YPlaDevice), ppem); + if (ValueFormat & 0x0040) ptAdvance->x += GPOS_get_device_table_value((const OT_DeviceTable*)(head + ValueRecord->XAdvDevice), ppem); + if (ValueFormat & 0x0080) ptAdvance->y += GPOS_get_device_table_value((const OT_DeviceTable*)(head + ValueRecord->YAdvDevice), ppem); + if (ValueFormat & 0xFF00) FIXME("Unhandled Value Format %x\n",ValueFormat&0xFF00); +} + 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) { int j;

1 0

Aric Stewart : usp10: Implement GPOS Single Adjustment Positioning.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: e3a98b437ba1aede1b6139a2f20c9519887d2801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a98b437ba1aede1b6139a2f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:24:13 2012 -0500 usp10: Implement GPOS Single Adjustment Positioning. --- dlls/usp10/opentype.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 55 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 70d0da7..b3913bf 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -327,6 +327,13 @@ typedef struct { typedef struct { WORD PosFormat; + WORD Coverage; + WORD ValueFormat; + WORD Value[1]; +} GPOS_SinglePosFormat1; + +typedef struct { + WORD PosFormat; WORD MarkCoverage; WORD BaseCoverage; WORD ClassCount; @@ -1048,6 +1055,34 @@ static VOID GPOS_get_value_record_offsets(const BYTE* head, GPOS_ValueRecord *Va 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) +{ + int j; + + TRACE("Single Adjustment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GPOS_SinglePosFormat1 *spf1; + WORD offset = GET_BE_WORD(look->SubTable[j]); + spf1 = (const GPOS_SinglePosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(spf1->PosFormat == 1)) + { + offset = GET_BE_WORD(spf1->Coverage); + if (GSUB_is_glyph_covered((const BYTE*)spf1+offset, glyphs[glyph_index]) != -1) + { + GPOS_ValueRecord ValueRecord = {0,0,0,0,0,0,0,0}; + WORD ValueFormat = GET_BE_WORD(spf1->ValueFormat); + GPOS_get_value_record(ValueFormat, spf1->Value, &ValueRecord); + GPOS_get_value_record_offsets((const BYTE*)spf1, &ValueRecord, ValueFormat, ppem, ptAdjust, ptAdvance); + TRACE("Glyph Adjusted by %i,%i\n",ValueRecord.XPlacement,ValueRecord.YPlacement); + } + } + else + FIXME("Single Adjustment Positioning: Format 2 Unhandled\n"); + } +} + 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) { int j; @@ -1124,6 +1159,26 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); switch(GET_BE_WORD(look->LookupType)) { + case 1: + { + 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); + if (adjust.x || adjust.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust.x, adjust.y, &devX, &devY); + pGoffset[glyph_index].du += (int)(devX+0.5); + pGoffset[glyph_index].dv += (int)(devY+0.5); + } + if (advance.x || advance.y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, advance.x, advance.y, &devX, &devY); + piAdvance[glyph_index] += (int)(devX+0.5); + if (advance.y) + FIXME("Unhandled adjustment to Y advancement\n"); + } + } case 4: { double devX, devY;

1 0

Aric Stewart : usp10: Implement GPOS Pair Adjustment Positioning Subtable.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 5a45e3474141536b02cfc4e924be3aacbd6ad2c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a45e3474141536b02cfc4e92… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:24:16 2012 -0500 usp10: Implement GPOS Pair Adjustment Positioning Subtable. --- dlls/usp10/opentype.c | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index b3913bf..9ffdf28 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -334,6 +334,26 @@ typedef struct { typedef struct { WORD PosFormat; + WORD Coverage; + WORD ValueFormat1; + WORD ValueFormat2; + WORD PairSetCount; + WORD PairSetOffset[1]; +} GPOS_PairPosFormat1; + +typedef struct { + WORD SecondGlyph; + WORD Value1[1]; + WORD Value2[1]; +} GPOS_PairValueRecord; + +typedef struct { + WORD PairValueCount; + GPOS_PairValueRecord PairValueRecord[1]; +} GPOS_PairSet; + +typedef struct { + WORD PosFormat; WORD MarkCoverage; WORD BaseCoverage; WORD ClassCount; @@ -1083,6 +1103,67 @@ static VOID GPOS_apply_SingleAdjustment(const OT_LookupTable *look, const WORD * } } +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) +{ + int j; + + TRACE("Pair Adjustment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + const GPOS_PairPosFormat1 *ppf1; + WORD offset = GET_BE_WORD(look->SubTable[j]); + ppf1 = (const GPOS_PairPosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(ppf1->PosFormat) == 1) + { + offset = GET_BE_WORD(ppf1->Coverage); + if (GSUB_is_glyph_covered((const BYTE*)ppf1+offset, glyphs[glyph_index]) != -1) + { + int i; + int count = GET_BE_WORD(ppf1->PairSetCount); + for (i = 0; i < count; i++) + { + int k; + int pair_count; + const GPOS_PairSet *ps; + offset = GET_BE_WORD(ppf1->PairSetOffset[i]); + ps = (const GPOS_PairSet*)((const BYTE*)ppf1+offset); + pair_count = GET_BE_WORD(ps->PairValueCount); + for (k = 0; k < pair_count; k++) + { + if (glyphs[glyph_index+write_dir] == GET_BE_WORD(ps->PairValueRecord[k].SecondGlyph)) + { + 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); + } + 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); + return glyph_index+2; + } + } + } + } + } + } + else + FIXME("Pair Adjustment Positioning: Format %i Unhandled\n",GET_BE_WORD(ppf1->PosFormat)); + } + 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) { int j; @@ -1179,6 +1260,37 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I FIXME("Unhandled adjustment to Y advancement\n"); } } + case 2: + { + POINT advance[2]= {{0,0},{0,0}}; + 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); + 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 += (int)(devX+0.5); + pGoffset[glyph_index].dv += (int)(devY+0.5); + } + if (advance[0].x || advance[0].y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[0].x, advance[0].y, &devX, &devY); + piAdvance[glyph_index] += (int)(devX+0.5); + } + 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 += (int)(devX+0.5); + pGoffset[glyph_index + write_dir].dv += (int)(devY+0.5); + } + if (advance[1].x || advance[1].y) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[1].x, advance[1].y, &devX, &devY); + piAdvance[glyph_index + write_dir] += (int)(devX+0.5); + } + return index; + } case 4: { double devX, devY;

1 0

Erich Hoover : hhctrl.ocx: Implement HH_CLOSE_ALL.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 97bcef997fdd53137ab250448ac15bb9d4b40ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bcef997fdd53137ab250448… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jul 12 10:21:36 2012 -0600 hhctrl.ocx: Implement HH_CLOSE_ALL. --- dlls/hhctrl.ocx/chm.c | 6 ++++-- dlls/hhctrl.ocx/help.c | 5 +++++ dlls/hhctrl.ocx/hhctrl.c | 31 +++++++++++++++++++++++++------ dlls/hhctrl.ocx/hhctrl.h | 3 +++ 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index cc92b89..82b8d9a 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -138,7 +138,8 @@ static BOOL ReadChmSystem(CHMInfo *chm) chm->codePage = CP_ACP; break; case 0x5: - TRACE("Default window is %s\n", debugstr_an(buf, entry.len)); + TRACE("Window name is %s\n", debugstr_an(buf, entry.len)); + chm->defWindow = strdupnAtoW(buf, entry.len); break; case 0x6: TRACE("Compiled file is %s\n", debugstr_an(buf, entry.len)); @@ -268,7 +269,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info) memset((void*)&(info->WinType), 0, sizeof(info->WinType)); info->WinType.cbStruct=sizeof(info->WinType); info->WinType.fUniCodeStrings=TRUE; - info->WinType.pszType=strdupW(defaultwinW); + info->WinType.pszType = strdupW(info->pCHMInfo->defWindow ? info->pCHMInfo->defWindow : defaultwinW); info->WinType.pszToc = strdupW(info->pCHMInfo->defToc ? info->pCHMInfo->defToc : null); info->WinType.pszIndex = strdupW(null); info->WinType.fsValidMembers=0; @@ -530,6 +531,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) } heap_free(chm->strings); + heap_free(chm->defWindow); heap_free(chm->defTitle); heap_free(chm->defTopic); heap_free(chm->defToc); diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index 87ea94f..2f2fba1 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -48,6 +48,8 @@ static void ExpandContract(HHInfo *pHHInfo); #define TAB_MARGIN 8 #define EDIT_HEIGHT 20 +struct list window_list = LIST_INIT(window_list); + static const WCHAR szEmpty[] = {0}; struct html_encoded_symbol { @@ -1740,6 +1742,8 @@ void ReleaseHelpViewer(HHInfo *info) if (!info) return; + list_remove(&info->entry); + /* Free allocated strings */ heap_free(info->pszType); heap_free(info->pszCaption); @@ -1798,6 +1802,7 @@ HHInfo *CreateHelpViewer(LPCWSTR filename) return NULL; } + list_add_tail(&window_list, &info->entry); return info; } diff --git a/dlls/hhctrl.ocx/hhctrl.c b/dlls/hhctrl.ocx/hhctrl.c index 7647abb..a5e7e37 100644 --- a/dlls/hhctrl.ocx/hhctrl.c +++ b/dlls/hhctrl.ocx/hhctrl.c @@ -41,6 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(htmlhelp); HINSTANCE hhctrl_hinstance; BOOL hh_process = FALSE; +extern struct list window_list; + BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD fdwReason, LPVOID lpvReserved) { TRACE("(%p,%d,%p)\n", hInstance, fdwReason, lpvReserved); @@ -98,7 +100,7 @@ static const char *command_to_string(UINT command) #undef X } -static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen, const WCHAR **index, const WCHAR **window) +static BOOL resolve_filename(const WCHAR *filename, WCHAR *fullname, DWORD buflen, WCHAR **index, WCHAR **window) { const WCHAR *extra; WCHAR chm_file[MAX_PATH]; @@ -164,14 +166,15 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat HHInfo *info; BOOL res; NMHDR nmhdr; + WCHAR *window = NULL; const WCHAR *index = NULL; + WCHAR *default_index = NULL; int tab_index = TAB_CONTENTS; - const WCHAR *default_index = NULL; if (!filename) return NULL; - if (!resolve_filename(filename, fullname, MAX_PATH, &default_index, NULL)) + if (!resolve_filename(filename, fullname, MAX_PATH, &default_index, &window)) { WARN("can't find %s\n", debugstr_w(filename)); return 0; @@ -180,10 +183,18 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat info = CreateHelpViewer(fullname); if(!info) + { + heap_free(default_index); + heap_free(window); return NULL; + } if(!index) index = info->WinType.pszFile; + if(!info->pszType) + info->WinType.pszType = info->pszType = window; + else + heap_free(window); /* called to load a specified topic */ switch(command) @@ -196,9 +207,7 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } res = NavigateToChm(info, info->pCHMInfo->szFile, index); - - if (default_index) - heap_free((WCHAR*)default_index); + heap_free(default_index); if(!res) { @@ -269,6 +278,16 @@ HWND WINAPI HtmlHelpW(HWND caller, LPCWSTR filename, UINT command, DWORD_PTR dat } return 0; } + case HH_CLOSE_ALL: { + HHInfo *info, *next; + + LIST_FOR_EACH_ENTRY_SAFE(info, next, &window_list, HHInfo, entry) + { + TRACE("Destroying window %s.\n", debugstr_w(info->WinType.pszType)); + ReleaseHelpViewer(info); + } + return 0; + } default: FIXME("HH case %s not handled.\n", command_to_string( command )); } diff --git a/dlls/hhctrl.ocx/hhctrl.h b/dlls/hhctrl.ocx/hhctrl.h index 8959748..f03d476 100644 --- a/dlls/hhctrl.ocx/hhctrl.h +++ b/dlls/hhctrl.ocx/hhctrl.h @@ -40,6 +40,7 @@ #include "wine/itss.h" #include "wine/unicode.h" +#include "wine/list.h" #define WB_GOBACK 0 #define WB_GOFORWARD 1 @@ -103,6 +104,7 @@ typedef struct CHMInfo DWORD strings_size; WCHAR *compiledFile; + WCHAR *defWindow; WCHAR *defTopic; WCHAR *defTitle; WCHAR *defToc; @@ -157,6 +159,7 @@ typedef struct { LPWSTR pszUrlJump2; LPWSTR pszCustomTabs; + struct list entry; CHMInfo *pCHMInfo; ContentItem *content; IndexItem *index;

1 0

Aric Stewart : usp10: Implement GPOS MarkToBase.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 85c9984389ba17ee98f72265adc2d8aee6e0996d URL: http://source.winehq.org/git/wine.git/?a=commit;h=85c9984389ba17ee98f72265a… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:24:06 2012 -0500 usp10: Implement GPOS MarkToBase. --- dlls/usp10/opentype.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 8434789..093dab7 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -314,6 +314,34 @@ typedef struct { WORD YDeviceTable; } GPOS_AnchorFormat3; +typedef struct { + WORD PosFormat; + WORD MarkCoverage; + WORD BaseCoverage; + WORD ClassCount; + WORD MarkArray; + WORD BaseArray; +} GPOS_MarkBasePosFormat1; + +typedef struct { + WORD BaseAnchor[1]; +} GPOS_BaseRecord; + +typedef struct { + WORD BaseCount; + GPOS_BaseRecord BaseRecord[1]; +} GPOS_BaseArray; + +typedef struct { + WORD Class; + WORD MarkAnchor; +} GPOS_MarkRecord; + +typedef struct { + WORD MarkCount; + GPOS_MarkRecord MarkRecord[1]; +} GPOS_MarkArray; + /********** * CMAP **********/ @@ -971,16 +999,106 @@ static VOID GPOS_get_anchor_values(LPCVOID table, LPPOINT pt, WORD ppem) } } +static void GPOS_convert_design_units_to_device(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, int desX, int desY, double *devX, double *devY) +{ + int emHeight = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; + + TRACE("emHeight %i lfWidth %i\n",emHeight, lplogfont->lfWidth); + *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; + *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; + if (lplogfont->lfWidth) + FIXME("Font with lfWidth set no handled properly\n"); +} + +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) +{ + int j; + + TRACE("MarkToBase Attachment Positioning Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset; + const GPOS_MarkBasePosFormat1 *mbpf1; + offset = GET_BE_WORD(look->SubTable[j]); + mbpf1 = (const GPOS_MarkBasePosFormat1*)((const BYTE*)look+offset); + if (GET_BE_WORD(mbpf1->PosFormat) == 1) + { + int offset = GET_BE_WORD(mbpf1->MarkCoverage); + int mark_index; + mark_index = GSUB_is_glyph_covered((const BYTE*)mbpf1+offset, glyphs[glyph_index]); + if (mark_index != -1) + { + int base_index; + offset = GET_BE_WORD(mbpf1->BaseCoverage); + base_index = GSUB_is_glyph_covered((const BYTE*)mbpf1+offset, glyphs[glyph_index - write_dir]); + if (base_index != -1) + { + const GPOS_MarkArray *ma; + const GPOS_MarkRecord *mr; + const GPOS_BaseArray *ba; + const GPOS_BaseRecord *br; + int mark_class; + int class_count = GET_BE_WORD(mbpf1->ClassCount); + 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); + 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; + } + 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(mbpf1->BaseArray); + ba = (const GPOS_BaseArray*)((const BYTE*)mbpf1 + offset); + baserecord_size = class_count * sizeof(WORD); + br = (const GPOS_BaseRecord*)((const BYTE*)ba + sizeof(WORD) + (baserecord_size * base_index)); + offset = GET_BE_WORD(br->BaseAnchor[mark_class]); + GPOS_get_anchor_values((const BYTE*)ba + offset, &base_pt, ppem); + offset = GET_BE_WORD(mr->MarkAnchor); + GPOS_get_anchor_values((const BYTE*)ma + offset, &mark_pt, ppem); + TRACE("Offset on base is %i,%i design units\n",base_pt.x,base_pt.y); + TRACE("Offset on mark is %i,%i design units\n",mark_pt.x, mark_pt.y); + 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); + } + } + } + else + FIXME("Unhandled Mark To Base Format %i\n",GET_BE_WORD(mbpf1->PosFormat)); + } +} + 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) { int offset; const OT_LookupTable *look; + int ppem = lpotm->otmTextMetrics.tmAscent + lpotm->otmTextMetrics.tmDescent - lpotm->otmTextMetrics.tmInternalLeading; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); TRACE("type %i, flag %x, subtables %i\n",GET_BE_WORD(look->LookupType),GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); switch(GET_BE_WORD(look->LookupType)) { + 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) + { + GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); + pGoffset[glyph_index].du += ((int)(devX+0.5) - piAdvance[glyph_index-1]); + pGoffset[glyph_index].dv += (int)(devY+0.5); + } + break; + } default: FIXME("We do not handle SubType %i\n",GET_BE_WORD(look->LookupType)); }

1 0

Aric Stewart : usp10: Change OpenType_GSUB_GetFontFeatureTags to OpenType_GetFontFeatureTags and load features from GPOS table .
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 84b8dbfa8a2364000df9c2ad174e697c1f3d3c62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84b8dbfa8a2364000df9c2ad1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:46 2012 -0500 usp10: Change OpenType_GSUB_GetFontFeatureTags to OpenType_GetFontFeatureTags and load features from GPOS table. --- dlls/usp10/opentype.c | 78 ++++++++++++++++++++++++++++++++++++++++-- dlls/usp10/shape.c | 6 ++-- dlls/usp10/usp10_internal.h | 2 +- 3 files changed, 78 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 369cfcc..fa160b7 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1153,7 +1153,7 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag { int i; - if (!language->feature_count && language->gsub_table) + if (language->gsub_table) { const OT_LangSys *lang = language->gsub_table; const GSUB_Header *header = (const GSUB_Header *)table; @@ -1186,7 +1186,77 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag } } -HRESULT OpenType_GSUB_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) +static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language) +{ + int i, count; + const OT_LangSys *lang = language->gpos_table; + const GPOS_Header *header = (const GPOS_Header *)table; + const OT_FeatureList *feature_list; + + if (!lang) + return; + + count = GET_BE_WORD(lang->FeatureCount); + feature_list = (const OT_FeatureList*)((const BYTE*)header + GET_BE_WORD(header->FeatureList)); + + TRACE("%i features\n",count); + if (!language->feature_count) + { + language->feature_count = count; + + if (language->feature_count) + { + language->features = HeapAlloc(GetProcessHeap(),0,sizeof(LoadedFeature)*language->feature_count); + + for (i = 0; i < language->feature_count; i++) + { + const OT_Feature *feature; + int j; + int index = GET_BE_WORD(lang->FeatureIndex[i]); + + language->features[i].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); + language->features[i].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const OT_Feature*)language->features[i].feature; + language->features[i].lookup_count = GET_BE_WORD(feature->LookupCount); + 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 = HeapReAlloc(GetProcessHeap(),0,language->features, sizeof(LoadedFeature)*(language->feature_count + count)); + + for (i = 0; i < count; i++) + { + const OT_Feature *feature; + int j; + int index = GET_BE_WORD(lang->FeatureIndex[i]); + int idx = language->feature_count + i; + + language->features[idx].tag = MS_MAKE_TAG(feature_list->FeatureRecord[index].FeatureTag[0], feature_list->FeatureRecord[index].FeatureTag[1], feature_list->FeatureRecord[index].FeatureTag[2], feature_list->FeatureRecord[index].FeatureTag[3]); + language->features[idx].feature = ((const BYTE*)feature_list + GET_BE_WORD(feature_list->FeatureRecord[index].Feature)); + feature = (const OT_Feature*)language->features[idx].feature; + language->features[idx].lookup_count = GET_BE_WORD(feature->LookupCount); + 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->feature_count += count; + } +} + +static void _initialize_feature_cache(ScriptCache *psc, LoadedLanguage *language) +{ + if (!language->feature_count) + { + 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) { int i; HRESULT rc = S_OK; @@ -1215,7 +1285,7 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t _initialize_language_cache(script); - if (script->default_language.gsub_table && script->default_language.tag == language_tag) + if ((script->default_language.gsub_table || script->default_language.gpos_table) && script->default_language.tag == language_tag) language = &script->default_language; else { @@ -1235,7 +1305,7 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t return S_OK; } - GSUB_initialize_feature_cache(psc->GSUB_Table, language); + _initialize_feature_cache(psc, language); *pcTags = language->feature_count; diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index 1655992..f9a0909 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -565,13 +565,13 @@ static LoadedFeature* load_GSUB_feature(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCac language = MS_MAKE_TAG('d','f','l','t'); attempt--; - OpenType_GSUB_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]), 1, &tags, &cTags, &feature); } while(attempt && !feature); /* try in the default (latin) table */ if (!feature) - OpenType_GSUB_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); + 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); } TRACE("Feature %s located at %p\n",debugstr_an(feat,4),feature); @@ -3294,7 +3294,7 @@ HRESULT SHAPE_GetFontFeatureTags( HDC hdc, ScriptCache *psc, filter = TRUE; } - hr = OpenType_GSUB_GetFontFeatureTags(psc, tagScript, tagLangSys, filter, 0x00000000, cMaxTags, pFeatureTags, pcTags, NULL); + hr = OpenType_GetFontFeatureTags(psc, tagScript, tagLangSys, filter, 0x00000000, cMaxTags, pFeatureTags, pcTags, NULL); if (FAILED(hr)) *pcTags = 0; diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 4077833..8cc8f14 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -238,4 +238,4 @@ void OpenType_GDEF_UpdateGlyphProps(HDC hdc, ScriptCache *psc, const WORD *pwGly INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) 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_GSUB_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, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN;

1 0

Aric Stewart : usp10: Change OpenType_GSUB_GetFontLangaugeTags to OpenType_GetFontLanguageTags and load languages from GPOS table as well .
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: 2123f049d30cad9d79867999eb49f46211e0e23c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2123f049d30cad9d79867999e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:23:42 2012 -0500 usp10: Change OpenType_GSUB_GetFontLangaugeTags to OpenType_GetFontLanguageTags and load languages from GPOS table as well. --- dlls/usp10/opentype.c | 92 ++++++++++++++++++++++++++++++++++++------- dlls/usp10/shape.c | 4 +- dlls/usp10/usp10_internal.h | 5 +- 3 files changed, 82 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1aa77c02..369cfcc 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -992,7 +992,7 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int i; - if (!script->language_count && script->gsub_table) + if (script->gsub_table) { DWORD offset; const OT_Script* table = script->gsub_table; @@ -1001,12 +1001,12 @@ static void GSUB_initialize_language_cache(LoadedScript *script) if (offset) { script->default_language.tag = MS_MAKE_TAG('d','f','l','t'); - script->default_language.table = (const BYTE*)table + offset; + script->default_language.gsub_table = (const BYTE*)table + offset; } if (script->language_count) { - TRACE("Deflang %p, LangCount %i\n",script->default_language.table, script->language_count); + TRACE("Deflang %p, LangCount %i\n",script->default_language.gsub_table, script->language_count); script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); @@ -1014,13 +1014,79 @@ static void GSUB_initialize_language_cache(LoadedScript *script) { int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); - script->languages[i].table = ((const BYTE*)table + offset); + script->languages[i].gsub_table = ((const BYTE*)table + offset); } } } } -HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table) +static void GPOS_expand_language_cache(LoadedScript *script) +{ + int count; + const OT_Script* table = script->gpos_table; + DWORD offset; + + if (!table) + return; + + offset = GET_BE_WORD(table->DefaultLangSys); + if (offset) + script->default_language.gpos_table = (const BYTE*)table + offset; + + count = GET_BE_WORD(table->LangSysCount); + + TRACE("Deflang %p, LangCount %i\n",script->default_language.gpos_table, count); + if (!script->language_count) + { + int i; + script->language_count = count; + + script->languages = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LoadedLanguage) * script->language_count); + + for (i = 0; i < script->language_count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + script->languages[i].tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + script->languages[i].gpos_table = ((const BYTE*)table + offset); + } + } + else if (count) + { + int i,j; + for (i = 0; i < count; i++) + { + int offset = GET_BE_WORD(table->LangSysRecord[i].LangSys); + OPENTYPE_TAG tag = MS_MAKE_TAG(table->LangSysRecord[i].LangSysTag[0], table->LangSysRecord[i].LangSysTag[1], table->LangSysRecord[i].LangSysTag[2], table->LangSysRecord[i].LangSysTag[3]); + + for (j = 0; j < script->language_count; j++) + { + if (script->languages[j].tag == tag) + { + script->languages[j].gpos_table = ((const BYTE*)table + offset); + break; + } + } + if (j == script->language_count) + { + script->language_count++; + script->languages = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,script->languages, sizeof(LoadedLanguage) * script->language_count); + script->languages[j].tag = tag; + script->languages[j].gpos_table = ((const BYTE*)table + offset); + } + } + } +} + +static void _initialize_language_cache(LoadedScript *script) +{ + if (!script->language_count) + { + GSUB_initialize_language_cache(script); + GPOS_expand_language_cache(script); + } +} + +HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags) { int i; HRESULT rc = S_OK; @@ -1040,7 +1106,7 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ if (!script) return E_INVALIDARG; - GSUB_initialize_language_cache(script); + _initialize_language_cache(script); if (!searchingFor && cMaxTags < script->language_count) rc = E_OUTOFMEMORY; @@ -1060,15 +1126,13 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ { pLanguageTags[0] = script->languages[i].tag; *pcTags = 1; - if (language_table) - *language_table = script->languages[i].table; rc = S_OK; break; } } } - if (script->default_language.table) + if (script->default_language.gsub_table) { if (i < cMaxTags) pLanguageTags[i] = script->default_language.tag; @@ -1076,8 +1140,6 @@ HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_ if (searchingFor && FAILED(rc)) { pLanguageTags[0] = script->default_language.tag; - if (language_table) - *language_table = script->default_language.table; } i++; *pcTags = (*pcTags) + 1; @@ -1091,9 +1153,9 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag { int i; - if (!language->feature_count) + if (!language->feature_count && language->gsub_table) { - const OT_LangSys *lang= language->table; + const OT_LangSys *lang = language->gsub_table; const GSUB_Header *header = (const GSUB_Header *)table; const OT_FeatureList *feature_list; @@ -1151,9 +1213,9 @@ HRESULT OpenType_GSUB_GetFontFeatureTags(ScriptCache *psc, OPENTYPE_TAG script_t return E_INVALIDARG; } - GSUB_initialize_language_cache(script); + _initialize_language_cache(script); - if (script->default_language.table && script->default_language.tag == language_tag) + if (script->default_language.gsub_table && script->default_language.tag == language_tag) language = &script->default_language; else { diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index b7d2822..1655992 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -3264,11 +3264,11 @@ HRESULT SHAPE_GetFontLanguageTags( HDC hdc, ScriptCache *psc, if (psa && psc->userLang != 0) searching = psc->userLang; - hr = OpenType_GSUB_GetFontLanguageTags(psc, tagScript, searching, cMaxTags, pLangSysTags, pcTags, NULL); + hr = OpenType_GetFontLanguageTags(psc, tagScript, searching, cMaxTags, pLangSysTags, pcTags); if (FAILED(hr)) { fellback = TRUE; - hr = OpenType_GSUB_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), searching, cMaxTags, pLangSysTags, pcTags, NULL); + hr = OpenType_GetFontLanguageTags(psc, MS_MAKE_TAG('l','a','t','n'), searching, cMaxTags, pLangSysTags, pcTags); } if (FAILED(hr) || fellback) diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 3cb48d8..4077833 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -137,7 +137,8 @@ typedef struct { typedef struct { OPENTYPE_TAG tag; - LPCVOID table; + LPCVOID gsub_table; + LPCVOID gpos_table; INT feature_count; LoadedFeature *features; } LoadedLanguage; @@ -236,5 +237,5 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR void OpenType_GDEF_UpdateGlyphProps(HDC hdc, 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; HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; -HRESULT OpenType_GSUB_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags, LPCVOID* language_table) 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_GSUB_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;

1 0

Aric Stewart : usp10: In ScriptTextOut make use of piAdvance and pGoffset to position glyphs.
by Alexandre Julliard July 16, 2012

July 16, 2012

Module: wine Branch: master Commit: b65d0b96ce31c0e9f1cfbbe34fa4c4a822e8d74f URL: http://source.winehq.org/git/wine.git/?a=commit;h=b65d0b96ce31c0e9f1cfbbe34… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Jul 16 07:24:02 2012 -0500 usp10: In ScriptTextOut make use of piAdvance and pGoffset to position glyphs. --- dlls/usp10/usp10.c | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 45 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 0b53599..9659e66 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3176,6 +3176,8 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN const int *piJustify, const GOFFSET *pGoffset) { HRESULT hr = S_OK; + INT i; + INT *lpDx; 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, @@ -3189,6 +3191,45 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN if (!psa->fNoGlyphIndex) /* Have Glyphs? */ fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ + lpDx = heap_alloc(cGlyphs * sizeof(INT) * 2); + + if (pGoffset) + { + for (i = 0; i < cGlyphs; i++) + if (!(fuOptions&ETO_PDY) && pGoffset[i].dv) + fuOptions |= ETO_PDY; + } + 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) + { + idx*=2; + prev_idx = idx-2; + } + lpDx[prev_idx] += pGoffset[i].du; + lpDx[idx] -= pGoffset[i].du; + if (fuOptions&ETO_PDY) + { + lpDx[prev_idx+1] += pGoffset[i].dv; + lpDx[idx+1] -= pGoffset[i].dv; + } + } + } + if (psa->fRTL && psa->fLogicalOrder) { int i; @@ -3201,14 +3242,16 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN for (i = 0; i < cGlyphs; i++) rtlGlyphs[i] = pwGlyphs[cGlyphs-1-i]; - if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, rtlGlyphs, cGlyphs, NULL)) + 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, NULL)) + if (!ExtTextOutW(hdc, x, y, fuOptions, lprc, pwGlyphs, cGlyphs, lpDx)) hr = S_FALSE; + heap_free(lpDx); + return hr; }

1 0