March 2012 - Wine-Commits - list.winehq.org

Jacek Caban : mshtml: Forward common getters from IHTMLObjectElement to IHTMLObjectElement2.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: e405e4ccb9ec6313672be48ce9992e5682a7feb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e405e4ccb9ec6313672be48ce… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 27 13:39:35 2012 +0200 mshtml: Forward common getters from IHTMLObjectElement to IHTMLObjectElement2. --- dlls/mshtml/htmlobject.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlobject.c b/dlls/mshtml/htmlobject.c index 362cb01..6f171c6 100644 --- a/dlls/mshtml/htmlobject.c +++ b/dlls/mshtml/htmlobject.c @@ -115,15 +115,19 @@ static HRESULT WINAPI HTMLObjectElement_get_object(IHTMLObjectElement *iface, ID static HRESULT WINAPI HTMLObjectElement_get_classid(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLObjectElement2_get_classid(&This->IHTMLObjectElement_iface, p); } static HRESULT WINAPI HTMLObjectElement_get_data(IHTMLObjectElement *iface, BSTR *p) { HTMLObjectElement *This = impl_from_IHTMLObjectElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLObjectElement2_get_data(&This->IHTMLObjectElement_iface, p); } static HRESULT WINAPI HTMLObjectElement_put_recordset(IHTMLObjectElement *iface, IDispatch *v)

1 0

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to initialize exception RTTI data.
by Alexandre Julliard March 27, 2012

March 27, 2012

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(a)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(a)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

Christian Costa : cmd/tests: If we rewind to the beginning of the line, don 't increment line number.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 6533168089ab98759562999618c7fbbe540038eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6533168089ab9875956299961… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Mar 26 10:13:44 2012 +0200 cmd/tests: If we rewind to the beginning of the line, don't increment line number. --- programs/cmd/tests/batch.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 8236352..6cf740b 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -315,7 +315,11 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da if(is_todo_wine) winetest_end_todo("wine"); if (is_exp_resync && err && is_todo_wine) + { exp_ptr -= sizeof(todo_wine_cmd); + /* If we rewind to the beginning of the line, don't increment line number */ + line--; + } else if (!is_exp_resync || (is_exp_resync && !err)) { exp_ptr = exp_nl+1;

1 0

Huw Davies : gdi32: Add a helper to retrieve the family pointer.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: 7ad330deef3a8e108ce6cc456b7721b8e3e506bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ad330deef3a8e108ce6cc456… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:39 2012 +0100 gdi32: Add a helper to retrieve the family pointer. --- dlls/gdi32/freetype.c | 59 +++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index e174921..1b38a8e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1520,6 +1520,41 @@ static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BO } } +static Family *get_family( FT_Face ft_face, BOOL vertical ) +{ + Family *family; + WCHAR *name, *english_name; + + get_family_names( ft_face, &name, &english_name, vertical ); + + family = find_family_from_name( name ); + + if (!family) + { + family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + family->FamilyName = strdupW( name ); + family->EnglishName = english_name ? strdupW( english_name ) : NULL; + list_init( &family->faces ); + family->replacement = &family->faces; + list_add_tail( &font_list, &family->entry ); + + if (english_name) + { + FontSubst *subst = HeapAlloc( GetProcessHeap(), 0, sizeof(*subst) ); + subst->from.name = strdupW( english_name ); + subst->from.charset = -1; + subst->to.name = strdupW( name ); + subst->to.charset = -1; + add_font_subst( &font_subst_list, subst, 0 ); + } + } + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, english_name ); + + return family; +} + + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1533,7 +1568,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr do { TT_OS2 *pOS2; TT_Header *pHeader; - WCHAR *family_name, *english_family; Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; @@ -1545,28 +1579,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; - get_family_names( ft_face, &family_name, &english_family, vertical ); - - family = find_family_from_name( family_name ); - if(!family) { - family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); - family->FamilyName = strdupW( family_name ); - family->EnglishName = english_family ? strdupW( english_family ) : NULL; - list_init(&family->faces); - family->replacement = &family->faces; - list_add_tail(&font_list, &family->entry); - - if(english_family) { - FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); - subst->from.name = strdupW(english_family); - subst->from.charset = -1; - subst->to.name = strdupW(family_name); - subst->to.charset = -1; - add_font_subst(&font_subst_list, subst, 0); - } - } - HeapFree(GetProcessHeap(), 0, family_name); - HeapFree(GetProcessHeap(), 0, english_family); + family = get_family( ft_face, vertical ); StyleW = towstr(CP_ACP, ft_face->style_name);

