September 2014 - Wine-Commits

Tag wine-1.7.26 : Alexandre Julliard : Release 1.7.26
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: refs/tags/wine-1.7.26 Tag: 8753cfc96bf7bf1121b6ccb5be169c25b18f2618 URL: http://source.winehq.org/git/wine.git/?a=tag;h=8753cfc96bf7bf1121b6ccb5be16… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 20:11:13 2014 +0200 Release 1.7.26

1 0

Alexandre Julliard : Release 1.7.26.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: d519886e1f3350fc359f6be6d35efedf7042c89a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d519886e1f3350fc359f6be6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 5 20:11:13 2014 +0200 Release 1.7.26. --- ANNOUNCE | 493 ++++++++++++++++++++++++++++++-------------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +-- 4 files changed, 255 insertions(+), 261 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d519886e1f3350fc359f6…

1 0

Nikolay Sivov : usp10: Add a missing 'break' for rule LB20.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: 1183a781eca8ceafd83966a62295b617ed535eb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1183a781eca8ceafd83966a62… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 4 22:30:06 2014 +0400 usp10: Add a missing 'break' for rule LB20. --- dlls/usp10/breaking.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/usp10/breaking.c b/dlls/usp10/breaking.c index 2f80f9a..58aad43 100644 --- a/dlls/usp10/breaking.c +++ b/dlls/usp10/breaking.c @@ -278,6 +278,7 @@ void BREAK_line(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT else_break(&break_before[i],b_s); if (i < count-1) else_break(&break_before[i+1],b_s); + break; /* LB21 */ case b_BA: case b_HY:

1 0

Sebastian Lackner : configure: Fix detection of ncurses library on Archlinux.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: 8d4e1fa7d77636a88651c9d48a48d39fab931c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4e1fa7d77636a88651c9d48… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Sep 4 09:26:33 2014 +0200 configure: Fix detection of ncurses library on Archlinux. --- configure | 8 ++++---- configure.ac | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 17c1e30..ca28645 100755 --- a/configure +++ b/configure @@ -11325,10 +11325,10 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : case "$LIBEXT" in dll) ac_cv_lib_soname_ncurses=`$ac_cv_path_LDD conftest.exe | grep "ncurses" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_ncurses=`otool -L conftest$ac_exeext | grep "libncurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libncurses\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_ncurses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libncurses\\.$LIBEXT" | sed -e "s/^.*\\[\$libncurses\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` + dylib) ac_cv_lib_soname_ncurses=`otool -L conftest$ac_exeext | grep "libncursesw\\{0,1\\}\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/$libncursesw\\{0,1\\}\.[0-9A-Za-z.]*dylib$.*$/\1/"';2,$d'` ;; + *) ac_cv_lib_soname_ncurses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libncursesw\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\\[\$libncursesw\\{0,1\\}\\.$LIBEXT[^ ]*\$\\].*$/\1/"';2,$d'` if ${ac_cv_lib_soname_ncurses:+false} :; then : - ac_cv_lib_soname_ncurses=`$LDD conftest$ac_exeext | grep "libncurses\\.$LIBEXT" | sed -e "s/^.*$libncurses\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` + ac_cv_lib_soname_ncurses=`$LDD conftest$ac_exeext | grep "libncursesw\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*$libncursesw\\{0,1\\}\.$LIBEXT[^ ]*$.*$/\1/"';2,$d'` fi ;; esac fi @@ -16950,7 +16950,7 @@ wine_fn_config_dll dpnet enable_dpnet clean,implib wine_fn_config_test dlls/dpnet/tests dpnet_test wine_fn_config_dll dpnhpast enable_dpnhpast wine_fn_config_dll dpnlobby enable_dpnlobby -wine_fn_config_dll dpvoice enable_dpvoice +wine_fn_config_dll dpvoice enable_dpvoice clean wine_fn_config_dll dpwsockx enable_dpwsockx wine_fn_config_dll drmclien enable_drmclien wine_fn_config_dll dsound enable_dsound clean,implib diff --git a/configure.ac b/configure.ac index db8b76f..2bc0008 100644 --- a/configure.ac +++ b/configure.ac @@ -1370,7 +1370,7 @@ dnl **** Check which curses lib to use *** CURSES_LIBS="" if test "$ac_cv_header_ncurses_h" = "yes" then - WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"]) + WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,[[libncursesw\\{0,1\\}]]) elif test "$ac_cv_header_curses_h" = "yes" then WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"]) @@ -2859,7 +2859,7 @@ WINE_CONFIG_DLL(dpnet,,[clean,implib]) WINE_CONFIG_TEST(dlls/dpnet/tests) WINE_CONFIG_DLL(dpnhpast) WINE_CONFIG_DLL(dpnlobby) -WINE_CONFIG_DLL(dpvoice) +WINE_CONFIG_DLL(dpvoice,,[clean]) WINE_CONFIG_DLL(dpwsockx) WINE_CONFIG_DLL(drmclien) WINE_CONFIG_DLL(dsound,,[clean,implib])

