wine-commits November 2012

wine-commits@winehq.org

2 participants
708 discussions

Alexandre Julliard : gdi32: Store the font file name in Unicode in the font cache.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 24cdd74c6fe1f1f3eea3c29446e51305f88f8392 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24cdd74c6fe1f1f3eea3c2944… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 13:16:26 2012 +0100 gdi32: Store the font file name in Unicode in the font cache. --- dlls/gdi32/freetype.c | 129 ++++++++++++++++++++++--------------------------- 1 files changed, 58 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24cdd74c6fe1f1f3eea3c…

1 0

Alexandre Julliard : gdi32: Avoid some redundant registry calls while loading the font cache.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: c1f8a0bf619d0100870b693a828e1759ced47db8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f8a0bf619d0100870b693a8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 1 12:35:32 2012 +0100 gdi32: Avoid some redundant registry calls while loading the font cache. --- dlls/gdi32/freetype.c | 110 ++++++++++++++++++++----------------------------- 1 files changed, 45 insertions(+), 65 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6af977c..58d3c5d 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1298,11 +1298,15 @@ static Family *create_family( WCHAR *name, WCHAR *english_name ) static LONG reg_load_dword(HKEY hkey, const WCHAR *value, DWORD *data) { - DWORD type, needed; - LONG r = RegQueryValueExW(hkey, value, NULL, &type, NULL, &needed); - if(r != ERROR_SUCCESS) return r; - if(type != REG_DWORD || needed != sizeof(DWORD)) return ERROR_BAD_CONFIGURATION; - return RegQueryValueExW(hkey, value, NULL, &type, (BYTE*)data, &needed); + DWORD type, size = sizeof(DWORD); + + if (RegQueryValueExW(hkey, value, NULL, &type, (BYTE *)data, &size) || + type != REG_DWORD || size != sizeof(DWORD)) + { + *data = 0; + return ERROR_BAD_CONFIGURATION; + } + return ERROR_SUCCESS; } static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) @@ -1310,30 +1314,26 @@ static inline LONG reg_save_dword(HKEY hkey, const WCHAR *value, DWORD data) return RegSetValueExW(hkey, value, 0, REG_DWORD, (BYTE*)&data, sizeof(DWORD)); } -static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) +static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family, void *buffer, DWORD buffer_size) { - DWORD needed; - DWORD num_strikes, max_strike_key_len; + DWORD needed, strike_index = 0; + HKEY hkey_strike; /* If we have a File Name key then this is a real font, not just the parent key of a bunch of non-scalable strikes */ - if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, NULL, &needed) == ERROR_SUCCESS) + needed = buffer_size; + if(RegQueryValueExA(hkey_face, "File Name", NULL, NULL, buffer, &needed) == ERROR_SUCCESS) { Face *face; face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); face->cached_enum_data = NULL; - face->file = HeapAlloc(GetProcessHeap(), 0, needed); - RegQueryValueExA(hkey_face, "File Name", NULL, NULL, (BYTE*)face->file, &needed); - + face->file = strdupA( buffer ); face->StyleName = strdupW(face_name); - if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, NULL, &needed) == ERROR_SUCCESS) - { - WCHAR *fullName = HeapAlloc(GetProcessHeap(), 0, needed); - RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, (BYTE*)fullName, &needed); - face->FullName = fullName; - } + needed = buffer_size; + if(RegQueryValueExW(hkey_face, face_full_name_value, NULL, NULL, buffer, &needed) == ERROR_SUCCESS) + face->FullName = strdupW( buffer ); else face->FullName = NULL; @@ -1374,57 +1374,41 @@ static void load_face(HKEY hkey_face, WCHAR *face_name, Family *family) TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(face->StyleName)); } - /* do we have any bitmap strikes? */ - RegQueryInfoKeyW(hkey_face, NULL, NULL, NULL, &num_strikes, &max_strike_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - if(num_strikes != 0) - { - WCHAR strike_name[10]; - DWORD strike_index = 0; + /* load bitmap strikes */ - needed = sizeof(strike_name) / sizeof(WCHAR); - while(RegEnumKeyExW(hkey_face, strike_index++, strike_name, &needed, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + needed = buffer_size; + while (!RegEnumKeyExW(hkey_face, strike_index++, buffer, &needed, NULL, NULL, NULL, NULL)) + { + if (!RegOpenKeyExW(hkey_face, buffer, 0, KEY_ALL_ACCESS, &hkey_strike)) { - HKEY hkey_strike; - RegOpenKeyExW(hkey_face, strike_name, 0, KEY_ALL_ACCESS, &hkey_strike); - load_face(hkey_strike, face_name, family); + load_face(hkey_strike, face_name, family, buffer, buffer_size); RegCloseKey(hkey_strike); - needed = sizeof(strike_name) / sizeof(WCHAR); } + needed = buffer_size; } } static void load_font_list_from_cache(HKEY hkey_font_cache) { - DWORD max_family_key_len, size; - WCHAR *family_name; - DWORD family_index = 0; + DWORD size, family_index = 0; Family *family; HKEY hkey_family; + WCHAR buffer[4096]; - RegQueryInfoKeyW(hkey_font_cache, NULL, NULL, NULL, NULL, &max_family_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - family_name = HeapAlloc(GetProcessHeap(), 0, (max_family_key_len + 1) * sizeof(WCHAR)); - - size = max_family_key_len + 1; - while(RegEnumKeyExW(hkey_font_cache, family_index++, family_name, &size, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(buffer); + while (!RegEnumKeyExW(hkey_font_cache, family_index++, buffer, &size, NULL, NULL, NULL, NULL)) { WCHAR *english_family = NULL; + WCHAR *family_name = strdupW( buffer ); DWORD face_index = 0; - WCHAR *face_name; - DWORD max_face_key_len; RegOpenKeyExW(hkey_font_cache, family_name, 0, KEY_ALL_ACCESS, &hkey_family); TRACE("opened family key %s\n", debugstr_w(family_name)); - if(RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, NULL, &size) == ERROR_SUCCESS) - { - english_family = HeapAlloc(GetProcessHeap(), 0, size); - RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE*)english_family, &size); - } + size = sizeof(buffer); + if (!RegQueryValueExW(hkey_family, english_name_value, NULL, NULL, (BYTE *)buffer, &size)) + english_family = strdupW( buffer ); - family = create_family(strdupW(family_name), english_family); + family = create_family(family_name, english_family); list_add_tail(&font_list, &family->entry); if(english_family) @@ -1437,27 +1421,23 @@ static void load_font_list_from_cache(HKEY hkey_font_cache) add_font_subst(&font_subst_list, subst, 0); } - RegQueryInfoKeyW(hkey_family, NULL, NULL, NULL, NULL, &max_face_key_len, NULL, NULL, - NULL, NULL, NULL, NULL); - - face_name = HeapAlloc(GetProcessHeap(), 0, (max_face_key_len + 1) * sizeof(WCHAR)); - size = max_face_key_len + 1; - while(RegEnumKeyExW(hkey_family, face_index++, face_name, &size, - NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + size = sizeof(buffer); + while (!RegEnumKeyExW(hkey_family, face_index++, buffer, &size, NULL, NULL, NULL, NULL)) { + WCHAR *face_name = strdupW( buffer ); HKEY hkey_face; - RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face); - load_face(hkey_face, face_name, family); - RegCloseKey(hkey_face); - size = max_face_key_len + 1; + if (!RegOpenKeyExW(hkey_family, face_name, 0, KEY_ALL_ACCESS, &hkey_face)) + { + load_face(hkey_face, face_name, family, buffer, sizeof(buffer)); + RegCloseKey(hkey_face); + } + HeapFree( GetProcessHeap(), 0, face_name ); + size = sizeof(buffer); } - HeapFree(GetProcessHeap(), 0, face_name); RegCloseKey(hkey_family); - size = max_family_key_len + 1; + size = sizeof(buffer); } - - HeapFree(GetProcessHeap(), 0, family_name); } static LONG create_font_cache_key(HKEY *hkey, DWORD *disposition)

1 0

Nikolay Sivov : msxml3: Fix indexed access to schema collection namespace uris.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 3d013afec7aad964224030c3832779185ae599a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d013afec7aad964224030c38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 13:13:02 2012 -0400 msxml3: Fix indexed access to schema collection namespace uris. --- dlls/msxml3/msxml_private.h | 15 ++++++ dlls/msxml3/schema.c | 105 ++++++++++++++++++++++++++++++------------- 2 files changed, 89 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 8468e55..503a580 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -404,6 +404,21 @@ static inline xmlChar *xmlchar_from_wchar( const WCHAR *str ) return xmlchar_from_wcharn(str, -1); } +static inline xmlChar *heap_strdupxmlChar(const xmlChar *str) +{ + xmlChar *ret = NULL; + + if(str) { + DWORD size; + + size = (xmlStrlen(str)+1)*sizeof(xmlChar); + ret = heap_alloc(size); + memcpy(ret, str, size); + } + + return ret; +} + #endif static inline HRESULT return_bstr(const WCHAR *value, BSTR *p) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 5d971f9..5626464 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -100,6 +100,9 @@ typedef struct MSXML_VERSION version; xmlHashTablePtr cache; + xmlChar **uris; + int allocated; + int count; VARIANT_BOOL validateOnLoad; int read_only; @@ -113,12 +116,6 @@ typedef struct LONG ref; } cache_entry; -typedef struct -{ - LONG index; - BSTR* out; -} cache_index_data; - /* datatypes lookup stuff * generated with help from gperf */ #define DT_MIN_STR_LEN 2 @@ -982,6 +979,55 @@ static void cache_free(void* data, xmlChar* name /* ignored */) cache_entry_release((cache_entry*)data); } +/* returns index or -1 if not found */ +static int cache_free_uri(schema_cache *cache, const xmlChar *uri) +{ + int i; + + for (i = 0; i < cache->count; i++) + if (xmlStrEqual(cache->uris[i], uri)) + { + heap_free(cache->uris[i]); + return i; + } + + return -1; +} + +static void cache_add_entry(schema_cache *cache, const xmlChar *uri, cache_entry *entry) +{ + int i; + + /* meaning no entry found with this name */ + if (xmlHashRemoveEntry(cache->cache, uri, cache_free)) + { + if (cache->count == cache->allocated) + { + cache->allocated *= 2; + cache->uris = heap_realloc(cache->uris, cache->allocated*sizeof(xmlChar*)); + } + i = cache->count++; + } + else + i = cache_free_uri(cache, uri); + + cache->uris[i] = heap_strdupxmlChar(uri); + xmlHashAddEntry(cache->cache, uri, entry); +} + +static void cache_remove_entry(schema_cache *cache, const xmlChar *uri) +{ + /* adjust index if entry was really removed */ + if (xmlHashRemoveEntry(cache->cache, uri, cache_free) == 0) + { + int i = cache_free_uri(cache, uri); + if (i == -1) return; + /* shift array */ + if (i != --cache->count) + memmove(&cache->uris[i], &cache->uris[i+1], (cache->count-i)*sizeof(xmlChar*)); + } +} + /* This one adds all namespaces defined in document to a cache, without anything associated with uri obviously. Unfortunately namespace:: axis implementation in libxml2 differs from what we need, @@ -1030,8 +1076,7 @@ HRESULT cache_from_doc_ns(IXMLDOMSchemaCollection2 *iface, xmlnode *node) entry->schema = NULL; entry->doc = NULL; - xmlHashRemoveEntry(This->cache, ns->href, cache_free); - xmlHashAddEntry(This->cache, ns->href, entry); + cache_add_entry(This, ns->href, entry); } pos++; } @@ -1088,6 +1133,11 @@ static ULONG WINAPI schema_cache_Release(IXMLDOMSchemaCollection2* iface) if (ref == 0) { + int i; + + for (i = 0; i < This->count; i++) + heap_free(This->uris[i]); + heap_free(This->uris); xmlHashFree(This->cache, cache_free); release_dispex(&This->dispex); heap_free(This); @@ -1143,7 +1193,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri { case VT_NULL: { - xmlHashRemoveEntry(This->cache, name, cache_free); + cache_remove_entry(This, name); } break; @@ -1161,8 +1211,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri return E_FAIL; } - xmlHashRemoveEntry(This->cache, name, cache_free); - xmlHashAddEntry(This->cache, name, entry); + cache_add_entry(This, name, entry); } break; @@ -1211,8 +1260,7 @@ static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri return E_FAIL; } - xmlHashRemoveEntry(This->cache, name, cache_free); - xmlHashAddEntry(This->cache, name, entry); + cache_add_entry(This, name, entry); } break; @@ -1260,7 +1308,7 @@ static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR if (This->version == MSXML6) return E_NOTIMPL; - xmlHashRemoveEntry(This->cache, name, cache_free); + cache_remove_entry(This, name); heap_free(name); return S_OK; } @@ -1272,33 +1320,25 @@ static HRESULT WINAPI schema_cache_get_length(IXMLDOMSchemaCollection2* iface, L if (!length) return E_POINTER; - *length = xmlHashSize(This->cache); - return S_OK; -} -static void cache_index(void* data /* ignored */, void* index, xmlChar* name) -{ - cache_index_data* index_data = (cache_index_data*)index; - - if (index_data->index-- == 0) - *index_data->out = bstr_from_xmlChar(name); + *length = This->count; + return S_OK; } static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* iface, - LONG index, BSTR* len) + LONG index, BSTR* uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - cache_index_data data = {index, len}; - TRACE("(%p)->(%i %p)\n", This, index, len); - if (!len) + TRACE("(%p)->(%i %p)\n", This, index, uri); + + if (!uri) return E_POINTER; - if (index >= xmlHashSize(This->cache)) + if (index >= This->count) return E_FAIL; - *len = NULL; - xmlHashScan(This->cache, cache_index, &data); + *uri = bstr_from_xmlChar(This->uris[index]); return S_OK; } @@ -1310,7 +1350,7 @@ static void cache_copy(void* data, void* dest, xmlChar* name) if (xmlHashLookup(This->cache, name) == NULL) { cache_entry_add_ref(entry); - xmlHashAddEntry(This->cache, name, entry); + cache_add_entry(This, name, entry); } } @@ -1528,6 +1568,9 @@ HRESULT SchemaCache_create(MSXML_VERSION version, IUnknown* outer, void** obj) This->IXMLDOMSchemaCollection2_iface.lpVtbl = &XMLDOMSchemaCollection2Vtbl; This->cache = xmlHashCreate(DEFAULT_HASHTABLE_SIZE); + This->allocated = 10; + This->count = 0; + This->uris = heap_alloc(This->allocated*sizeof(xmlChar*)); This->ref = 1; This->version = version; This->validateOnLoad = VARIANT_TRUE;

1 0

Nikolay Sivov : dwrite: Support nine more script ranges up to code point 0x0bff.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 4d2164c936d5d0a0c162761a5f25a24ffc48ec01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2164c936d5d0a0c162761a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Nov 1 09:16:43 2012 -0400 dwrite: Support nine more script ranges up to code point 0x0bff. --- dlls/dwrite/analyzer.c | 29 +++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 64 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 0 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 0a0642a..6794c10 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -30,12 +30,21 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Bengali = 3, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, + Script_Devanagari = 18, Script_Greek = 23, + Script_Gujarati = 24, + Script_Gurmukhi = 25, Script_Hebrew = 29, Script_Latin = 38, + Script_NKo = 48, + Script_Oriya = 53, + Script_Syriac = 64, + Script_Tamil = 68, + Script_Thaana = 70, Script_Symbol = 77, Script_Unknown = (UINT16)-1 }; @@ -87,6 +96,26 @@ static const struct script_range script_ranges[] = { { Script_Hebrew, 0x590, 0x5ff }, /* Arabic: U+0600–U+06FF */ { Script_Arabic, 0x600, 0x6ff }, + /* Syriac: U+0600–U+06FF */ + { Script_Syriac, 0x700, 0x74f }, + /* Arabic Supplement: U+0750–U+077F */ + { Script_Arabic, 0x750, 0x77f }, + /* Thaana: U+0780–U+07BF */ + { Script_Thaana, 0x780, 0x7bf }, + /* N'Ko: U+07C0–U+07FF */ + { Script_NKo, 0x7c0, 0x7ff }, + /* Devanagari: U+0900–U+097F */ + { Script_Devanagari, 0x900, 0x97f }, + /* Bengali: U+0980–U+09FF */ + { Script_Bengali, 0x980, 0x9ff }, + /* Gurmukhi: U+0A00–U+0A7F */ + { Script_Gurmukhi, 0xa00, 0xa7f }, + /* Gujarati: U+0A80–U+0AFF */ + { Script_Gujarati, 0xa80, 0xaff }, + /* Oriya: U+0B00–U+0B7F */ + { Script_Oriya, 0xb00, 0xb7f }, + /* Tamil: U+0B80–U+0BFF */ + { Script_Tamil, 0xb80, 0xbff }, /* unsupported range */ { Script_Unknown } }; diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 648759f..dbd0307 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -399,12 +399,21 @@ struct sa_test { enum scriptcode { Script_Arabic = 0, Script_Armenian = 1, + Script_Bengali = 3, Script_C1Controls = 12, Script_Coptic = 13, Script_Cyrillic = 16, + Script_Devanagari = 18, Script_Greek = 23, + Script_Gujarati = 24, + Script_Gurmukhi = 25, Script_Hebrew = 29, Script_Latin = 38, + Script_NKo = 48, + Script_Oriya = 53, + Script_Syriac = 64, + Script_Tamil = 68, + Script_Thaana = 70, Script_Symbol = 77 }; @@ -532,6 +541,61 @@ static struct sa_test sa_tests[] = { { 9, 10, { Script_Hebrew, DWRITE_SCRIPT_SHAPES_DEFAULT } }, { 19, 10, { Script_Latin, DWRITE_SCRIPT_SHAPES_DEFAULT } }} }, + { + /* Syriac */ + {0x710,0x712,0x712,0x714,'.',0}, 1, + { { 0, 5, { Script_Syriac, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Arabic Supplement */ + {0x750,0x760,0x76d,'.',0}, 1, + { { 0, 4, { Script_Arabic, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thaana */ + {0x780,0x78e,0x798,0x7a6,0x7b0,'.',0}, 1, + { { 0, 6, { Script_Thaana, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* N'Ko */ + {0x7c0,0x7ca,0x7e8,0x7eb,0x7f6,'.',0}, 1, + { { 0, 6, { Script_NKo, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Thaana */ + {0x780,0x798,0x7a5,0x7a6,0x7b0,'.',0}, 1, + { { 0, 6, { Script_Thaana, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Devanagari */ + {0x926,0x947,0x935,0x928,0x93e,0x917,0x930,0x940,'.',0}, 1, + { { 0, 9, { Script_Devanagari, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Bengali */ + {0x9ac,0x9be,0x982,0x9b2,0x9be,'.',0}, 1, + { { 0, 6, { Script_Bengali, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Gurmukhi */ + {0xa17,0xa41,0xa30,0xa2e,0xa41,0xa16,0xa40,'.',0}, 1, + { { 0, 8, { Script_Gurmukhi, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Gujarati */ + {0xa97,0xac1,0xa9c,0xab0,0xabe,0xaa4,0xac0,'.',0}, 1, + { { 0, 8, { Script_Gujarati, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Oriya */ + {0xb13,0xb21,0xb3c,0xb3f,0xb06,'.',0}, 1, + { { 0, 6, { Script_Oriya, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, + { + /* Tamil */ + {0xba4,0xbae,0xbbf,0xbb4,0xbcd,'.',0}, 1, + { { 0, 6, { Script_Tamil, DWRITE_SCRIPT_SHAPES_DEFAULT } }} + }, /* keep this as end marker */ { {0} } };

1 0

Vincent Povirk : gdiplus: Reimplement GdipCreateMetafileFromEmf without using IPicture.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 91a3e5fc10b7fb0faae5498ae8bfb0d83478514b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91a3e5fc10b7fb0faae5498ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 15:37:16 2012 -0500 gdiplus: Reimplement GdipCreateMetafileFromEmf without using IPicture. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 70 ++++++++++++++++------------------------ dlls/gdiplus/image.c | 3 +- dlls/gdiplus/metafile.c | 38 +++++++++++++++++++++ 4 files changed, 70 insertions(+), 43 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 53f978c..13a63e6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -58,6 +58,7 @@ extern GpStatus METAFILE_GetGraphicsContext(GpMetafile* metafile, GpGraphics **r extern GpStatus METAFILE_GetDC(GpMetafile* metafile, HDC *hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_ReleaseDC(GpMetafile* metafile, HDC hdc) DECLSPEC_HIDDEN; extern GpStatus METAFILE_GraphicsDeleted(GpMetafile* metafile) DECLSPEC_HIDDEN; +extern MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) DECLSPEC_HIDDEN; extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2) DECLSPEC_HIDDEN; @@ -280,6 +281,7 @@ struct GpMetafile{ GpUnit unit; MetafileType metafile_type; HENHMETAFILE hemf; + int preserve_hemf; /* if true, hemf belongs to the app and should not be deleted */ /* recording */ HDC record_dc; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7380c5d..b3eaa86d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2350,62 +2350,43 @@ GpStatus WINGDIPAPI GdipCreateFromHWNDICM(HWND hwnd, GpGraphics **graphics) GpStatus WINGDIPAPI GdipCreateMetafileFromEmf(HENHMETAFILE hemf, BOOL delete, GpMetafile **metafile) { - IStream *stream = NULL; - UINT read; - ENHMETAHEADER *copy; - GpStatus retval = Ok; + ENHMETAHEADER header; + MetafileType metafile_type; TRACE("(%p,%i,%p)\n", hemf, delete, metafile); if(!hemf || !metafile) return InvalidParameter; - read = GetEnhMetaFileBits(hemf, 0, NULL); - copy = GdipAlloc(read); - GetEnhMetaFileBits(hemf, read, (BYTE *)copy); - - if(CreateStreamOnHGlobal(copy, TRUE, &stream) != S_OK){ - ERR("could not make stream\n"); - GdipFree(copy); - retval = GenericError; - goto err; - } + if (GetEnhMetaFileHeader(hemf, sizeof(header), &header) == 0) + return GenericError; - *metafile = GdipAlloc(sizeof(GpMetafile)); - if(!*metafile){ - retval = OutOfMemory; - goto err; - } + metafile_type = METAFILE_GetEmfType(hemf); - if(OleLoadPicture(stream, 0, FALSE, &IID_IPicture, - (LPVOID*) &((*metafile)->image.picture)) != S_OK) - { - retval = GenericError; - goto err; - } + if (metafile_type == MetafileTypeInvalid) + return GenericError; + *metafile = GdipAlloc(sizeof(GpMetafile)); + if (!*metafile) + return OutOfMemory; (*metafile)->image.type = ImageTypeMetafile; - memcpy(&(*metafile)->image.format, &ImageFormatWMF, sizeof(GUID)); - (*metafile)->image.palette = NULL; - (*metafile)->image.xres = (REAL)copy->szlDevice.cx; - (*metafile)->image.yres = (REAL)copy->szlDevice.cy; - (*metafile)->bounds.X = (REAL)copy->rclBounds.left; - (*metafile)->bounds.Y = (REAL)copy->rclBounds.top; - (*metafile)->bounds.Width = (REAL)(copy->rclBounds.right - copy->rclBounds.left); - (*metafile)->bounds.Height = (REAL)(copy->rclBounds.bottom - copy->rclBounds.top); + (*metafile)->image.format = ImageFormatEMF; + (*metafile)->image.frame_count = 1; + (*metafile)->image.xres = (REAL)header.szlDevice.cx; + (*metafile)->image.yres = (REAL)header.szlDevice.cy; + (*metafile)->bounds.X = (REAL)header.rclBounds.left; + (*metafile)->bounds.Y = (REAL)header.rclBounds.top; + (*metafile)->bounds.Width = (REAL)(header.rclBounds.right - header.rclBounds.left); + (*metafile)->bounds.Height = (REAL)(header.rclBounds.bottom - header.rclBounds.top); (*metafile)->unit = UnitPixel; - - if(delete) - DeleteEnhMetaFile(hemf); + (*metafile)->metafile_type = metafile_type; + (*metafile)->hemf = hemf; + (*metafile)->preserve_hemf = !delete; TRACE("<-- %p\n", *metafile); -err: - if (retval != Ok) - GdipFree(*metafile); - IStream_Release(stream); - return retval; + return Ok; } GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, @@ -2431,7 +2412,8 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, hemf = SetWinMetaFileBits(read, copy, NULL, NULL); GdipFree(copy); - retval = GdipCreateMetafileFromEmf(hemf, FALSE, metafile); + /* FIXME: We should store and use hwmf instead of converting to hemf */ + retval = GdipCreateMetafileFromEmf(hemf, TRUE, metafile); if (retval == Ok) { @@ -2443,9 +2425,13 @@ GpStatus WINGDIPAPI GdipCreateMetafileFromWmf(HMETAFILE hwmf, BOOL delete, placeable->BoundingBox.Left); (*metafile)->bounds.Height = (REAL)(placeable->BoundingBox.Bottom - placeable->BoundingBox.Top); + (*metafile)->metafile_type = MetafileTypeWmfPlaceable; + (*metafile)->image.format = ImageFormatWMF; if (delete) DeleteMetaFile(hwmf); } + else + DeleteEnhMetaFile(hemf); return retval; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3918301..73f08b9 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -2189,7 +2189,8 @@ static GpStatus free_image_data(GpImage *image) GpMetafile *metafile = (GpMetafile*)image; GdipFree(metafile->comment_data); DeleteEnhMetaFile(CloseEnhMetaFile(metafile->record_dc)); - DeleteEnhMetaFile(metafile->hemf); + if (!metafile->preserve_hemf) + DeleteEnhMetaFile(metafile->hemf); if (metafile->record_graphics) { WARN("metafile closed while recording\n"); diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 030b2a2..4345ece 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -548,3 +548,41 @@ GpStatus WINGDIPAPI GdipEnumerateMetafileSrcRectDestPoints(GpGraphics *graphics, return stat; } + +static int CALLBACK get_metafile_type_proc(HDC hDC, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, + int nObj, LPARAM lpData) +{ + MetafileType *result = (MetafileType*)lpData; + + if (lpEMFR->iType == EMR_GDICOMMENT) + { + const EMRGDICOMMENT *comment = (const EMRGDICOMMENT*)lpEMFR; + + if (comment->cbData >= 4 && memcmp(comment->Data, "EMF+", 4) == 0) + { + const EmfPlusRecordHeader *header = (const EmfPlusRecordHeader*)&comment->Data[4]; + + if (4 + sizeof(EmfPlusRecordHeader) <= comment->cbData && + header->Type == EmfPlusRecordTypeHeader) + { + if ((header->Flags & 1) == 1) + *result = MetafileTypeEmfPlusDual; + else + *result = MetafileTypeEmfPlusOnly; + } + } + else + *result = MetafileTypeEmf; + } + else + *result = MetafileTypeEmf; + + return FALSE; +} + +MetafileType METAFILE_GetEmfType(HENHMETAFILE hemf) +{ + MetafileType result = MetafileTypeInvalid; + EnumEnhMetaFile(NULL, hemf, get_metafile_type_proc, &result, NULL); + return result; +}

1 0

Vincent Povirk : gdiplus: Implement GdipCloneImage for metafiles with a handle.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: d8a855305f177ad2315a9c4840a6f174c5f90805 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8a855305f177ad2315a9c484… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 14:33:50 2012 -0500 gdiplus: Implement GdipCloneImage for metafiles with a handle. --- dlls/gdiplus/image.c | 34 ++++++++++++++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 24 ++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3ee024c..3918301 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1382,10 +1382,40 @@ GpStatus WINGDIPAPI GdipCloneImage(GpImage *image, GpImage **cloneImage) return stat; } + else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) + { + GpMetafile *result, *metafile; + + metafile = (GpMetafile*)image; + + result = GdipAlloc(sizeof(*result)); + if (!result) + return OutOfMemory; + + result->image.type = ImageTypeMetafile; + result->image.format = image->format; + result->image.flags = image->flags; + result->image.frame_count = 1; + result->image.xres = image->xres; + result->image.yres = image->yres; + result->bounds = metafile->bounds; + result->unit = metafile->unit; + result->metafile_type = metafile->metafile_type; + result->hemf = CopyEnhMetaFileW(metafile->hemf, NULL); + + if (!result->hemf) + { + GdipFree(result); + return OutOfMemory; + } + + *cloneImage = &result->image; + return Ok; + } else { - ERR("GpImage with no IPicture or bitmap?!\n"); - return NotImplemented; + WARN("GpImage with no image data (metafile in wrong state?)\n"); + return InvalidParameter; } } diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index f283c06..3366f0e 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -474,6 +474,7 @@ static void test_emfonly(void) { GpStatus stat; GpMetafile *metafile; + GpImage *clone; GpGraphics *graphics; HDC hdc, metafile_dc; HENHMETAFILE hemf; @@ -560,6 +561,29 @@ static void test_emfonly(void) expect(Ok, stat); expect(0xff0000ff, color); + stat = GdipCloneImage((GpImage*)metafile, &clone); + expect(Ok, stat); + + if (stat == Ok) + { + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, clone, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + expect(0xff0000ff, color); + + GdipDisposeImage(clone); + } + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Implement drawing metafiles with an emf handle.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 0cbec5508bf66542e1592aed50bbc52783cba27e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbec5508bf66542e1592aed5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 13:36:00 2012 -0500 gdiplus: Implement drawing metafiles with an emf handle. --- dlls/gdiplus/graphics.c | 23 +++++++++++++++++++++-- dlls/gdiplus/tests/metafile.c | 8 ++++---- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index c428b6b..7380c5d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3085,6 +3085,13 @@ GpStatus WINGDIPAPI GdipDrawImagePointsI(GpGraphics *graphics, GpImage *image, return GdipDrawImagePoints(graphics, image, ptf, count); } +static BOOL CALLBACK play_metafile_proc(EmfPlusRecordType record_type, unsigned int flags, + unsigned int dataSize, const unsigned char *pStr, void *userdata) +{ + GdipPlayMetafileRecord(userdata, record_type, flags, dataSize, pStr); + return TRUE; +} + GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image, GDIPCONST GpPointF *points, INT count, REAL srcx, REAL srcy, REAL srcwidth, REAL srcheight, GpUnit srcUnit, GDIPCONST GpImageAttributes* imageAttributes, @@ -3379,10 +3386,22 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image DeleteObject(hbitmap); } } + else if (image->type == ImageTypeMetafile && ((GpMetafile*)image)->hemf) + { + GpRectF rc; + + rc.X = srcx; + rc.Y = srcy; + rc.Width = srcwidth; + rc.Height = srcheight; + + return GdipEnumerateMetafileSrcRectDestPoints(graphics, (GpMetafile*)image, + points, count, &rc, srcUnit, play_metafile_proc, image, imageAttributes); + } else { - ERR("GpImage with no IPicture or HBITMAP?!\n"); - return NotImplemented; + WARN("GpImage with nothing we can draw (metafile in wrong state?)\n"); + return InvalidParameter; } return Ok; diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 31374a5..f283c06 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -431,7 +431,7 @@ static void test_getdc(void) stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); @@ -439,7 +439,7 @@ static void test_getdc(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat); @@ -550,7 +550,7 @@ static void test_emfonly(void) stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); - todo_wine expect(Ok, stat); + expect(Ok, stat); stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); expect(Ok, stat); @@ -558,7 +558,7 @@ static void test_emfonly(void) stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); expect(Ok, stat); - todo_wine expect(0xff0000ff, color); + expect(0xff0000ff, color); stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Vincent Povirk : gdiplus: Add tests for drawing recorded metafiles.
by Alexandre Julliard 01 Nov '12

01 Nov '12

Module: wine Branch: master Commit: 954b49382ff2ef46c421ae9cb391a0ed249733fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=954b49382ff2ef46c421ae9cb… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 31 13:24:20 2012 -0500 gdiplus: Add tests for drawing recorded metafiles. --- dlls/gdiplus/tests/metafile.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 9530b0c..31374a5 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -426,6 +426,21 @@ static void test_getdc(void) expect(Ok, stat); expect(0, color); + stat = GdipBitmapSetPixel(bitmap, 15, 15, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + todo_wine expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat); @@ -530,6 +545,21 @@ static void test_emfonly(void) expect(Ok, stat); expect(0xff0000ff, color); + stat = GdipBitmapSetPixel(bitmap, 50, 50, 0); + expect(Ok, stat); + + stat = GdipDrawImagePointsRect(graphics, (GpImage*)metafile, dst_points, 3, + 0.0, 0.0, 100.0, 100.0, UnitPixel, NULL, NULL, NULL); + todo_wine expect(Ok, stat); + + stat = GdipBitmapGetPixel(bitmap, 15, 15, &color); + expect(Ok, stat); + expect(0, color); + + stat = GdipBitmapGetPixel(bitmap, 50, 50, &color); + expect(Ok, stat); + todo_wine expect(0xff0000ff, color); + stat = GdipDeleteGraphics(graphics); expect(Ok, stat);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2012