system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-10 17:07:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

usp10: Avoid LPCVOID.

Browse source 
And cleanup a few style issues along the way.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Aric Stewart <aric@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2017-03-23 22:49:41 +01:00 committed by Alexandre Julliard
parent a204e589b5
commit 1403087954
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
dlls/usp10/opentype.c
View file

@ -815,7 +815,7 @@ void OpenType_GDEF_UpdateGlyphProps(ScriptCache *psc, const WORD *pwGlyphs, cons
**********/ **********/
static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count); static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count);
static INT GSUB_is_glyph_covered(LPCVOID table , UINT glyph) static int GSUB_is_glyph_covered(const void *table, unsigned int glyph)
{ {
const OT_CoverageFormat1* cf1; const OT_CoverageFormat1* cf1;
@ -1486,7 +1486,8 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD
return GSUB_E_NOGLYPH; return GSUB_E_NOGLYPH;
} }
INT OpenType_apply_GSUB_lookup(LPCVOID table, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) int OpenType_apply_GSUB_lookup(const void *table, unsigned int lookup_index, WORD *glyphs,
unsigned int glyph_index, int write_dir, int *glyph_count)
{ {
const GSUB_Header *header = (const GSUB_Header *)table; const GSUB_Header *header = (const GSUB_Header *)table;
const OT_LookupList *lookup = (const OT_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList)); const OT_LookupList *lookup = (const OT_LookupList*)((const BYTE*)header + GET_BE_WORD(header->LookupList));
@ -2769,7 +2770,7 @@ HRESULT OpenType_GetFontLanguageTags(ScriptCache *psc, OPENTYPE_TAG script_tag,
} }
static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *language) static void GSUB_initialize_feature_cache(const void *table, LoadedLanguage *language)
{ {
int i; int i;
@ -2812,7 +2813,7 @@ static void GSUB_initialize_feature_cache(LPCVOID table, LoadedLanguage *languag
} }
} }
static void GPOS_expand_feature_cache(LPCVOID table, LoadedLanguage *language) static void GPOS_expand_feature_cache(const void *table, LoadedLanguage *language)
{ {
int i, count; int i, count;
const OT_LangSys *lang = language->gpos_table; const OT_LangSys *lang = language->gpos_table;

3
dlls/usp10/shape.c
View file

@ -542,7 +542,8 @@ static const ScriptShapeData ShapingData[] =
extern scriptData scriptInformation[]; extern scriptData scriptInformation[];
static INT GSUB_apply_feature_all_lookups(LPCVOID header, LoadedFeature *feature, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) static int GSUB_apply_feature_all_lookups(const void *header, LoadedFeature *feature,
WORD *glyphs, unsigned int glyph_index, int write_dir, int *glyph_count)
{ {
int i; int i;
int out_index = GSUB_E_NOGLYPH; int out_index = GSUB_E_NOGLYPH;

13
dlls/usp10/usp10_internal.h
View file

@ -144,15 +144,15 @@ enum usp10_script
typedef struct { typedef struct {
OPENTYPE_TAG tag; OPENTYPE_TAG tag;
CHAR tableType; CHAR tableType;
LPCVOID feature; const void *feature;
INT lookup_count; INT lookup_count;
WORD *lookups; WORD *lookups;
} LoadedFeature; } LoadedFeature;
typedef struct { typedef struct {
OPENTYPE_TAG tag; OPENTYPE_TAG tag;
LPCVOID gsub_table; const void *gsub_table;
LPCVOID gpos_table; const void *gpos_table;
BOOL features_initialized; BOOL features_initialized;
INT feature_count; INT feature_count;
LoadedFeature *features; LoadedFeature *features;
@ -160,8 +160,8 @@ typedef struct {
typedef struct { typedef struct {
OPENTYPE_TAG tag; OPENTYPE_TAG tag;
LPCVOID gsub_table; const void *gsub_table;
LPCVOID gpos_table; const void *gpos_table;
LoadedLanguage default_language; LoadedLanguage default_language;
BOOL languages_initialized; BOOL languages_initialized;
INT language_count; INT language_count;
@ -273,7 +273,8 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT
DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DECLSPEC_HIDDEN; 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; 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_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 OpenType_apply_GPOS_lookup(const ScriptCache *psc, const OUTLINETEXTMETRICW *otm, 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 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; const WORD *glyphs, unsigned int glyph_index, unsigned int glyph_count, GOFFSET *goffset) DECLSPEC_HIDDEN;