1 0

Huw Davies : gdi32: Separate face creation from face insertion.
by Alexandre Julliard March 27, 2012

March 27, 2012

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

Piotr Caban : msvcp90: Use DEFINE_RTTI_DATA to define iosb RTTI base descriptor.
by Alexandre Julliard March 27, 2012

March 27, 2012

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(a)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(a)DU?$char_traits(a)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(a)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(a)H@std@@"); DEFINE_RTTI_DATA(ios_base, 0, 1, &iosb_rtti_base_descriptor, NULL, NULL, ".?AV?$_Iosb(a)H@std@@"); DEFINE_RTTI_DATA(basic_ios_char, 0, 2, &ios_base_rtti_base_descriptor, &iosb_rtti_base_descriptor, NULL, ".?AV?$basic_ios(a)DU?$char_traits(a)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(a)std@@QAEAAV01(a)ABV01@@Z */ /* ??4ios_base(a)std@@QEAAAEAV01(a)AEBV01@@Z */ DEFINE_THISCALL_WRAPPER(ios_base_assign, 8)

1 0

Huw Davies : gdi32: Add a helper to retrieve the family names and simplify the logic.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: c6af1d541680fb43fc9f6252c45198ea24f45b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6af1d541680fb43fc9f6252c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:38 2012 +0100 gdi32: Add a helper to retrieve the family names and simplify the logic. --- dlls/gdi32/freetype.c | 55 ++++++++++++++++++++++++++++-------------------- 1 files changed, 32 insertions(+), 23 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 461d646..e174921 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1496,6 +1496,30 @@ static WCHAR *prepend_at(WCHAR *family) return str; } +static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BOOL vertical ) +{ + *english = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES ); + if (!*english) *english = towstr( CP_ACP, ft_face->family_name ); + + *name = get_face_name( ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID() ); + if (!*name) + { + *name = *english; + *english = NULL; + } + else if (!strcmpiW( *name, *english )) + { + HeapFree( GetProcessHeap(), 0, *english ); + *english = NULL; + } + + if (vertical) + { + *name = prepend_at( *name ); + *english = prepend_at( *english ); + } +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1509,7 +1533,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr do { TT_OS2 *pOS2; TT_Header *pHeader; - WCHAR *english_family, *localised_family; + WCHAR *family_name, *english_family; Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; @@ -1521,42 +1545,27 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; - english_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, TT_MS_LANGID_ENGLISH_UNITED_STATES); - if (!english_family) - english_family = towstr(CP_ACP, ft_face->family_name); - - localised_family = get_face_name(ft_face, TT_NAME_ID_FONT_FAMILY, GetUserDefaultLCID()); - if (localised_family && !strcmpiW(localised_family, english_family)) - { - HeapFree(GetProcessHeap(), 0, localised_family); - localised_family = NULL; - } - - if (vertical) - { - english_family = prepend_at(english_family); - localised_family = prepend_at(localised_family); - } + get_family_names( ft_face, &family_name, &english_family, vertical ); - family = find_family_from_name(localised_family ? localised_family : english_family); + family = find_family_from_name( family_name ); if(!family) { family = HeapAlloc(GetProcessHeap(), 0, sizeof(*family)); - family->FamilyName = strdupW(localised_family ? localised_family : english_family); - family->EnglishName = localised_family ? strdupW(english_family) : NULL; + family->FamilyName = strdupW( family_name ); + family->EnglishName = english_family ? strdupW( english_family ) : NULL; list_init(&family->faces); family->replacement = &family->faces; list_add_tail(&font_list, &family->entry); - if(localised_family) { + if(english_family) { FontSubst *subst = HeapAlloc(GetProcessHeap(), 0, sizeof(*subst)); subst->from.name = strdupW(english_family); subst->from.charset = -1; - subst->to.name = strdupW(localised_family); + subst->to.name = strdupW(family_name); subst->to.charset = -1; add_font_subst(&font_subst_list, subst, 0); } } - HeapFree(GetProcessHeap(), 0, localised_family); + HeapFree(GetProcessHeap(), 0, family_name); HeapFree(GetProcessHeap(), 0, english_family); StyleW = towstr(CP_ACP, ft_face->style_name);

1 0

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

March 27, 2012

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

Huw Davies : gdi32: Add a helper to retrieve the ntm flags.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: afae44da2528b09ca8a302d072b2256ba55eee62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afae44da2528b09ca8a302d07… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:42 2012 +0100 gdi32: Add a helper to retrieve the ntm flags. --- dlls/gdi32/freetype.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 2926d59..446175e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1579,6 +1579,21 @@ static inline FT_Fixed get_font_version( FT_Face ft_face ) return version; } +static inline DWORD get_ntm_flags( FT_Face ft_face ) +{ + DWORD flags = 0; + FT_ULong table_size = 0; + + if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) flags |= NTM_ITALIC; + if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) flags |= NTM_BOLD; + if (flags == 0) flags = NTM_REGULAR; + + if (!pFT_Load_Sfnt_Table( ft_face, FT_MAKE_TAG( 'C','F','F',' ' ), 0, NULL, &table_size )) + flags |= NTM_PS_OPENTYPE; + + return flags; +} + #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 #define ADDFONT_ADD_TO_CACHE 0x04 @@ -1597,7 +1612,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr int internal_leading; FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; - FT_ULong tmp_size; FT_Fixed version; if(!FT_IS_SCALABLE(ft_face)) @@ -1676,12 +1690,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->font_data_size = font_data_size; } face->face_index = face_index; - face->ntmFlags = 0; - if (ft_face->style_flags & FT_STYLE_FLAG_ITALIC) - face->ntmFlags |= NTM_ITALIC; - if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) - face->ntmFlags |= NTM_BOLD; - if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; + face->ntmFlags = get_ntm_flags( ft_face ); face->font_version = version; face->family = family; face->vertical = vertical; @@ -1704,14 +1713,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr face->scalable = FALSE; } - /* check for the presence of the 'CFF ' table to check if the font is Type1 */ - tmp_size = 0; - if (!pFT_Load_Sfnt_Table(ft_face, FT_MAKE_TAG('C','F','F',' '), 0, NULL, &tmp_size)) - { - TRACE("Font %s/%p is OTF Type1\n", wine_dbgstr_a(file), font_data_ptr); - face->ntmFlags |= NTM_PS_OPENTYPE; - } - 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],

