ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

usp10: Avoid LPWORD. 

And cleanup a style issue 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-22 23:11:38 +01:00 committed by Alexandre Julliard
parent ab8ec605b8
commit 34c2f74518
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/usp10/opentype.c
View File

@ -669,22 +669,22 @@ static int compare_group(const void *a, const void* b)
return 0; return 0;
} }
DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWORD pgi, DWORD flags) DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, WORD *glyph_index, DWORD flags)
{ {
/* BMP: use gdi32 for ease */ /* BMP: use gdi32 for ease */
if (utf32c < 0x10000) if (utf32c < 0x10000)
{ {
WCHAR ch = utf32c; WCHAR ch = utf32c;
return GetGlyphIndicesW(hdc,&ch, 1, pgi, flags); return GetGlyphIndicesW(hdc, &ch, 1, glyph_index, flags);
} }
if (!psc->CMAP_format12_Table) if (!psc->CMAP_format12_Table)
psc->CMAP_format12_Table = load_CMAP_format12_table(hdc, psc); psc->CMAP_format12_Table = load_CMAP_format12_table(hdc, psc);
if (flags & GGI_MARK_NONEXISTING_GLYPHS) if (flags & GGI_MARK_NONEXISTING_GLYPHS)
*pgi = 0xffff; *glyph_index = 0xffffu;
else else
*pgi = 0; *glyph_index = 0u;
if (psc->CMAP_format12_Table) if (psc->CMAP_format12_Table)
{ {
@ -699,7 +699,7 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR
if (group) if (group)
{ {
DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode); DWORD offset = utf32c - GET_BE_DWORD(group->startCharCode);
*pgi = GET_BE_DWORD(group->startGlyphID) + offset; *glyph_index = GET_BE_DWORD(group->startGlyphID) + offset;
return 0; return 0;
} }
} }