November 2018 - Wine-commits

Henri Verbeet : d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 5731069addd04d2526b5dd458bd549e8d70b7904 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5731069addd04d2526b5dd45… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:54 2018 +0330 d3d8: Prefer bind flags over usage flags in d3d8_device_CopyRects(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 27b32fa..b05df7e 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1267,7 +1267,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, wined3d_mutex_lock(); wined3d_texture_get_sub_resource_desc(src->wined3d_texture, src->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Source %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", src_surface); wined3d_mutex_unlock(); @@ -1278,7 +1278,7 @@ static HRESULT WINAPI d3d8_device_CopyRects(IDirect3DDevice8 *iface, src_h = wined3d_desc.height; wined3d_texture_get_sub_resource_desc(dst->wined3d_texture, dst->sub_resource_idx, &wined3d_desc); - if (wined3d_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (wined3d_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { WARN("Destination %p is a depth stencil surface, returning D3DERR_INVALIDCALL.\n", dst_surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 86a0f486c6b891853a6a09aebb46615e140716bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=86a0f486c6b891853a6a09ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:55 2018 +0330 d3d9: Prefer bind flags over usage flags in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index d4f5a43..e513549 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1668,13 +1668,13 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (dst->texture && !(dst_desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) + if (dst->texture && !(dst_desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL))) { WARN("Destination is a regular texture.\n"); goto done; } - if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (src_desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { if (device->in_scene) {

1 0

Henri Verbeet : d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill().
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: cc0c7d727b62f6d9ee2cfda60b5bbcc7279281ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0c7d727b62f6d9ee2cfda6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:56 2018 +0330 d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e513549..1e7c0ea 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, WARN("Colour fills are not allowed on surfaces with resource access %#x.\n", desc.access); return D3DERR_INVALIDCALL; } - if ((desc.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_TEXTURE)) == WINED3DUSAGE_TEXTURE) + if ((desc.bind_flags & (WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_SHADER_RESOURCE)) == WINED3D_BIND_SHADER_RESOURCE) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.\n"); return D3DERR_INVALIDCALL; } - if (desc.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (desc.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { wined3d_mutex_unlock(); WARN("Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.\n");

1 0

