wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Nikolay Sivov : dwrite/tests: Some tests for font set properties.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: f577fc8fa22da5645bd33f26a68a053d9bfc0132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f577fc8fa22da5645bd33f26a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:25:16 2017 +0300 dwrite/tests: Some tests for font set properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/font.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 144 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index c28f27a..7a14180 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -8305,6 +8305,149 @@ static void test_AnalyzeContainerType(void) IDWriteFactory5_Release(factory); } +static void test_fontsetbuilder(void) +{ + IDWriteFontCollection1 *collection; + IDWriteFontSetBuilder *builder; + IDWriteFactory3 *factory; + UINT32 count, i, ref; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory3); + if (!factory) { + skip("IDWriteFontSetBuilder is not supported.\n"); + return; + } + + EXPECT_REF(factory, 1); + hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); +todo_wine + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + if (FAILED(hr)) { + IDWriteFactory3_Release(factory); + return; + } + + EXPECT_REF(factory, 2); + IDWriteFontSetBuilder_Release(builder); + + hr = IDWriteFactory3_GetSystemFontCollection(factory, FALSE, &collection, FALSE); + ok(hr == S_OK, "Failed to get system collection, hr %#x.\n", hr); + count = IDWriteFontCollection1_GetFontFamilyCount(collection); + + for (i = 0; i < count; i++) { + IDWriteFontFamily1 *family; + UINT32 j, fontcount; + IDWriteFont3 *font; + + hr = IDWriteFontCollection1_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + + fontcount = IDWriteFontFamily1_GetFontCount(family); + for (j = 0; j < fontcount; j++) { + IDWriteFontFaceReference *ref, *ref2; + IDWriteFontSet *fontset; + UINT32 setcount, id; + + hr = IDWriteFontFamily1_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + /* Create a set with a single font reference, test set properties. */ + hr = IDWriteFactory3_CreateFontSetBuilder(factory, &builder); + ok(hr == S_OK, "Failed to create font set builder, hr %#x.\n", hr); + + hr = IDWriteFont3_GetFontFaceReference(font, &ref); + ok(hr == S_OK, "Failed to get fontface reference, hr %#x.\n", hr); + + EXPECT_REF(ref, 1); + hr = IDWriteFontSetBuilder_AddFontFaceReference(builder, ref); + ok(hr == S_OK, "Failed to add fontface reference, hr %#x.\n", hr); + EXPECT_REF(ref, 1); + + hr = IDWriteFontSetBuilder_CreateFontSet(builder, &fontset); + ok(hr == S_OK, "Failed to create a font set, hr %#x.\n", hr); + + setcount = IDWriteFontSet_GetFontCount(fontset); + ok(setcount == 1, "Unexpected font count %u.\n", setcount); + + hr = IDWriteFontSet_GetFontFaceReference(fontset, 0, &ref2); + ok(hr == S_OK, "Failed to get font face reference, hr %#x.\n", hr); + ok(ref2 != ref, "Unexpected reference.\n"); + IDWriteFontFaceReference_Release(ref2); + + for (id = DWRITE_FONT_PROPERTY_ID_FAMILY_NAME; id < DWRITE_FONT_PROPERTY_ID_TOTAL; id++) { + static const WCHAR fmtW[] = {'%','u',0}; + IDWriteLocalizedStrings *values; + WCHAR buffW[255], buff2W[255]; + UINT32 c, ivalue; + BOOL exists; + + hr = IDWriteFontSet_GetPropertyValues(fontset, 0, id, &exists, &values); + ok(hr == S_OK, "Failed to get property value, hr %#x.\n", hr); + + if (!exists) + continue; + + switch (id) + { + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + ivalue = IDWriteFont3_GetWeight(font); + break; + case DWRITE_FONT_PROPERTY_ID_STRETCH: + ivalue = IDWriteFont3_GetStretch(font); + break; + case DWRITE_FONT_PROPERTY_ID_STYLE: + ivalue = IDWriteFont3_GetStyle(font); + break; + default: + ; + } + + switch (id) + { + case DWRITE_FONT_PROPERTY_ID_WEIGHT: + case DWRITE_FONT_PROPERTY_ID_STRETCH: + case DWRITE_FONT_PROPERTY_ID_STYLE: + c = IDWriteLocalizedStrings_GetCount(values); + ok(c == 1, "Unexpected string count %u.\n", c); + + buffW[0] = 'a'; + hr = IDWriteLocalizedStrings_GetLocaleName(values, 0, buffW, sizeof(buffW)/sizeof(buffW[0])); + ok(hr == S_OK, "Failed to get locale name, hr %#x.\n", hr); + ok(!*buffW, "Unexpected locale %s.\n", wine_dbgstr_w(buffW)); + + buff2W[0] = 0; + hr = IDWriteLocalizedStrings_GetString(values, 0, buff2W, sizeof(buff2W)/sizeof(buff2W[0])); + ok(hr == S_OK, "Failed to get property string, hr %#x.\n", hr); + + wsprintfW(buffW, fmtW, ivalue); + ok(!lstrcmpW(buffW, buff2W), "Unexpected property value %s, expected %s.\n", wine_dbgstr_w(buff2W), + wine_dbgstr_w(buffW)); + break; + default: + ; + } + + IDWriteLocalizedStrings_Release(values); + } + + IDWriteFontSet_Release(fontset); + IDWriteFontFaceReference_Release(ref); + IDWriteFontSetBuilder_Release(builder); + + IDWriteFont3_Release(font); + } + + IDWriteFontFamily1_Release(family); + } + + IDWriteFontCollection1_Release(collection); + + ref = IDWriteFactory3_Release(factory); + ok(ref == 0, "factory not released, %u\n", ref); +} + START_TEST(font) { IDWriteFactory *factory; @@ -8371,6 +8514,7 @@ START_TEST(font) test_CreateCustomRenderingParams(); test_localfontfileloader(); test_AnalyzeContainerType(); + test_fontsetbuilder(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : include: Fix DWRITE_FONT_PROPERTY_ID enum.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: master Commit: 699c65ab1a9a53a434378d96b829faef1400d1f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699c65ab1a9a53a434378d96b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 20 00:25:15 2017 +0300 include: Fix DWRITE_FONT_PROPERTY_ID enum. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dwrite_3.idl | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index b80d033..6b4931c 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -57,6 +57,7 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, DWRITE_FONT_PROPERTY_ID_DESIGN_SCRIPT_LANGUAGE_TAG, + DWRITE_FONT_PROPERTY_ID_SUPPORTED_SCRIPT_LANGUAGE_TAG, DWRITE_FONT_PROPERTY_ID_SEMANTIC_TAG, DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH,

1 0

Alexandre Julliard : Wine release 2.0.3
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: website Branch: master Commit: f94ebd6c733eb0b8acfd3c40473b2da4406c34e9 URL: http://source.winehq.org/git/website.git/?a=commit;h=f94ebd6c733eb0b8acfd3c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 14:20:07 2017 +0200 Wine release 2.0.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2017102001.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2017102001.xml b/news/en/2017102001.xml new file mode 100644 index 0000000..4732f6d --- /dev/null +++ b/news/en/2017102001.xml @@ -0,0 +1,13 @@ +<news> +<date>October 20, 2017</date> +<title>Wine 2.0.3 Released</title> +<body> + The Wine maintenance release 2.0.3 is now available. + <a href="{$root}/announce/2.0.3">What's new</a> in this release: +<ul> + <li>Various bug fixes</li> + <li>FreeType 2.8.1 compatibility fixes</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/2.0/wine-2.0.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-2.0.3 : Alexandre Julliard : Release 2.0.3
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: refs/tags/wine-2.0.3 Tag: d27ee71d1da516136214cfa164ec9e5fa4f99291 URL: http://source.winehq.org/git/wine.git/?a=tag;h=d27ee71d1da516136214cfa164ec… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 20 14:17:32 2017 +0200 Release 2.0.3

1 0

Michael Stefaniuc : Release 2.0.3
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: da73ab413f1e642ab3c3ba4e4480caa556a15816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da73ab413f1e642ab3c3ba4e4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Oct 10 09:44:51 2017 +0200 Release 2.0.3 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 347 ++++++++++++++++++++++++++------------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 ++-- 4 files changed, 158 insertions(+), 210 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=da73ab413f1e642ab3c3b…

1 0

Huw Davies : user32: Explicitly set last error to ERROR_SUCCESS.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: d76c5ad8b4a5244bca0016f9f43ae87e52672adc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d76c5ad8b4a5244bca0016f9f… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Mar 27 10:18:32 2017 +0100 user32: Explicitly set last error to ERROR_SUCCESS. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0a36078ee1016053d746e77d1f636b018c537ff8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 827bee7..93b39b4 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -3288,6 +3288,7 @@ static BOOL MENU_TrackMenu( HMENU hmenu, UINT wFlags, INT x, INT y, if( menu ) menu->bTimeToHide = FALSE; } + SetLastError( ERROR_SUCCESS ); /* The return value is only used by TrackPopupMenu */ if (!(wFlags & TPM_RETURNCMD)) return TRUE; if (executedMenuId == -1) executedMenuId = 0;

1 0

Nikolay Sivov : shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: f2561f395fda36e27794ac3e6ceb402757636d0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2561f395fda36e27794ac3e6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 13:21:42 2017 +0300 shell32/ebrowser: Respond to IOleWindow from IExplorerBrowser. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 5badc91a0fe9933f0dc60ca8a74b68cf66559b0d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/ebrowser.c | 3 ++- dlls/shell32/tests/ebrowser.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index bbccf88..07046502 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -782,7 +782,8 @@ static HRESULT WINAPI IExplorerBrowser_fnQueryInterface(IExplorerBrowser *iface, { *ppvObject = &This->IExplorerBrowser_iface; } - else if(IsEqualIID(riid, &IID_IShellBrowser)) + else if(IsEqualIID(riid, &IID_IShellBrowser) || + IsEqualIID(riid, &IID_IOleWindow)) { *ppvObject = &This->IShellBrowser_iface; } diff --git a/dlls/shell32/tests/ebrowser.c b/dlls/shell32/tests/ebrowser.c index c04a2b4..7db5842 100644 --- a/dlls/shell32/tests/ebrowser.c +++ b/dlls/shell32/tests/ebrowser.c @@ -575,7 +575,7 @@ static void test_QueryInterface(void) test_qinterface(IID_IUnknown, S_OK); test_qinterface(IID_IExplorerBrowser, S_OK); test_qinterface(IID_IShellBrowser, S_OK); - todo_wine test_qinterface(IID_IOleWindow, S_OK); + test_qinterface(IID_IOleWindow, S_OK); test_qinterface(IID_ICommDlgBrowser, S_OK); test_qinterface(IID_ICommDlgBrowser2, S_OK); test_qinterface(IID_ICommDlgBrowser3, S_OK);

1 0

Michael Müller : include: Fix an invalid UUID in dxva2api.idl.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 305c86b0bcbed42359ddd4756c03e9eec52ba488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=305c86b0bcbed42359ddd4756… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 24 16:27:25 2017 +0200 include: Fix an invalid UUID in dxva2api.idl. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 11a1ceebc3544dd7954f4ef140a913cd722aa286) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index ebd508b..7a29157 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -434,7 +434,7 @@ interface IDirectXVideoDecoder : IUnknown */ [ object, - uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), + uuid(fc51a552-d5e7-11d9-af55-00054e43ff02), local ] interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService

1 0

Ken Thomases : gdiplus: Avoid infinite recursion in flatten_bezier().
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: d1ed9d7310a34d784bbe7eb65afc5d8406fe1930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ed9d7310a34d784bbe7eb65… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Apr 24 13:16:08 2017 -0500 gdiplus: Avoid infinite recursion in flatten_bezier(). If either of the recursive calls would have the same x2, y2, x3, and y3 arguments as the current call, the path is as flat as the precision of floats allows. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a3f0a5913299d675426e039b5f1d794993144fbf) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 5a3356a..4d70796 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -142,6 +142,10 @@ static BOOL flatten_bezier(path_list_node_t *start, REAL x2, REAL y2, REAL x3, R mp[2].X = (mp[1].X + mp[3].X) / 2.0; mp[2].Y = (mp[1].Y + mp[3].Y) / 2.0; + if ((x2 == mp[0].X && y2 == mp[0].Y && x3 == mp[1].X && y3 == mp[1].Y) || + (x2 == mp[3].X && y2 == mp[3].Y && x3 == mp[4].X && y3 == mp[4].Y)) + return TRUE; + pt = end->pt; pt_st = start->pt; /* check flatness as a half of distance between middle point and a linearized path */

1 0

Nikolay Sivov : include: Fix IShellFolderView method macros.
by Alexandre Julliard 20 Oct '17

20 Oct '17

Module: wine Branch: stable Commit: 8637f4ffc4887dd331a6bb34f83c41c489183d4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8637f4ffc4887dd331a6bb34f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 24 08:51:44 2017 +0300 include: Fix IShellFolderView method macros. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 16d21d94c182b0a5ce3b9b22a5049e2eb1d425e8) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/shlobj.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/shlobj.h b/include/shlobj.h index c40be95..88f4b41 100644 --- a/include/shlobj.h +++ b/include/shlobj.h @@ -652,11 +652,11 @@ DECLARE_INTERFACE_(IShellFolderView, IUnknown) #define IShellFolderView_GetDropPoint(p,a) (p)->lpVtbl->GetDropPoint(p,a) #define IShellFolderView_MoveIcons(p,a) (p)->lpVtbl->MoveIcons(p,a) #define IShellFolderView_SetItemPos(p,a,b) (p)->lpVtbl->SetItemPos(p,a,b) -#define IShellFolderView_DropTarget(p,a) (p)->lpVtbl->DropTarget(p,a) +#define IShellFolderView_IsBkDropTarget(p,a) (p)->lpVtbl->IsBkDropTarget(p,a) #define IShellFolderView_SetClipboard(p,a) (p)->lpVtbl->SetClipboard(p,a) #define IShellFolderView_SetPoints(p,a) (p)->lpVtbl->SetPoints(p,a) #define IShellFolderView_GetItemSpacing(p,a) (p)->lpVtbl->GetItemSpacing(p,a) -#define IShellFolderView_SetCallback(p,a) (p)->lpVtbl->SetCallback(p,a) +#define IShellFolderView_SetCallback(p,a,b) (p)->lpVtbl->SetCallback(p,a,b) #define IShellFolderView_Select(p,a) (p)->lpVtbl->Select(p,a) #define IShellFolderView_QuerySupport(p,a) (p)->lpVtbl->QuerySupport(p,a) #define IShellFolderView_SetAutomationObject(p,a) (p)->lpVtbl->SetAutomationObject(p,a)

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
48
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 October 2017