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

Henri Verbeet : d2d1: Fix the bitmap DPI scale for bitmap brushes.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: 3b400cad3441e1514d081737da23e6d97e9ee3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b400cad3441e1514d081737d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:08 2015 +0200 d2d1: Fix the bitmap DPI scale for bitmap brushes. --- dlls/d2d1/brush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index 28b896b..5c45d3c 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -757,10 +757,10 @@ HRESULT d2d_brush_get_ps_cb(struct d2d_brush *brush, struct d2d_d3d_render_targe /* Scale for bitmap size and dpi. */ b = brush->transform; - dpi_scale = bitmap->pixel_size.width * (bitmap->dpi_x / 96.0f); + dpi_scale = bitmap->pixel_size.width * (96.0f / bitmap->dpi_x); b._11 *= dpi_scale; b._21 *= dpi_scale; - dpi_scale = bitmap->pixel_size.height * (bitmap->dpi_y / 96.0f); + dpi_scale = bitmap->pixel_size.height * (96.0f / bitmap->dpi_y); b._12 *= dpi_scale; b._22 *= dpi_scale;

1 0

Henri Verbeet : d2d1: Implement d2d_d3d_render_target_GetPixelFormat().
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: a4bcae0bf77c86e4a55029f5b8ea81be03cd1ec2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4bcae0bf77c86e4a55029f5b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 21 08:39:09 2015 +0200 d2d1: Implement d2d_d3d_render_target_GetPixelFormat(). --- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/render_target.c | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 377c72a..0c564fa 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -79,6 +79,7 @@ struct d2d_d3d_render_target D2D1_DRAWING_STATE_DESCRIPTION drawing_state; IDWriteRenderingParams *text_rendering_params; + D2D1_PIXEL_FORMAT format; D2D1_SIZE_U pixel_size; struct d2d_clip_stack clip_stack; float dpi_x; diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index 736e062..e939fef 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -1182,10 +1182,11 @@ static HRESULT STDMETHODCALLTYPE d2d_d3d_render_target_EndDraw(ID2D1RenderTarget static D2D1_PIXEL_FORMAT * STDMETHODCALLTYPE d2d_d3d_render_target_GetPixelFormat(ID2D1RenderTarget *iface, D2D1_PIXEL_FORMAT *format) { - FIXME("iface %p, format %p stub!\n", iface, format); + struct d2d_d3d_render_target *render_target = impl_from_ID2D1RenderTarget(iface); + + TRACE("iface %p, format %p.\n", iface, format); - format->format = DXGI_FORMAT_UNKNOWN; - format->alphaMode = D2D1_ALPHA_MODE_UNKNOWN; + *format = render_target->format; return format; } @@ -1784,6 +1785,7 @@ HRESULT d2d_d3d_render_target_init(struct d2d_d3d_render_target *render_target, goto err; } + render_target->format = desc->pixelFormat; render_target->pixel_size.width = surface_desc.Width; render_target->pixel_size.height = surface_desc.Height; render_target->drawing_state.transform = identity;

1 0

Hans Leidekker : davclnt: Add stub implementations of DavRegisterAuthCallback and DavUnregisterAuthCallback.
by Alexandre Julliard 21 Jul '15

21 Jul '15

Module: wine Branch: master Commit: f0dee09c52387c3c6dffc13f2e42574218363eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dee09c52387c3c6dffc13f2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 21 11:00:48 2015 +0200 davclnt: Add stub implementations of DavRegisterAuthCallback and DavUnregisterAuthCallback. --- dlls/davclnt/davclnt.spec | 4 +-- dlls/davclnt/main.c | 22 +++++++++++++++ include/Makefile.in | 1 + include/davclnt.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/davclnt/davclnt.spec b/dlls/davclnt/davclnt.spec index 996a595..2df7b6c 100644 --- a/dlls/davclnt/davclnt.spec +++ b/dlls/davclnt/davclnt.spec @@ -3,8 +3,8 @@ @ stub DavGetDiskSpaceUsage @ stub DavGetTheLockOwnerOfTheFile @ stub DavInvalidateCache -@ stub DavRegisterAuthCallback -@ stub DavUnregisterAuthCallback +@ stdcall DavRegisterAuthCallback(ptr long) +@ stdcall DavUnregisterAuthCallback(long) @ stub DllCanUnloadNow @ stub DllGetClassObject @ stdcall -private DllMain(long long ptr) diff --git a/dlls/davclnt/main.c b/dlls/davclnt/main.c index 099b915..ac38697 100644 --- a/dlls/davclnt/main.c +++ b/dlls/davclnt/main.c @@ -24,6 +24,11 @@ #include "windef.h" #include "winbase.h" +#include "davclnt.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(davclnt); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { @@ -38,3 +43,20 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) return TRUE; } + +/*********************************************************************** + * DavRegisterAuthCallback (davclnt.@) + */ +OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK cb, ULONG version) +{ + FIXME("%p, %u\n", cb, version); + return 0; +} + +/*********************************************************************** + * DavUnregisterAuthCallback (davclnt.@) + */ +VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE handle) +{ + FIXME("%u\n", handle); +} diff --git a/include/Makefile.in b/include/Makefile.in index b524326..87cabec 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -236,6 +236,7 @@ SRCDIR_INCLUDES = \ d3dx9shape.h \ d3dx9tex.h \ d3dx9xof.h \ + davclnt.h \ dbccmd.idl \ dbcses.idl \ dbdsad.idl \ diff --git a/include/davclnt.h b/include/davclnt.h new file mode 100644 index 0000000..a1643dd --- /dev/null +++ b/include/davclnt.h @@ -0,0 +1,71 @@ +/* + * Copyright 2015 Hans Leidekker 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 + */ + +#ifndef __WINE_DAVCLNT_H +#define __WINE_DAVCLNT_H + +#define OPAQUE_HANDLE DWORD + +#define DAV_AUTHN_SCHEME_BASIC 0x00000001 +#define DAV_AUTHN_SCHEME_NTLM 0x00000002 +#define DAV_AUTHN_SCHEME_PASSPORT 0x00000004 +#define DAV_AUTHN_SCHEME_DIGEST 0x00000008 +#define DAV_AUTHN_SCHEME_NEGOTIATE 0x00000010 +#define DAV_AUTHN_SCHEME_CERT 0x00010000 +#define DAV_AUTHN_SCHEME_FBA 0x00100000 + +typedef enum +{ + DefaultBehavior, + RetryRequest, + CancelRequest +} AUTHNEXTSTEP; + +typedef struct _DAV_CALLBACK_AUTH_BLOB +{ + PVOID pBuffer; + ULONG ulSize; + ULONG ulType; +} DAV_CALLBACK_AUTH_BLOB, *PDAV_CALLBACK_AUTH_BLOB; + +typedef struct _DAV_CALLBACK_AUTH_UNP +{ + LPWSTR pszUserName; + ULONG ulUserNameLength; + LPWSTR pszPassword; + ULONG ulPasswordLength; +} DAV_CALLBACK_AUTH_UNP, *PDAV_CALLBACK_AUTH_UNP; + +typedef struct _DAV_CALLBACK_CRED +{ + DAV_CALLBACK_AUTH_BLOB AuthBlob; + DAV_CALLBACK_AUTH_UNP UNPBlob; + BOOL bAuthBlobValid; + BOOL bSave; +} DAV_CALLBACK_CRED, *PDAV_CALLBACK_CRED; + +typedef DWORD (*PFNDAVAUTHCALLBACK_FREECRED) + (PVOID); + +typedef DWORD (*PFNDAVAUTHCALLBACK) + (LPWSTR,LPWSTR,DWORD,DWORD,PDAV_CALLBACK_CRED,AUTHNEXTSTEP*,PFNDAVAUTHCALLBACK_FREECRED*); + +OPAQUE_HANDLE WINAPI DavRegisterAuthCallback(PFNDAVAUTHCALLBACK,ULONG); +VOID WINAPI DavUnregisterAuthCallback(OPAQUE_HANDLE); + +#endif /* __WINE_DAVCLNT_H */

1 0

Alex Henrie : user32/tests: Correct spelling of "Invisible".
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 541a6e1e5e86b89ea60eb7475ed14e75e6bdda6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=541a6e1e5e86b89ea60eb7475… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Jul 20 00:42:36 2015 -0600 user32/tests: Correct spelling of "Invisible". --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 03f6b5c..8b4475f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -3209,7 +3209,7 @@ static const struct message WmMinimizeMDIchildVisibleSeq[] = { { 0 } }; /* ShowWindow(SW_RESTORE) for a not visible MDI child window */ -static const struct message WmRestoreMDIchildInisibleSeq[] = { +static const struct message WmRestoreMDIchildInvisibleSeq[] = { { HCBT_MINMAX, hook|lparam, 0, SW_RESTORE }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_SHOWWINDOW|SWP_FRAMECHANGED|SWP_STATECHANGED }, { WM_NCCALCSIZE, sent|wparam, 1 }, @@ -3537,7 +3537,7 @@ static void test_mdi_messages(void) ok_sequence(WmHideChildSeq, "ShowWindow(SW_HIDE):MDI child", FALSE); ShowWindow(mdi_child2, SW_RESTORE); - ok_sequence(WmRestoreMDIchildInisibleSeq, "ShowWindow(SW_RESTORE):invisible MDI child", FALSE); + ok_sequence(WmRestoreMDIchildInvisibleSeq, "ShowWindow(SW_RESTORE):invisible MDI child", FALSE); flush_sequence(); ok(GetWindowLongA(mdi_child2, GWL_STYLE) & WS_VISIBLE, "MDI child should be visible\n");

1 0

Jacek Caban : ieframe: Allow travellog buffer to grow even if we' re loading from the history.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 5f2d2c146c27d4ee98fe1b00a03d50220bc48f10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2d2c146c27d4ee98fe1b00a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 14:01:13 2015 +0200 ieframe: Allow travellog buffer to grow even if we're loading from the history. Spotted by Marcus Meissner. --- dlls/ieframe/dochost.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index c76e91c..b0d713b 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -395,25 +395,25 @@ static void update_travellog(DocHost *This) { travellog_entry_t *new_entry; - if(This->travellog.loading_pos == -1) { - /* Clear forward history. */ - if(!This->travellog.log) { - This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); - if(!This->travellog.log) - return; + if(!This->travellog.log) { + This->travellog.log = heap_alloc(4 * sizeof(*This->travellog.log)); + if(!This->travellog.log) + return; - This->travellog.size = 4; - }else if(This->travellog.size < This->travellog.position+1) { - travellog_entry_t *new_travellog; + This->travellog.size = 4; + }else if(This->travellog.size < This->travellog.position+1) { + travellog_entry_t *new_travellog; - new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); - if(!new_travellog) - return; + new_travellog = heap_realloc(This->travellog.log, This->travellog.size*2*sizeof(*This->travellog.log)); + if(!new_travellog) + return; - This->travellog.log = new_travellog; - This->travellog.size *= 2; - } + This->travellog.log = new_travellog; + This->travellog.size *= 2; + } + if(This->travellog.loading_pos == -1) { + /* Clear forward history. */ while(This->travellog.length > This->travellog.position) free_travellog_entry(This->travellog.log + --This->travellog.length); }

1 0

Nikolay Sivov : dwrite: Improve parameter validation in GetGdiCompatibleGlyphAdvances(), add some tests.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 5231715d31cc1f7ebbfca64247383b1aa7fdc2ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=5231715d31cc1f7ebbfca6424… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:13:58 2015 +0300 dwrite: Improve parameter validation in GetGdiCompatibleGlyphAdvances(), add some tests. --- dlls/dwrite/font.c | 13 +++++- dlls/dwrite/tests/font.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 127 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 11ff9d0..2d01574 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -771,10 +771,19 @@ static HRESULT WINAPI dwritefontface1_GetGdiCompatibleGlyphAdvances(IDWriteFontF TRACE("(%p)->(%.2f %.2f %p %d %d %u %p %p)\n", This, em_size, ppdip, m, use_gdi_natural, is_sideways, glyph_count, glyphs, advances); - if (m && memcmp(m, &identity, sizeof(*m))) - FIXME("transform is not supported, %s\n", debugstr_matrix(m)); + if (em_size < 0.0 || ppdip <= 0.0) { + memset(advances, 0, sizeof(*advances) * glyph_count); + return E_INVALIDARG; + } scale = em_size * ppdip / This->metrics.designUnitsPerEm; + if (scale == 0.0) { + memset(advances, 0, sizeof(*advances) * glyph_count); + return S_OK; + } + + if (m && memcmp(m, &identity, sizeof(*m))) + FIXME("transform is not supported, %s\n", debugstr_matrix(m)); for (i = 0; i < glyph_count; i++) { hr = IDWriteFontFace2_GetDesignGlyphAdvances(iface, 1, glyphs + i, advances + i, is_sideways); diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 7dc6077..94dccdd 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3905,6 +3905,121 @@ static void test_GetPanose(void) IDWriteFactory_Release(factory); } +static INT32 get_gdi_font_advance(HDC hdc, FLOAT emsize) +{ + LOGFONTW logfont; + HFONT hfont; + BOOL ret; + ABC abc; + + memset(&logfont, 0, sizeof(logfont)); + logfont.lfHeight = (LONG)-emsize; + logfont.lfWeight = FW_NORMAL; + logfont.lfQuality = CLEARTYPE_QUALITY; + lstrcpyW(logfont.lfFaceName, tahomaW); + + hfont = CreateFontIndirectW(&logfont); + SelectObject(hdc, hfont); + + ret = GetCharABCWidthsW(hdc, 'A', 'A', &abc); + ok(ret, "got %d\n", ret); + + DeleteObject(hfont); + + return abc.abcA + abc.abcB + abc.abcC; +} + +static void test_GetGdiCompatibleGlyphAdvances(void) +{ + IDWriteFontFace1 *fontface1; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + HRESULT hr; + HDC hdc; + UINT32 codepoint; + UINT16 glyph; + FLOAT emsize; + DWRITE_FONT_METRICS1 fm; + INT32 advance; + + factory = create_factory(); + font = get_tahoma_instance(factory, DWRITE_FONT_STYLE_NORMAL); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); + IDWriteFontFace_Release(fontface); + + if (hr != S_OK) { + IDWriteFactory_Release(factory); + win_skip("GetGdiCompatibleGlyphAdvances() is not supported\n"); + return; + } + + codepoint = 'A'; + glyph = 0; + hr = IDWriteFontFace1_GetGlyphIndices(fontface1, &codepoint, 1, &glyph); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyph > 0, "got %u\n", glyph); + + /* zero emsize */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 0.0, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* negative emsize */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, -1.0, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* zero ppdip */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 1.0, + 0.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + /* negative ppdip */ + advance = 1; + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, 1.0, + -1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(advance == 0, "got %d\n", advance); + + IDWriteFontFace1_GetMetrics(fontface1, &fm); + + hdc = CreateCompatibleDC(0); + + for (emsize = 1.0; emsize <= fm.designUnitsPerEm; emsize += 1.0) { + INT32 gdi_advance; + + gdi_advance = get_gdi_font_advance(hdc, emsize); + hr = IDWriteFontFace1_GetGdiCompatibleGlyphAdvances(fontface1, emsize, + 1.0, NULL, FALSE, FALSE, 1, &glyph, &advance); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* advance is in design units */ + advance = (int)floorf(emsize * advance / fm.designUnitsPerEm + 0.5f); + + /* allow 1 pixel difference for large sizes, for Tahoma this happens for 16 sizes in [1, 2048] range */ + if (emsize > 150.0) + ok((advance - gdi_advance) <= 1, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + else + ok(gdi_advance == advance, "%.0f: got advance %d, expected %d\n", emsize, advance, gdi_advance); + } + + DeleteObject(hdc); + + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -3950,6 +4065,7 @@ START_TEST(font) test_CreateGlyphRunAnalysis(); test_GetGdiCompatibleMetrics(); test_GetPanose(); + test_GetGdiCompatibleGlyphAdvances(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite/tests: Some tests for bounds returned by GetAlphaTextureBounds().
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: a718a9a5ca3ff014db5c685d3747e9c442bfbe09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a718a9a5ca3ff014db5c685d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:14:32 2015 +0300 dwrite/tests: Some tests for bounds returned by GetAlphaTextureBounds(). --- dlls/dwrite/tests/font.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 94dccdd..c85193a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3403,6 +3403,7 @@ static void test_CreateGlyphRunAnalysis(void) RECT rect; DWRITE_GLYPH_OFFSET offset; DWRITE_GLYPH_METRICS metrics; + DWRITE_FONT_METRICS fm; int i; factory = create_factory(); @@ -3492,6 +3493,41 @@ static void test_CreateGlyphRunAnalysis(void) IDWriteGlyphRunAnalysis_Release(analysis); } + IDWriteFontFace_GetMetrics(run.fontFace, &fm); + + /* check bbox for a single glyph run */ + for (run.fontEmSize = 1.0; run.fontEmSize <= 100.0; run.fontEmSize += 1.0) { + DWRITE_GLYPH_METRICS gm; + LONG bboxX, bboxY; + + hr = IDWriteFactory_CreateGlyphRunAnalysis(factory, &run, 1.0, NULL, + DWRITE_RENDERING_MODE_ALIASED, DWRITE_MEASURING_MODE_GDI_CLASSIC, + 0.0, 0.0, &analysis); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(&rect, 0, sizeof(rect)); + hr = IDWriteGlyphRunAnalysis_GetAlphaTextureBounds(analysis, DWRITE_TEXTURE_ALIASED_1x1, &rect); + todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + if (hr != S_OK) + break; + + hr = IDWriteFontFace_GetGdiCompatibleGlyphMetrics(run.fontFace, run.fontEmSize, 1.0, NULL, + DWRITE_MEASURING_MODE_GDI_CLASSIC, run.glyphIndices, 1, &gm, run.isSideways); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* metrics are in design units */ + bboxX = (int)floorf((gm.advanceWidth - gm.leftSideBearing - gm.rightSideBearing) * run.fontEmSize / fm.designUnitsPerEm + 0.5f); + bboxY = (int)floorf((gm.advanceHeight - gm.topSideBearing - gm.bottomSideBearing) * run.fontEmSize / fm.designUnitsPerEm + 0.5f); + + rect.right -= rect.left; + rect.bottom -= rect.top; + ok(abs(bboxX - rect.right) <= 1, "%.0f: bbox width %d, from metrics %d\n", run.fontEmSize, rect.right, bboxX); + ok(abs(bboxY - rect.bottom) <= 1, "%.0f: bbox height %d, from metrics %d\n", run.fontEmSize, rect.bottom, bboxY); + + IDWriteGlyphRunAnalysis_Release(analysis); + } + IDWriteFontFace_Release(face); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Round centered alignment shift for compatible layouts.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: c8b0c803653e3a126b059f8f0ef280dba2eecd0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8b0c803653e3a126b059f8f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:15:01 2015 +0300 dwrite: Round centered alignment shift for compatible layouts. --- dlls/dwrite/layout.c | 83 +++++++++++++++++++++++++++++++++++++--------- dlls/dwrite/tests/layout.c | 44 ++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8b0c803653e3a126b059…

1 0

Nikolay Sivov : dwrite/tests: Some tests for isNewline clusters.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 491e84a7718b06cdc7ec60b8efe4c029ed0a617b URL: http://source.winehq.org/git/wine.git/?a=commit;h=491e84a7718b06cdc7ec60b8e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 20 15:15:30 2015 +0300 dwrite/tests: Some tests for isNewline clusters. --- dlls/dwrite/tests/layout.c | 80 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 0e8404c..9e2aaea 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -1630,12 +1630,14 @@ static void test_typography(void) static void test_GetClusterMetrics(void) { + static const WCHAR str5W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n','e',0xb,'f',0xc, + 'g',0x0085,'h',0x2028,'i',0x2029,0}; static const WCHAR str3W[] = {0x2066,')',')',0x661,'(',0x627,')',0}; static const WCHAR str2W[] = {0x202a,0x202c,'a',0}; static const WCHAR strW[] = {'a','b','c','d',0}; static const WCHAR str4W[] = {'a',' ',0}; DWRITE_INLINE_OBJECT_METRICS inline_metrics; - DWRITE_CLUSTER_METRICS metrics[4]; + DWRITE_CLUSTER_METRICS metrics[20]; IDWriteTextLayout1 *layout1; IDWriteInlineObject *trimm; IDWriteTextFormat *format; @@ -1918,6 +1920,44 @@ todo_wine IDWriteTextLayout_Release(layout); + /* isNewline tests */ + hr = IDWriteFactory_CreateTextLayout(factory, str5W, 20, format, 100.0, 200.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + count = 0; + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, metrics, 20, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 20, "got %u\n", count); + +todo_wine { + ok(metrics[1].isNewline == 1, "got %d\n", metrics[1].isNewline); + ok(metrics[3].isNewline == 1, "got %d\n", metrics[3].isNewline); + ok(metrics[5].isNewline == 1, "got %d\n", metrics[5].isNewline); + ok(metrics[6].isNewline == 1, "got %d\n", metrics[6].isNewline); + ok(metrics[9].isNewline == 1, "got %d\n", metrics[9].isNewline); + ok(metrics[11].isNewline == 1, "got %d\n", metrics[11].isNewline); + ok(metrics[13].isNewline == 1, "got %d\n", metrics[13].isNewline); + ok(metrics[15].isNewline == 1, "got %d\n", metrics[15].isNewline); + ok(metrics[17].isNewline == 1, "got %d\n", metrics[17].isNewline); + ok(metrics[19].isNewline == 1, "got %d\n", metrics[19].isNewline); +} + ok(metrics[0].isNewline == 0, "got %d\n", metrics[0].isNewline); + ok(metrics[2].isNewline == 0, "got %d\n", metrics[2].isNewline); + ok(metrics[4].isNewline == 0, "got %d\n", metrics[4].isNewline); + ok(metrics[7].isNewline == 0, "got %d\n", metrics[7].isNewline); + ok(metrics[8].isNewline == 0, "got %d\n", metrics[8].isNewline); + ok(metrics[10].isNewline == 0, "got %d\n", metrics[10].isNewline); + ok(metrics[12].isNewline == 0, "got %d\n", metrics[12].isNewline); + ok(metrics[14].isNewline == 0, "got %d\n", metrics[14].isNewline); + ok(metrics[16].isNewline == 0, "got %d\n", metrics[16].isNewline); + ok(metrics[18].isNewline == 0, "got %d\n", metrics[18].isNewline); + + for (i = 0; i < count; i++) + ok(metrics[i].length == 1, "%d: got %d\n", i, metrics[i].length); + + IDWriteTextLayout_Release(layout); + IDWriteInlineObject_Release(trimm); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); @@ -2975,10 +3015,11 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) static void test_GetLineMetrics(void) { + static const WCHAR str3W[] = {'a','\r','b','\n','c','\n','\r','d','\r','\n',0}; static const WCHAR strW[] = {'a','b','c','d',' ',0}; static const WCHAR str2W[] = {'a','b','\r','c','d',0}; DWRITE_FONT_METRICS fontmetrics; - DWRITE_LINE_METRICS metrics[2]; + DWRITE_LINE_METRICS metrics[6]; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFontFace *fontface; @@ -3035,9 +3076,42 @@ todo_wine { metrics[1].baseline); } IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); - IDWriteFontFace_Release(fontface); + /* line breaks */ + 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); + + hr = IDWriteFactory_CreateTextLayout(factory, str3W, 10, format, 100.0, 300.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 6, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(count == 6, "got %u\n", count); + +todo_wine { + ok(metrics[0].length == 2, "got %u\n", metrics[0].length); + ok(metrics[1].length == 2, "got %u\n", metrics[1].length); + ok(metrics[2].length == 2, "got %u\n", metrics[2].length); + ok(metrics[3].length == 1, "got %u\n", metrics[3].length); + ok(metrics[4].length == 3, "got %u\n", metrics[4].length); + ok(metrics[5].length == 0, "got %u\n", metrics[5].length); +} + +todo_wine { + ok(metrics[0].newlineLength == 1, "got %u\n", metrics[0].newlineLength); + ok(metrics[1].newlineLength == 1, "got %u\n", metrics[1].newlineLength); + ok(metrics[2].newlineLength == 1, "got %u\n", metrics[2].newlineLength); + ok(metrics[3].newlineLength == 1, "got %u\n", metrics[3].newlineLength); + ok(metrics[4].newlineLength == 2, "got %u\n", metrics[4].newlineLength); + ok(metrics[5].newlineLength == 0, "got %u\n", metrics[5].newlineLength); +} + IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format); + IDWriteFontFace_Release(fontface); IDWriteFactory_Release(factory); }

1 0

Jacek Caban : ieframe: Fixed invalid COM object usage.
by Alexandre Julliard 20 Jul '15

20 Jul '15

Module: wine Branch: master Commit: 088192a9aa205ff22bacd516c54d454a19530f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=088192a9aa205ff22bacd516c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 20 15:25:00 2015 +0200 ieframe: Fixed invalid COM object usage. --- dlls/ieframe/tests/webbrowser.c | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index a70428f..9ceed46 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -3842,43 +3842,24 @@ static void test_FileProtocol(void) DeleteFileA(file_path); } -struct sink -{ - IAdviseSink IAdviseSink_iface; -}; - -static inline struct sink *impl_from_IAdviseSink(IAdviseSink *iface) -{ - return CONTAINING_RECORD(iface, struct sink, IAdviseSink_iface); -} - static HRESULT WINAPI sink_QueryInterface( IAdviseSink *iface, REFIID riid, void **obj) { - struct sink *sink = impl_from_IAdviseSink(iface); - - trace("%p, %p, %p\n", iface, riid, obj); - - if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) - { - *obj = &sink->IAdviseSink_iface; - } - else - { - return E_NOINTERFACE; + if (IsEqualGUID(riid, &IID_IAdviseSink) || IsEqualGUID(riid, &IID_IUnknown)) { + *obj = iface; + return S_OK; } - IAdviseSink_AddRef(iface); - return S_OK; + + ok(0, "unexpected call QI(%s)\n", wine_dbgstr_guid(riid)); + return E_NOINTERFACE; } static ULONG WINAPI sink_AddRef(IAdviseSink *iface) { - trace("%p\n", iface); return 2; } static ULONG WINAPI sink_Release(IAdviseSink *iface) { - trace("%p\n", iface); return 1; }

1 0