Huw Davies : usp10: Free the final page.
Alexandre Julliard
julliard at winehq.org
Tue Aug 9 11:11:05 CDT 2016
Module: wine
Branch: master
Commit: 0dbd2e37f916d6b52eac8bad7fa529aa952a0b1b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dbd2e37f916d6b52eac8bad7fa529aa952a0b1b
Author: Huw Davies <huw at codeweavers.com>
Date: Tue Aug 9 15:45:24 2016 +0100
usp10: Free the final page.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Aric Stewart <aric at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/usp10/usp10.c | 2 +-
dlls/usp10/usp10_internal.h | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index dc1cc06..0471fc6 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -1019,7 +1019,7 @@ HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc)
{
heap_free(((ScriptCache *)*psc)->widths[i]);
}
- for (i = 0; i < 0x10; i++)
+ for (i = 0; i < NUM_PAGES; i++)
{
unsigned int j;
if (((ScriptCache *)*psc)->page[i])
diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h
index c1a5ccf..1c0d1c5 100644
--- a/dlls/usp10/usp10_internal.h
+++ b/dlls/usp10/usp10_internal.h
@@ -125,6 +125,8 @@
#define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1)
#define GLYPH_MAX 65536
+#define NUM_PAGES 17
+
#define GSUB_E_NOFEATURE -2
#define GSUB_E_NOGLYPH -1
@@ -169,7 +171,7 @@ typedef struct {
OUTLINETEXTMETRICW *otm;
SCRIPT_FONTPROPERTIES sfp;
BOOL sfnt;
- CacheGlyphPage *page[0x11];
+ CacheGlyphPage *page[NUM_PAGES];
ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE];
LPVOID GSUB_Table;
LPVOID GDEF_Table;
More information about the wine-cvs
mailing list