1 0

Huw Davies : gdi32: Add a helper to create a family.
by Alexandre Julliard March 27, 2012

March 27, 2012

Module: wine Branch: master Commit: e27a633b93dd43ad17268fd6bca52ae1dc51e080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e27a633b93dd43ad17268fd6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:40 2012 +0100 gdi32: Add a helper to create a family. --- dlls/gdi32/freetype.c | 28 +++++++++++++++++++++------- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 1b38a8e..3afc2ea 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1520,6 +1520,21 @@ static void get_family_names( FT_Face ft_face, WCHAR **name, WCHAR **english, BO } } +/**************************************************************** + * NB This function stores the ptrs to the strings to save copying. + * Don't free them after calling. + */ +static Family *create_family( WCHAR *name, WCHAR *english_name ) +{ + Family *family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); + family->FamilyName = name; + family->EnglishName = english_name; + list_init( &family->faces ); + family->replacement = &family->faces; + + return family; +} + static Family *get_family( FT_Face ft_face, BOOL vertical ) { Family *family; @@ -1531,11 +1546,7 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) if (!family) { - family = HeapAlloc( GetProcessHeap(), 0, sizeof(*family) ); - family->FamilyName = strdupW( name ); - family->EnglishName = english_name ? strdupW( english_name ) : NULL; - list_init( &family->faces ); - family->replacement = &family->faces; + family = create_family( name, english_name ); list_add_tail( &font_list, &family->entry ); if (english_name) @@ -1548,8 +1559,11 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) add_font_subst( &font_subst_list, subst, 0 ); } } - HeapFree( GetProcessHeap(), 0, name ); - HeapFree( GetProcessHeap(), 0, english_name ); + else + { + HeapFree( GetProcessHeap(), 0, name ); + HeapFree( GetProcessHeap(), 0, english_name ); + } return family; }

1 0