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

Henri Verbeet : wined3d: Split combined render target and depth/ stencil clears if needed in ffp_blitter_clear().
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: a9a5f371aee02d8087f1c16e74c223ad75585102 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9a5f371aee02d8087f1c16e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:39 2017 +0200 wined3d: Split combined render target and depth/stencil clears if needed in ffp_blitter_clear(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 632a42b..d5820bd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2570,6 +2570,7 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de { struct wined3d_rendertarget_view *view; struct wined3d_blitter *next; + DWORD next_flags = 0; unsigned int i; if (flags & WINED3DCLEAR_TARGET) @@ -2579,12 +2580,15 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if (!(view = fb->render_targets[i])) continue; - if ((!(flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - && ffp_blitter_use_cpu_clear(view)) + if (ffp_blitter_use_cpu_clear(view) || (!(view->resource->usage & WINED3DUSAGE_RENDERTARGET) && (wined3d_settings.offscreen_rendering_mode != ORM_FBO || !(view->format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE)))) - goto next; + { + next_flags |= WINED3DCLEAR_TARGET; + flags &= ~WINED3DCLEAR_TARGET; + break; + } /* FIXME: We should reject colour fills on formats with fixups, * but this would break P8 colour fills for example. */ @@ -2593,16 +2597,18 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view)) - goto next; + { + next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); + flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); + } - device_clear_render_targets(device, rt_count, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); - return; + if (flags) + device_clear_render_targets(device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); -next: - if ((next = blitter->next)) + if (next_flags && (next = blitter->next)) next->ops->blitter_clear(next, device, rt_count, fb, rect_count, - clear_rects, draw_rect, flags, colour, depth, stencil); + clear_rects, draw_rect, next_flags, colour, depth, stencil); } static void ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op,

1 0

Henri Verbeet : wined3d: Avoid using the CPU blitter for clearing either depth or stencil on combined formats.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 92d030c41edf15818d8ee4fb9cfd5007cc98e97e URL: http://source.winehq.org/git/wine.git/?a=commit;h=92d030c41edf15818d8ee4fb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:40 2017 +0200 wined3d: Avoid using the CPU blitter for clearing either depth or stencil on combined formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d5820bd..58a4388 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2595,8 +2595,10 @@ static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_de } } - if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) - && (view = fb->depth_stencil) && ffp_blitter_use_cpu_clear(view)) + if ((flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL)) && (view = fb->depth_stencil) + && (!view->format->depth_size || (flags & WINED3DCLEAR_ZBUFFER)) + && (!view->format->stencil_size || (flags & WINED3DCLEAR_STENCIL)) + && ffp_blitter_use_cpu_clear(view)) { next_flags |= flags & (WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL); flags &= ~(WINED3DCLEAR_ZBUFFER | WINED3DCLEAR_STENCIL);

1 0

Henri Verbeet : wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren' t current on the CPU.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 990be0ba5010def7e9a1f0b5312df6a77c7b6cda URL: http://source.winehq.org/git/wine.git/?a=commit;h=990be0ba5010def7e9a1f0b53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:41 2017 +0200 wined3d: Avoid using the CPU blitter for clearing converted surfaces that aren't current on the CPU. Since that would imply reading them back, with associated format conversion. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58a4388..c143256 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2551,17 +2551,14 @@ static BOOL ffp_blitter_use_cpu_clear(struct wined3d_rendertarget_view *view) struct wined3d_texture *texture; resource = view->resource; - if (resource->pool == WINED3D_POOL_SYSTEM_MEM) - return TRUE; - if (resource->type == WINED3D_RTYPE_BUFFER) - return FALSE; + return resource->pool == WINED3D_POOL_SYSTEM_MEM; texture = texture_from_resource(resource); - if (!(texture->flags & WINED3D_TEXTURE_PIN_SYSMEM)) - return FALSE; + if (texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding) + return resource->pool == WINED3D_POOL_SYSTEM_MEM || (texture->flags & WINED3D_TEXTURE_PIN_SYSMEM); - return texture->sub_resources[view->sub_resource_idx].locations & resource->map_binding; + return resource->pool == WINED3D_POOL_SYSTEM_MEM && !(texture->flags & WINED3D_TEXTURE_CONVERTED); } static void ffp_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device,

1 0

