wine-commits August 2014

wine-commits@winehq.org

2 participants
304 discussions

Gerald Pfeifer : winex11.drv: Remove colour_is_brighter.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: fe79e62a9f38316af8a78af3eb42a782ffb8eda2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe79e62a9f38316af8a78af3e… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:23:03 2014 +0200 winex11.drv: Remove colour_is_brighter. --- dlls/winex11.drv/palette.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index cd90885..cf049c5 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -782,12 +782,6 @@ static int X11DRV_SysPaletteLookupPixel( COLORREF col, BOOL skipReserved ) } -static inline BOOL colour_is_brighter(RGBQUAD c1, RGBQUAD c2) -{ - return (c1.rgbRed * c1.rgbRed + c1.rgbGreen * c1.rgbGreen + c1.rgbBlue * c1.rgbBlue) > - (c2.rgbRed * c2.rgbRed + c2.rgbGreen * c2.rgbGreen + c2.rgbBlue * c2.rgbBlue); -} - /*********************************************************************** * X11DRV_PALETTE_GetColor *

1 0

Gerald Pfeifer : uninstaller: Remove BackSlashW.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 1f140313348e1227afc70057f5a9e7f9ca810b5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f140313348e1227afc70057f… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:20:37 2014 +0200 uninstaller: Remove BackSlashW. --- programs/uninstaller/main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c index 0a60c93..6b16e5d 100644 --- a/programs/uninstaller/main.c +++ b/programs/uninstaller/main.c @@ -49,7 +49,6 @@ static int FetchUninstallInformation(void); static void UninstallProgram(void); static int cmp_by_name(const void *a, const void *b); -static const WCHAR BackSlashW[] = { '\\', 0 }; static const WCHAR DisplayNameW[] = {'D','i','s','p','l','a','y','N','a','m','e',0}; static const WCHAR PathUninstallW[] = { 'S','o','f','t','w','a','r','e','\\',

1 0

Gerald Pfeifer : cmd: Remove fslashW.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 51d217e6df3f112e8b1fd62356a0a3687d231f2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d217e6df3f112e8b1fd6235… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Aug 20 17:18:38 2014 +0200 cmd: Remove fslashW. --- programs/cmd/builtins.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cb7dfef..f7db4a9 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -100,7 +100,6 @@ static const WCHAR externals[][10] = { {'A','T','T','R','I','B','\0'}, {'X','C','O','P','Y','\0'} }; -static const WCHAR fslashW[] = {'/','\0'}; static const WCHAR onW[] = {'O','N','\0'}; static const WCHAR offW[] = {'O','F','F','\0'}; static const WCHAR parmY[] = {'/','Y','\0'};

1 0

Jactry Zeng : riched20: Pass count of character into ME_WordBreakProc() instead of count of byte.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 063b3bc9dbe359611bbe4bc39245649a9576ef8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=063b3bc9dbe359611bbe4bc39… Author: Jactry Zeng <wine(a)jactry.com> Date: Wed Aug 20 16:11:52 2014 +0800 riched20: Pass count of character into ME_WordBreakProc() instead of count of byte. --- dlls/riched20/string.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 12e4ad7..44726b3 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -125,8 +125,7 @@ ME_WordBreakProc(LPWSTR s, INT start, INT len, INT code) /* FIXME: Native also knows about punctuation */ TRACE("s==%s, start==%d, len==%d, code==%d\n", debugstr_wn(s, len), start, len, code); - /* convert number of bytes to number of characters. */ - len /= sizeof(WCHAR); + switch (code) { case WB_ISDELIMITER: @@ -154,7 +153,7 @@ int ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT code) { if (!editor->pfnWordBreak) { - return ME_WordBreakProc(str, start, len * sizeof(WCHAR), code); + return ME_WordBreakProc(str, start, len, code); } else if (!editor->bEmulateVersion10) { /* MSDN lied about the third parameter for EditWordBreakProc being the number * of characters, it is actually the number of bytes of the string. */

1 0

André Hentschel : wpcap: Add version resource.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: 3a372f26e9c35d1edab4cdb58a97e57cae373e8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a372f26e9c35d1edab4cdb58… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 20 23:05:10 2014 +0200 wpcap: Add version resource. --- dlls/wpcap/Makefile.in | 2 ++ dlls/wpcap/version.rc | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 5caffbc..e44613f 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -4,3 +4,5 @@ EXTRALIBS = @LIBPCAP@ C_SRCS = \ wpcap.c + +RC_SRCS = version.rc diff --git a/dlls/wpcap/version.rc b/dlls/wpcap/version.rc new file mode 100644 index 0000000..d60cec4 --- /dev/null +++ b/dlls/wpcap/version.rc @@ -0,0 +1,26 @@ +/* + * Copyright 2014 André Hentschel + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "wpcap.dll Dynamic Link Library - based on libpcap 1.0" +#define WINE_FILENAME_STR "wpcap.dll" +#define WINE_FILEVERSION 4,1,0,2980 +#define WINE_FILEVERSION_STR "4.1.0.2980" +#define WINE_PRODUCTVERSION 4,1,0,2980 +#define WINE_PRODUCTVERSION_STR "4.1.0.2980" + +#include "wine/wine_common_ver.rc"

1 0

André Hentschel : wpcap: Implement pcap_findalldevs_ex.
by Alexandre Julliard 21 Aug '14

21 Aug '14

Module: wine Branch: master Commit: e141ecf89de094f16bc37d6a11fa0505dc5ff6b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e141ecf89de094f16bc37d6a1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Aug 20 23:04:46 2014 +0200 wpcap: Implement pcap_findalldevs_ex. --- dlls/wpcap/wpcap.c | 6 ++++++ dlls/wpcap/wpcap.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 90b0647a..da545a8 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -116,6 +116,12 @@ int CDECL wine_pcap_findalldevs(pcap_if_t **alldevsp, char *errbuf) return ret; } +int CDECL wine_pcap_findalldevs_ex(char *source, void *auth, pcap_if_t **alldevs, char *errbuf) +{ + FIXME("(%s %p %p %p): partial stub\n", debugstr_a(source), auth, alldevs, errbuf); + return wine_pcap_findalldevs(alldevs, errbuf); +} + void CDECL wine_pcap_freealldevs(pcap_if_t *alldevs) { TRACE("(%p)\n", alldevs); diff --git a/dlls/wpcap/wpcap.spec b/dlls/wpcap/wpcap.spec index 540089d..c7d2cd1 100644 --- a/dlls/wpcap/wpcap.spec +++ b/dlls/wpcap/wpcap.spec @@ -25,7 +25,7 @@ @ stub pcap_file @ stub pcap_fileno @ cdecl pcap_findalldevs(ptr ptr) wine_pcap_findalldevs -@ stub pcap_findalldevs_ex +@ cdecl pcap_findalldevs_ex(ptr ptr ptr ptr) wine_pcap_findalldevs_ex @ cdecl pcap_freealldevs(ptr) wine_pcap_freealldevs @ cdecl pcap_freecode(ptr) wine_pcap_freecode @ cdecl pcap_get_airpcap_handle(ptr) wine_pcap_get_airpcap_handle

1 0

Ken Thomases : loader: Set LSUIElement to 1 in the embedded Mac Info.plist.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: dbe0d0be34e0a427de85b4dc87a38835e61b747e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbe0d0be34e0a427de85b4dc8… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Aug 20 13:39:34 2014 -0500 loader: Set LSUIElement to 1 in the embedded Mac Info.plist. --- loader/wine_info.plist.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine_info.plist.in b/loader/wine_info.plist.in index aea99e5..2895aea 100644 --- a/loader/wine_info.plist.in +++ b/loader/wine_info.plist.in @@ -22,5 +22,7 @@ <string>@PACKAGE_VERSION@</string> <key>NSPrincipalClass</key> <string>WineApplication</string> + <key>LSUIElement</key> + <string>1</string> </dict> </plist>

1 0

Aric Stewart : dwrite: Implement TryGetFontTable and ReleaseFontTable.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: bc77ee68180e402148f70f75d7a9464324fc7ea1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc77ee68180e402148f70f75d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Aug 16 20:42:24 2014 -0500 dwrite: Implement TryGetFontTable and ReleaseFontTable. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 65 ++++++++++++++++++++++++++++++-- dlls/dwrite/opentype.c | 88 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 151 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index f56b6f0..a64e632 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -94,3 +94,4 @@ extern HRESULT font_create_fontface(IDWriteFactory *iface, DWRITE_FONT_FACE_TYPE /* Opentype font table functions */ extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; +extern HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8c82d08..0683dd5 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -156,6 +156,14 @@ struct dwrite_font { WCHAR *facename; }; +#define DWRITE_FONTTABLE_MAGIC 0xededfafa + +struct dwrite_fonttable { + UINT32 magic; + LPVOID context; + UINT32 file_index; +}; + struct dwrite_fontface { IDWriteFontFace IDWriteFontFace_iface; LONG ref; @@ -384,14 +392,65 @@ static HRESULT WINAPI dwritefontface_TryGetFontTable(IDWriteFontFace *iface, UIN const void **table_data, UINT32 *table_size, void **context, BOOL *exists) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%u %p %p %p %p): stub\n", This, table_tag, table_data, table_size, context, exists); - return E_NOTIMPL; + if (This->is_system) + { + FIXME("(%p)->(%u %p %p %p %p): stub\n", This, table_tag, table_data, table_size, context, exists); + return E_NOTIMPL; + } + else + { + HRESULT hr = S_OK; + int i; + struct dwrite_fonttable *table; + + TRACE("(%p)->(%u %p %p %p %p)\n", This, table_tag, table_data, table_size, context, exists); + + table = heap_alloc(sizeof(struct dwrite_fonttable)); + table->magic = DWRITE_FONTTABLE_MAGIC; + if (!table) + return E_OUTOFMEMORY; + + *exists = FALSE; + for (i = 0; i < This->file_count && !(*exists); i++) + { + IDWriteFontFileStream *stream; + hr = _dwritefontfile_GetFontFileStream(This->files[i], &stream); + if (FAILED(hr)) + continue; + table->file_index = i; + + hr = find_font_table(stream, This->index, table_tag, table_data, &table->context, table_size, exists); + + IDWriteFontFileStream_Release(stream); + } + if (FAILED(hr) && !*exists) + heap_free(table); + else + *context = (LPVOID)table; + return hr; + } } static void WINAPI dwritefontface_ReleaseFontTable(IDWriteFontFace *iface, void *table_context) { struct dwrite_fontface *This = impl_from_IDWriteFontFace(iface); - FIXME("(%p)->(%p): stub\n", This, table_context); + struct dwrite_fonttable *table = (struct dwrite_fonttable *)table_context; + IDWriteFontFileStream *stream; + HRESULT hr; + TRACE("(%p)->(%p)\n", This, table_context); + + if (table->magic != DWRITE_FONTTABLE_MAGIC) + { + TRACE("Invalid table magic\n"); + return; + } + + hr = _dwritefontfile_GetFontFileStream(This->files[table->file_index], &stream); + if (FAILED(hr)) + return; + IDWriteFontFileStream_ReleaseFileFragment(stream, table->context); + IDWriteFontFileStream_Release(stream); + heap_free(table); } static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace *iface, FLOAT emSize, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 538db98..6c90a96 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -47,6 +47,21 @@ typedef struct { DWORD OffsetTable[1]; } TTC_Header_V1; +typedef struct { + DWORD version; + WORD numTables; + WORD searchRange; + WORD entrySelector; + WORD rangeShift; +} TTC_SFNT_V1; + +typedef struct { + CHAR tag[4]; + DWORD checkSum; + DWORD offset; + DWORD length; +} TT_TableRecord; + HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) { /* TODO: Do font validation */ @@ -81,3 +96,76 @@ HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_ } return S_OK; } + +HRESULT find_font_table(IDWriteFontFileStream *stream, UINT32 font_index, UINT32 tag, const void** table_data, void** table_context, UINT32 *table_size, BOOL* found) +{ + const CHAR *first_data; + void *first_context; + HRESULT hr; + TTC_SFNT_V1 *font_header = NULL; + void *sfnt_context; + TT_TableRecord *table_record = NULL; + void *table_record_context; + int i; + int table_count; + int table_offset = 0; + + *found = FALSE; + + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&first_data, 0, 4, &first_context); + if (SUCCEEDED(hr)) + { + if (DWRITE_MAKE_OPENTYPE_TAG(first_data[0], first_data[1], first_data[2], first_data[3]) == MS_TTCF_TAG) + { + const TTC_Header_V1 *ttc_header; + void * ttc_context; + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&ttc_header, 0, sizeof(*ttc_header), &ttc_context); + if (SUCCEEDED(hr)) + { + table_offset = GET_BE_DWORD(ttc_header->OffsetTable[0]); + if (font_index >= GET_BE_DWORD(ttc_header->numFonts)) + hr = E_INVALIDARG; + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, table_offset, sizeof(*font_header), &sfnt_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, ttc_context); + } + } + else + { + if (font_index > 0) + hr = E_INVALIDARG; + else + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&font_header, 0, sizeof(*font_header), &sfnt_context); + } + IDWriteFontFileStream_ReleaseFileFragment(stream, first_context); + } + if (FAILED(hr)) + return hr; + + table_count = GET_BE_WORD(font_header->numTables); + table_offset += sizeof(*font_header); + for (i = 0; i < table_count; i++) + { + hr = IDWriteFontFileStream_ReadFileFragment(stream, (const void**)&table_record, table_offset, sizeof(*table_record), &table_record_context); + if (FAILED(hr)) + break; + if (DWRITE_MAKE_OPENTYPE_TAG(table_record->tag[0], table_record->tag[1], table_record->tag[2], table_record->tag[3]) == tag) + break; + IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); + table_offset += sizeof(*table_record); + } + + IDWriteFontFileStream_ReleaseFileFragment(stream, sfnt_context); + if (SUCCEEDED(hr) && i < table_count) + { + int offset = GET_BE_DWORD(table_record->offset); + int length = GET_BE_DWORD(table_record->length); + IDWriteFontFileStream_ReleaseFileFragment(stream, table_record_context); + + *found = TRUE; + *table_size = length; + hr = IDWriteFontFileStream_ReadFileFragment(stream, table_data, offset, length, table_context); + } + + return hr; +}

1 0

Aric Stewart : dwrite: Initial implementation of CreateFontFace.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 26977d4a4b3e6159072ae75e77a3e3b007bd3127 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26977d4a4b3e6159072ae75e7… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Aug 16 20:40:48 2014 -0500 dwrite: Initial implementation of CreateFontFace. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 194 +++++++++++++++++++++++++++++++++++-------- dlls/dwrite/main.c | 4 +- dlls/dwrite/tests/font.c | 4 + 4 files changed, 166 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=26977d4a4b3e6159072ae…

1 0

Aric Stewart : dwrite: Beginning implementation of IDWriteFontFile_Analyze.
by Alexandre Julliard 20 Aug '14

20 Aug '14

Module: wine Branch: master Commit: 366c40813ce8342191b974d81e5ddd1121cc1064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366c40813ce8342191b974d81… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 12 14:11:37 2014 -0500 dwrite: Beginning implementation of IDWriteFontFile_Analyze. --- dlls/dwrite/Makefile.in | 3 +- dlls/dwrite/dwrite_private.h | 3 ++ dlls/dwrite/font.c | 25 ++++++++++++- dlls/dwrite/opentype.c | 83 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 14 ++++++++ 5 files changed, 126 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 9ee7181..c714419 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -7,4 +7,5 @@ C_SRCS = \ font.c \ gdiinterop.c \ layout.c \ - main.c + main.c \ + opentype.c diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index fcc9b7f..64f55e2 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -90,3 +90,6 @@ extern HRESULT get_system_fontcollection(IDWriteFontCollection**) DECLSPEC_HIDDE extern void release_system_fontcollection(void) DECLSPEC_HIDDEN; extern HRESULT get_textanalyzer(IDWriteTextAnalyzer**) DECLSPEC_HIDDEN; extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *reference_key, UINT32 key_size, IDWriteFontFile **font_file) DECLSPEC_HIDDEN; + +/* Opentype font table functions */ +extern HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index afeca27..0c75271 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1057,9 +1057,32 @@ static HRESULT WINAPI dwritefontfile_GetLoader(IDWriteFontFile *iface, IDWriteFo static HRESULT WINAPI dwritefontfile_Analyze(IDWriteFontFile *iface, BOOL *isSupportedFontType, DWRITE_FONT_FILE_TYPE *fontFileType, DWRITE_FONT_FACE_TYPE *fontFaceType, UINT32 *numberOfFaces) { + HRESULT hr; + const void *font_data; + void *context; + IDWriteFontFileStream *stream; + struct dwrite_fontfile *This = impl_from_IDWriteFontFile(iface); FIXME("(%p)->(%p, %p, %p, %p): Stub\n", This, isSupportedFontType, fontFileType, fontFaceType, numberOfFaces); - return E_NOTIMPL; + + *isSupportedFontType = FALSE; + *fontFileType = DWRITE_FONT_FILE_TYPE_UNKNOWN; + if (fontFaceType) + *fontFaceType = DWRITE_FONT_FACE_TYPE_UNKNOWN; + *numberOfFaces = 0; + + hr = IDWriteFontFileLoader_CreateStreamFromKey(This->loader, This->reference_key, This->key_size, &stream); + if (FAILED(hr)) + return S_OK; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &font_data, 0, 28, &context); + if (SUCCEEDED(hr)) + { + hr = analyze_opentype_font(font_data, numberOfFaces, fontFileType, fontFaceType, isSupportedFontType); + IDWriteFontFileStream_ReleaseFileFragment(stream, context); + } + /* TODO: Further Analysis */ + IDWriteFontFileStream_Release(stream); + return S_OK; } static const IDWriteFontFileVtbl dwritefontfilevtbl = { diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c new file mode 100644 index 0000000..538db98 --- /dev/null +++ b/dlls/dwrite/opentype.c @@ -0,0 +1,83 @@ +/* + * Methods for dealing with opentype font tables + * + * Copyright 2014 Aric Stewart for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS + +#include "dwrite.h" +#include "dwrite_private.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dwrite); + +#define DWRITE_MAKE_OPENTYPE_TAG(ch0, ch1, ch2, ch3) \ + ((DWORD)(BYTE)(ch0) | ((DWORD)(BYTE)(ch1) << 8) | \ + ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) + +#define MS_TTCF_TAG DWRITE_MAKE_OPENTYPE_TAG('t','t','c','f') +#define MS_OTTO_TAG DWRITE_MAKE_OPENTYPE_TAG('O','T','T','O') + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#define GET_BE_DWORD(x) (x) +#else +#define GET_BE_WORD(x) MAKEWORD(HIBYTE(x), LOBYTE(x)) +#define GET_BE_DWORD(x) MAKELONG(GET_BE_WORD(HIWORD(x)), GET_BE_WORD(LOWORD(x))) +#endif + +typedef struct { + CHAR TTCTag[4]; + DWORD Version; + DWORD numFonts; + DWORD OffsetTable[1]; +} TTC_Header_V1; + +HRESULT analyze_opentype_font(const void* font_data, UINT32* font_count, DWRITE_FONT_FILE_TYPE *file_type, DWRITE_FONT_FACE_TYPE *face_type, BOOL *supported) +{ + /* TODO: Do font validation */ + const char* tag = font_data; + + *supported = FALSE; + *file_type = DWRITE_FONT_FILE_TYPE_UNKNOWN; + if (face_type) + *face_type = DWRITE_FONT_FACE_TYPE_UNKNOWN; + *font_count = 0; + + if (DWRITE_MAKE_OPENTYPE_TAG(tag[0], tag[1], tag[2], tag[3]) == MS_TTCF_TAG) + { + const TTC_Header_V1 *header = font_data; + *font_count = GET_BE_DWORD(header->numFonts); + *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE_COLLECTION; + if (face_type) + *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE_COLLECTION; + *supported = TRUE; + } + else if (GET_BE_DWORD(*(DWORD*)font_data) == 0x10000) + { + *font_count = 1; + *file_type = DWRITE_FONT_FILE_TYPE_TRUETYPE; + if (face_type) + *face_type = DWRITE_FONT_FACE_TYPE_TRUETYPE; + *supported = TRUE; + } + else if (DWRITE_MAKE_OPENTYPE_TAG(tag[0], tag[1], tag[2], tag[3]) == MS_OTTO_TAG) + { + *file_type = DWRITE_FONT_FILE_TYPE_CFF; + } + return S_OK; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 4368bcf..44e7ee6 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -763,6 +763,10 @@ static void test_FontLoader(void) IDWriteFontFileLoader floader2 = { &dwritefontfileloadervtbl }; IDWriteFontFileLoader floader3 = { &dwritefontfileloadervtbl }; IDWriteFontFile *ffile = NULL; + BOOL support = 1; + DWRITE_FONT_FILE_TYPE type = 1; + DWRITE_FONT_FACE_TYPE face = 1; + UINT32 count = 1; HRESULT hr; hr = IDWriteFactory_RegisterFontFileLoader(factory, NULL); @@ -789,6 +793,16 @@ static void test_FontLoader(void) if (SUCCEEDED(hr)) IDWriteFontFile_Release(ffile); + hr = IDWriteFactory_CreateCustomFontFileReference(factory, "test", 4, &floader, &ffile); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Analyze(ffile, &support, &type, &face, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(support == FALSE, "got %i\n", support); + ok(type == DWRITE_FONT_FILE_TYPE_UNKNOWN, "got %i\n", type); + ok(face == DWRITE_FONT_FACE_TYPE_UNKNOWN, "got %i\n", face); + ok(count == 0, "got %i\n", count); + IDWriteFontFile_Release(ffile); + hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFactory_UnregisterFontFileLoader(factory, &floader);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
31
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 August 2014