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

Alistair Leslie-Hughes : mscoree: Allow capital for version number.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: d08e89a8d61bf3224503327b7f40ef65cab7b038 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08e89a8d61bf3224503327b7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Mar 15 22:40:25 2012 +1100 mscoree: Allow capital for version number. --- dlls/mscoree/metahost.c | 2 +- dlls/mscoree/mscoree_main.c | 3 +++ dlls/mscoree/tests/mscoree.c | 6 ++++++ 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index f915d73..f877b1e 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -988,7 +988,7 @@ static BOOL parse_runtime_version(LPCWSTR version, DWORD *major, DWORD *minor, D *minor = 0; *build = 0; - if (version[0] == 'v') + if (version[0] == 'v' || version[0] == 'V') { version++; if (!isdigit(*version)) diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 0ebc813..1e06909 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -347,6 +347,9 @@ HRESULT WINAPI GetRequestedRuntimeInfo(LPCWSTR pExe, LPCWSTR pwszVersion, LPCWST if (SUCCEEDED(ret)) { + if(pwszVersion) + pVersion[0] = pwszVersion[0]; + *dwDirectoryLength = dwDirectory; ret = ICLRRuntimeInfo_GetRuntimeDirectory(info, pDirectory, dwDirectoryLength); } diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index 9b115c0..f8de6fa 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -61,6 +61,7 @@ static BOOL init_functionpointers(void) static void test_versioninfo(void) { const WCHAR v9_0[] = {'v','9','.','0','.','3','0','3','1','9',0}; + const WCHAR v2_0cap[] = {'V','2','.','0','.','5','0','7','2','7',0}; const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0}; const WCHAR v2_0_0[] = {'v','2','.','0','.','0',0}; const WCHAR v1_1[] = {'v','1','.','1','.','4','3','2','2',0}; @@ -147,6 +148,11 @@ static void test_versioninfo(void) ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); ok(!winetest_strcmpW(version, v2_0), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0)); + memset(version, 0, sizeof(version)); + hr = pGetRequestedRuntimeInfo( NULL, v2_0cap, NULL, 0, 0, path, MAX_PATH, &path_len, version, MAX_PATH, NULL); + ok(hr == S_OK, "GetRequestedRuntimeInfo returned %08x\n", hr); + ok(!winetest_strcmpW(version, v2_0cap), "version is %s , expected %s\n", wine_dbgstr_w(version), wine_dbgstr_w(v2_0cap)); + /* Invalid Version and RUNTIME_INFO_UPGRADE_VERSION flag*/ memset(version, 0, sizeof(version)); hr = pGetRequestedRuntimeInfo( NULL, v1_1, NULL, 0, RUNTIME_INFO_UPGRADE_VERSION, path, MAX_PATH, &path_len, version, MAX_PATH, NULL);

1 0

André Hentschel : winedbg: Fix a typo.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: db8d76034d7125415ddcb0ca5896ea1e73db6bf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db8d76034d7125415ddcb0ca5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Mar 25 12:33:49 2012 +0200 winedbg: Fix a typo. --- programs/winedbg/db_disasm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/db_disasm.c b/programs/winedbg/db_disasm.c index e2270fc..c745617 100644 --- a/programs/winedbg/db_disasm.c +++ b/programs/winedbg/db_disasm.c @@ -1334,7 +1334,7 @@ void be_i386_disasm_one_insn(ADDRESS64 *addr, int display) struct i_addr address; /* - * Set this so we get can suppress the printout if we need to. + * Set this so we can suppress the printout if we need to. */ db_display = display; switch (addr->Mode)

1 0

Dmitry Timoshkov : psapi: Add missing return value checks.
by Alexandre Julliard 27 Mar '12

27 Mar '12

Module: wine Branch: master Commit: 4c6a19837b7eb2477a65ab107d36405446d8c28b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c6a19837b7eb2477a65ab107… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 22 16:27:26 2012 +0800 psapi: Add missing return value checks. --- dlls/psapi/tests/psapi_main.c | 22 +++++++++++++++------- 1 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 2087881..1944065 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -178,15 +178,20 @@ static void test_GetProcessMemoryInfo(void) DWORD ret; SetLastError(0xdeadbeef); - pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); + ret = pGetProcessMemoryInfo(NULL, &pmc, sizeof(pmc)); + ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + ret = pGetProcessMemoryInfo(hpSR, &pmc, sizeof(pmc)); +todo_wine + ok(!ret, "GetProcessMemoryInfo should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); + ret = pGetProcessMemoryInfo(hpQI, &pmc, sizeof(pmc)-1); + ok(!ret, "GetProcessMemoryInfo should fail\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected error=ERROR_INSUFFICIENT_BUFFER but got %d\n", GetLastError()); SetLastError(0xdeadbeef); @@ -239,13 +244,16 @@ static void test_GetMappedFileName(void) HANDLE hfile, hmap; SetLastError(0xdeadbeef); - pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); + ret = pGetMappedFileNameA(NULL, hMod, szMapPath, sizeof(szMapPath)); + ok(!ret, "GetMappedFileName should fail\n"); todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "expected error=ERROR_INVALID_HANDLE but got %d\n", GetLastError()); SetLastError(0xdeadbeef); - pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); - todo_wine ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); + ret = pGetMappedFileNameA(hpSR, hMod, szMapPath, sizeof(szMapPath)); + ok(!ret, "GetMappedFileName should fail\n"); +todo_wine + ok(GetLastError() == ERROR_ACCESS_DENIED, "expected error=ERROR_ACCESS_DENIED but got %d\n", GetLastError()); SetLastError( 0xdeadbeef ); ret = pGetMappedFileNameA(hpQI, hMod, szMapPath, sizeof(szMapPath));

1 0

Huw Davies : gdi32: Add a helper to retrieve the family names and simplify the logic.
by Alexandre Julliard 27 Mar '12

27 Mar '12

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 the family pointer.
by Alexandre Julliard 27 Mar '12

27 Mar '12

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: Add a helper to create a family.
by Alexandre Julliard 27 Mar '12

27 Mar '12

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

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

27 Mar '12

Module: wine Branch: master Commit: 37eb3867391a18313159738883bdfabfb0cc947d URL: http://source.winehq.org/git/wine.git/?a=commit;h=37eb3867391a1831315973888… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 27 11:48:41 2012 +0100 gdi32: Add a helper to retrieve the font version. --- dlls/gdi32/freetype.c | 21 +++++++++++++++------ 1 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3afc2ea..2926d59 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1568,6 +1568,16 @@ static Family *get_family( FT_Face ft_face, BOOL vertical ) return family; } +static inline FT_Fixed get_font_version( FT_Face ft_face ) +{ + FT_Fixed version = 0; + TT_Header *header; + + header = pFT_Get_Sfnt_Table( ft_face, ft_sfnt_head ); + if (header) version = header->Font_Revision; + + return version; +} #define ADDFONT_EXTERNAL_FONT 0x01 #define ADDFONT_FORCE_BITMAP 0x02 @@ -1581,7 +1591,6 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr do { TT_OS2 *pOS2; - TT_Header *pHeader; Face *face; struct list *face_elem_ptr; FT_WinFNT_HeaderRec winfnt_header; @@ -1589,6 +1598,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr FONTSIGNATURE fs; My_FT_Bitmap_Size *size = NULL; FT_ULong tmp_size; + FT_Fixed version; if(!FT_IS_SCALABLE(ft_face)) size = (My_FT_Bitmap_Size *)ft_face->available_sizes + bitmap_num; @@ -1626,16 +1636,15 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr internal_leading = winfnt_header.internal_leading; } - pHeader = pFT_Get_Sfnt_Table(ft_face, ft_sfnt_head); + 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, pHeader ? pHeader->Font_Revision : 0); - - if(!pHeader || pHeader->Font_Revision <= face->font_version) { + face->font_version, version); + if(version <= face->font_version) { TRACE("Original font is newer so skipping this one\n"); HeapFree(GetProcessHeap(), 0, StyleW); return; @@ -1673,7 +1682,7 @@ static void AddFaceToList(FT_Face ft_face, const char *file, void *font_data_ptr if (ft_face->style_flags & FT_STYLE_FLAG_BOLD) face->ntmFlags |= NTM_BOLD; if (face->ntmFlags == 0) face->ntmFlags = NTM_REGULAR; - face->font_version = pHeader ? pHeader->Font_Revision : 0; + face->font_version = version; face->family = family; face->vertical = vertical; face->external = (flags & ADDFONT_EXTERNAL_FONT) ? TRUE : FALSE;

1 0

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

27 Mar '12

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

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