Henri Verbeet : wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt().
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 56128d18d4dfcd306beda6aacb69836938c1a2bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=56128d18d4dfcd306beda6aac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 17 14:01:42 2017 +0200 wined3d: Drop the special case for "converted" surfaces in wined3d_surface_blt(). We still want to avoid invalidating the system memory copy for these surfaces, but we've become a lot better at preserving the current location for resources, to the point that the special case actually hurts. In particular, if the resource wasn't already current on the CPU, using the CPU blitter would cause us to read it back, which is what we're trying to avoid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c143256..584c511 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3621,16 +3621,6 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const RECT *dst goto cpu; } - /* We want to avoid invalidating the sysmem location for converted - * surfaces, since otherwise we'd have to convert the data back when - * locking them. */ - if (dst_texture->flags & WINED3D_TEXTURE_CONVERTED || dst_texture->resource.format->convert - || wined3d_format_get_color_key_conversion(dst_texture, TRUE)) - { - WARN_(d3d_perf)("Converted surface, using CPU blit.\n"); - goto cpu; - } - if (flags & ~simple_blit) { WARN_(d3d_perf)("Using fallback for complex blit (%#x).\n", flags);

1 0

Nikolay Sivov : dwrite: Improve rendering parameters validation.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: e1f191e34376138149d497f3026817f2eabce8fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f191e34376138149d497f30… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 17 23:18:43 2017 +0300 dwrite: Improve rendering parameters validation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/font.c | 11 ++++- dlls/dwrite/main.c | 27 ++++++++++- dlls/dwrite/tests/font.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e1f191e34376138149d49…

1 0

Nikolay Sivov : dwrite: Use antialias mode set for bitmap render target.
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: 1e5b9d369bbb312a22b73513b9afc1aaf7041f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e5b9d369bbb312a22b73513b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 17 23:18:44 2017 +0300 dwrite: Use antialias mode set for bitmap render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 37 +++++++++++++++-------------- dlls/dwrite/tests/font.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 18 deletions(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index b870448..aa2e3a6 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -43,7 +43,7 @@ struct rendertarget { ID2D1SimplifiedGeometrySink ID2D1SimplifiedGeometrySink_iface; LONG ref; - IDWriteFactory *factory; + IDWriteFactory5 *factory; DWRITE_TEXT_ANTIALIAS_MODE antialiasmode; FLOAT ppdip; DWRITE_MATRIX m; @@ -243,7 +243,7 @@ static ULONG WINAPI rendertarget_Release(IDWriteBitmapRenderTarget1 *iface) if (!ref) { - IDWriteFactory_Release(This->factory); + IDWriteFactory5_Release(This->factory); DeleteDC(This->hdc); heap_free(This); } @@ -313,8 +313,10 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac struct rendertarget *This = impl_from_IDWriteBitmapRenderTarget1(iface); IDWriteGlyphRunAnalysis *analysis; DWRITE_RENDERING_MODE rendermode; + DWRITE_GRID_FIT_MODE gridfitmode; DWRITE_TEXTURE_TYPE texturetype; - IDWriteFontFace1 *fontface1; + IDWriteFontFace2 *fontface2; + DWRITE_GLYPH_RUN scaled_run; RECT target, bounds; HRESULT hr; @@ -326,17 +328,15 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!This->dib.ptr) return S_OK; - hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace1, (void**)&fontface1); - if (hr == S_OK) { - hr = IDWriteFontFace1_GetRecommendedRenderingMode(fontface1, run->fontEmSize, This->ppdip * 96.0f, - This->ppdip * 96.0f, NULL, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, - &rendermode); - IDWriteFontFace1_Release(fontface1); + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void **)&fontface2))) { + WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr); + return hr; } - else - hr = IDWriteFontFace_GetRecommendedRenderingMode(run->fontFace, run->fontEmSize, - This->ppdip, measuring_mode, params, &rendermode); + hr = IDWriteFontFace2_GetRecommendedRenderingMode(fontface2, run->fontEmSize, This->ppdip * 96.0f, + This->ppdip * 96.0f, NULL /* FIXME */, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + params, &rendermode, &gridfitmode); + IDWriteFontFace2_Release(fontface2); if (FAILED(hr)) return hr; @@ -392,9 +392,10 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac return hr; } - hr = IDWriteFactory_CreateGlyphRunAnalysis(This->factory, - run, This->ppdip, &This->m, rendermode, measuring_mode, - originX, originY, &analysis); + scaled_run = *run; + scaled_run.fontEmSize *= This->ppdip; + hr = IDWriteFactory5_CreateGlyphRunAnalysis(This->factory, &scaled_run, &This->m, rendermode, measuring_mode, + gridfitmode, This->antialiasmode, originX, originY, &analysis); if (FAILED(hr)) { WARN("failed to create analysis instance, 0x%08x\n", hr); return hr; @@ -549,7 +550,7 @@ static const IDWriteBitmapRenderTarget1Vtbl rendertargetvtbl = { rendertarget_SetTextAntialiasMode }; -static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) +static HRESULT create_rendertarget(IDWriteFactory5 *factory, HDC hdc, UINT32 width, UINT32 height, IDWriteBitmapRenderTarget **ret) { struct rendertarget *target; HRESULT hr; @@ -575,7 +576,7 @@ static HRESULT create_rendertarget(IDWriteFactory *factory, HDC hdc, UINT32 widt target->ppdip = GetDeviceCaps(target->hdc, LOGPIXELSX) / 96.0f; target->antialiasmode = DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE; target->factory = factory; - IDWriteFactory_AddRef(factory); + IDWriteFactory5_AddRef(factory); *ret = (IDWriteBitmapRenderTarget*)&target->IDWriteBitmapRenderTarget1_iface; @@ -779,7 +780,7 @@ static HRESULT WINAPI gdiinterop_CreateBitmapRenderTarget(IDWriteGdiInterop1 *if { struct gdiinterop *This = impl_from_IDWriteGdiInterop1(iface); TRACE("(%p)->(%p %u %u %p)\n", This, hdc, width, height, target); - return create_rendertarget((IDWriteFactory*)This->factory, hdc, width, height, target); + return create_rendertarget(This->factory, hdc, width, height, target); } static HRESULT WINAPI gdiinterop1_CreateFontFromLOGFONT(IDWriteGdiInterop1 *iface, diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index dc88e2c..52ce9f0 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1053,9 +1053,13 @@ static void test_CreateBitmapRenderTarget(void) { IDWriteBitmapRenderTarget *target, *target2; IDWriteBitmapRenderTarget1 *target1; + IDWriteRenderingParams *params; IDWriteGdiInterop *interop; + IDWriteFontFace *fontface; IDWriteFactory *factory; + DWRITE_GLYPH_RUN run; HBITMAP hbm, hbm2; + UINT16 glyphs[2]; DWRITE_MATRIX m; DIBSECTION ds; XFORM xform; @@ -1064,6 +1068,7 @@ static void test_CreateBitmapRenderTarget(void) FLOAT pdip; SIZE size; ULONG ref; + UINT32 ch; HDC hdc; int ret; @@ -1307,6 +1312,62 @@ static void test_CreateBitmapRenderTarget(void) else win_skip("IDWriteBitmapRenderTarget1 is not supported.\n"); + /* DrawGlyphRun() argument validation. */ + hr = IDWriteBitmapRenderTarget_Resize(target, 16, 16); + ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + + fontface = create_fontface(factory); + + ch = 'A'; + glyphs[0] = 0; + hr = IDWriteFontFace_GetGlyphIndices(fontface, &ch, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyphs[0] > 0, "got %u\n", glyphs[0]); + glyphs[1] = glyphs[0]; + + memset(&run, 0, sizeof(run)); + run.fontFace = fontface; + run.fontEmSize = 12.0f; + run.glyphCount = 2; + run.glyphIndices = glyphs; + + hr = IDWriteFactory_CreateCustomRenderingParams(factory, 1.0f, 0.0f, 0.0f, DWRITE_PIXEL_GEOMETRY_FLAT, + DWRITE_RENDERING_MODE_DEFAULT, &params); + ok(hr == S_OK, "Failed to create rendering params, hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL, + &run, NULL, RGB(255, 0, 0), NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1, + &run, NULL, RGB(255, 0, 0), NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1, + &run, params, RGB(255, 0, 0), NULL); + ok(hr == E_INVALIDARG || broken(hr == S_OK) /* Vista */, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL, + &run, params, RGB(255, 0, 0), NULL); + ok(hr == S_OK, "Failed to draw a run, hr %#x.\n", hr); + + IDWriteRenderingParams_Release(params); + + /* Zero sized target returns earlier. */ + hr = IDWriteBitmapRenderTarget_Resize(target, 0, 16); + ok(hr == S_OK, "Failed to resize target, hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL, + &run, NULL, RGB(255, 0, 0), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1, + &run, params, RGB(255, 0, 0), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IDWriteFontFace_Release(fontface); + ref = IDWriteBitmapRenderTarget_Release(target); ok(ref == 0, "render target not released, %u\n", ref); ref = IDWriteGdiInterop_Release(interop);

1 0

Nikolay Sivov : dwrite: Explicitly check rendering parameters pointer passed to DrawGlyphRun().
by Alexandre Julliard 17 Jul '17

17 Jul '17

Module: wine Branch: master Commit: cef8a52deae6afd83c6d10ced727929bc199101c URL: http://source.winehq.org/git/wine.git/?a=commit;h=cef8a52deae6afd83c6d10ced… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 17 23:18:45 2017 +0300 dwrite: Explicitly check rendering parameters pointer passed to DrawGlyphRun(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/gdiinterop.c | 3 +++ dlls/dwrite/tests/font.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index aa2e3a6..84921e6 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -328,6 +328,9 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac if (!This->dib.ptr) return S_OK; + if (!params) + return E_INVALIDARG; + if (FAILED(hr = IDWriteFontFace_QueryInterface(run->fontFace, &IID_IDWriteFontFace2, (void **)&fontface2))) { WARN("Failed to get IDWriteFontFace2 interface, hr %#x.\n", hr); return hr; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 52ce9f0..fe2d802 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1337,7 +1337,6 @@ static void test_CreateBitmapRenderTarget(void) hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_NATURAL, &run, NULL, RGB(255, 0, 0), NULL); -todo_wine ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = IDWriteBitmapRenderTarget_DrawGlyphRun(target, 0.0f, 0.0f, DWRITE_MEASURING_MODE_GDI_NATURAL + 1,

1 0

Nikolay Sivov : regedit: Simplify double-click listview handler.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: cbd6e05e681ffc08cdaf89d00d041aae59c40d5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd6e05e681ffc08cdaf89d00… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 14 00:27:11 2017 +0300 regedit: Simplify double-click listview handler. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/childwnd.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c index 1797b52..f2359c4 100644 --- a/programs/regedit/childwnd.c +++ b/programs/regedit/childwnd.c @@ -347,12 +347,8 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam case NM_DBLCLK: { NMITEMACTIVATE *nmitem = (NMITEMACTIVATE *)lParam; - LVHITTESTINFO info; - info.pt.x = nmitem->ptAction.x; - info.pt.y = nmitem->ptAction.y; - - if (SendMessageW(g_pChildWnd->hListWnd, LVM_HITTEST, 0, (LPARAM)&info) != -1) + if (nmitem->iItem != -1) { LVITEMW item; @@ -362,7 +358,7 @@ static int listview_notify(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam item.state = LVIS_FOCUSED | LVIS_SELECTED; item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; - SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, info.iItem, (LPARAM)&item); + SendMessageW(g_pChildWnd->hListWnd, LVM_SETITEMSTATE, nmitem->iItem, (LPARAM)&item); SendMessageW(hFrameWnd, WM_COMMAND, ID_EDIT_MODIFY, 0); }

1 0

Henri Verbeet : wined3d: Fix the WINED3DFMT_D24_UNORM_S8_UINT entry in wined3d_format_convert_from_float ().
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 7578e09801b7a2a651be258322bd4574bcd8e7c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7578e09801b7a2a651be25832… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 14 07:54:11 2017 +0200 wined3d: Fix the WINED3DFMT_D24_UNORM_S8_UINT entry in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 79c322f..1c64606 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5057,7 +5057,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con } double_conv[] = { - {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0, 1.0, 0.0, 0.0}, {8, 0, 0, 0}}, {WINED3DFMT_X8D24_UNORM, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, {WINED3DFMT_D32_UNORM, {4294967295.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, };

1 0

Vincent Povirk : gdiplus: Fix leak in widen_dashed_figure.
by Alexandre Julliard 14 Jul '17

14 Jul '17

Module: wine Branch: master Commit: 9f22041b31e6656a38aa92dcc1757fd7f5b07847 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f22041b31e6656a38aa92dcc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jul 13 13:56:14 2017 -0500 gdiplus: Fix leak in widen_dashed_figure. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 458019f..e190532 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2187,6 +2187,7 @@ static void widen_dashed_figure(GpPath *path, GpPen *pen, int start, int end, closed ? LineCapFlat : pen->endcap, pen->customend, last_point); } + heap_free(dash_pattern_scaled); heap_free(tmp_points); }

1 0