February 2015 - Wine-commits

Matteo Bruni : d3d9/tests: Move a Present out of the loops in fog_with_shader_test().
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: d423e06223a18643a01b9d0433791c72021d876d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d423e06223a18643a01b9d043… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 20 13:06:06 2015 +0100 d3d9/tests: Move a Present out of the loops in fog_with_shader_test(). --- dlls/d3d9/tests/visual.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5f64ec3..fb0b1b5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2214,10 +2214,9 @@ static void fog_with_shader_test(void) ok(color_match(color, test_data[i].color[j], 13), "fog vs%i ps%i fvm%i ftm%i %d: got color %08x, expected %08x +-5%%\n", test_data[i].vshader, test_data[i].pshader, test_data[i].vfog, test_data[i].tfog, j, color, test_data[i].color[j]); - - IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); } } + IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); IDirect3DVertexShader9_Release(vertex_shader[1]); IDirect3DVertexShader9_Release(vertex_shader[2]);

1 0

Alexandre Julliard : Release 1.7.37.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: c72f9a0082c3cc07454fb93bca88e2940afc5dcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=c72f9a0082c3cc07454fb93bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 23:23:03 2015 +0900 Release 1.7.37. --- .mailmap | 2 + ANNOUNCE | 497 +++++++++++++++++++++++++++++++++++++------------------------- VERSION | 2 +- configure | 18 +-- 4 files changed, 309 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c72f9a0082c3cc07454fb…

1 0

Tag wine-1.7.37 : Alexandre Julliard : Release 1.7.37
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: refs/tags/wine-1.7.37 Tag: 3ffe76280d4aff71c6e58cb84f6c5b76d8c2a806 URL: http://source.winehq.org/git/wine.git/?a=tag;h=3ffe76280d4aff71c6e58cb84f6c… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 20 23:23:03 2015 +0900 Release 1.7.37

1 0

Austin English : po: Use English names for Programs Files in Lithuanian translation.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: 6cf6c4c596d6bbf5ceb7b7035625aedafa869e40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cf6c4c596d6bbf5ceb7b7035… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Feb 19 15:25:10 2015 -0600 po: Use English names for Programs Files in Lithuanian translation. --- po/lt.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/lt.po b/po/lt.po index d1c03fe..854c896 100644 --- a/po/lt.po +++ b/po/lt.po @@ -8161,7 +8161,7 @@ msgstr "Istorija" #: shell32.rc:215 msgid "Program Files" -msgstr "Programų failai" +msgstr "Program Files" #: shell32.rc:217 msgid "My Pictures" @@ -8193,7 +8193,7 @@ msgstr "Vaizdai" #: shell32.rc:216 msgid "Program Files (x86)" -msgstr "Programų failai (x86)" +msgstr "Program Files (x86)" #: shell32.rc:224 msgid "Contacts"

1 0

Mark Harmstone : winecfg: Draw colour button using theme.
by Alexandre Julliard 20 Feb '15

20 Feb '15

Module: wine Branch: master Commit: b467908ea4a7d1f731265a08dead57a894f7b989 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b467908ea4a7d1f731265a08d… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Fri Feb 20 00:03:58 2015 +0000 winecfg: Draw colour button using theme. --- programs/winecfg/theme.c | 58 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 10 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 0618974..79c8b7c 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1070,14 +1070,52 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) if (draw_info->CtlID == IDC_SYSPARAM_COLOR) { - UINT state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + UINT state; + HTHEME theme; + RECT buttonrect; - if (draw_info->itemState & ODS_DISABLED) - state |= DFCS_INACTIVE; - else - state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + theme = OpenThemeData(draw_info->hwndItem, WC_BUTTONW); - DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + if (theme) { + MARGINS margins; + + if (draw_info->itemState & ODS_DISABLED) + state = PBS_DISABLED; + else if (draw_info->itemState & ODS_SELECTED) + state = PBS_PRESSED; + else + state = PBS_NORMAL; + + if (IsThemeBackgroundPartiallyTransparent(theme, BP_PUSHBUTTON, state)) + DrawThemeParentBackground(draw_info->hwndItem, draw_info->hDC, NULL); + + DrawThemeBackground(theme, draw_info->hDC, BP_PUSHBUTTON, state, &draw_info->rcItem, NULL); + + buttonrect = draw_info->rcItem; + + GetThemeMargins(theme, draw_info->hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, &draw_info->rcItem, &margins); + + buttonrect.left += margins.cxLeftWidth; + buttonrect.top += margins.cyTopHeight; + buttonrect.right -= margins.cxRightWidth; + buttonrect.bottom -= margins.cyBottomHeight; + + if (draw_info->itemState & ODS_FOCUS) + DrawFocusRect(draw_info->hDC, &buttonrect); + + CloseThemeData(theme); + } else { + state = DFCS_ADJUSTRECT | DFCS_BUTTONPUSH; + + if (draw_info->itemState & ODS_DISABLED) + state |= DFCS_INACTIVE; + else + state |= draw_info->itemState & ODS_SELECTED ? DFCS_PUSHED : 0; + + DrawFrameControl(draw_info->hDC, &draw_info->rcItem, DFC_BUTTON, state); + + buttonrect = draw_info->rcItem; + } if (!(draw_info->itemState & ODS_DISABLED)) { @@ -1087,10 +1125,10 @@ static void on_draw_item(HWND hDlg, WPARAM wParam, LPARAM lParam) index = SendDlgItemMessageW(hDlg, IDC_SYSPARAM_COMBO, CB_GETITEMDATA, index, 0); brush = CreateSolidBrush(metrics[index].color); - InflateRect(&draw_info->rcItem, -1, -1); - FrameRect(draw_info->hDC, &draw_info->rcItem, black_brush); - InflateRect(&draw_info->rcItem, -1, -1); - FillRect(draw_info->hDC, &draw_info->rcItem, brush); + InflateRect(&buttonrect, -1, -1); + FrameRect(draw_info->hDC, &buttonrect, black_brush); + InflateRect(&buttonrect, -1, -1); + FillRect(draw_info->hDC, &buttonrect, brush); DeleteObject(brush); } }

