January 2016 - Wine-commits

Henri Verbeet : ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_blt_clipped().
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 643f1f1c74b25dd4b80e0ac768ce8a7b5a7509b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643f1f1c74b25dd4b80e0ac76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:44:35 2016 +0100 ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_blt_clipped(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index d4a25c6..823d802 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1404,19 +1404,6 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons HRESULT hr = DD_OK; UINT i; - if (!dst_surface->clipper) - { - if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src_surface, src_rect_in, TRUE); - if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(dst_surface->wined3d_surface, dst_rect_in, - wined3d_src_surface, src_rect_in, flags, fx, filter); - if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(dst_surface, dst_rect_in, FALSE); - - return hr; - } - if (!dst_rect_in) { dst_rect.left = 0; @@ -1454,6 +1441,19 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons SetRect(&src_rect, 0, 0, 0, 0); } + if (!dst_surface->clipper) + { + if (src_surface && src_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + hr = ddraw_surface_update_frontbuffer(src_surface, &src_rect, TRUE); + if (SUCCEEDED(hr)) + hr = wined3d_surface_blt(dst_surface->wined3d_surface, &dst_rect, + wined3d_src_surface, &src_rect, flags, fx, filter); + if (SUCCEEDED(hr) && (dst_surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + hr = ddraw_surface_update_frontbuffer(dst_surface, &dst_rect, FALSE); + + return hr; + } + scale_x = (float)(src_rect.right - src_rect.left) / (float)(dst_rect.right - dst_rect.left); scale_y = (float)(src_rect.bottom - src_rect.top) / (float)(dst_rect.bottom - dst_rect.top);

1 0

Henri Verbeet : ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface7_BltFast().
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 58a7c3cb7d2e3310b0e1a6eabadc49c5be518fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a7c3cb7d2e3310b0e1a6eab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:44:36 2016 +0100 ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface7_BltFast(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 52 +++++++++++++++++++++++----------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 823d802..baf6201 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4093,44 +4093,38 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M * For more details, see IWineD3DSurface::BltFast * *****************************************************************************/ -static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD dstx, DWORD dsty, - IDirectDrawSurface7 *Source, RECT *rsrc, DWORD trans) +static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, + DWORD dst_x, DWORD dst_y, IDirectDrawSurface7 *src_surface, RECT *src_rect, DWORD trans) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); - struct ddraw_surface *src = unsafe_impl_from_IDirectDrawSurface7(Source); + struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); + struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src_surface); DWORD src_w, src_h, dst_w, dst_h; HRESULT hr = DD_OK; + RECT dst_rect, s; DWORD flags = 0; - RECT dst_rect; TRACE("iface %p, dst_x %u, dst_y %u, src_surface %p, src_rect %s, flags %#x.\n", - iface, dstx, dsty, Source, wine_dbgstr_rect(rsrc), trans); + iface, dst_x, dst_y, src_surface, wine_dbgstr_rect(src_rect), trans); - dst_w = This->surface_desc.dwWidth; - dst_h = This->surface_desc.dwHeight; + dst_w = dst_impl->surface_desc.dwWidth; + dst_h = dst_impl->surface_desc.dwHeight; - /* Source must be != NULL, This is not checked by windows. Windows happily throws a 0xc0000005 - * in that case - */ - if(rsrc) - { - src_w = rsrc->right - rsrc->left; - src_h = rsrc->bottom - rsrc->top; - } - else + if (!src_rect) { - src_w = src->surface_desc.dwWidth; - src_h = src->surface_desc.dwHeight; + SetRect(&s, 0, 0, src_impl->surface_desc.dwWidth, src_impl->surface_desc.dwHeight); + src_rect = &s; } - if (src_w > dst_w || dstx > dst_w - src_w - || src_h > dst_h || dsty > dst_h - src_h) + src_w = src_rect->right - src_rect->left; + src_h = src_rect->bottom - src_rect->top; + if (src_w > dst_w || dst_x > dst_w - src_w + || src_h > dst_h || dst_y > dst_h - src_h) { WARN("Destination area out of bounds, returning DDERR_INVALIDRECT.\n"); return DDERR_INVALIDRECT; } - SetRect(&dst_rect, dstx, dsty, dstx + src_w, dsty + src_h); + SetRect(&dst_rect, dst_x, dst_y, dst_x + src_w, dst_y + src_h); if (trans & DDBLTFAST_SRCCOLORKEY) flags |= WINEDDBLT_KEYSRC; if (trans & DDBLTFAST_DESTCOLORKEY) @@ -4141,20 +4135,20 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurfac flags |= WINEDDBLT_DONOTWAIT; wined3d_mutex_lock(); - if (This->clipper) + if (dst_impl->clipper) { wined3d_mutex_unlock(); WARN("Destination surface has a clipper set, returning DDERR_BLTFASTCANTCLIP.\n"); return DDERR_BLTFASTCANTCLIP; } - if (src->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - hr = ddraw_surface_update_frontbuffer(src, rsrc, TRUE); + if (src_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + hr = ddraw_surface_update_frontbuffer(src_impl, src_rect, TRUE); if (SUCCEEDED(hr)) - hr = wined3d_surface_blt(This->wined3d_surface, &dst_rect, - src->wined3d_surface, rsrc, flags, NULL, WINED3D_TEXF_POINT); - if (SUCCEEDED(hr) && (This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) - hr = ddraw_surface_update_frontbuffer(This, &dst_rect, FALSE); + hr = wined3d_surface_blt(dst_impl->wined3d_surface, &dst_rect, + src_impl->wined3d_surface, src_rect, flags, NULL, WINED3D_TEXF_POINT); + if (SUCCEEDED(hr) && (dst_impl->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) + hr = ddraw_surface_update_frontbuffer(dst_impl, &dst_rect, FALSE); wined3d_mutex_unlock(); switch(hr)

1 0

Henri Verbeet : wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in wined3d_texture_blt().
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 1be5ab334668c38a44257c10ed550ffaf50dd462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1be5ab334668c38a44257c10e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 20:44:37 2016 +0100 wined3d: Pass non-NULL rectangles to wined3d_surface_blt() in wined3d_texture_blt(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f9c1d9..556ce0c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1405,28 +1405,41 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct return WINED3D_OK; } -HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect_in, - struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, const RECT *src_rect_in, DWORD flags, - const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) +HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, + const RECT *dst_rect, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + const RECT *src_rect, DWORD flags, const WINEDDBLTFX *fx, enum wined3d_texture_filter_type filter) { struct wined3d_resource *dst_resource, *src_resource = NULL; + RECT d, s; - TRACE("dst_texture %p, dst_sub_resource_idx %u, src_texture %p, src_sub_resource_idx %u.\n", - dst_texture, dst_sub_resource_idx, src_texture, src_sub_resource_idx); + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_rect %s, src_texture %p, " + "src_sub_resource_idx %u, src_rect %s, flags %#x, fx %p, filter %s.\n", + dst_texture, dst_sub_resource_idx, wine_dbgstr_rect(dst_rect), src_texture, + src_sub_resource_idx, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); if (!(dst_resource = wined3d_texture_get_sub_resource(dst_texture, dst_sub_resource_idx)) || dst_resource->type != WINED3D_RTYPE_SURFACE) return WINED3DERR_INVALIDCALL; + if (!dst_rect) + { + SetRect(&d, 0, 0, dst_resource->width, dst_resource->height); + dst_rect = &d; + } if (src_texture) { if (!(src_resource = wined3d_texture_get_sub_resource(src_texture, src_sub_resource_idx)) || src_resource->type != WINED3D_RTYPE_SURFACE) return WINED3DERR_INVALIDCALL; + if (!src_rect) + { + SetRect(&s, 0, 0, src_resource->width, src_resource->height); + src_rect = &s; + } } - return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect_in, - src_resource ? surface_from_resource(src_resource) : NULL, src_rect_in, flags, fx, filter); + return wined3d_surface_blt(surface_from_resource(dst_resource), dst_rect, + src_resource ? surface_from_resource(src_resource) : NULL, src_rect, flags, fx, filter); } HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc,

1 0

Hans Leidekker : wined3d: Don' t leak the device context on failure in context_create().
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 29a2594b7f3c216156bc1a266065710f614edc98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29a2594b7f3c216156bc1a266… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jan 27 13:38:04 2016 +0100 wined3d: Don't leak the device context on failure in context_create(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index dabb5fd..490c20f 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1456,7 +1456,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, unsigned int s; int swap_interval; DWORD state; - HDC hdc; + HDC hdc = 0; BOOL hdc_is_private = FALSE; TRACE("swapchain %p, target %p, window %p.\n", swapchain, target, swapchain->win_handle); @@ -1837,6 +1837,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, return ret; out: + if (hdc) wined3d_release_dc(swapchain->win_handle, hdc); device->shader_backend->shader_free_context_data(ret); device->adapter->fragment_pipe->free_context_data(ret); HeapFree(GetProcessHeap(), 0, ret->free_event_queries);

1 0

Alistair Leslie-Hughes : olepro32: Add typelib resource.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 25aa26e81537f904f0c2c3df7bbedc3d70128616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25aa26e81537f904f0c2c3df7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 27 20:15:21 2016 +1100 olepro32: Add typelib resource. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- dlls/olepro32/Makefile.in | 2 + dlls/olepro32/olepro.idl | 270 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 274 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25aa26e81537f904f0c2c…

1 0

Huw Davies : include: Add IDropSourceNotify.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 8f6fde50e809d2b8d905e8bd12d481e4702e22d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f6fde50e809d2b8d905e8bd1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jan 27 13:31:47 2016 +0000 include: Add IDropSourceNotify. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/oleidl.idl | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/include/oleidl.idl b/include/oleidl.idl index 74962ff..9a9d466 100644 --- a/include/oleidl.idl +++ b/include/oleidl.idl @@ -956,3 +956,18 @@ interface IDropTarget : IUnknown [in] POINTL pt, [in, out] DWORD *pdwEffect); } + +/***************************************************************************** + * IDropSourceNotify interface + */ +[ + object, + uuid(0000012b-0000-0000-c000-000000000046), + pointer_default(unique), + local +] +interface IDropSourceNotify : IUnknown +{ + HRESULT DragTargetEnter( [in] HWND hwnd ); + HRESULT DragTargetLeave( void ); +}

1 0

Nikolay Sivov : dwrite: Fix invalid cluster metrics array index access.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 3254a6b2d632050564d7a568963b6f110d68be63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3254a6b2d632050564d7a5689… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 15:57:47 2016 +0300 dwrite: Fix invalid cluster metrics array index access. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 0300166..77426e9 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -3264,7 +3264,7 @@ static HRESULT WINAPI dwritetextlayout_DetermineMinWidth(IDWriteTextLayout2 *ifa /* Ignore trailing whitespace clusters, in case of single space range will be reduced to empty range, or [start,start+1). */ - while ((end - 1) >= start && This->clustermetrics[end-1].isWhitespace) + while (end > start && This->clustermetrics[end-1].isWhitespace) end--; /* check if cluster range exceeds last minimal width */

1 0

Nikolay Sivov : dwrite: Line height/baseline includes lineGap as well.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 2c6799dfe21b07886aa07492d2343f5767ec823b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c6799dfe21b07886aa07492d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 27 15:57:48 2016 +0300 dwrite: Line height/baseline includes lineGap as well. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 4 +- dlls/dwrite/tests/layout.c | 101 +++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 94 insertions(+), 11 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 77426e9..9fd4baf 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -892,8 +892,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) else IDWriteFontFace_GetMetrics(run->run.fontFace, &fontmetrics); - r->baseline = SCALE_FONT_METRIC(fontmetrics.ascent, run->run.fontEmSize, &fontmetrics); - r->height = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.descent, run->run.fontEmSize, &fontmetrics); + r->baseline = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.lineGap, run->run.fontEmSize, &fontmetrics); + r->height = SCALE_FONT_METRIC(fontmetrics.ascent + fontmetrics.descent + fontmetrics.lineGap, run->run.fontEmSize, &fontmetrics); layout_set_cluster_metrics(layout, r, &cluster); diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 7d83c1a..b623414 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -3157,18 +3157,34 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) return fontface; } +static void get_enus_string(IDWriteLocalizedStrings *strings, WCHAR *buff, UINT32 size) +{ + UINT32 index; + BOOL exists = FALSE; + HRESULT hr; + + hr = IDWriteLocalizedStrings_FindLocaleName(strings, enusW, &index, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + + hr = IDWriteLocalizedStrings_GetString(strings, index, buff, size); + ok(hr == S_OK, "got 0x%08x\n", hr); +} + 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}; + IDWriteFontCollection *syscollection; DWRITE_FONT_METRICS fontmetrics; DWRITE_LINE_METRICS metrics[6]; + UINT32 count, i, familycount; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFontFace *fontface; IDWriteFactory *factory; - UINT32 count; + WCHAR nameW[256]; HRESULT hr; factory = create_factory(); @@ -3194,16 +3210,83 @@ static void test_GetLineMetrics(void) ok(metrics[0].newlineLength == 0, "got %u\n", metrics[0].newlineLength); ok(metrics[0].isTrimmed == FALSE, "got %d\n", metrics[0].isTrimmed); - /* Tahoma doesn't provide BASE table, so baseline is calculated from font metrics */ + IDWriteTextLayout_Release(layout); + + /* Test line height and baseline calculation */ + hr = IDWriteFactory_GetSystemFontCollection(factory, &syscollection, FALSE); + ok(hr == S_OK, "got 0x%08x\n", hr); + familycount = IDWriteFontCollection_GetFontFamilyCount(syscollection); + + for (i = 0; i < familycount; i++) { + static const WCHAR mvboliW[] = {'M','V',' ','B','o','l','i',0}; + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + IDWriteFont *font; + + format = NULL; + layout = NULL; + + hr = IDWriteFontCollection_GetFontFamily(syscollection, i, &family); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STRETCH_NORMAL, + DWRITE_FONT_STYLE_NORMAL, &font); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "got 0x%08x\n", hr); + + get_enus_string(names, nameW, sizeof(nameW)/sizeof(nameW[0])); + + IDWriteLocalizedStrings_Release(names); + IDWriteFont_Release(font); + + /* This will effectively skip on Vista/2008 only, newer systems work just fine with this font. */ + if (!lstrcmpW(nameW, mvboliW)) { + skip("Skipping line metrics test for %s, gives inconsistent results\n", wine_dbgstr_w(nameW)); + goto cleanup; + } + + IDWriteFontFace_GetMetrics(fontface, &fontmetrics); + hr = IDWriteFactory_CreateTextFormat(factory, nameW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, fontmetrics.designUnitsPerEm, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 5, format, 30000.0f, 100.0f, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(metrics, 0, sizeof(metrics)); + count = 0; + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(count == 1, "got %u\n", count); + + ok(metrics[0].baseline == fontmetrics.ascent + fontmetrics.lineGap, "%s: got %.2f, expected %d, " + "linegap %d\n", wine_dbgstr_w(nameW), metrics[0].baseline, fontmetrics.ascent + fontmetrics.lineGap, + fontmetrics.lineGap); + ok(metrics[0].height == fontmetrics.ascent + fontmetrics.descent + fontmetrics.lineGap, + "%s: got %.2f, expected %d, linegap %d\n", wine_dbgstr_w(nameW), metrics[0].height, + fontmetrics.ascent + fontmetrics.descent + fontmetrics.lineGap, fontmetrics.lineGap); + + cleanup: + if (layout) + IDWriteTextLayout_Release(layout); + if (format) + IDWriteTextFormat_Release(format); + IDWriteFontFace_Release(fontface); + IDWriteFontFamily_Release(family); + } + IDWriteFontCollection_Release(syscollection); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 2048.0f, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + fontface = get_fontface_from_format(format); ok(fontface != NULL, "got %p\n", fontface); - IDWriteFontFace_GetMetrics(fontface, &fontmetrics); - - ok(metrics[0].baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics[0].baseline, - fontmetrics.ascent); - ok(metrics[0].height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", - metrics[0].height, fontmetrics.ascent + fontmetrics.descent); - IDWriteTextLayout_Release(layout); /* force 2 lines */ hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 10000.0, 1000.0, &layout);

1 0

Hugh McMaster : kernel32: Implement the TRUE pathway of GetCurrentConsoleFont.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: 2c5756347bc4e9abcb656a7d1e001f60415b78b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5756347bc4e9abcb656a7d1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jan 27 14:55:16 2016 +1100 kernel32: Implement the TRUE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4767fb2..b86cd8e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3267,20 +3267,21 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON memset(fontinfo, 0, sizeof(CONSOLE_FONT_INFO)); - if (maxwindow) - { - FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - SERVER_START_REQ(get_console_output_info) { req->handle = console_handle_unmap(hConsole); if ((ret = !wine_server_call_err(req))) { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + if (maxwindow) + { + fontinfo->dwFontSize.X = min(reply->width, reply->max_width); + fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); + } + else + { + fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; + fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + } } } SERVER_END_REQ;

1 0

Hugh McMaster : kernel32/tests: Add tests for the TRUE pathway of GetCurrentConsoleFont.
by Alexandre Julliard 27 Jan '16

27 Jan '16

Module: wine Branch: master Commit: c6e10496b3106a5b4203243f473b400a77e51d7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6e10496b3106a5b4203243f4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jan 27 14:55:17 2016 +1100 kernel32/tests: Add tests for the TRUE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/console.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 43a4b75..4dca17d 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -2606,6 +2606,14 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(NULL, TRUE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); ret = GetCurrentConsoleFont(GetStdHandle(STD_INPUT_HANDLE), FALSE, &cfi); ok(!ret, "got %d, expected 0\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); @@ -2614,6 +2622,14 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(GetStdHandle(STD_INPUT_HANDLE), TRUE, &cfi); + ok(!ret, "got %d, expected 0\n", ret); + ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError()); + ok(!cfi.dwFontSize.X, "got %d, expected 0\n", cfi.dwFontSize.X); + ok(!cfi.dwFontSize.Y, "got %d, expected 0\n", cfi.dwFontSize.Y); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); ret = GetCurrentConsoleFont(std_output, FALSE, &cfi); ok(ret, "got %d, expected non-zero\n", ret); ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); @@ -2625,6 +2641,16 @@ static void test_GetCurrentConsoleFont(HANDLE std_output) "got %d, expected %d\n", cfi.dwFontSize.X, width); ok(cfi.dwFontSize.Y == height || cfi.dwFontSize.Y == c.Y /* Vista and higher */, "got %d, expected %d\n", cfi.dwFontSize.Y, height); + + memset(&cfi, 0, sizeof(CONSOLE_FONT_INFO)); + SetLastError(0xdeadbeef); + ret = GetCurrentConsoleFont(std_output, TRUE, &cfi); + ok(ret, "got %d, expected non-zero\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError()); + ok(cfi.dwFontSize.X == csbi.dwMaximumWindowSize.X, + "got %d, expected %d\n", cfi.dwFontSize.X, csbi.dwMaximumWindowSize.X); + ok(cfi.dwFontSize.Y == csbi.dwMaximumWindowSize.Y, + "got %d, expected %d\n", cfi.dwFontSize.Y, csbi.dwMaximumWindowSize.Y); } static void test_GetConsoleFontSize(HANDLE std_output)

1 0