1 0

Indrek Altpere : winemenubuilder: Fix crash on invalid icon entries.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: c205e6800a63a5df9960d8484a2e67687d53bc50 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c205e6800a63a5df9960d8484… Author: Indrek Altpere <efbiaiinzinz(a)hotmail.com> Date: Thu Aug 28 19:05:19 2014 +0300 winemenubuilder: Fix crash on invalid icon entries. --- programs/winemenubuilder/winemenubuilder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index b617510..fba3664 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -612,6 +612,7 @@ static int populate_module_icons(HMODULE hModule, GRPICONDIR *grpIconDir, ICONDI if ((hResData = LoadResource(hModule, hResInfo))) { BITMAPINFO *pIcon; + DWORD size = min( grpIconDir->idEntries[i].dwBytesInRes, ((IMAGE_RESOURCE_DATA_ENTRY *)hResInfo)->Size ); if ((pIcon = LockResource(hResData))) { iconDirEntries[validEntries].bWidth = grpIconDir->idEntries[i].bWidth; @@ -620,11 +621,11 @@ static int populate_module_icons(HMODULE hModule, GRPICONDIR *grpIconDir, ICONDI iconDirEntries[validEntries].bReserved = grpIconDir->idEntries[i].bReserved; iconDirEntries[validEntries].wPlanes = grpIconDir->idEntries[i].wPlanes; iconDirEntries[validEntries].wBitCount = grpIconDir->idEntries[i].wBitCount; - iconDirEntries[validEntries].dwBytesInRes = grpIconDir->idEntries[i].dwBytesInRes; + iconDirEntries[validEntries].dwBytesInRes = size; iconDirEntries[validEntries].dwImageOffset = *iconOffset; validEntries++; - memcpy(&icons[*iconOffset], pIcon, grpIconDir->idEntries[i].dwBytesInRes); - *iconOffset += grpIconDir->idEntries[i].dwBytesInRes; + memcpy(&icons[*iconOffset], pIcon, size); + *iconOffset += size; } FreeResource(hResData); }

1 0

Nikolay Sivov : dwrite: Implement AnalyzeLineBreakpoints() using Unicode breaking algorithm.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: f60350808dbf03f90d5a5ddc4a30d17be14fdc7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60350808dbf03f90d5a5ddc4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 4 22:35:40 2014 +0400 dwrite: Implement AnalyzeLineBreakpoints() using Unicode breaking algorithm. --- dlls/dwrite/Makefile.in | 1 + dlls/dwrite/analyzer.c | 472 +++++++++++++++++++++- dlls/dwrite/linebreak.c | 914 +++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/analyzer.c | 14 +- tools/make_unicode | 1 + 5 files changed, 1393 insertions(+), 9 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f60350808dbf03f90d5a5…

1 0

Jacek Caban : wininet/tests: Fixed more tests on IE11.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: 3241d8450aad2811ef574e5eeca2e25a6fc878a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3241d8450aad2811ef574e5ee… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 5 16:14:12 2014 +0200 wininet/tests: Fixed more tests on IE11. --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 0a840a2..ad6622c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4224,7 +4224,7 @@ static void test_cert_struct(HINTERNET req, const cert_struct_test_t *test) ok(!info.lpszSignatureAlgName, "lpszSignatureAlgName = %s\n", info.lpszSignatureAlgName); ok(!info.lpszEncryptionAlgName, "lpszEncryptionAlgName = %s\n", info.lpszEncryptionAlgName); ok(!info.lpszProtocolName, "lpszProtocolName = %s\n", info.lpszProtocolName); - ok(info.dwKeySize == 128, "dwKeySize = %u\n", info.dwKeySize); + ok(info.dwKeySize == 128 || info.dwKeySize == 256, "dwKeySize = %u\n", info.dwKeySize); release_cert_info(&info); } @@ -4811,7 +4811,6 @@ static void test_user_agent_header(void) ret = HttpQueryInfoA(req, HTTP_QUERY_USER_AGENT | HTTP_QUERY_FLAG_REQUEST_HEADERS, buffer, &size, NULL); err = GetLastError(); ok(ret, "HttpQueryInfo failed\n"); - ok(err == ERROR_HTTP_HEADER_NOT_FOUND, "expected ERROR_HTTP_HEADER_NOT_FOUND, got %u\n", err); InternetCloseHandle(req);

1 0

Felix Janda : ntdll: getdents64 might have been defined previously.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: 3ae113a957d396d400a88259634e2870368f307b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae113a957d396d400a882596… Author: Felix Janda <felix.janda(a)posteo.de> Date: Sat Aug 23 17:02:58 2014 +0200 ntdll: getdents64 might have been defined previously. --- dlls/ntdll/directory.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index a2796b2..01998b2 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -119,6 +119,7 @@ typedef struct char d_name[256]; } KERNEL_DIRENT64; +#undef getdents64 static inline int getdents64( int fd, char *de, unsigned int size ) { return syscall( __NR_getdents64, fd, de, size );