1 0

Jacek Caban : mshtml: Use constant instead of define for REDIRECT_* flags.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 1f310395eb699df247c006143da2f25700ed6eda URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f310395eb699df247c006143… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 18 18:00:26 2015 +0100 mshtml: Use constant instead of define for REDIRECT_* flags. --- dlls/mshtml/nsiface.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 9ba7c05..d7ced56 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -711,9 +711,9 @@ interface nsIAsyncVerifyRedirectCallback : nsISupports ] interface nsIChannelEventSink : nsISupports { - cpp_quote("#define REDIRECT_TEMPORARY 1") - cpp_quote("#define REDIRECT_PERMANENT 2") - cpp_quote("#define REDIRECT_INTERNAL 4") + const UINT REDIRECT_TEMPORARY = 1; + const UINT REDIRECT_PERMANENT = 2; + const UINT REDIRECT_INTERNAL = 4; nsresult AsyncOnChannelRedirect(nsIChannel *oldChannel, nsIChannel *newChannel, uint32_t flags, nsIAsyncVerifyRedirectCallback *callback);

1 0

Austin English : xapofx1_4: Add stub dll.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 0135a59658848dc85af1797cef8679e3c75ec5eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=0135a59658848dc85af1797ce… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 18 14:02:33 2015 -0600 xapofx1_4: Add stub dll. --- configure | 2 ++ configure.ac | 1 + dlls/xapofx1_4/Makefile.in | 4 ++++ dlls/xapofx1_4/main.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/xapofx1_4/xapofx1_4.spec | 1 + 5 files changed, 45 insertions(+) diff --git a/configure b/configure index 0deacd1..fd639fc 100755 --- a/configure +++ b/configure @@ -1325,6 +1325,7 @@ enable_wuapi enable_wuaueng enable_x3daudio1_7 enable_xapofx1_1 +enable_xapofx1_4 enable_xapofx1_5 enable_xaudio2_7 enable_xinput1_1 @@ -17676,6 +17677,7 @@ wine_fn_config_dll wuapi enable_wuapi clean wine_fn_config_dll wuaueng enable_wuaueng wine_fn_config_dll x3daudio1_7 enable_x3daudio1_7 wine_fn_config_dll xapofx1_1 enable_xapofx1_1 +wine_fn_config_dll xapofx1_4 enable_xapofx1_4 wine_fn_config_dll xapofx1_5 enable_xapofx1_5 wine_fn_config_dll xaudio2_7 enable_xaudio2_7 wine_fn_config_dll xinput1_1 enable_xinput1_1 diff --git a/configure.ac b/configure.ac index 11a3b78..97ae4e2 100644 --- a/configure.ac +++ b/configure.ac @@ -3386,6 +3386,7 @@ WINE_CONFIG_DLL(wuapi,,[clean]) WINE_CONFIG_DLL(wuaueng) WINE_CONFIG_DLL(x3daudio1_7) WINE_CONFIG_DLL(xapofx1_1) +WINE_CONFIG_DLL(xapofx1_4) WINE_CONFIG_DLL(xapofx1_5) WINE_CONFIG_DLL(xaudio2_7) WINE_CONFIG_DLL(xinput1_1) diff --git a/dlls/xapofx1_4/Makefile.in b/dlls/xapofx1_4/Makefile.in new file mode 100644 index 0000000..12978d8 --- /dev/null +++ b/dlls/xapofx1_4/Makefile.in @@ -0,0 +1,4 @@ +MODULE = xapofx1_4.dll + +C_SRCS = \ + main.c diff --git a/dlls/xapofx1_4/main.c b/dlls/xapofx1_4/main.c new file mode 100644 index 0000000..1b223ad --- /dev/null +++ b/dlls/xapofx1_4/main.c @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2015 Austin English + * + * 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 + */ +#include "config.h" + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) +{ + switch (reason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(instance); + break; + } + + return TRUE; +} diff --git a/dlls/xapofx1_4/xapofx1_4.spec b/dlls/xapofx1_4/xapofx1_4.spec new file mode 100644 index 0000000..33269e3 --- /dev/null +++ b/dlls/xapofx1_4/xapofx1_4.spec @@ -0,0 +1 @@ +@ stub CreateFX

1 0

Nikolay Sivov : dwrite: Fix error code returned by GetFontFromFontFace().
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 5196be7706ae4189edb3b67cf441d7a1077539ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=5196be7706ae4189edb3b67cf… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Feb 18 22:46:10 2015 +0300 dwrite: Fix error code returned by GetFontFromFontFace(). --- dlls/dwrite/font.c | 2 +- dlls/dwrite/tests/font.c | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index e3480ec..527fa5d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1514,7 +1514,7 @@ static HRESULT WINAPI dwritefontcollection_GetFontFromFontFace(IDWriteFontCollec } if (!found_font) - return E_INVALIDARG; + return DWRITE_E_NOFONT; hr = create_fontfamily(found_family, iface, &family); if (FAILED(hr)) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index ca31f29..e00e788 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -2028,6 +2028,7 @@ static void test_GetFontFromFontFace(void) IDWriteFont *font, *font2, *font3; IDWriteFontFamily *family; IDWriteFactory *factory; + IDWriteFontFile *file; HRESULT hr; factory = create_factory(); @@ -2064,14 +2065,32 @@ static void test_GetFontFromFontFace(void) ok(hr == S_OK, "got 0x%08x\n", hr); ok(fontface2 == fontface, "got %p, %p\n", fontface2, fontface); IDWriteFontFace_Release(fontface2); + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font3); + IDWriteFactory_Release(factory); + + /* fontface that wasn't created from this collection */ + factory = create_factory(); + create_testfontfile(test_fontfile); + + hr = IDWriteFactory_CreateFontFileReference(factory, test_fontfile, NULL, &file); + ok(hr == S_OK, "got 0x%08x\n",hr); + + hr = IDWriteFactory_CreateFontFace(factory, DWRITE_FONT_FACE_TYPE_TRUETYPE, 1, &file, 0, DWRITE_FONT_SIMULATIONS_NONE, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFontFile_Release(file); + + hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font3); + ok(hr == DWRITE_E_NOFONT, "got 0x%08x\n", hr); + ok(font3 == NULL, "got %p\n", font3); + IDWriteFontFace_Release(fontface); IDWriteFont_Release(font); IDWriteFont_Release(font2); - IDWriteFont_Release(font3); - IDWriteFontFace_Release(fontface); IDWriteFontFamily_Release(family); IDWriteFontCollection_Release(collection); IDWriteFactory_Release(factory); + DeleteFileW(test_fontfile); } static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style)

