wine-commits March 2012

wine-commits@winehq.org

3 participants
710 discussions

Christian Costa : attrib: Display unknown options.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 25b97e99839473276bfba9a35abde480a7181c55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b97e99839473276bfba9a35… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 22:05:37 2012 +0200 attrib: Display unknown options. --- programs/attrib/attrib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/attrib/attrib.c b/programs/attrib/attrib.c index 0728563..34b8592 100644 --- a/programs/attrib/attrib.c +++ b/programs/attrib/attrib.c @@ -167,7 +167,7 @@ int wmain(int argc, WCHAR *argv[]) } else if (((param[1] == 'R') || (param[1] == 'r')) && !param[2]) { WINE_FIXME("Option /R not yet supported\n"); } else { - WINE_FIXME("Unrecognized option\n"); + WINE_FIXME("Unknown option %s\n", debugstr_w(param)); } } else if (param[0]) { strcpyW(name, param);

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to initialize exception RTTI data.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d18b406b5647f102fe83d80f369c129476f72154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d18b406b5647f102fe83d80f3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:41:39 2012 +0200 msvcp90: Use DEFINE_RTTI_DATA to initialize exception RTTI data. --- dlls/msvcp90/exception.c | 48 +++++++++++++++++++++++------------------- dlls/msvcp90/msvcp90.h | 1 - dlls/msvcp90/msvcp90_main.c | 1 - 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index 5eeca1d..040c274 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -61,6 +61,7 @@ typedef struct __cxx_exception_type void WINAPI _CxxThrowException(exception*,const cxx_exception_type*); /* vtables */ +extern const vtable_ptr MSVCP_exception_vtable; extern const vtable_ptr MSVCP_bad_alloc_vtable; extern const vtable_ptr MSVCP_logic_error_vtable; extern const vtable_ptr MSVCP_length_error_vtable; @@ -68,19 +69,12 @@ extern const vtable_ptr MSVCP_out_of_range_vtable; extern const vtable_ptr MSVCP_invalid_argument_vtable; extern const vtable_ptr MSVCP_runtime_error_vtable; -/* exception class data */ -static type_info exception_type_info = { - NULL, /* set by set_exception_vtable */ - NULL, - ".?AVexception@std@@" -}; - DEFINE_THISCALL_WRAPPER(MSVCP_exception_ctor, 8) exception* __thiscall MSVCP_exception_ctor(exception *this, const char **name) { TRACE("(%p %s)\n", this, *name); - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; if(*name) { unsigned int name_len = strlen(*name) + 1; this->name = malloc(name_len); @@ -99,7 +93,7 @@ exception* __thiscall MSVCP_exception_copy_ctor(exception *this, const exception TRACE("(%p,%p)\n", this, rhs); if(!rhs->do_free) { - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; this->name = rhs->name; this->do_free = FALSE; } else @@ -112,17 +106,32 @@ DEFINE_THISCALL_WRAPPER(MSVCP_exception_dtor,4) void __thiscall MSVCP_exception_dtor(exception *this) { TRACE("(%p)\n", this); - this->vtable = exception_type_info.vtable; + this->vtable = &MSVCP_exception_vtable; if(this->do_free) free(this->name); } -static const rtti_base_descriptor exception_rtti_base_descriptor = { - &exception_type_info, - 0, - { 0, -1, 0 }, - 0 -}; +DEFINE_THISCALL_WRAPPER(MSVCP_exception_vector_dtor, 8) +void * __thiscall MSVCP_exception_vector_dtor(exception *this, unsigned int flags) +{ + TRACE("%p %x\n", this, flags); + if(flags & 2) { + /* we have an array, with the number of elements stored before the first object */ + int i, *ptr = (int *)this-1; + + for(i=*ptr-1; i>=0; i--) + MSVCP_exception_dtor(this+i); + MSVCRT_operator_delete(ptr); + } else { + MSVCP_exception_dtor(this); + if(flags & 1) + MSVCRT_operator_delete(this); + } + + return this; +} + +DEFINE_RTTI_DATA(exception, 0, 0, NULL, NULL, NULL, ".?AVexception@std@@"); static const cxx_type_info exception_cxx_type_info = { 0, @@ -148,12 +157,6 @@ static const cxx_exception_type exception_cxx_type = { &exception_cxx_type_table }; -void set_exception_vtable(void) -{ - HMODULE hmod = GetModuleHandleA("msvcrt.dll"); - exception_type_info.vtable = (void*)GetProcAddress(hmod, "??_7exception@@6B@"); -} - /* bad_alloc class data */ typedef exception bad_alloc; @@ -591,6 +594,7 @@ const char* __thiscall MSVCP_runtime_error_what(runtime_error *this) #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(exception, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(bad_alloc, VTABLE_ADD_FUNC(MSVCP_what_exception)); __ASM_VTABLE(logic_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); __ASM_VTABLE(length_error, VTABLE_ADD_FUNC(MSVCP_logic_error_what)); diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index a57eedf..f59efa6 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -166,7 +166,6 @@ typedef enum __exception_type { EXCEPTION_RUNTIME_ERROR } exception_type; void throw_exception(exception_type, const char *); -void set_exception_vtable(void); /* rtti */ typedef struct __type_info diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index fa9513f..6a1d4d2 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -89,7 +89,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: init_cxx_funcs(); - set_exception_vtable(); init_lockit(); break; case DLL_PROCESS_DETACH:

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to define locale_facet RTTI base descriptor.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 1328da18151f83b98b84d0fa1e70f79d08450a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1328da18151f83b98b84d0fa1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:41:05 2012 +0200 msvcp90: Use DEFINE_RTTI_DATA to define locale_facet RTTI base descriptor. --- dlls/msvcp90/locale.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index f667d91..d2e7798 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -182,9 +182,7 @@ locale_facet* __thiscall MSVCP_locale_facet_vector_dtor(locale_facet *this, unsi return this; } -const vtable_ptr MSVCP_locale_facet_vtable[] = { - (vtable_ptr)THISCALL_NAME(MSVCP_locale_facet_vector_dtor) -}; +extern const vtable_ptr MSVCP_locale_facet_vtable; /* ??0id@locale@std@@QAE@I@Z */ /* ??0id@locale@std@@QEAA@_K@Z */ @@ -240,7 +238,7 @@ DEFINE_THISCALL_WRAPPER(locale_facet_ctor, 4) locale_facet* __thiscall locale_facet_ctor(locale_facet *this) { TRACE("(%p)\n", this); - this->vtable = MSVCP_locale_facet_vtable; + this->vtable = &MSVCP_locale_facet_vtable; this->refs = 0; return this; } @@ -251,7 +249,7 @@ DEFINE_THISCALL_WRAPPER(locale_facet_ctor_refs, 8) locale_facet* __thiscall locale_facet_ctor_refs(locale_facet *this, MSVCP_size_t refs) { TRACE("(%p %lu)\n", this, refs); - this->vtable = MSVCP_locale_facet_vtable; + this->vtable = &MSVCP_locale_facet_vtable; this->refs = refs; return this; } @@ -666,12 +664,6 @@ _Timevec*__thiscall _Locinfo__Gettnames(const _Locinfo *this, _Timevec *ret) return ret; } -static const type_info locale_facet_type_info = { - MSVCP_locale_facet_vtable, - NULL, - ".?AVfacet@locale@std@@" -}; - /* ?id@?$collate@D@std@@2V0locale@2@A */ locale_id collate_char_id = {0}; @@ -4127,13 +4119,7 @@ basic_string_char* __thiscall locale_name(const locale *this, basic_string_char return ret; } -static const rtti_base_descriptor locale_facet_rtti_base_descriptor = { - &locale_facet_type_info, - 0, - { 0, -1, 0}, - 64 -}; - +DEFINE_RTTI_DATA(locale_facet, 0, 0, NULL, NULL, NULL, ".?AVfacet@locale@std@@"); DEFINE_RTTI_DATA(collate_char, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate@D@std@@"); DEFINE_RTTI_DATA(collate_wchar, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate@_W@std@@"); DEFINE_RTTI_DATA(collate_short, 0, 1, &locale_facet_rtti_base_descriptor, NULL, NULL, ".?AV?$collate@G@std@@"); @@ -4151,6 +4137,7 @@ DEFINE_RTTI_DATA(num_get_short, 0, 1, &locale_facet_rtti_base_descriptor, NULL, #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(locale_facet, ""); __ASM_VTABLE(collate_char, VTABLE_ADD_FUNC(collate_char_do_compare) VTABLE_ADD_FUNC(collate_char_do_transform)

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to define iosb RTTI base descriptor.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 50bbba932e5dea05f17860ea7a95aa792d717e99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bbba932e5dea05f17860ea7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:40:47 2012 +0200 msvcp90: Use DEFINE_RTTI_DATA to define iosb RTTI base descriptor. --- dlls/msvcp90/ios.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a8d4ddd..25c0e39 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -149,6 +149,8 @@ typedef struct { basic_ios_char child; } basic_ostream_char; +extern const vtable_ptr MSVCP_iosb_vtable; + /* ??_7ios_base@std@@6B@ */ extern const vtable_ptr MSVCP_ios_base_vtable; @@ -164,19 +166,7 @@ extern const vtable_ptr MSVCP_basic_streambuf_char_vtable; /* ??_7?$basic_ostream@DU?$char_traits@D@std@@@std@@6B@ */ extern const vtable_ptr MSVCP_basic_ostream_char_vtable; -static const type_info iosb_type_info = { - &MSVCP_ios_base_vtable, - NULL, - ".?AV?$_Iosb@H@std@@" -}; - -static const rtti_base_descriptor iosb_rtti_base_descriptor = { - &iosb_type_info, - 0, - { 4, -1, 0 }, - 64 -}; - +DEFINE_RTTI_DATA(iosb, 0, 0, NULL, NULL, NULL, ".?AV?$_Iosb@H@std@@"); DEFINE_RTTI_DATA(ios_base, 0, 1, &iosb_rtti_base_descriptor, NULL, NULL, ".?AV?$_Iosb@H@std@@"); DEFINE_RTTI_DATA(basic_ios_char, 0, 2, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, NULL, ".?AV?$basic_ios@DU?$char_traits@D@std@@@std@@"); @@ -190,6 +180,7 @@ DEFINE_RTTI_DATA(basic_ostream_char, 4, 3, &basic_ios_char_rtti_base_descriptor, #ifndef __GNUC__ void __asm_dummy_vtables(void) { #endif + __ASM_VTABLE(iosb, ""); __ASM_VTABLE(ios_base, ""); __ASM_VTABLE(basic_ios_char, ""); __ASM_VTABLE(basic_ios_wchar, ""); @@ -260,6 +251,12 @@ ios_base* __thiscall MSVCP_ios_base_vector_dtor(ios_base *this, unsigned int fla return this; } +DEFINE_THISCALL_WRAPPER(MSVCP_iosb_vector_dtor, 8) +ios_base* __thiscall MSVCP_iosb_vector_dtor(ios_base *this, unsigned int flags) +{ + return MSVCP_ios_base_vector_dtor(this, flags); +} + /* ??4ios_base@std@@QAEAAV01@ABV01@@Z */ /* ??4ios_base@std@@QEAAAEAV01@AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(ios_base_assign, 8)

1 0

Piotr Caban : msvcp90: Don't define separate structures for num_get<char> and num_get<wchar>.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 1650f09158a558de101368f77fb51b86764cd39b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1650f09158a558de101368f77… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Mar 27 12:40:31 2012 +0200 msvcp90: Don't define separate structures for num_get<char> and num_get<wchar>. --- dlls/msvcp90/locale.c | 129 +++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1650f09158a558de10136…

1 0

Huw Davies : gdi32: Separate face creation from face insertion.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 0318951aac7e299b93bae38ae3caf2cf2bdadd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0318951aac7e299b93bae38ae… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:47 2012 +0100 gdi32: Separate face creation from face insertion. --- dlls/gdi32/freetype.c | 156 +++++++++++++++++++++++++----------------------- 1 files changed, 81 insertions(+), 75 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d7accf0..8a077a9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1448,7 +1448,7 @@ static inline int TestStyles(DWORD flags, DWORD styles) return (flags & styles) == styles; } -static int StyleOrdering(Face *face) +static inline int style_order(Face *face) { if (TestStyles(face->ntmFlags, NTM_BOLD | NTM_ITALIC)) return 3; @@ -1467,21 +1467,6 @@ static int StyleOrdering(Face *face) return 9999; } -/* Add a style of face to a font family using an ordering of the list such - that regular fonts come before bold and italic, and single styles come - before compound styles. */ -static void AddFaceToFamily(Face *face, Family *family) -{ - struct list *entry; - - LIST_FOR_EACH( entry, &family->faces ) - { - Face *ent = LIST_ENTRY(entry, Face, entry); - if (StyleOrdering(face) < StyleOrdering(ent)) break; - } - list_add_before( entry, &face->entry ); -} - static WCHAR *prepend_at(WCHAR *family) { WCHAR *str; @@ -1681,58 +1666,17 @@ static inline void free_face( Face *face ) #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 -static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) +static Face *create_face( FT_Face ft_face, FT_Long face_index, const char *file, void *font_data_ptr, DWORD font_data_size, + DWORD flags, BOOL vertical ) { - Family *family; - WCHAR *StyleW; - Face *face; - struct list *face_elem_ptr; - FONTSIGNATURE fs; - My_FT_Bitmap_Size *size = NULL; - FT_Fixed version; + Face *face = HeapAlloc( GetProcessHeap(), 0, sizeof(*face) ); + My_FT_Bitmap_Size *size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - if(!FT_IS_SCALABLE(ft_face)) - size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - - family = get_family( ft_face, vertical ); - - StyleW = towstr(CP_ACP, ft_face->style_name); - - get_fontsig( ft_face, &fs ); - - version = get_font_version( ft_face ); - LIST_FOR_EACH(face_elem_ptr, &family->faces) - { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(!strcmpiW(face->StyleName, StyleW) && - (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) - { - TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", - debugstr_w(family->FamilyName), debugstr_w(StyleW), - face->font_version, version); - if(version <= face->font_version) - { - TRACE("Original font is newer so skipping this one\n"); - HeapFree(GetProcessHeap(), 0, StyleW); - return; - } - else - { - TRACE("Replacing original with this one\n"); - list_remove(&face->entry); - free_face( face ); - break; - } - } - } - - face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); - face->cached_enum_data = NULL; - face->StyleName = StyleW; - face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); + face->StyleName = towstr( CP_ACP, ft_face->style_name ); + face->FullName = get_face_name( ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES ); if (file) { - face->file = strdupA(file); + face->file = strdupA( file ); face->font_data_ptr = NULL; face->font_data_size = 0; } @@ -1742,17 +1686,15 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->font_data_ptr = font_data_ptr; face->font_data_size = font_data_size; } + face->face_index = face_index; + get_fontsig( ft_face, &face->fs ); face->ntmFlags = get_ntm_flags( ft_face ); - face->font_version = version; - face->family = family; - face->vertical = vertical; - face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; - face->fs = fs; + face->font_version = get_font_version( ft_face ); - if(FT_IS_SCALABLE(ft_face)) + if (FT_IS_SCALABLE( ft_face )) { - memset(&face->size, 0, sizeof(face->size)); + memset( &face->size, 0, sizeof(face->size) ); face->scalable = TRUE; } else @@ -1769,18 +1711,82 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->scalable = FALSE; } + face->vertical = vertical; + face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; + face->family = NULL; + face->cached_enum_data = NULL; + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", face->fs.fsCsb[0], face->fs.fsCsb[1], face->fs.fsUsb[0], face->fs.fsUsb[1], face->fs.fsUsb[2], face->fs.fsUsb[3]); - if(flags & ADDFONT_ADD_TO_CACHE) - add_face_to_cache(face); + return face; +} + +static inline BOOL faces_equal( Face *f1, Face *f2 ) +{ + if (strcmpiW( f1->StyleName, f2->StyleName )) return FALSE; + if (f1->scalable) return TRUE; + if (f2->size.y_ppem != f2->size.y_ppem) return FALSE; + return !memcmp( &f1->fs, &f2->fs, sizeof(f1->fs) ); +} + +static BOOL insert_face_in_family_list( Face *face, Family *family ) +{ + Face *cursor; + + LIST_FOR_EACH_ENTRY( cursor, &family->faces, Face, entry ) + { + if (faces_equal( face, cursor )) + { + TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", + debugstr_w(family->FamilyName), debugstr_w(face->StyleName), + cursor->font_version, face->font_version); + + if (face->font_version <= cursor->font_version) + { + TRACE("Original font is newer so skipping this one\n"); + return FALSE; + } + else + { + TRACE("Replacing original with this one\n"); + list_add_before( &cursor->entry, &face->entry ); + face->family = family; + list_remove( &cursor->entry); + free_face( cursor ); + return TRUE; + } + } + + if (style_order( face ) < style_order( cursor )) break; + } + + list_add_before( &cursor->entry, &face->entry ); + face->family = family; + return TRUE; +} + +static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, + FT_Long face_index, DWORD flags, BOOL vertical) +{ + Face *face; + Family *family; + + face = create_face( ft_face, face_index, file, font_data_ptr, font_data_size, flags, vertical ); + family = get_family( ft_face, vertical ); + if (!insert_face_in_family_list( face, family )) + { + free_face( face ); + return; + } - AddFaceToFamily(face, family); + if (flags & ADDFONT_ADD_TO_CACHE) + add_face_to_cache( face ); TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), - debugstr_w(StyleW)); + debugstr_w(face->StyleName)); } static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_size, DWORD flags)

1 0

Huw Davies : gdi32: Remove the loop over bitmap sizes. FreeType lists different sizes as separate faces.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 2489c3285c74ba5d09aabad42186d0851014ce44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2489c3285c74ba5d09aabad42… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:46 2012 +0100 gdi32: Remove the loop over bitmap sizes. FreeType lists different sizes as separate faces. Windows format bitmap fonts have been enumerated as separate faces since FreeType 2.1.5, since we require 2.1.9 for bitmap support we can safely drop this loop. --- dlls/gdi32/freetype.c | 168 +++++++++++++++++++++++++------------------------ 1 files changed, 86 insertions(+), 82 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index efa36bb..d7accf0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1683,97 +1683,101 @@ static inline void free_face( Face *face ) static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr, DWORD font_data_size, FT_Long face_index, DWORD flags, BOOL vertical) { - int bitmap_num = 0; Family *family; WCHAR *StyleW; + Face *face; + struct list *face_elem_ptr; + FONTSIGNATURE fs; + My_FT_Bitmap_Size *size = NULL; + FT_Fixed version; - do { - Face *face; - struct list *face_elem_ptr; - FONTSIGNATURE fs; - My_FT_Bitmap_Size *size = NULL; - FT_Fixed version; - - if(!FT_IS_SCALABLE(ft_face)) - size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; + if(!FT_IS_SCALABLE(ft_face)) + size = (My_FT_Bitmap_Size *)ft_face->available_sizes; - family = get_family( ft_face, vertical ); + family = get_family( ft_face, vertical ); - StyleW = towstr(CP_ACP, ft_face->style_name); + StyleW = towstr(CP_ACP, ft_face->style_name); - get_fontsig( ft_face, &fs ); + get_fontsig( ft_face, &fs ); - version = get_font_version( ft_face ); - LIST_FOR_EACH(face_elem_ptr, &family->faces) { - face = LIST_ENTRY(face_elem_ptr, Face, entry); - if(!strcmpiW(face->StyleName, StyleW) && - (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) { - TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", - debugstr_w(family->FamilyName), debugstr_w(StyleW), - face->font_version, version); - if(version <= face->font_version) { - TRACE("Original font is newer so skipping this one\n"); - HeapFree(GetProcessHeap(), 0, StyleW); - return; - } else { - TRACE("Replacing original with this one\n"); - list_remove(&face->entry); - free_face( face ); - break; - } - } - } - face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); - face->cached_enum_data = NULL; - face->StyleName = StyleW; - face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); - if (file) - { - face->file = strdupA(file); - face->font_data_ptr = NULL; - face->font_data_size = 0; - } - else + version = get_font_version( ft_face ); + LIST_FOR_EACH(face_elem_ptr, &family->faces) + { + face = LIST_ENTRY(face_elem_ptr, Face, entry); + if(!strcmpiW(face->StyleName, StyleW) && + (FT_IS_SCALABLE(ft_face) || ((size->y_ppem == face->size.y_ppem) && !memcmp(&fs, &face->fs, sizeof(fs)) ))) { - face->file = NULL; - face->font_data_ptr = font_data_ptr; - face->font_data_size = font_data_size; + TRACE("Already loaded font %s %s original version is %lx, this version is %lx\n", + debugstr_w(family->FamilyName), debugstr_w(StyleW), + face->font_version, version); + if(version <= face->font_version) + { + TRACE("Original font is newer so skipping this one\n"); + HeapFree(GetProcessHeap(), 0, StyleW); + return; + } + else + { + TRACE("Replacing original with this one\n"); + list_remove(&face->entry); + free_face( face ); + break; + } } - face->face_index = face_index; - face->ntmFlags = get_ntm_flags( ft_face ); - face->font_version = version; - face->family = family; - face->vertical = vertical; - face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; - face->fs = fs; + } - if(FT_IS_SCALABLE(ft_face)) { - memset(&face->size, 0, sizeof(face->size)); - face->scalable = TRUE; - } else { - TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", - size->height, size->width, size->size >> 6, - size->x_ppem >> 6, size->y_ppem >> 6); - face->size.height = size->height; - face->size.width = size->width; - face->size.size = size->size; - face->size.x_ppem = size->x_ppem; - face->size.y_ppem = size->y_ppem; - face->size.internal_leading = get_bitmap_internal_leading( ft_face ); - face->scalable = FALSE; - } + face = HeapAlloc(GetProcessHeap(), 0, sizeof(*face)); + face->cached_enum_data = NULL; + face->StyleName = StyleW; + face->FullName = get_face_name(ft_face, TT_NAME_ID_FULL_NAME, TT_MS_LANGID_ENGLISH_UNITED_STATES); + if (file) + { + face->file = strdupA(file); + face->font_data_ptr = NULL; + face->font_data_size = 0; + } + else + { + face->file = NULL; + face->font_data_ptr = font_data_ptr; + face->font_data_size = font_data_size; + } + face->face_index = face_index; + face->ntmFlags = get_ntm_flags( ft_face ); + face->font_version = version; + face->family = family; + face->vertical = vertical; + face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE; + face->fs = fs; - TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", - face->fs.fsCsb[0], face->fs.fsCsb[1], - face->fs.fsUsb[0], face->fs.fsUsb[1], - face->fs.fsUsb[2], face->fs.fsUsb[3]); + if(FT_IS_SCALABLE(ft_face)) + { + memset(&face->size, 0, sizeof(face->size)); + face->scalable = TRUE; + } + else + { + TRACE("Adding bitmap size h %d w %d size %ld x_ppem %ld y_ppem %ld\n", + size->height, size->width, size->size >> 6, + size->x_ppem >> 6, size->y_ppem >> 6); + face->size.height = size->height; + face->size.width = size->width; + face->size.size = size->size; + face->size.x_ppem = size->x_ppem; + face->size.y_ppem = size->y_ppem; + face->size.internal_leading = get_bitmap_internal_leading( ft_face ); + face->scalable = FALSE; + } - if(flags & ADDFONT_ADD_TO_CACHE) - add_face_to_cache(face); + TRACE("fsCsb = %08x %08x/%08x %08x %08x %08x\n", + face->fs.fsCsb[0], face->fs.fsCsb[1], + face->fs.fsUsb[0], face->fs.fsUsb[1], + face->fs.fsUsb[2], face->fs.fsUsb[3]); - AddFaceToFamily(face, family); + if(flags & ADDFONT_ADD_TO_CACHE) + add_face_to_cache(face); - } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes); + AddFaceToFamily(face, family); TRACE("Added font %s %s\n", debugstr_w(family->FamilyName), debugstr_w(StyleW));

1 0

Huw Davies : gdi32: Add a helper to free a face object and fix a potential memory leak.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 8d50bb6711e3e3e3cc0bfd56ad15aafa2ef712a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d50bb6711e3e3e3cc0bfd56a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:45 2012 +0100 gdi32: Add a helper to free a face object and fix a potential memory leak. --- dlls/gdi32/freetype.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index be03c34..efa36bb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1668,6 +1668,15 @@ static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) } } +static inline void free_face( Face *face ) +{ + HeapFree( GetProcessHeap(), 0, face->file ); + HeapFree( GetProcessHeap(), 0, face->StyleName ); + HeapFree( GetProcessHeap(), 0, face->FullName ); + HeapFree( GetProcessHeap(), 0, face->cached_enum_data ); + HeapFree( GetProcessHeap(), 0, face ); +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1709,10 +1718,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr } else { TRACE("Replacing original with this one\n"); list_remove(&face->entry); - HeapFree(GetProcessHeap(), 0, face->file); - HeapFree(GetProcessHeap(), 0, face->StyleName); - HeapFree(GetProcessHeap(), 0, face->FullName); - HeapFree(GetProcessHeap(), 0, face); + free_face( face ); break; } }

1 0

Huw Davies : gdi32: Add a helper to retrieve the fontsignature.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: b5115f77bc1c24111d4e8182f24916c292600e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5115f77bc1c24111d4e8182f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:44 2012 +0100 gdi32: Add a helper to retrieve the fontsignature. --- dlls/gdi32/freetype.c | 112 ++++++++++++++++++++++++++++--------------------- 1 files changed, 64 insertions(+), 48 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 6f916c1..be03c34 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1605,6 +1605,69 @@ static inline int get_bitmap_internal_leading( FT_Face ft_face ) return internal_leading; } +static inline void get_fontsig( FT_Face ft_face, FONTSIGNATURE *fs ) +{ + TT_OS2 *os2; + FT_UInt dummy; + CHARSETINFO csi; + FT_WinFNT_HeaderRec winfnt_header; + int i; + + memset( fs, 0, sizeof(*fs) ); + + os2 = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_os2 ); + if (os2) + { + fs->fsUsb[0] = os2->ulUnicodeRange1; + fs->fsUsb[1] = os2->ulUnicodeRange2; + fs->fsUsb[2] = os2->ulUnicodeRange3; + fs->fsUsb[3] = os2->ulUnicodeRange4; + + if (os2->version == 0) + { + if (pFT_Get_First_Char( ft_face, &dummy ) < 0x100) + fs->fsCsb[0] = FS_LATIN1; + else + fs->fsCsb[0] = FS_SYMBOL; + } + else + { + fs->fsCsb[0] = os2->ulCodePageRange1; + fs->fsCsb[1] = os2->ulCodePageRange2; + } + } + else + { + if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) + { + TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, + winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); + if (TranslateCharsetInfo( (DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET )) + *fs = csi.fs; + } + } + + if (fs->fsCsb[0] == 0) + { + /* let's see if we can find any interesting cmaps */ + for (i = 0; i < ft_face->num_charmaps; i++) + { + switch (ft_face->charmaps[i]->encoding) + { + case FT_ENCODING_UNICODE: + case FT_ENCODING_APPLE_ROMAN: + fs->fsCsb[0] |= FS_LATIN1; + break; + case FT_ENCODING_MS_SYMBOL: + fs->fsCsb[0] |= FS_SYMBOL; + break; + default: + break; + } + } + } +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1616,10 +1679,8 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr WCHAR *StyleW; do { - TT_OS2 *pOS2; Face *face; struct list *face_elem_ptr; - FT_WinFNT_HeaderRec winfnt_header; FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; FT_Fixed version; @@ -1631,32 +1692,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr StyleW = towstr(CP_ACP, ft_face->style_name); - memset(&fs, 0, sizeof(fs)); - - pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); - if(pOS2) { - fs.fsCsb[0] = pOS2->ulCodePageRange1; - fs.fsCsb[1] = pOS2->ulCodePageRange2; - fs.fsUsb[0] = pOS2->ulUnicodeRange1; - fs.fsUsb[1] = pOS2->ulUnicodeRange2; - fs.fsUsb[2] = pOS2->ulUnicodeRange3; - fs.fsUsb[3] = pOS2->ulUnicodeRange4; - if(pOS2->version == 0) { - FT_UInt dummy; - - if(pFT_Get_First_Char( ft_face, &dummy ) < 0x100) - fs.fsCsb[0] |= FS_LATIN1; - else - fs.fsCsb[0] |= FS_SYMBOL; - } - } - else if(!pFT_Get_WinFNT_Header(ft_face, &winfnt_header)) { - CHARSETINFO csi; - TRACE("pix_h %d charset %d dpi %dx%d pt %d\n", winfnt_header.pixel_height, winfnt_header.charset, - winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); - if(TranslateCharsetInfo((DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET)) - fs = csi.fs; - } + get_fontsig( ft_face, &fs ); version = get_font_version( ft_face ); LIST_FOR_EACH(face_elem_ptr, &family->faces) { @@ -1726,26 +1762,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->fs.fsUsb[0], face->fs.fsUsb[1], face->fs.fsUsb[2], face->fs.fsUsb[3]); - if(face->fs.fsCsb[0] == 0) - { - int i; - - /* let's see if we can find any interesting cmaps */ - for(i = 0; i < ft_face->num_charmaps; i++) { - switch(ft_face->charmaps[i]->encoding) { - case FT_ENCODING_UNICODE: - case FT_ENCODING_APPLE_ROMAN: - face->fs.fsCsb[0] |= FS_LATIN1; - break; - case FT_ENCODING_MS_SYMBOL: - face->fs.fsCsb[0] |= FS_SYMBOL; - break; - default: - break; - } - } - } - if(flags & ADDFONT_ADD_TO_CACHE) add_face_to_cache(face);

1 0

Huw Davies : gdi32: Add a helper to retrieve a bitmap font' s internal leading.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 45d79feaf5789bdc4c0a2c98ee54b672a4bfbe36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45d79feaf5789bdc4c0a2c98e… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:43 2012 +0100 gdi32: Add a helper to retrieve a bitmap font's internal leading. --- dlls/gdi32/freetype.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 446175e..6f916c1 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1594,6 +1594,17 @@ static inline DWORD get_ntm_flags( FT_Face ft_face ) return flags; } +static inline int get_bitmap_internal_leading( FT_Face ft_face ) +{ + int internal_leading = 0; + FT_WinFNT_HeaderRec winfnt_header; + + if (!pFT_Get_WinFNT_Header( ft_face, &winfnt_header )) + internal_leading = winfnt_header.internal_leading; + + return internal_leading; +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1609,7 +1620,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; - int internal_leading; FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; FT_Fixed version; @@ -1621,7 +1631,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr StyleW = towstr(CP_ACP, ft_face->style_name); - internal_leading = 0; memset(&fs, 0, sizeof(fs)); pOS2 = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_os2); @@ -1647,7 +1656,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr winfnt_header.vertical_resolution,winfnt_header.horizontal_resolution, winfnt_header.nominal_point_size); if(TranslateCharsetInfo((DWORD*)(UINT_PTR)winfnt_header.charset, &csi, TCI_SRCCHARSET)) fs = csi.fs; - internal_leading = winfnt_header.internal_leading; } version = get_font_version( ft_face ); @@ -1709,7 +1717,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->size.size = size->size; face->size.x_ppem = size->x_ppem; face->size.y_ppem = size->y_ppem; - face->size.internal_leading = internal_leading; + face->size.internal_leading = get_bitmap_internal_leading( ft_face ); face->scalable = FALSE; }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
71
Older →

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 March 2012