Henri Verbeet : wined3d: Get rid of WINED3DUSAGE_RENDERTARGET.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 3adf4b8415731395e722b724aecc5fb713d55aa5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3adf4b8415731395e722b724… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:57 2018 +0330 wined3d: Get rid of WINED3DUSAGE_RENDERTARGET. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 2 -- dlls/ddraw/surface.c | 1 - dlls/dxgi/device.c | 2 -- dlls/wined3d/directx.c | 4 +--- dlls/wined3d/resource.c | 3 +-- dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/utils.c | 1 - include/wine/wined3d.h | 3 +-- 8 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index c7c682b..2a1a8c6 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -450,8 +450,6 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_SHADER_RESOURCE) wined3d_usage |= WINED3DUSAGE_TEXTURE; - if (bind_flags & D3D11_BIND_RENDER_TARGET) - wined3d_usage |= WINED3DUSAGE_RENDERTARGET; if (bind_flags & D3D11_BIND_DEPTH_STENCIL) wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 5ce1d85..6bb92d5 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6181,7 +6181,6 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ } else if (desc->ddsCaps.dwCaps & DDSCAPS_3DDEVICE) { - wined3d_desc.usage |= WINED3DUSAGE_RENDERTARGET; wined3d_desc.bind_flags |= WINED3D_BIND_RENDER_TARGET; } } diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 26f2488..9b57b46 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -190,8 +190,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac surface_desc.usage = 0; if (surface_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) surface_desc.usage |= WINED3DUSAGE_TEXTURE; - if (surface_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) - surface_desc.usage |= WINED3DUSAGE_RENDERTARGET; surface_desc.access = WINED3D_RESOURCE_ACCESS_GPU; surface_desc.width = desc->Width; surface_desc.height = desc->Height; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a03465f..a79e924 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1541,13 +1541,11 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); format = wined3d_get_format(adapter, check_format_id, bind_flags); - if (usage & WINED3DUSAGE_RENDERTARGET) - bind_flags |= WINED3D_BIND_RENDER_TARGET; if (usage & WINED3DUSAGE_DEPTHSTENCIL) bind_flags |= WINED3D_BIND_DEPTH_STENCIL; if (usage & WINED3DUSAGE_TEXTURE) bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - usage &= ~(WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); + usage &= ~(WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_TEXTURE); switch (resource_type) { diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ff58456..58caccc 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); static void resource_check_usage(DWORD usage) { - static const DWORD handled = WINED3DUSAGE_RENDERTARGET - | WINED3DUSAGE_DEPTHSTENCIL + static const DWORD handled = WINED3DUSAGE_DEPTHSTENCIL | WINED3DUSAGE_WRITEONLY | WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_STATICDECL diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 4ab1594..36e7b2e 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -921,8 +921,6 @@ static HRESULT swapchain_init(struct wined3d_swapchain *swapchain, struct wined3 texture_desc.usage = 0; if (device->wined3d->flags & WINED3D_NO3D) texture_desc.usage |= WINED3DUSAGE_OWNDC; - if (texture_desc.bind_flags & WINED3D_BIND_RENDER_TARGET) - texture_desc.usage |= WINED3DUSAGE_RENDERTARGET; if (texture_desc.bind_flags & WINED3D_BIND_SHADER_RESOURCE) texture_desc.usage |= WINED3DUSAGE_TEXTURE; for (i = 0; i < swapchain->desc.backbuffer_count; ++i) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 73e8cf2..a7b1b10 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4511,7 +4511,6 @@ const char *debug_d3dusage(DWORD usage) init_debug_buffer(&buffer, "0"); #define WINED3DUSAGE_TO_STR(x) if (usage & x) { debug_append(&buffer, #x, " | "); usage &= ~x; } - WINED3DUSAGE_TO_STR(WINED3DUSAGE_RENDERTARGET); WINED3DUSAGE_TO_STR(WINED3DUSAGE_DEPTHSTENCIL); WINED3DUSAGE_TO_STR(WINED3DUSAGE_WRITEONLY); WINED3DUSAGE_TO_STR(WINED3DUSAGE_SOFTWAREPROCESSING); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3575f7e..fd90757 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -914,7 +914,6 @@ enum wined3d_shader_type #define WINED3D_BIND_DEPTH_STENCIL 0x00000040 #define WINED3D_BIND_UNORDERED_ACCESS 0x00000080 -#define WINED3DUSAGE_RENDERTARGET 0x00000001 #define WINED3DUSAGE_DEPTHSTENCIL 0x00000002 #define WINED3DUSAGE_WRITEONLY 0x00000008 #define WINED3DUSAGE_SOFTWAREPROCESSING 0x00000010 @@ -928,7 +927,7 @@ enum wined3d_shader_type #define WINED3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 #define WINED3DUSAGE_DMAP 0x00004000 #define WINED3DUSAGE_TEXTAPI 0x10000000 -#define WINED3DUSAGE_MASK 0x10007bff +#define WINED3DUSAGE_MASK 0x10007bfa #define WINED3DUSAGE_SCRATCH 0x00200000 #define WINED3DUSAGE_PRIVATE 0x00400000

1 0

Lucian Poston : dwrite/tests: Add a test for text format with unknown font family name.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 70654e5c83812d20250b0c8b4698dc934ebf0f11 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70654e5c83812d20250b0c8b… Author: Lucian Poston <lucianposton(a)pm.me> Date: Mon Nov 5 15:01:06 2018 +0300 dwrite/tests: Add a test for text format with unknown font family name. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/layout.c | 188 ++++++++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 77 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index c77a0ea..e6ed3c1 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2677,83 +2677,6 @@ static void test_SetVerticalGlyphOrientation(void) IDWriteFactory_Release(factory); } -static void test_fallback(void) -{ - static const WCHAR strW[] = {'a','b','c','d',0}; - IDWriteFontFallback *fallback, *fallback2; - IDWriteTextLayout2 *layout2; - IDWriteTextFormat1 *format1; - IDWriteTextFormat *format; - IDWriteTextLayout *layout; - IDWriteFactory2 *factory2; - IDWriteFactory *factory; - HRESULT hr; - - factory = create_factory(); - - hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); - ok(hr == S_OK, "got 0x%08x\n", hr); - - hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteTextFormat_Release(format); - - hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); - IDWriteTextLayout_Release(layout); - - if (hr != S_OK) { - win_skip("GetFontFallback() is not supported.\n"); - IDWriteFactory_Release(factory); - return; - } - - if (0) /* crashes on native */ - hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback == NULL, "got %p\n", fallback); - - hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback = (void*)0xdeadbeef; - hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback == NULL, "got %p\n", fallback); - - hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback = NULL; - hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback != NULL, "got %p\n", fallback); - - hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback2 = (void*)0xdeadbeef; - hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback2 == fallback, "got %p\n", fallback2); - - hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); - ok(hr == S_OK, "got 0x%08x\n", hr); - - fallback2 = (void*)0xdeadbeef; - hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fallback2 == NULL, "got %p\n", fallback2); - - IDWriteFontFallback_Release(fallback); - IDWriteTextFormat1_Release(format1); - IDWriteTextLayout2_Release(layout2); - IDWriteFactory_Release(factory); -} - static void test_DetermineMinWidth(void) { struct minwidth_test { @@ -4939,6 +4862,117 @@ todo_wine { ok(ref == 0, "Factory is not released, ref %u.\n", ref); } +static void test_fallback(void) +{ + static const WCHAR strW[] = {'a','b','c','d',0}; + IDWriteFontFallback *fallback, *fallback2; + DWRITE_CLUSTER_METRICS clusters[4]; + DWRITE_TEXT_METRICS metrics; + IDWriteTextLayout2 *layout2; + IDWriteTextFormat1 *format1; + IDWriteTextFormat *format; + IDWriteTextLayout *layout; + IDWriteFactory2 *factory2; + IDWriteFactory *factory; + UINT32 count, i; + FLOAT width; + HRESULT hr; + + factory = create_factory(); + + /* Font does not exist in system collection. */ + hr = IDWriteFactory_CreateTextFormat(factory, g_blahfontW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %#x.\n", hr); + + count = 0; + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); +todo_wine { + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(count == 4, "Unexpected count %u.\n", count); +} + for (i = 0, width = 0.0; i < count; i++) + width += clusters[i].width; + + memset(&metrics, 0xcc, sizeof(metrics)); + hr = IDWriteTextLayout_GetMetrics(layout, &metrics); + ok(hr == S_OK, "Failed to get layout metrics, hr %#x.\n", hr); +todo_wine { + ok(metrics.width > 0.0 && metrics.width == width, "Unexpected width %.2f, expected %.2f.\n", metrics.width, width); + ok(metrics.height > 0.0, "Unexpected height %.2f.\n", metrics.height); + ok(metrics.lineCount == 1, "Unexpected line count %u.\n", metrics.lineCount); +} + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, enusW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + /* Existing font. */ + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteTextFormat_Release(format); + + hr = IDWriteTextLayout_QueryInterface(layout, &IID_IDWriteTextLayout2, (void**)&layout2); + IDWriteTextLayout_Release(layout); + + if (hr != S_OK) { + win_skip("GetFontFallback() is not supported.\n"); + IDWriteFactory_Release(factory); + return; + } + + if (0) /* crashes on native */ + hr = IDWriteTextLayout2_GetFontFallback(layout2, NULL); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteTextLayout2_QueryInterface(layout2, &IID_IDWriteTextFormat1, (void**)&format1); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback == NULL, "got %p\n", fallback); + + hr = IDWriteFactory_QueryInterface(factory, &IID_IDWriteFactory2, (void**)&factory2); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback = NULL; + hr = IDWriteFactory2_GetSystemFontFallback(factory2, &fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback != NULL, "got %p\n", fallback); + + hr = IDWriteTextFormat1_SetFontFallback(format1, fallback); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextLayout2_GetFontFallback(layout2, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == fallback, "got %p\n", fallback2); + + hr = IDWriteTextLayout2_SetFontFallback(layout2, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + fallback2 = (void*)0xdeadbeef; + hr = IDWriteTextFormat1_GetFontFallback(format1, &fallback2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(fallback2 == NULL, "got %p\n", fallback2); + + IDWriteFontFallback_Release(fallback); + IDWriteTextFormat1_Release(format1); + IDWriteTextLayout2_Release(layout2); + IDWriteFactory_Release(factory); +} + + static void test_SetTypography(void) { static const WCHAR strW[] = {'a','f','i','b',0};

1 0

Nikolay Sivov : dwrite/layout: Set default tab stop width.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: 689683dfaf76fd14871e5b695a229d1b91611a0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=689683dfaf76fd14871e5b69… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 5 15:01:07 2018 +0300 dwrite/layout: Set default tab stop width. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 27 +++++++++++---- dlls/dwrite/tests/layout.c | 86 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 106 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 5deae45..a562927 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -53,6 +53,7 @@ struct dwrite_textformat_data { DWRITE_LINE_SPACING spacing; FLOAT fontsize; + FLOAT tabstop; DWRITE_TRIMMING trimming; IDWriteInlineObject *trimmingsign; @@ -4272,7 +4273,13 @@ static HRESULT WINAPI dwritetextformat_layout_SetFlowDirection(IDWriteTextFormat static HRESULT WINAPI dwritetextformat_layout_SetIncrementalTabStop(IDWriteTextFormat2 *iface, FLOAT tabstop) { struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); - FIXME("(%p)->(%f): stub\n", This, tabstop); + + TRACE("(%p)->(%f)\n", This, tabstop); + + if (tabstop <= 0.0f) + return E_INVALIDARG; + + This->format.tabstop = tabstop; return S_OK; } @@ -4346,8 +4353,8 @@ static DWRITE_FLOW_DIRECTION WINAPI dwritetextformat_layout_GetFlowDirection(IDW static FLOAT WINAPI dwritetextformat_layout_GetIncrementalTabStop(IDWriteTextFormat2 *iface) { struct dwrite_textlayout *This = impl_layout_from_IDWriteTextFormat2(iface); - FIXME("(%p): stub\n", This); - return 0.0f; + TRACE("(%p)\n", This); + return This->format.tabstop; } static HRESULT WINAPI dwritetextformat_layout_GetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING *options, @@ -4875,6 +4882,7 @@ static HRESULT layout_format_from_textformat(struct dwrite_textlayout *layout, I layout->format.style = IDWriteTextFormat_GetFontStyle(format); layout->format.stretch = IDWriteTextFormat_GetFontStretch(format); layout->format.fontsize= IDWriteTextFormat_GetFontSize(format); + layout->format.tabstop = IDWriteTextFormat_GetIncrementalTabStop(format); layout->format.textalignment = IDWriteTextFormat_GetTextAlignment(format); layout->format.paralign = IDWriteTextFormat_GetParagraphAlignment(format); layout->format.wrapping = IDWriteTextFormat_GetWordWrapping(format); @@ -5302,7 +5310,13 @@ static HRESULT WINAPI dwritetextformat_SetFlowDirection(IDWriteTextFormat2 *ifac static HRESULT WINAPI dwritetextformat_SetIncrementalTabStop(IDWriteTextFormat2 *iface, FLOAT tabstop) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat2(iface); - FIXME("(%p)->(%f): stub\n", This, tabstop); + + TRACE("(%p)->(%f)\n", This, tabstop); + + if (tabstop <= 0.0f) + return E_INVALIDARG; + + This->format.tabstop = tabstop; return S_OK; } @@ -5368,8 +5382,8 @@ static DWRITE_FLOW_DIRECTION WINAPI dwritetextformat_GetFlowDirection(IDWriteTex static FLOAT WINAPI dwritetextformat_GetIncrementalTabStop(IDWriteTextFormat2 *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat2(iface); - FIXME("(%p): stub\n", This); - return 0.0f; + TRACE("(%p)\n", This); + return This->format.tabstop; } static HRESULT WINAPI dwritetextformat_GetTrimming(IDWriteTextFormat2 *iface, DWRITE_TRIMMING *options, @@ -5631,6 +5645,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->format.weight = weight; This->format.style = style; This->format.fontsize = size; + This->format.tabstop = 4.0f * size; This->format.stretch = stretch; This->format.textalignment = DWRITE_TEXT_ALIGNMENT_LEADING; This->format.optical_alignment = DWRITE_OPTICAL_ALIGNMENT_NONE; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index e6ed3c1..a117ca0 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4972,7 +4972,6 @@ todo_wine { IDWriteFactory_Release(factory); } - static void test_SetTypography(void) { static const WCHAR strW[] = {'a','f','i','b',0}; @@ -5599,6 +5598,90 @@ static void test_GetOverhangMetrics(void) IDWriteFactory_Release(factory); } +static void test_tab_stops(void) +{ + static const WCHAR strW[] = {'\t','a','\t','b'}; + DWRITE_CLUSTER_METRICS clusters[4]; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + IDWriteFactory *factory; + DWRITE_TEXT_RANGE range; + FLOAT tabstop, size; + ULONG count; + HRESULT hr; + + factory = create_factory(); + + /* Default tab stop value. */ + for (size = 1.0f; size < 25.0f; size += 5.0f) + { + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, size, enusW, &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + tabstop = IDWriteTextFormat_GetIncrementalTabStop(format); + ok(tabstop == 4.0f * size, "Unexpected tab stop %f.\n", tabstop); + + IDWriteTextFormat_Release(format); + } + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, + DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, 10.0f, enusW, &format); + ok(hr == S_OK, "Failed to create text format, hr %#x.\n", hr); + + hr = IDWriteTextFormat_SetIncrementalTabStop(format, 0.0f); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IDWriteTextFormat_SetIncrementalTabStop(format, -10.0f); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + tabstop = IDWriteTextFormat_GetIncrementalTabStop(format); + ok(tabstop == 40.0f, "Unexpected tab stop %f.\n", tabstop); + + hr = IDWriteTextFormat_SetIncrementalTabStop(format, 100.0f); + ok(hr == S_OK, "Failed to set tab stop value, hr %#x.\n", hr); + + tabstop = IDWriteTextFormat_GetIncrementalTabStop(format); + ok(tabstop == 100.0f, "Unexpected tab stop %f.\n", tabstop); + + hr = IDWriteFactory_CreateTextLayout(factory, strW, 4, format, 1000.0f, 1000.0f, &layout); + ok(hr == S_OK, "Failed to create text layout, hr %x.\n", hr); + + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(clusters[0].isWhitespace, "Unexpected isWhitespace.\n"); + ok(!clusters[1].isWhitespace, "Unexpected isWhitespace.\n"); + ok(clusters[2].isWhitespace, "Unexpected isWhitespace.\n"); + ok(!clusters[3].isWhitespace, "Unexpected isWhitespace.\n"); +todo_wine { + ok(clusters[0].width == tabstop, "Unexpected tab width.\n"); + ok(clusters[1].width + clusters[2].width == tabstop, "Unexpected tab width.\n"); +} + range.startPosition = 0; + range.length = ~0u; + hr = IDWriteTextLayout_SetFontSize(layout, 20.0f, range); + ok(hr == S_OK, "Failed to set font size, hr %#x.\n", hr); + + tabstop = IDWriteTextLayout_GetIncrementalTabStop(layout); + ok(tabstop == 100.0f, "Unexpected tab stop %f.\n", tabstop); + + hr = IDWriteTextLayout_GetClusterMetrics(layout, clusters, 4, &count); + ok(hr == S_OK, "Failed to get cluster metrics, hr %#x.\n", hr); + ok(clusters[0].isWhitespace, "Unexpected isWhitespace.\n"); + ok(!clusters[1].isWhitespace, "Unexpected isWhitespace.\n"); + ok(clusters[2].isWhitespace, "Unexpected isWhitespace.\n"); + ok(!clusters[3].isWhitespace, "Unexpected isWhitespace.\n"); +todo_wine { + ok(clusters[0].width == tabstop, "Unexpected tab width.\n"); + ok(clusters[1].width + clusters[2].width == tabstop, "Unexpected tab width.\n"); +} + IDWriteTextLayout_Release(layout); + + IDWriteTextFormat_Release(format); + + IDWriteFactory_Release(factory); +} + START_TEST(layout) { IDWriteFactory *factory; @@ -5649,6 +5732,7 @@ START_TEST(layout) test_InvalidateLayout(); test_line_spacing(); test_GetOverhangMetrics(); + test_tab_stops(); IDWriteFactory_Release(factory); }

1 0

Dmitry Timoshkov : kernel32/tests: Add more directory change notification tests.
by Alexandre Julliard 05 Nov '18

05 Nov '18

Module: wine Branch: master Commit: c055a274e998e1a8e844a646d44bc6302f85ca4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c055a274e998e1a8e844a646… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 5 13:47:12 2018 +0300 kernel32/tests: Add more directory change notification tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/change.c | 40 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index f4abad4..3c8084d 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -254,11 +254,12 @@ static void test_FindFirstChangeNotification(void) static void test_ffcn(void) { DWORD filter; - HANDLE handle; + HANDLE handle, file; LONG r; - WCHAR path[MAX_PATH], subdir[MAX_PATH]; + WCHAR path[MAX_PATH], subdir[MAX_PATH], filename[MAX_PATH]; static const WCHAR szBoo[] = { '\\','b','o','o',0 }; static const WCHAR szHoo[] = { '\\','h','o','o',0 }; + static const WCHAR szZoo[] = { '\\','z','o','o',0 }; SetLastError(0xdeadbeef); r = GetTempPathW( MAX_PATH, path ); @@ -275,6 +276,9 @@ static void test_ffcn(void) lstrcpyW( subdir, path ); lstrcatW( subdir, szHoo ); + lstrcpyW( filename, path ); + lstrcatW( filename, szZoo ); + RemoveDirectoryW( subdir ); RemoveDirectoryW( path ); @@ -290,6 +294,38 @@ static void test_ffcn(void) r = WaitForSingleObject( handle, 0 ); ok( r == STATUS_TIMEOUT, "should time out\n"); + file = CreateFileW( filename, GENERIC_READ | GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0 ); + ok( file != INVALID_HANDLE_VALUE, "CreateFile error %u\n", GetLastError() ); + CloseHandle(file); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + + r = DeleteFileW( filename ); + ok( r == TRUE, "failed to remove file\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == WAIT_OBJECT_0, "should be ready\n"); + + r = FindNextChangeNotification(handle); + ok( r == TRUE, "find next failed\n"); + + r = WaitForSingleObject( handle, 0 ); + ok( r == STATUS_TIMEOUT, "should time out\n"); + r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create subdir\n");

1 0

Zebediah Figura : widl: Correctly handle conformant arrays in clear_output_vars().
by Alexandre Julliard 02 Nov '18

02 Nov '18

Module: wine Branch: master Commit: 66f46f81829bb77497ebd35ddfe368f421874a00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66f46f81829bb77497ebd35d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 23:53:44 2018 -0500 widl: Correctly handle conformant arrays in clear_output_vars(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/proxy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index c56ef48..12424d9 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -110,7 +110,13 @@ static void clear_output_vars( const var_list_t *args ) if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_BASIC) continue; if (type_get_type(type_pointer_get_ref(arg->type)) == TYPE_ENUM) continue; } - print_proxy( "if (%s) MIDL_memset( %s, 0, sizeof( *%s ));\n", arg->name, arg->name, arg->name ); + print_proxy( "if (%s) MIDL_memset( %s, 0, ", arg->name, arg->name ); + if (is_array(arg->type) && type_array_has_conformance(arg->type)) + { + write_expr( proxy, type_array_get_conformance(arg->type), 1, 1, NULL, NULL, "" ); + fprintf( proxy, " * " ); + } + fprintf( proxy, "sizeof( *%s ));\n", arg->name ); } }

1 0

Zebediah Figura : rpcrt4: Avoid reference leaks when unmarshalling [in, out] pointers.
by Alexandre Julliard 02 Nov '18

02 Nov '18

Module: wine Branch: master Commit: 666bbe084e56cc97cf9be6a402fe53803473785a URL: https://source.winehq.org/git/wine.git/?a=commit;h=666bbe084e56cc97cf9be6a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 1 23:53:45 2018 -0500 rpcrt4: Avoid reference leaks when unmarshalling [in, out] pointers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_ole.c | 10 ++++++++-- dlls/rpcrt4/tests/ndr_marshall.c | 2 -- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 8608691..c8026c0 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -338,19 +338,25 @@ unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg PFORMAT_STRING pFormat, unsigned char fMustAlloc) { + IUnknown **unk = (IUnknown **)ppMemory; LPSTREAM stream; HRESULT hr; TRACE("(%p,%p,%p,%d)\n", pStubMsg, ppMemory, pFormat, fMustAlloc); if (!LoadCOM()) return NULL; - *(LPVOID*)ppMemory = NULL; + + /* Avoid reference leaks for [in, out] pointers. */ + if (pStubMsg->IsClient && *unk) + IUnknown_Release(*unk); + + *unk = NULL; if (pStubMsg->Buffer + sizeof(DWORD) < (unsigned char *)pStubMsg->RpcMsg->Buffer + pStubMsg->BufferLength) { ULONG size; hr = RpcStream_Create(pStubMsg, FALSE, &size, &stream); if (hr == S_OK) { if (size != 0) - hr = COM_UnmarshalInterface(stream, &IID_NULL, (LPVOID*)ppMemory); + hr = COM_UnmarshalInterface(stream, &IID_NULL, (void **)unk); IStream_Release(stream); } diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 5da03e2..d436b42 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1327,9 +1327,7 @@ static void test_iface_ptr(void) ok(!my_alloc_called, "alloc called %d\n", my_alloc_called); ok(!my_free_called, "free called %d\n", my_free_called); ok(server_obj.ref > 1, "got %d references\n", server_obj.ref); -todo_wine ok(client_obj.ref == 1, "got %d references\n", client_obj.ref); -client_obj.ref = 1; hr = IPersist_GetClassID(proxy, &clsid); ok(hr == S_OK, "got hr %#x\n", hr);

1 0

Zebediah Figura : oleaut32/tests: Add some more tests for marshalling arrays.
by Alexandre Julliard 02 Nov '18

02 Nov '18

Module: wine Branch: master Commit: b6bee08366f0ea3e46b766f89acfd42f1db23304 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6bee08366f0ea3e46b766f8… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 2 00:15:18 2018 -0500 oleaut32/tests: Add some more tests for marshalling arrays. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 166 ++++++++++++++++++++++++--------------- dlls/oleaut32/tests/tmarshal.idl | 22 ++++-- 2 files changed, 118 insertions(+), 70 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b6bee08366f0ea3e46b7…

1 0