1 0

Felix Janda : makedep: Don't mix options and arguments for wrc and widl.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: 4fde1e238bf551997428cfad93c271b8a76fa282 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fde1e238bf551997428cfad9… Author: Felix Janda <felix.janda(a)posteo.de> Date: Sat Aug 23 17:04:52 2014 +0200 makedep: Don't mix options and arguments for wrc and widl. --- tools/makedep.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 396a1e3..54aab45 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1816,7 +1816,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t strarray_add( &res_files, strmake( "%s.res", obj )); output( "%s.res: %s %s\n", obj_dir_path( make, obj ), tools_path( make, "wrc" ), source->filename ); - output( "\t%s -o $@ %s", tools_path( make, "wrc" ), source->filename ); + output( "\t%s -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); @@ -1827,13 +1827,18 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t { strarray_add( &po_files, source->filename ); output_filename( strmake( "--po-dir=%s", top_obj_dir_path( make, "po" ))); + output_filename( source->filename ); output( "\n" ); output( "%s.res:", obj_dir_path( make, obj )); output_filenames( mo_files ); output( "\n" ); output( "%s ", obj_dir_path( make, "rsrc.pot" )); } - else output( "\n" ); + else + { + output_filename( source->filename ); + output( "\n" ); + } output( "%s.res:", obj_dir_path( make, obj )); } else if (!strcmp( ext, "mc" )) /* message file */ @@ -1873,12 +1878,13 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t if (source->file->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); output_filenames_obj_dir( make, targets ); output( ": %s\n", tools_path( make, "widl" )); - output( "\t%s -o $@ %s", tools_path( make, "widl" ), source->filename ); + output( "\t%s -o $@", tools_path( make, "widl" ) ); output_filenames( target_flags ); output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); output_filenames( get_expanded_make_var_array( make, "EXTRAIDLFLAGS" )); + output_filename( source->filename ); output( "\n" ); output_filenames_obj_dir( make, targets ); output( ": %s", source->filename ); @@ -2038,12 +2044,12 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t output_filenames( po_files ); output( "\n" ); output( "\t%s -O pot -o $@", tools_path( make, "wrc" )); - output_filenames( po_files ); if (make->is_win16) output_filename( "-m16" ); else output_filenames( target_flags ); output_filename( "--nostdinc" ); output_filenames( includes ); output_filenames( make->define_args ); + output_filenames( po_files ); output( "\n" ); strarray_add( &clean_files, "rsrc.pot" ); }

1 0

Aric Stewart : dwrite: Shift to using localized string for family name.
by Alexandre Julliard Sept. 5, 2014

Sept. 5, 2014

Module: wine Branch: master Commit: 5d3eaf57ca2b18e3dcd44ced1711c898bbd19224 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d3eaf57ca2b18e3dcd44ced1… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu Sep 4 17:45:37 2014 -0500 dwrite: Shift to using localized string for family name. --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 44 +++++++++++++++++++++++++++----------------- dlls/dwrite/main.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 17 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a23a9d5..77834cd 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -91,6 +91,7 @@ extern HRESULT create_trimmingsign(IDWriteInlineObject**) DECLSPEC_HIDDEN; extern HRESULT get_gdiinterop(IDWriteGdiInterop**) DECLSPEC_HIDDEN; extern HRESULT create_localizedstrings(IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT add_localizedstring(IDWriteLocalizedStrings*,const WCHAR*,const WCHAR*) DECLSPEC_HIDDEN; +extern HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) DECLSPEC_HIDDEN; extern HRESULT get_system_fontcollection(IDWriteFontCollection**) 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; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c6fcf6a..8b59a37 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -77,7 +77,7 @@ struct dwrite_fontfamily { IDWriteFontCollection* collection; - WCHAR *familyname; + IDWriteLocalizedStrings *familyname; }; struct dwrite_font { @@ -123,7 +123,7 @@ struct dwrite_fontfile { IDWriteFontFileStream *stream; }; -static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family); +static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family); static HRESULT create_font_base(IDWriteFont **font); static HRESULT create_font_from_data(struct dwrite_font_data *data, IDWriteFont **font); @@ -744,7 +744,7 @@ static ULONG WINAPI dwritefontfamily_Release(IDWriteFontFamily *iface) if (!ref) { int i; - heap_free(This->familyname); + IDWriteLocalizedStrings_Release(This->familyname); if (This->collection) IDWriteFontCollection_Release(This->collection); @@ -803,15 +803,7 @@ static HRESULT WINAPI dwritefontfamily_GetFont(IDWriteFontFamily *iface, UINT32 static HRESULT WINAPI dwritefontfamily_GetFamilyNames(IDWriteFontFamily *iface, IDWriteLocalizedStrings **names) { struct dwrite_fontfamily *This = impl_from_IDWriteFontFamily(iface); - static const WCHAR enusW[] = {'e','n','-','u','s',0}; - HRESULT hr; - - TRACE("(%p)->(%p)\n", This, names); - - hr = create_localizedstrings(names); - if (FAILED(hr)) return hr; - - return add_localizedstring(*names, enusW, This->familyname); + return clone_localizedstring(This->familyname, names); } static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *iface, DWRITE_FONT_WEIGHT weight, @@ -828,7 +820,7 @@ static HRESULT WINAPI dwritefontfamily_GetFirstMatchingFont(IDWriteFontFamily *i memset(&lf, 0, sizeof(lf)); lf.lfWeight = weight; lf.lfItalic = style == DWRITE_FONT_STYLE_ITALIC; - strcpyW(lf.lfFaceName, This->familyname); + IDWriteLocalizedStrings_GetString(This->familyname, 0, lf.lfFaceName, LF_FACESIZE); return create_font_from_logfont(&lf, font); } @@ -929,6 +921,9 @@ static UINT32 WINAPI dwritefontcollection_GetFontFamilyCount(IDWriteFontCollecti static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection *iface, UINT32 index, IDWriteFontFamily **family) { struct dwrite_fontcollection *This = impl_from_IDWriteFontCollection(iface); + HRESULT hr; + IDWriteLocalizedStrings *familyname; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; TRACE("(%p)->(%u %p)\n", This, index, family); @@ -938,7 +933,12 @@ static HRESULT WINAPI dwritefontcollection_GetFontFamily(IDWriteFontCollection * return E_FAIL; } - return create_fontfamily(This->families[index], family); + hr = create_localizedstrings(&familyname); + if (FAILED(hr)) + return hr; + add_localizedstring(familyname, enusW, This->families[index]); + + return create_fontfamily(familyname, family); } static HRESULT WINAPI dwritefontcollection_FindFamilyName(IDWriteFontCollection *iface, const WCHAR *name, UINT32 *index, BOOL *exists) @@ -1035,7 +1035,7 @@ HRESULT get_system_fontcollection(IDWriteFontCollection **collection) return S_OK; } -static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **family) +static HRESULT create_fontfamily(IDWriteLocalizedStrings *familyname, IDWriteFontFamily **family) { struct dwrite_fontfamily *This; @@ -1050,7 +1050,7 @@ static HRESULT create_fontfamily(const WCHAR *familyname, IDWriteFontFamily **fa This->alloc = 2; This->fonts = heap_alloc(sizeof(*This->fonts) * 2); This->collection = NULL; - This->familyname = heap_strdupW(familyname); + This->familyname = familyname; *family = &This->IDWriteFontFamily_iface; @@ -1098,6 +1098,7 @@ static HRESULT create_font_base(IDWriteFont **font) HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) { const WCHAR* facename, *familyname; + IDWriteLocalizedStrings *name; struct dwrite_font *This; IDWriteFontFamily *family; OUTLINETEXTMETRICW *otm; @@ -1105,6 +1106,7 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) HFONT hfont; HDC hdc; int ret; + static const WCHAR enusW[] = {'e','n','-','u','s',0}; LPVOID tt_os2 = NULL; LPVOID tt_head = NULL; LPVOID tt_post = NULL; @@ -1174,7 +1176,15 @@ HRESULT create_font_from_logfont(const LOGFONTW *logfont, IDWriteFont **font) familyname = (WCHAR*)((char*)otm + (ptrdiff_t)otm->otmpFamilyName); TRACE("facename=%s, familyname=%s\n", debugstr_w(facename), debugstr_w(familyname)); - hr = create_fontfamily(familyname, &family); + hr = create_localizedstrings(&name); + if (FAILED(hr)) + { + heap_free(This); + return hr; + } + add_localizedstring(name, enusW, familyname); + hr = create_fontfamily(name, &family); + heap_free(otm); if (hr != S_OK) { diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 01394dc..bcddbba 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -355,6 +355,37 @@ HRESULT add_localizedstring(IDWriteLocalizedStrings *iface, const WCHAR *locale, return S_OK; } +HRESULT clone_localizedstring(IDWriteLocalizedStrings *iface, IDWriteLocalizedStrings **strings) +{ + struct localizedstrings *This = impl_from_IDWriteLocalizedStrings(iface); + struct localizedstrings *New; + int i; + + *strings = NULL; + + New = heap_alloc(sizeof(struct localizedstrings)); + if (!This) return E_OUTOFMEMORY; + + New->IDWriteLocalizedStrings_iface.lpVtbl = &localizedstringsvtbl; + New->ref = 1; + New->count = This->count; + New->data = heap_alloc(sizeof(struct localizedpair) * New->count); + if (!New->data) { + heap_free(New); + return E_OUTOFMEMORY; + } + for (i = 0; i < New->count; i++) + { + New->data[i].locale = heap_strdupW(This->data[i].locale); + New->data[i].string = heap_strdupW(This->data[i].string); + } + New->alloc = New->count; + + *strings = &New->IDWriteLocalizedStrings_iface; + + return S_OK; +} + struct dwritefactory{ IDWriteFactory IDWriteFactory_iface; LONG ref;

1 0