1 0

Nikolay Sivov : dwrite: Set facename field of a LOGFONT in ConvertFontFaceToLOGFONT().
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 5a318c3e8badda11b2a00884e6de2c0367616525 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a318c3e8badda11b2a00884e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 19 11:43:15 2015 +0300 dwrite: Set facename field of a LOGFONT in ConvertFontFaceToLOGFONT(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 59 ++++++++++-------------------------------- dlls/dwrite/gdiinterop.c | 61 +++++++++++++++++++++++++++++++++++++++++++- dlls/dwrite/tests/font.c | 1 - 4 files changed, 75 insertions(+), 47 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 674e9f0..9a27a5e 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -121,6 +121,7 @@ extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; +extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; /* Opentype font table functions */ extern HRESULT opentype_analyze_font(IDWriteFontFileStream*,UINT32*,DWRITE_FONT_FILE_TYPE*,DWRITE_FONT_FACE_TYPE*,BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 527fa5d..2092576 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -773,45 +773,22 @@ static const IDWriteFontFace2Vtbl dwritefontfacevtbl = { dwritefontface2_GetRecommendedRenderingMode }; -HRESULT convert_fontface_to_logfont(IDWriteFontFace *face, LOGFONTW *logfont) +HRESULT get_family_names_from_stream(IDWriteFontFileStream *stream, UINT32 index, DWRITE_FONT_FACE_TYPE facetype, + IDWriteLocalizedStrings **names) { - DWRITE_FONT_SIMULATIONS simulations; - DWRITE_FONT_FACE_TYPE face_type; - IDWriteFontFileStream *stream; - DWRITE_FONT_STRETCH stretch; - DWRITE_FONT_STYLE style; - DWRITE_FONT_WEIGHT weight; - IDWriteFontFile *file = NULL; - UINT32 index; - HRESULT hr; - - memset(logfont, 0, sizeof(*logfont)); - - index = 1; - hr = IDWriteFontFace_GetFiles(face, &index, &file); - if (FAILED(hr) || !file) - return hr; + const void *name_table = NULL; + void *name_context; + HRESULT hr = S_OK; - hr = get_filestream_from_file(file, &stream); - if (FAILED(hr)) { - IDWriteFontFile_Release(file); - return hr; + opentype_get_font_table(stream, facetype, index, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); + if (name_table) { + hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, names); + IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); } + else + names = NULL; - index = IDWriteFontFace_GetIndex(face); - face_type = IDWriteFontFace_GetType(face); - opentype_get_font_properties(stream, face_type, index, &stretch, &weight, &style); - IDWriteFontFileStream_Release(stream); - - simulations = IDWriteFontFace_GetSimulations(face); - - logfont->lfCharSet = DEFAULT_CHARSET; - logfont->lfWeight = weight; - logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); - logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; - /* TODO: set facename */ - - return S_OK; + return hr; } static HRESULT get_fontface_from_font(struct dwrite_font *font, IDWriteFontFace2 **fontface) @@ -1730,8 +1707,6 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat for (i = 0; i < face_count; i++) { IDWriteLocalizedStrings *family_name = NULL; struct dwrite_font_data *font_data; - const void *name_table; - void *name_context; IDWriteFontFileStream *stream; WCHAR buffer[255]; UINT32 index; @@ -1742,15 +1717,9 @@ HRESULT create_font_collection(IDWriteFactory2* factory, IDWriteFontFileEnumerat break; /* get family name from font file */ - name_table = NULL; - opentype_get_font_table(stream, face_type, i, MS_NAME_TAG, &name_table, &name_context, NULL, NULL); - if (name_table) { - hr = opentype_get_font_strings_from_id(name_table, DWRITE_INFORMATIONAL_STRING_WIN32_FAMILY_NAMES, &family_name); - IDWriteFontFileStream_ReleaseFileFragment(stream, name_context); - } + hr = get_family_names_from_stream(stream, i, face_type, &family_name); IDWriteFontFileStream_Release(stream); - - if (FAILED(hr) || !family_name) { + if (FAILED(hr)) { WARN("unable to get family name from font\n"); release_font_data(font_data); continue; diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index bead01d..8f91ded 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -406,9 +406,68 @@ static HRESULT WINAPI gdiinterop_ConvertFontToLOGFONT(IDWriteGdiInterop *iface, static HRESULT WINAPI gdiinterop_ConvertFontFaceToLOGFONT(IDWriteGdiInterop *iface, IDWriteFontFace *fontface, LOGFONTW *logfont) { + static const WCHAR enusW[] = {'e','n','-','u','s',0}; struct gdiinterop *This = impl_from_IDWriteGdiInterop(iface); + IDWriteLocalizedStrings *familynames; + DWRITE_FONT_SIMULATIONS simulations; + DWRITE_FONT_FACE_TYPE face_type; + IDWriteFontFileStream *stream; + DWRITE_FONT_STRETCH stretch; + DWRITE_FONT_STYLE style; + DWRITE_FONT_WEIGHT weight; + IDWriteFontFile *file = NULL; + UINT32 index; + BOOL exists; + HRESULT hr; + TRACE("(%p)->(%p %p)\n", This, fontface, logfont); - return convert_fontface_to_logfont(fontface, logfont); + + memset(logfont, 0, sizeof(*logfont)); + + index = 1; + hr = IDWriteFontFace_GetFiles(fontface, &index, &file); + if (FAILED(hr) || !file) + return hr; + + hr = get_filestream_from_file(file, &stream); + if (FAILED(hr)) { + IDWriteFontFile_Release(file); + return hr; + } + + index = IDWriteFontFace_GetIndex(fontface); + face_type = IDWriteFontFace_GetType(fontface); + opentype_get_font_properties(stream, face_type, index, &stretch, &weight, &style); + hr = get_family_names_from_stream(stream, index, face_type, &familynames); + IDWriteFontFile_Release(file); + IDWriteFontFileStream_Release(stream); + if (FAILED(hr)) + return hr; + + simulations = IDWriteFontFace_GetSimulations(fontface); + + logfont->lfCharSet = DEFAULT_CHARSET; + logfont->lfWeight = weight; + logfont->lfItalic = style == DWRITE_FONT_STYLE_ITALIC || (simulations & DWRITE_FONT_SIMULATIONS_OBLIQUE); + logfont->lfOutPrecision = OUT_OUTLINE_PRECIS; + logfont->lfFaceName[0] = 0; + + exists = FALSE; + hr = IDWriteLocalizedStrings_FindLocaleName(familynames, enusW, &index, &exists); + if (FAILED(hr) || !exists) { + /* fallback to 0 index */ + if (IDWriteLocalizedStrings_GetCount(familynames) > 0) + index = 0; + else { + IDWriteLocalizedStrings_Release(familynames); + return E_FAIL; + } + } + + hr = IDWriteLocalizedStrings_GetString(familynames, index, logfont->lfFaceName, sizeof(logfont->lfFaceName)/sizeof(WCHAR)); + IDWriteLocalizedStrings_Release(familynames); + + return hr; } static HRESULT WINAPI gdiinterop_CreateFontFaceFromHdc(IDWriteGdiInterop *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index e00e788..d171411 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1467,7 +1467,6 @@ if (0) /* crashes on native */ ok(logfont.lfItalic == 1, "got %d\n", logfont.lfItalic); ok(logfont.lfUnderline == 0, "got %d\n", logfont.lfUnderline); ok(logfont.lfStrikeOut == 0, "got %d\n", logfont.lfStrikeOut); -todo_wine ok(!lstrcmpW(logfont.lfFaceName, tahomaW), "got %s\n", wine_dbgstr_w(logfont.lfFaceName)); IDWriteGdiInterop_Release(interop);

1 0

Matteo Bruni : d3d9/tests: Allow more alternative results in the ATI1N test.
by Alexandre Julliard 19 Feb '15

19 Feb '15

Module: wine Branch: master Commit: 2aed2c3a15ab6ccb14612661f462827338ce3926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aed2c3a15ab6ccb14612661f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Feb 18 14:20:45 2015 +0100 d3d9/tests: Allow more alternative results in the ATI1N test. --- dlls/d3d9/tests/visual.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index a8cf55f..5f64ec3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16728,15 +16728,17 @@ static void test_3dc_formats(void) static const struct { struct vec2 position; - D3DCOLOR amd; - D3DCOLOR nvidia; + D3DCOLOR amd_r500; + D3DCOLOR amd_r600; + D3DCOLOR nvidia_old; + D3DCOLOR nvidia_new; } expected_colors[] = { - {{ 80, 240}, 0x003f3f3f, 0x007f0000}, - {{240, 240}, 0x003f3f3f, 0x007f0000}, - {{400, 240}, 0x00007fff, 0x00007fff}, - {{560, 240}, 0x007f00ff, 0x007f00ff}, + {{ 80, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{240, 240}, 0x007fffff, 0x003f3f3f, 0x007f7f7f, 0x007f0000}, + {{400, 240}, 0x00007fff, 0x00007fff, 0x00007fff, 0x00007fff}, + {{560, 240}, 0x007f00ff, 0x007f00ff, 0x007f00ff, 0x007f00ff}, }; IDirect3D9 *d3d; IDirect3DDevice9 *device; @@ -16835,9 +16837,11 @@ static void test_3dc_formats(void) for (i = 0; i < 4; ++i) { color = getPixelColor(device, expected_colors[i].position.x, expected_colors[i].position.y); - ok (color_match(color, expected_colors[i].amd, 1) || color_match(color, expected_colors[i].nvidia, 1), - "Expected color 0x%08x or 0x%08x, got 0x%08x, case %u.\n", - expected_colors[i].amd, expected_colors[i].nvidia, color, i); + ok (color_match(color, expected_colors[i].amd_r500, 1) + || color_match(color, expected_colors[i].amd_r600, 1) + || color_match(color, expected_colors[i].nvidia_old, 1) + || color_match(color, expected_colors[i].nvidia_new, 1), + "Got unexpected color 0x%08x, case %u.\n", color, i); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL);

1 0