From: Jacek Caban jacek@codeweavers.com
--- dlls/gdi32/uniscribe/bidi.c | 4 +- dlls/gdi32/uniscribe/breaking.c | 2 +- dlls/gdi32/uniscribe/shape.c | 6 +-- dlls/gdi32/uniscribe/usp10.c | 2 +- dlls/gdi32/uniscribe/usp10_internal.h | 77 +++++++++++++++++---------- 5 files changed, 56 insertions(+), 35 deletions(-)
diff --git a/dlls/gdi32/uniscribe/bidi.c b/dlls/gdi32/uniscribe/bidi.c index ad384071d43..353d143334e 100644 --- a/dlls/gdi32/uniscribe/bidi.c +++ b/dlls/gdi32/uniscribe/bidi.c @@ -54,8 +54,8 @@
#include "usp10_internal.h"
-extern const unsigned short bidi_bracket_table[] DECLSPEC_HIDDEN; -extern const unsigned short bidi_direction_table[] DECLSPEC_HIDDEN; +extern const unsigned short bidi_bracket_table[]; +extern const unsigned short bidi_direction_table[];
WINE_DEFAULT_DEBUG_CHANNEL(bidi);
diff --git a/dlls/gdi32/uniscribe/breaking.c b/dlls/gdi32/uniscribe/breaking.c index d6fabdc168a..8d83eecb284 100644 --- a/dlls/gdi32/uniscribe/breaking.c +++ b/dlls/gdi32/uniscribe/breaking.c @@ -37,7 +37,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
-extern const unsigned short wine_linebreak_table[] DECLSPEC_HIDDEN; +extern const unsigned short wine_linebreak_table[];
enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, diff --git a/dlls/gdi32/uniscribe/shape.c b/dlls/gdi32/uniscribe/shape.c index 912d3e6965b..44b652cca6d 100644 --- a/dlls/gdi32/uniscribe/shape.c +++ b/dlls/gdi32/uniscribe/shape.c @@ -85,9 +85,9 @@ static void ShapeCharGlyphProp_Kannada( HDC hdc, ScriptCache *psc, SCRIPT_ANALYS static void ShapeCharGlyphProp_Malayalam( 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_Khmer( 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 );
-extern const unsigned short indic_syllabic_table[] DECLSPEC_HIDDEN; -extern const unsigned short wine_shaping_table[] DECLSPEC_HIDDEN; -extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4] DECLSPEC_HIDDEN; +extern const unsigned short indic_syllabic_table[]; +extern const unsigned short wine_shaping_table[]; +extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4];
enum joining_types { diff --git a/dlls/gdi32/uniscribe/usp10.c b/dlls/gdi32/uniscribe/usp10.c index 75fc7b380a7..72e75224069 100644 --- a/dlls/gdi32/uniscribe/usp10.c +++ b/dlls/gdi32/uniscribe/usp10.c @@ -855,7 +855,7 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc)
static WCHAR mirror_char( WCHAR ch ) { - extern const WCHAR wine_mirror_map[] DECLSPEC_HIDDEN; + extern const WCHAR wine_mirror_map[]; WCHAR mirror = get_table_entry_16( wine_mirror_map, ch ); return mirror ? mirror : ch; } diff --git a/dlls/gdi32/uniscribe/usp10_internal.h b/dlls/gdi32/uniscribe/usp10_internal.h index e329b5206dd..b8ae1fb1a57 100644 --- a/dlls/gdi32/uniscribe/usp10_internal.h +++ b/dlls/gdi32/uniscribe/usp10_internal.h @@ -251,40 +251,61 @@ typedef void (*reorder_function)(WCHAR *chars, IndicSyllable *syllable, lexical_ #define BIDI_WEAK 2 #define BIDI_NEUTRAL 0
-BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size) DECLSPEC_HIDDEN; -int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target) DECLSPEC_HIDDEN; +BOOL usp10_array_reserve(void **elements, SIZE_T *capacity, SIZE_T count, SIZE_T size); +int USP10_FindGlyphInLogClust(const WORD* pwLogClust, int cChars, WORD target);
BOOL BIDI_DetermineLevels(const WCHAR *string, unsigned int count, const SCRIPT_STATE *s, - const SCRIPT_CONTROL *c, WORD *levels, WORD *overrides) DECLSPEC_HIDDEN; + const SCRIPT_CONTROL *c, WORD *levels, WORD *overrides); BOOL BIDI_GetStrengths(const WCHAR *string, unsigned int count, - const SCRIPT_CONTROL *c, WORD *strength) DECLSPEC_HIDDEN; -INT BIDI_ReorderV2lLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse) DECLSPEC_HIDDEN; -INT BIDI_ReorderL2vLevel(int level, int *pIndices, 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 ) 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; -HRESULT SHAPE_GetFontScriptTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, OPENTYPE_TAG *pScriptTags, int *pcTags) DECLSPEC_HIDDEN; -HRESULT SHAPE_GetFontLanguageTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, int cMaxTags, OPENTYPE_TAG *pLangSysTags, int *pcTags) DECLSPEC_HIDDEN; -HRESULT SHAPE_GetFontFeatureTags( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags) DECLSPEC_HIDDEN; + const SCRIPT_CONTROL *c, WORD *strength); +INT BIDI_ReorderV2lLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse); +INT BIDI_ReorderL2vLevel(int level, int *pIndices, const BYTE* plevel, int cch, BOOL fReverse); +void SHAPE_ContextualShaping(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, WCHAR* pwcChars, + INT cChars, WORD* pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, + WORD *pwLogClust); +void SHAPE_ApplyDefaultOpentypeFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, + WORD *pwOutGlyphs, INT* pcGlyphs, INT cMaxGlyphs, + INT cChars, WORD *pwLogClust); +void SHAPE_ApplyOpenTypePositions(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, + const WORD *glyphs, INT cGlyphs, int *piAdvance, GOFFSET *goffset ); +HRESULT SHAPE_CheckFontForRequiredFeatures(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa); +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); +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); +HRESULT SHAPE_GetFontScriptTags(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, int cMaxTags, + OPENTYPE_TAG *pScriptTags, int *pcTags); +HRESULT SHAPE_GetFontLanguageTags(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, + OPENTYPE_TAG tagScript, int cMaxTags, + OPENTYPE_TAG *pLangSysTags, int *pcTags); +HRESULT SHAPE_GetFontFeatureTags(HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, + OPENTYPE_TAG tagScript, OPENTYPE_TAG tagLangSys, + int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags);
-void Indic_ReorderCharacters(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, WCHAR *input, unsigned int cChars, - IndicSyllable **syllables, int *syllable_count, lexical_function lexical_f, - reorder_function reorder_f, BOOL modern) DECLSPEC_HIDDEN; -void Indic_ParseSyllables(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache* psc, const WCHAR *input, unsigned int cChar, - IndicSyllable **syllables, int *syllable_count, lexical_function lex, BOOL modern) DECLSPEC_HIDDEN; +void Indic_ReorderCharacters(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, WCHAR *input, + unsigned int cChars, IndicSyllable **syllables, int *syllable_count, + lexical_function lexical_f, reorder_function reorder_f, BOOL modern); +void Indic_ParseSyllables(HDC hdc, SCRIPT_ANALYSIS *psa, ScriptCache *psc, const WCHAR *input, + unsigned int cChar, IndicSyllable **syllables, int *syllable_count, + lexical_function lex, BOOL modern);
-void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) DECLSPEC_HIDDEN; +void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la);
-DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; -void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, WORD* pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp) DECLSPEC_HIDDEN; +DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags); +void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, const WORD cGlyphs, + WORD *pwLogClust, const WORD cChars, SCRIPT_GLYPHPROP *pGlyphProp); int OpenType_apply_GSUB_lookup(const void *table, unsigned int lookup_index, WORD *glyphs, - unsigned int glyph_index, int write_dir, int *glyph_count) DECLSPEC_HIDDEN; + unsigned int glyph_index, int write_dir, int *glyph_count); unsigned int OpenType_apply_GPOS_lookup(const ScriptCache *psc, const OUTLINETEXTMETRICW *otm, const LOGFONTW *logfont, const SCRIPT_ANALYSIS *analysis, int *advance, unsigned int lookup_index, - const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, GOFFSET *goffset) 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, char tableType, int cMaxTags, OPENTYPE_TAG *pFeatureTags, int *pcTags, LoadedFeature** feature) DECLSPEC_HIDDEN; + const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, GOFFSET *goffset); +HRESULT OpenType_GetFontScriptTags(ScriptCache *psc, OPENTYPE_TAG searchingFor, int cMaxTags, + OPENTYPE_TAG *pScriptTags, int *pcTags); +HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag, OPENTYPE_TAG searchingFor, + int cMaxTags, OPENTYPE_TAG *pLanguageTags, int *pcTags); +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);