Henri Verbeet : usp10: Avoid LPWORD.
Alexandre Julliard
julliard at winehq.org
Thu Mar 23 15:34:53 CDT 2017
Module: wine
Branch: master
Commit: 34c2f745183b703b5e8cd3c364a4079c20f6591f
URL: http://source.winehq.org/git/wine.git/?a=commit;h=34c2f745183b703b5e8cd3c364a4079c20f6591f
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Mar 22 23:11:38 2017 +0100
usp10: Avoid LPWORD.
And cleanup a style issue along the way.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/usp10/opentype.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c
index 0579aed..e3c7a56 100644
--- a/dlls/usp10/opentype.c
+++ b/dlls/usp10/opentype.c
@@ -669,22 +669,22 @@ static int compare_group(const void *a, const void* b)
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 */
if (utf32c < 0x10000)
{
WCHAR ch = utf32c;
- return GetGlyphIndicesW(hdc,&ch, 1, pgi, flags);
+ return GetGlyphIndicesW(hdc, &ch, 1, glyph_index, flags);
}
if (!psc->CMAP_format12_Table)
psc->CMAP_format12_Table = load_CMAP_format12_table(hdc, psc);
if (flags & GGI_MARK_NONEXISTING_GLYPHS)
- *pgi = 0xffff;
+ *glyph_index = 0xffffu;
else
- *pgi = 0;
+ *glyph_index = 0u;
if (psc->CMAP_format12_Table)
{
@@ -699,7 +699,7 @@ DWORD OpenType_CMAP_GetGlyphIndex(HDC hdc, ScriptCache *psc, DWORD utf32c, LPWOR
if (group)
{
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;
}
}
More information about the wine-cvs
mailing list