July 2015 - Wine-Commits - list.winehq.org

Thomas Faber : shell32/tests: Destroy shell view windows.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: eff884f19b2ace1d475bdaa5fcc519f68d3b7c7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=eff884f19b2ace1d475bdaa5f… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jul 2 06:25:46 2015 -0400 shell32/tests: Destroy shell view windows. --- dlls/shell32/tests/shlview.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 1cfffaa..2134a49 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -676,6 +676,10 @@ if (0) ok(hr == S_OK, "got (0x%08x)\n", hr); IDropTarget_Release(dt); + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + IShellView_Release(view); IShellFolder_Release(desktop); } @@ -835,6 +839,10 @@ if (0) win_skip("IFolderView2 is not supported.\n"); if (fv2) IFolderView2_Release(fv2); + hr = IShellView_DestroyViewWindow(view); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok(!IsWindow(hwnd_view), "hwnd %p still valid\n", hwnd_view); + IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view);

1 0

Thomas Faber : shell32/tests: Fix an ok() print.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: 71f1c90628376dc135d388103434c5d3cff5ea60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f1c90628376dc135d388103… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Thu Jul 2 06:25:25 2015 -0400 shell32/tests: Fix an ok() print. --- dlls/shell32/tests/shlview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index eafaec5..1cfffaa 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -667,7 +667,7 @@ if (0) hwnd2 = (HWND)0xdeadbeef; hr = IShellView_CreateViewWindow(view, NULL, &settings, &test_shellbrowser, &r, &hwnd2); ok(hr == E_UNEXPECTED, "got (0x%08x)\n", hr); - ok(hwnd2 == NULL, "got %p\n", hwnd_view); + ok(hwnd2 == NULL, "got %p\n", hwnd2); /* ::DragLeave without drag operation */ hr = IShellView_QueryInterface(view, &IID_IDropTarget, (void**)&dt);

1 0

Huw Davies : comctl32/tests: Extra WM_PAINT messages are occasionally sent on Vista and Win 7.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: f6653a93eb6796b733c6b0e9e289746692ab0a69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6653a93eb6796b733c6b0e9e… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jul 6 10:53:00 2015 +0100 comctl32/tests: Extra WM_PAINT messages are occasionally sent on Vista and Win 7. --- dlls/comctl32/tests/button.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c index badd8a7..8c27c0f 100644 --- a/dlls/comctl32/tests/button.c +++ b/dlls/comctl32/tests/button.c @@ -316,6 +316,7 @@ static const struct message setstyle_seq[] = { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_PAINT, sent|optional }, { 0 } }; @@ -363,6 +364,7 @@ static const struct message setstate_seq[] = { WM_PAINT, sent }, { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ { WM_ERASEBKGND, sent|defwinproc|optional }, + { WM_PAINT, sent|optional }, { 0 } }; @@ -424,6 +426,7 @@ static const struct message setcheck_ignored_seq[] = { { BM_SETCHECK, sent }, { WM_APP, sent|wparam|lparam, 0, 0 }, + { WM_PAINT, sent|optional }, { 0 } };

1 0

Olivier F. R. Dierick : kernel32: Fail gracefully in K32EnumProcessModules with NULL pointer.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: c3f95eddc1bf73b0c5dc95fdfde2b0f8a6d292a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f95eddc1bf73b0c5dc95fdf… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Thu Jul 2 04:23:22 2015 +0200 kernel32: Fail gracefully in K32EnumProcessModules with NULL pointer. --- dlls/kernel32/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index f495e81..dac66c1 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -1226,7 +1226,7 @@ BOOL WINAPI K32EnumProcessModules(HANDLE process, HMODULE *lphModule, if (!init_module_iterator(&iter, process)) return FALSE; - if (!needed) + if ((cb && !lphModule) || !needed) { SetLastError(ERROR_NOACCESS); return FALSE;

1 0

Huw Davies : dwrite/tests: Add tests for GetGdiCompatibleMetrics.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: bbf5b249ca882df07b326b50027d27baa5b586c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf5b249ca882df07b326b500… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jul 3 15:53:07 2015 +0100 dwrite/tests: Add tests for GetGdiCompatibleMetrics. --- dlls/dwrite/tests/font.c | 225 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 221 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 111762c..d3ac83c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -19,9 +19,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #define COBJMACROS #include "windows.h" +#include "winternl.h" #include "dwrite_2.h" #include "initguid.h" #include "d2d1.h" @@ -33,6 +36,7 @@ ((DWORD)(BYTE)(ch2) << 16) | ((DWORD)(BYTE)(ch3) << 24)) #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') +#define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -87,6 +91,7 @@ static inline BOOL heap_free(void *mem) static const WCHAR test_fontfile[] = {'w','i','n','e','_','t','e','s','t','_','f','o','n','t','.','t','t','f',0}; static const WCHAR tahomaW[] = {'T','a','h','o','m','a',0}; +static const WCHAR arialW[] = {'A','r','i','a','l',0}; static const WCHAR tahomaUppercaseW[] = {'T','A','H','O','M','A',0}; static const WCHAR tahomaStrangecaseW[] = {'t','A','h','O','m','A',0}; static const WCHAR blahW[] = {'B','l','a','h','!',0}; @@ -2255,11 +2260,11 @@ static void test_GetFontFromFontFace(void) DELETE_FONTFILE(path); } -static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style) +static IDWriteFont *get_font(IDWriteFactory *factory, const WCHAR *name, DWRITE_FONT_STYLE style) { IDWriteFontCollection *collection; IDWriteFontFamily *family; - IDWriteFont *font; + IDWriteFont *font = NULL; UINT32 index; BOOL exists; HRESULT hr; @@ -2269,9 +2274,9 @@ static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STY index = ~0; exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(collection, tahomaW, &index, &exists); + hr = IDWriteFontCollection_FindFamilyName(collection, name, &index, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(exists, "got %d\n", exists); + if (!exists) goto not_found; hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2281,10 +2286,18 @@ static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STY ok(hr == S_OK, "got 0x%08x\n", hr); IDWriteFontFamily_Release(family); +not_found: IDWriteFontCollection_Release(collection); return font; } +static IDWriteFont *get_tahoma_instance(IDWriteFactory *factory, DWRITE_FONT_STYLE style) +{ + IDWriteFont *font = get_font(factory, tahomaW, style); + ok(font != NULL, "failed to get Tahoma\n"); + return font; +} + static void test_GetFirstMatchingFont(void) { DWRITE_FONT_SIMULATIONS simulations; @@ -3418,6 +3431,209 @@ static void test_CreateGlyphRunAnalysis(void) IDWriteFactory_Release(factory); } +#define round(x) ((int)floor((x) + 0.5)) + +struct VDMX_Header +{ + WORD version; + WORD numRecs; + WORD numRatios; +}; + +struct VDMX_Ratio +{ + BYTE bCharSet; + BYTE xRatio; + BYTE yStartRatio; + BYTE yEndRatio; +}; + +struct VDMX_group +{ + WORD recs; + BYTE startsz; + BYTE endsz; +}; + +struct VDMX_vTable +{ + WORD yPelHeight; + SHORT yMax; + SHORT yMin; +}; + +#ifdef WORDS_BIGENDIAN +#define GET_BE_WORD(x) (x) +#else +#define GET_BE_WORD(x) RtlUshortByteSwap(x) +#endif + +static const struct VDMX_group *find_vdmx_group(const struct VDMX_Header *hdr) +{ + WORD num_ratios, i, group_offset = 0; + struct VDMX_Ratio *ratios = (struct VDMX_Ratio*)(hdr + 1); + BYTE dev_x_ratio = 1, dev_y_ratio = 1; + + num_ratios = GET_BE_WORD(hdr->numRatios); + + for (i = 0; i < num_ratios; i++) + { + if (!ratios[i].bCharSet) continue; + + if ((ratios[i].xRatio == 0 && ratios[i].yStartRatio == 0 && + ratios[i].yEndRatio == 0) || + (ratios[i].xRatio == dev_x_ratio && ratios[i].yStartRatio <= dev_y_ratio && + ratios[i].yEndRatio >= dev_y_ratio)) + { + group_offset = GET_BE_WORD(*((WORD *)(ratios + num_ratios) + i)); + break; + } + } + if (group_offset) + return (const struct VDMX_group *)((BYTE *)hdr + group_offset); + return NULL; +} + +static BOOL get_vdmx_size(const struct VDMX_group *group, int emsize, int *a, int *d) +{ + WORD recs, i; + const struct VDMX_vTable *tables; + + if (!group) return FALSE; + + recs = GET_BE_WORD(group->recs); + if (emsize < group->startsz || emsize >= group->endsz) return FALSE; + + tables = (const struct VDMX_vTable *)(group + 1); + for (i = 0; i < recs; i++) + { + WORD ppem = GET_BE_WORD(tables[i].yPelHeight); + if (ppem > emsize) + { + /* FIXME: Supposed to interpolate */ + trace("FIXME interpolate %d\n", emsize); + return FALSE; + } + + if (ppem == emsize) + { + *a = (SHORT)GET_BE_WORD(tables[i].yMax); + *d = -(SHORT)GET_BE_WORD(tables[i].yMin); + return TRUE; + } + } + return FALSE; +} + +static void test_GetGdiCompatibleMetrics_face(IDWriteFontFace *face) +{ + HRESULT hr; + DWRITE_FONT_METRICS design_metrics, comp_metrics; + FLOAT emsize, scale; + int ascent, descent, expect; + const struct VDMX_Header *vdmx; + UINT32 vdmx_len; + void *vdmx_ctx; + BOOL exists; + const struct VDMX_group *vdmx_group = NULL; + + IDWriteFontFace_GetMetrics(face, &design_metrics); + + hr = IDWriteFontFace_TryGetFontTable(face, MS_VDMX_TAG, (const void **)&vdmx, + &vdmx_len, &vdmx_ctx, &exists); + if (hr != S_OK || !exists) + vdmx = NULL; + else + vdmx_group = find_vdmx_group(vdmx); + + for (emsize = 5; emsize <= design_metrics.designUnitsPerEm; emsize++) + { + scale = emsize / design_metrics.designUnitsPerEm; + hr = IDWriteFontFace_GetGdiCompatibleMetrics(face, emsize, 1.0, NULL, &comp_metrics); +todo_wine + ok(hr == S_OK, "got %08x\n", hr); + if (hr != S_OK) return; + + if (!get_vdmx_size(vdmx_group, emsize, &ascent, &descent)) + { + ascent = round(design_metrics.ascent * scale); + descent = round(design_metrics.descent * scale); + } + + ok(comp_metrics.designUnitsPerEm == design_metrics.designUnitsPerEm, + "%.2f: emsize: got %d expect %d\n", + emsize, comp_metrics.designUnitsPerEm, design_metrics.designUnitsPerEm); + + ok(comp_metrics.ascent == round(ascent / scale), "%.2f a: got %d expect %d\n", + emsize, comp_metrics.ascent, round(ascent / scale)); + + ok(comp_metrics.descent == round(descent / scale), "%.2f d: got %d expect %d\n", + emsize, comp_metrics.descent, round(descent / scale)); + + expect = round(round(design_metrics.lineGap * scale) / scale); + ok(comp_metrics.lineGap == expect, "%.2f lg: got %d expect %d\n", + emsize, comp_metrics.lineGap, expect); + + expect = round(round(design_metrics.capHeight * scale) / scale); + ok(comp_metrics.capHeight == expect, "%.2f capH: got %d expect %d\n", + emsize, comp_metrics.capHeight, expect); + + expect = round(round(design_metrics.xHeight * scale) / scale); + ok(comp_metrics.xHeight == expect, "%.2f xH: got %d expect %d\n", + emsize, comp_metrics.xHeight, expect); + + expect = round(round(design_metrics.underlinePosition * scale) / scale); + ok(comp_metrics.underlinePosition == expect, "%.2f ulP: got %d expect %d\n", + emsize, comp_metrics.underlinePosition, expect); + + expect = round(round(design_metrics.underlineThickness * scale) / scale); + ok(comp_metrics.underlineThickness == expect, "%.2f ulTh: got %d expect %d\n", + emsize, comp_metrics.underlineThickness, expect); + + expect = round(round(design_metrics.strikethroughPosition * scale) / scale); + ok(comp_metrics.strikethroughPosition == expect, "%.2f stP: got %d expect %d\n", + emsize, comp_metrics.strikethroughPosition, expect); + + expect = round(round(design_metrics.strikethroughThickness * scale) / scale); + ok(comp_metrics.strikethroughThickness == expect, "%.2f stTh: got %d expect %d\n", + emsize, comp_metrics.strikethroughThickness, expect); + } + + if (vdmx) IDWriteFontFace_ReleaseFontTable(face, vdmx_ctx); +} + +static void test_GetGdiCompatibleMetrics(void) +{ + IDWriteFactory *factory; + IDWriteFont *font; + IDWriteFontFace *fontface; + HRESULT hr; + + factory = create_factory(); + + font = get_font(factory, tahomaW, DWRITE_FONT_STYLE_NORMAL); + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + test_GetGdiCompatibleMetrics_face(fontface); + IDWriteFontFace_Release(fontface); + + font = get_font(factory, arialW, DWRITE_FONT_STYLE_NORMAL); + if (!font) + skip("Skipping tests with Arial\n"); + else + { + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + test_GetGdiCompatibleMetrics_face(fontface); + IDWriteFontFace_Release(fontface); + } + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3461,6 +3677,7 @@ START_TEST(font) test_GetKerningPairAdjustments(); test_CreateRenderingParams(); test_CreateGlyphRunAnalysis(); + test_GetGdiCompatibleMetrics(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Test that pair kerning affects shaping.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: b49f9f609a9882372e2876ac5647a9452bf899d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49f9f609a9882372e2876ac5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:06:38 2015 +0300 dwrite/tests: Test that pair kerning affects shaping. --- dlls/dwrite/tests/layout.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6e55c60..232f127 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1839,13 +1839,15 @@ if (0) /* crashes on native */ static void test_SetPairKerning(void) { - static const WCHAR strW[] = {'a','b','c','d',0}; + static const WCHAR strW[] = {'a','e',0x0300,'d',0}; /* accent grave */ + DWRITE_CLUSTER_METRICS clusters[4]; IDWriteTextLayout1 *layout1; IDWriteTextFormat *format; IDWriteTextLayout *layout; DWRITE_TEXT_RANGE range; IDWriteFactory *factory; BOOL kerning; + UINT32 count; HRESULT hr; factory = create_factory(); @@ -1881,9 +1883,22 @@ if (0) { /* crashes on native */ hr = IDWriteTextLayout1_GetPairKerning(layout1, 0, &kerning, &range); ok(hr == S_OK, "got 0x%08x\n", hr); ok(!kerning, "got %d\n", kerning); + ok(range.length == ~0u, "got %u\n", range.length); + count = 0; + hr = IDWriteTextLayout1_GetClusterMetrics(layout1, clusters, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); +if (count == 3) { + ok(clusters[0].length == 1, "got %u\n", clusters[0].length); + ok(clusters[1].length == 2, "got %u\n", clusters[1].length); + ok(clusters[2].length == 1, "got %u\n", clusters[2].length); +} + /* pair kerning flag participates in itemization - combining characters + breaks */ range.startPosition = 0; - range.length = 1; + range.length = 2; hr = IDWriteTextLayout1_SetPairKerning(layout1, 2, range); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1892,6 +1907,15 @@ if (0) { /* crashes on native */ ok(hr == S_OK, "got 0x%08x\n", hr); ok(kerning == TRUE, "got %d\n", kerning); + count = 0; + hr = IDWriteTextLayout1_GetClusterMetrics(layout1, clusters, 4, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 4, "got %u\n", count); + ok(clusters[0].length == 1, "got %u\n", clusters[0].length); + ok(clusters[1].length == 1, "got %u\n", clusters[1].length); + ok(clusters[2].length == 1, "got %u\n", clusters[2].length); + ok(clusters[3].length == 1, "got %u\n", clusters[3].length); + IDWriteTextLayout1_Release(layout1); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement leading and trailing text alignment modes.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: 44c135dd179637076c53166485362e7e45ca7d62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c135dd179637076c5316648… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:05:41 2015 +0300 dwrite: Implement leading and trailing text alignment modes. --- dlls/dwrite/layout.c | 127 ++++++++++++++++++++++++++++++++++++++++++--- dlls/dwrite/tests/layout.c | 54 ++++++++++++++++++- 2 files changed, 173 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44c135dd179637076c531…

1 0

Nikolay Sivov : dwrite: Make it possible to set text alignment on created layout.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: de46f610fe61ed5f1ff99908682d33a32e8c9f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de46f610fe61ed5f1ff999086… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:05:10 2015 +0300 dwrite: Make it possible to set text alignment on created layout. --- dlls/dwrite/layout.c | 22 ++++++++--------- dlls/dwrite/tests/layout.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 693f046..13a9ce0 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -328,6 +328,14 @@ static inline const char *debugstr_run(const struct regular_layout_run *run) run->descr.stringLength); } +static inline HRESULT format_set_textalignment(struct dwrite_textformat_data *format, DWRITE_TEXT_ALIGNMENT alignment) +{ + if ((UINT32)alignment > DWRITE_TEXT_ALIGNMENT_JUSTIFIED) + return E_INVALIDARG; + format->textalignment = alignment; + return S_OK; +} + static HRESULT get_fontfallback_from_format(const struct dwrite_textformat_data *format, IDWriteFontFallback **fallback) { *fallback = format->fallback; @@ -1955,7 +1963,6 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout2 *iface) static HRESULT WINAPI dwritetextlayout_SetTextAlignment(IDWriteTextLayout2 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)->(%d)\n", This, alignment); return IDWriteTextFormat1_SetTextAlignment(&This->IDWriteTextFormat1_iface, alignment); } @@ -2013,7 +2020,6 @@ static HRESULT WINAPI dwritetextlayout_SetLineSpacing(IDWriteTextLayout2 *iface, static DWRITE_TEXT_ALIGNMENT WINAPI dwritetextlayout_GetTextAlignment(IDWriteTextLayout2 *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout2(iface); - TRACE("(%p)\n", This); return IDWriteTextFormat1_GetTextAlignment(&This->IDWriteTextFormat1_iface); } @@ -2972,8 +2978,8 @@ static ULONG WINAPI dwritetextformat1_layout_Release(IDWriteTextFormat1 *iface) static HRESULT WINAPI dwritetextformat1_layout_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textlayout *This = impl_layout_form_IDWriteTextFormat1(iface); - FIXME("(%p)->(%d): stub\n", This, alignment); - return E_NOTIMPL; + TRACE("(%p)->(%d)\n", This, alignment); + return format_set_textalignment(&This->format, alignment); } static HRESULT WINAPI dwritetextformat1_layout_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) @@ -3846,14 +3852,8 @@ static ULONG WINAPI dwritetextformat_Release(IDWriteTextFormat1 *iface) static HRESULT WINAPI dwritetextformat_SetTextAlignment(IDWriteTextFormat1 *iface, DWRITE_TEXT_ALIGNMENT alignment) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat1(iface); - TRACE("(%p)->(%d)\n", This, alignment); - - if ((UINT32)alignment > DWRITE_TEXT_ALIGNMENT_JUSTIFIED) - return E_INVALIDARG; - - This->format.textalignment = alignment; - return S_OK; + return format_set_textalignment(&This->format, alignment); } static HRESULT WINAPI dwritetextformat_SetParagraphAlignment(IDWriteTextFormat1 *iface, DWRITE_PARAGRAPH_ALIGNMENT alignment) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index eee86a9..57d3a34 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2863,6 +2863,65 @@ todo_wine { IDWriteFactory_Release(factory); } +static void test_SetTextAlignment(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteTextFormat1 *format1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory *factory; + DWRITE_TEXT_ALIGNMENT v; + HRESULT hr; + + factory = create_factory(); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 12.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetTextAlignment(format); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 300.0, 100.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextLayout_GetTextAlignment(layout); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + hr = IDWriteTextLayout_SetTextAlignment(layout, DWRITE_TEXT_ALIGNMENT_TRAILING); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetTextAlignment(format); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + v = IDWriteTextLayout_GetTextAlignment(layout); + ok(v == DWRITE_TEXT_ALIGNMENT_TRAILING, "got %d\n", v); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextFormat1, (void**)&format1); + if (hr == S_OK) { + hr = IDWriteTextFormat1_SetTextAlignment(format1, DWRITE_TEXT_ALIGNMENT_CENTER); + ok(hr == S_OK, "got 0x%08x\n", hr); + + v = IDWriteTextFormat_GetTextAlignment(format); + ok(v == DWRITE_TEXT_ALIGNMENT_LEADING, "got %d\n", v); + + v = IDWriteTextLayout_GetTextAlignment(layout); + ok(v == DWRITE_TEXT_ALIGNMENT_CENTER, "got %d\n", v); + + v = IDWriteTextFormat1_GetTextAlignment(format1); + ok(v == DWRITE_TEXT_ALIGNMENT_CENTER, "got %d\n", v); + + IDWriteTextFormat1_Release(format1); + } + else + win_skip("IDWriteTextFormat1 is not supported\n"); + + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + IDWriteFactory_Release(factory); +} + START_TEST(layout) { static const WCHAR ctrlstrW[] = {0x202a,0}; @@ -2903,6 +2962,7 @@ START_TEST(layout) test_SetFlowDirection(); test_SetDrawingEffect(); test_GetLineMetrics(); + test_SetTextAlignment(); IDWriteFactory_Release(factory); }

1 0

Michael Stefaniuc : dmime/tests: Add some basic IDirectMusicTrack8 tests.
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: 3de79096aaf84357f0203c98f331e064bffda344 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3de79096aaf84357f0203c98f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 6 00:05:56 2015 +0200 dmime/tests: Add some basic IDirectMusicTrack8 tests. --- dlls/dmime/tests/dmime.c | 60 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 9 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 85dd8f0..3e93c39 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -484,6 +484,7 @@ static void test_segment(void) static void test_track(void) { IDirectMusicTrack *dmt; + IDirectMusicTrack8 *dmt8; IPersistStream *ps; CLSID classid; ULARGE_INTEGER size; @@ -492,16 +493,17 @@ static void test_track(void) const struct { REFCLSID clsid; const char *name; + BOOL has_param; } class[] = { - { X(DirectMusicLyricsTrack) }, - { X(DirectMusicMarkerTrack) }, - { X(DirectMusicParamControlTrack) }, - { X(DirectMusicSegmentTriggerTrack) }, - { X(DirectMusicSeqTrack) }, - { X(DirectMusicSysExTrack) }, - { X(DirectMusicTempoTrack) }, - { X(DirectMusicTimeSigTrack) }, - { X(DirectMusicWaveTrack) } + { X(DirectMusicLyricsTrack), TRUE }, + { X(DirectMusicMarkerTrack), TRUE }, + { X(DirectMusicParamControlTrack), TRUE }, + { X(DirectMusicSegmentTriggerTrack), TRUE }, + { X(DirectMusicSeqTrack), FALSE }, + { X(DirectMusicSysExTrack), FALSE }, + { X(DirectMusicTempoTrack), TRUE }, + { X(DirectMusicTimeSigTrack), TRUE }, + { X(DirectMusicWaveTrack), TRUE } }; #undef X unsigned int i; @@ -512,6 +514,46 @@ static void test_track(void) (void**)&dmt); ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + /* IDirectMusicTrack */ + if (!class[i].has_param) { + hr = IDirectMusicTrack_GetParam(dmt, NULL, 0, NULL, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_GetParam failed: %08x\n", hr); + hr = IDirectMusicTrack_SetParam(dmt, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_SetParam failed: %08x\n", hr); + hr = IDirectMusicTrack_IsParamSupported(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_IsParamSupported failed: %08x\n", hr); + } + if (class[i].clsid != &CLSID_DirectMusicMarkerTrack && + class[i].clsid != &CLSID_DirectMusicTimeSigTrack) { + hr = IDirectMusicTrack_AddNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_AddNotificationType failed: %08x\n", hr); + hr = IDirectMusicTrack_RemoveNotificationType(dmt, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack_RemoveNotificationType failed: %08x\n", hr); + } + hr = IDirectMusicTrack_Clone(dmt, 0, 0, NULL); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack_Clone failed: %08x\n", hr); + + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IDirectMusicTrack8, (void**)&dmt8); + if (hr == S_OK) { + hr = IDirectMusicTrack8_PlayEx(dmt8, NULL, 0, 0, 0, 0, NULL, NULL, 0); + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_PlayEx failed: %08x\n", hr); + if (!class[i].has_param) { + hr = IDirectMusicTrack8_GetParamEx(dmt8, NULL, 0, NULL, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_GetParamEx failed: %08x\n", hr); + hr = IDirectMusicTrack8_SetParamEx(dmt8, NULL, 0, NULL, NULL, 0); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_SetParamEx failed: %08x\n", hr); + } + hr = IDirectMusicTrack8_Compose(dmt8, NULL, 0, NULL); + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Compose failed: %08x\n", hr); + hr = IDirectMusicTrack8_Join(dmt8, NULL, 0, NULL, 0, NULL); + if (class[i].clsid == &CLSID_DirectMusicTempoTrack) + todo_wine ok(hr == E_POINTER, "IDirectMusicTrack8_Join failed: %08x\n", hr); + else + ok(hr == E_NOTIMPL, "IDirectMusicTrack8_Join failed: %08x\n", hr); + IDirectMusicTrack8_Release(dmt8); + } + /* IPersistStream */ hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Nikolay Sivov : shell32: Handle string-to-guid conversion errors (Coverity ).
by Alexandre Julliard July 6, 2015

July 6, 2015

Module: wine Branch: master Commit: 69733d65e82035a4375042e283bf9720f833ca69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69733d65e82035a4375042e28… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 6 09:09:06 2015 +0300 shell32: Handle string-to-guid conversion errors (Coverity). --- dlls/shell32/shellpath.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 42f34a2..1a4528f 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -5334,7 +5334,11 @@ static HRESULT WINAPI knownfolder_GetFolderDefinition( hr = HRESULT_FROM_WIN32(RegGetValueW(HKEY_LOCAL_MACHINE, knownfolder->registryPath, szParentFolder, RRF_RT_REG_SZ, NULL, parentGuid, &dwSize)); if(SUCCEEDED(hr)) - IIDFromString(parentGuid, &pKFD->fidParent); + { + hr = IIDFromString(parentGuid, &pKFD->fidParent); + if(FAILED(hr)) + return hr; + } get_known_folder_dword(knownfolder->registryPath, szAttributes, &pKFD->dwAttributes);

1 0