November 2018 - Wine-Commits

Henri Verbeet : wined3d: Prefer bind flags over usage flags in wined3d_device_set_rendertarget_view ().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: b93cfc18faa9d45db35584378c7b0d71f2ac63d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b93cfc18faa9d45db3558437… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 5 15:31:53 2018 +0330 wined3d: Prefer bind flags over usage flags in wined3d_device_set_rendertarget_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5515b27..1af76f2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4461,9 +4461,9 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3DERR_INVALIDCALL; } - if (view && !(view->resource->usage & WINED3DUSAGE_RENDERTARGET)) + if (view && !(view->resource->bind_flags & WINED3D_BIND_RENDER_TARGET)) { - WARN("View resource %p doesn't have render target usage.\n", view->resource); + WARN("View resource %p doesn't have render target bind flags.\n", view->resource); return WINED3DERR_INVALIDCALL; }

1 0

Alexandre Julliard : user32: Implement GetCurrentInputMessageSource().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 4da1c4370be6515bf64c185e6b55a305247c754b URL: https://source.winehq.org/git/wine.git/?a=commit;h=4da1c4370be6515bf64c185e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:01:08 2018 +0100 user32: Implement GetCurrentInputMessageSource(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 18 ++++++++++++++++-- dlls/user32/user_private.h | 7 ++++--- include/wine/server_protocol.h | 15 +++++++++++---- server/protocol.def | 13 ++++++++++--- server/queue.c | 35 +++++++++++++++++++++-------------- 5 files changed, 62 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4da1c4370be6515bf64c…

1 0

Nikolay Sivov : dwrite/layout: Set default tab stop width.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

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

Lucian Poston : dwrite/tests: Add a test for text format with unknown font family name.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

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

Henri Verbeet : wined3d: Get rid of WINED3DUSAGE_RENDERTARGET.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

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

Alexandre Julliard : user32/tests: Add tests for GetCurrentInputMessageSource().
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 542150afe578c2e460c0b4a94c55accd95096877 URL: https://source.winehq.org/git/wine.git/?a=commit;h=542150afe578c2e460c0b4a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 13:01:18 2018 +0100 user32/tests: Add tests for GetCurrentInputMessageSource(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 154 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 147 insertions(+), 7 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 03b8400..14fd5f8 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -77,6 +77,7 @@ static struct { } key_status; static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t); +static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source ); static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD); static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT); @@ -156,14 +157,13 @@ static void init_function_pointers(void) HMODULE hdll = GetModuleHandleA("user32"); #define GET_PROC(func) \ - p ## func = (void*)GetProcAddress(hdll, #func); \ - if(!p ## func) \ - trace("GetProcAddress(%s) failed\n", #func); - - GET_PROC(SendInput) - GET_PROC(GetMouseMovePointsEx) - GET_PROC(GetRawInputDeviceList) + if (!(p ## func = (void*)GetProcAddress(hdll, #func))) \ + trace("GetProcAddress(%s) failed\n", #func) + GET_PROC(SendInput); + GET_PROC(GetCurrentInputMessageSource); + GET_PROC(GetMouseMovePointsEx); + GET_PROC(GetRawInputDeviceList); #undef GET_PROC } @@ -2487,6 +2487,7 @@ static void test_GetKeyState(void) result = WaitForSingleObject(semaphores[0], 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + SetForegroundWindow(hwnd); SetFocus(hwnd); keybd_event('X', 0, 0, 0); @@ -2540,9 +2541,141 @@ static void test_OemKeyScan(void) } } +static INPUT_MESSAGE_SOURCE expect_src; + +static LRESULT WINAPI msg_source_proc( HWND hwnd, UINT message, WPARAM wp, LPARAM lp ) +{ + INPUT_MESSAGE_SOURCE source; + MSG msg; + + ok( pGetCurrentInputMessageSource( &source ), "GetCurrentInputMessageSource failed\n" ); + switch (message) + { + case WM_KEYDOWN: + case WM_KEYUP: + case WM_SYSKEYDOWN: + case WM_SYSKEYUP: + case WM_MOUSEMOVE: + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + ok( source.deviceType == expect_src.deviceType || /* also accept system-generated WM_MOUSEMOVE */ + (message == WM_MOUSEMOVE && source.deviceType == IMDT_UNAVAILABLE), + "%x: wrong deviceType %x/%x\n", message, source.deviceType, expect_src.deviceType ); + ok( source.originId == expect_src.originId || + (message == WM_MOUSEMOVE && source.originId == IMO_SYSTEM), + "%x: wrong originId %x/%x\n", message, source.originId, expect_src.originId ); + SendMessageA( hwnd, WM_USER, 0, 0 ); + PostMessageA( hwnd, WM_USER, 0, 0 ); + if (PeekMessageW( &msg, hwnd, WM_USER, WM_USER, PM_REMOVE )) DispatchMessageW( &msg ); + ok( source.deviceType == expect_src.deviceType || /* also accept system-generated WM_MOUSEMOVE */ + (message == WM_MOUSEMOVE && source.deviceType == IMDT_UNAVAILABLE), + "%x: wrong deviceType %x/%x\n", message, source.deviceType, expect_src.deviceType ); + ok( source.originId == expect_src.originId || + (message == WM_MOUSEMOVE && source.originId == IMO_SYSTEM), + "%x: wrong originId %x/%x\n", message, source.originId, expect_src.originId ); + break; + default: + ok( source.deviceType == IMDT_UNAVAILABLE, "%x: wrong deviceType %x\n", + message, source.deviceType ); + ok( source.originId == 0, "%x: wrong originId %x\n", message, source.originId ); + break; + } + + return DefWindowProcA( hwnd, message, wp, lp ); +} + +static void test_input_message_source(void) +{ + WNDCLASSA cls; + TEST_INPUT inputs[2]; + HWND hwnd; + RECT rc; + MSG msg; + + cls.style = 0; + cls.lpfnWndProc = msg_source_proc; + cls.cbClsExtra = 0; + cls.cbWndExtra = 0; + cls.hInstance = GetModuleHandleA(0); + cls.hIcon = 0; + cls.hCursor = LoadCursorA(0, (LPCSTR)IDC_ARROW); + cls.hbrBackground = 0; + cls.lpszMenuName = NULL; + cls.lpszClassName = "message source class"; + RegisterClassA(&cls); + hwnd = CreateWindowA( cls.lpszClassName, "test", WS_OVERLAPPED, 0, 0, 100, 100, + 0, 0, 0, 0 ); + ShowWindow( hwnd, SW_SHOWNORMAL ); + UpdateWindow( hwnd ); + SetForegroundWindow( hwnd ); + SetFocus( hwnd ); + + inputs[0].type = INPUT_KEYBOARD; + inputs[0].u.ki.dwExtraInfo = 0; + inputs[0].u.ki.time = 0; + inputs[0].u.ki.wVk = 0; + inputs[0].u.ki.wScan = 0x3c0; + inputs[0].u.ki.dwFlags = KEYEVENTF_UNICODE; + inputs[1] = inputs[0]; + inputs[1].u.ki.dwFlags |= KEYEVENTF_KEYUP; + + expect_src.deviceType = IMDT_UNAVAILABLE; + expect_src.originId = IMO_UNAVAILABLE; + SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); + SendMessageA( hwnd, WM_MOUSEMOVE, 0, 0 ); + + pSendInput( 2, (INPUT *)inputs, sizeof(INPUT) ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + expect_src.deviceType = IMDT_KEYBOARD; + expect_src.originId = IMO_INJECTED; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + GetWindowRect( hwnd, &rc ); + simulate_click( TRUE, (rc.left + rc.right) / 2, (rc.top + rc.bottom) / 2 ); + simulate_click( FALSE, (rc.left + rc.right) / 2 + 1, (rc.top + rc.bottom) / 2 + 1 ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + expect_src.deviceType = IMDT_MOUSE; + expect_src.originId = IMO_INJECTED; + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + expect_src.deviceType = IMDT_UNAVAILABLE; + expect_src.originId = IMO_UNAVAILABLE; + SendMessageA( hwnd, WM_KEYDOWN, 0, 0 ); + SendMessageA( hwnd, WM_LBUTTONDOWN, 0, 0 ); + PostMessageA( hwnd, WM_KEYUP, 0, 0 ); + PostMessageA( hwnd, WM_LBUTTONUP, 0, 0 ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + expect_src.deviceType = IMDT_UNAVAILABLE; + expect_src.originId = IMO_SYSTEM; + SetCursorPos( (rc.left + rc.right) / 2 - 1, (rc.top + rc.bottom) / 2 - 1 ); + while (PeekMessageW( &msg, hwnd, 0, 0, PM_REMOVE )) + { + TranslateMessage( &msg ); + DispatchMessageW( &msg ); + } + + DestroyWindow( hwnd ); + UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) ); +} + START_TEST(input) { + POINT pos; + init_function_pointers(); + GetCursorPos( &pos ); if (pSendInput) { @@ -2574,4 +2707,11 @@ START_TEST(input) test_GetRawInputDeviceList(); else win_skip("GetRawInputDeviceList is not available\n"); + + if (pGetCurrentInputMessageSource) + test_input_message_source(); + else + win_skip("GetCurrentInputMessageSource is not available\n"); + + SetCursorPos( pos.x, pos.y ); }

1 0

Alexandre Julliard : server: Add a helper function to allocate a hardware message.
by Alexandre Julliard Nov. 5, 2018

Nov. 5, 2018

Module: wine Branch: master Commit: 383cf211da7c19855bf7d04e2f8926b64560e34e URL: https://source.winehq.org/git/wine.git/?a=commit;h=383cf211da7c19855bf7d04e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 5 12:32:24 2018 +0100 server: Add a helper function to allocate a hardware message. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/queue.c | 110 ++++++++++++++++----------------------------------------- 1 file changed, 30 insertions(+), 80 deletions(-) diff --git a/server/queue.c b/server/queue.c index f274dfb..75070a7 100644 --- a/server/queue.c +++ b/server/queue.c @@ -339,31 +339,39 @@ static int assign_thread_input( struct thread *thread, struct thread_input *new_ return 1; } -/* set the cursor position and queue the corresponding mouse message */ -static void set_cursor_pos( struct desktop *desktop, int x, int y ) +/* allocate a hardware message and its data */ +static struct message *alloc_hardware_message( lparam_t info, unsigned int time ) { struct hardware_msg_data *msg_data; struct message *msg; - if (!(msg = mem_alloc( sizeof(*msg) ))) return; + if (!(msg = mem_alloc( sizeof(*msg) ))) return NULL; if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) { free( msg ); - return; + return NULL; } - memset( msg_data, 0, sizeof(*msg_data) ); - + memset( msg, 0, sizeof(*msg) ); msg->type = MSG_HARDWARE; - msg->win = 0; - msg->msg = WM_MOUSEMOVE; - msg->wparam = 0; - msg->lparam = 0; - msg->x = x; - msg->y = y; - msg->time = get_tick_count(); - msg->result = NULL; + msg->time = time; msg->data = msg_data; msg->data_size = sizeof(*msg_data); + + memset( msg_data, 0, sizeof(*msg_data) ); + msg_data->info = info; + return msg; +} + +/* set the cursor position and queue the corresponding mouse message */ +static void set_cursor_pos( struct desktop *desktop, int x, int y ) +{ + struct message *msg; + + if (!(msg = alloc_hardware_message( 0, get_tick_count() ))) return; + + msg->msg = WM_MOUSEMOVE; + msg->x = x; + msg->y = y; queue_hardware_message( desktop, msg, 1 ); } @@ -1639,24 +1647,14 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((device = current->process->rawinput_mouse)) { - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } + if (!(msg = alloc_hardware_message( input->mouse.info, time ))) return 0; + msg_data = msg->data; - msg->type = MSG_HARDWARE; msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; msg->lparam = 0; - msg->time = time; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg->result = NULL; - msg_data->info = input->mouse.info; msg_data->flags = flags; msg_data->rawinput.type = RIM_TYPEMOUSE; msg_data->rawinput.mouse.x = x - desktop->cursor.x; @@ -1672,26 +1670,15 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if (!(flags & (1 << i))) continue; flags &= ~(1 << i); - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } - memset( msg_data, 0, sizeof(*msg_data) ); + if (!(msg = alloc_hardware_message( input->mouse.info, time ))) return 0; + msg_data = msg->data; - msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); msg->msg = messages[i]; msg->wparam = input->mouse.data << 16; msg->lparam = 0; msg->x = x; msg->y = y; - msg->time = time; - msg->result = NULL; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg_data->info = input->mouse.info; if (hook_flags & SEND_HWMSG_INJECTED) msg_data->flags = LLMHF_INJECTED; /* specify a sender only when sending the last message */ @@ -1783,26 +1770,15 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c break; } + if (!(msg = alloc_hardware_message( input->kbd.info, time ))) return 0; + msg_data = msg->data; + if ((device = current->process->rawinput_kbd)) { - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } - - msg->type = MSG_HARDWARE; msg->win = device->target; msg->msg = WM_INPUT; msg->wparam = RIM_INPUT; - msg->lparam = 0; - msg->time = time; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg->result = NULL; - msg_data->info = input->kbd.info; msg_data->flags = input->kbd.flags; msg_data->rawinput.type = RIM_TYPEKEYBOARD; msg_data->rawinput.kbd.message = message_code; @@ -1812,23 +1788,9 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c queue_hardware_message( desktop, msg, 0 ); } - if (!(msg = mem_alloc( sizeof(*msg) ))) return 0; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return 0; - } - memset( msg_data, 0, sizeof(*msg_data) ); - - msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); msg->msg = message_code; msg->lparam = (input->kbd.scan << 16) | 1u; /* repeat count */ - msg->time = time; - msg->result = NULL; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); - msg_data->info = input->kbd.info; if (hook_flags & SEND_HWMSG_INJECTED) msg_data->flags = LLKHF_INJECTED; if (input->kbd.flags & KEYEVENTF_UNICODE) @@ -1858,28 +1820,16 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c static void queue_custom_hardware_message( struct desktop *desktop, user_handle_t win, const hw_input_t *input ) { - struct hardware_msg_data *msg_data; struct message *msg; - if (!(msg = mem_alloc( sizeof(*msg) ))) return; - if (!(msg_data = mem_alloc( sizeof(*msg_data) ))) - { - free( msg ); - return; - } - memset( msg_data, 0, sizeof(*msg_data) ); + if (!(msg = alloc_hardware_message( 0, get_tick_count() ))) return; - msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( win ); msg->msg = input->hw.msg; msg->wparam = 0; msg->lparam = input->hw.lparam; msg->x = desktop->cursor.x; msg->y = desktop->cursor.y; - msg->time = get_tick_count(); - msg->result = NULL; - msg->data = msg_data; - msg->data_size = sizeof(*msg_data); queue_hardware_message( desktop, msg, 1 ); }

1 0

Henri Verbeet : wined3d: Prefer bind flags over usage flags in texture2d_load_drawable().
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: eed05ad890b3cd2d5d842923a9da8e834b3040d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eed05ad890b3cd2d5d842923… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Nov 2 13:21:15 2018 +0330 wined3d: Prefer bind flags over usage flags in texture2d_load_drawable(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 902611c..99cc1a5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1473,7 +1473,7 @@ BOOL texture2d_load_drawable(struct wined3d_texture *texture, unsigned int level; RECT r; - if (texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) + if (texture->resource.bind_flags & WINED3D_BIND_DEPTH_STENCIL) { DWORD current = texture->sub_resources[sub_resource_idx].locations; FIXME("Unimplemented copy from %s for depth/stencil buffers.\n",

1 0

Hans Leidekker : wshom: Split the command line before passing it to ShellExecuteEx.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: 979f9078d3a2c4406dc494c81b86fea2da15dabc URL: https://source.winehq.org/git/wine.git/?a=commit;h=979f9078d3a2c4406dc494c8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 2 11:34:59 2018 +0100 wshom: Split the command line before passing it to ShellExecuteEx. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wshom.ocx/shell.c | 34 ++++++++++++++++++++++++-- dlls/wshom.ocx/tests/wshom.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 3 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index 1aa353a..ca4f7ff 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -1218,12 +1218,37 @@ static inline BOOL is_optional_argument(const VARIANT *arg) return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } +static WCHAR *split_command( BSTR cmd, WCHAR **params ) +{ + WCHAR *ret, *ptr; + BOOL in_quotes = FALSE; + + if (!(ret = heap_alloc((strlenW(cmd) + 1) * sizeof(WCHAR)))) return NULL; + strcpyW( ret, cmd ); + + *params = NULL; + for (ptr = ret; *ptr; ptr++) + { + if (*ptr == '"') in_quotes = !in_quotes; + else if (*ptr == ' ' && !in_quotes) + { + *ptr = 0; + *params = ptr + 1; + break; + } + } + + return ret; +} + static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, VARIANT *wait, DWORD *exit_code) { SHELLEXECUTEINFOW info; int waitforprocess; + WCHAR *file, *params; VARIANT s; HRESULT hr; + BOOL ret; TRACE("(%s %s %s %p)\n", debugstr_w(cmd), debugstr_variant(style), debugstr_variant(wait), exit_code); @@ -1251,13 +1276,18 @@ static HRESULT WINAPI WshShell3_Run(IWshShell3 *iface, BSTR cmd, VARIANT *style, waitforprocess = V_I4(&w); } + if (!(file = split_command(cmd, &params))) return E_OUTOFMEMORY; + memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info); info.fMask = waitforprocess ? SEE_MASK_NOASYNC | SEE_MASK_NOCLOSEPROCESS : SEE_MASK_DEFAULT; - info.lpFile = cmd; + info.lpFile = file; + info.lpParameters = params; info.nShow = V_I4(&s); - if (!ShellExecuteExW(&info)) + ret = ShellExecuteExW(&info); + heap_free( file ); + if (!ret) { TRACE("ShellExecute failed, %d\n", GetLastError()); return HRESULT_FROM_WIN32(GetLastError()); diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 18ff4d6..c1f9519 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -66,6 +66,17 @@ static void test_wshshell(void) static const WCHAR path2W[] = {'P','A','T','H',0}; static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; static const WCHAR emptyW[] = {'e','m','p','t','y',0}; + static const WCHAR cmdexeW[] = {'\\','c','m','d','.','e','x','e',0}; + static const WCHAR testdirW[] = {'w','s','h','o','m',' ','t','e','s','t',' ','d','i','r',0}; + static const WCHAR paramsW[] = + {' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\','n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmdW[] = + {'c','m','d','.','e','x','e',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + static const WCHAR cmd2W[] = + {'"','c','m','d','.','e','x','e',' ','"',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', + 'n','o','s','u','c','h','d','i','r',0}; + WCHAR path[MAX_PATH], path2[MAX_PATH], buf[MAX_PATH]; IWshEnvironment *env; IWshExec *shexec; IWshShell3 *sh3; @@ -82,7 +93,7 @@ static void test_wshshell(void) EXCEPINFO ei; VARIANT arg, res, arg2; BSTR str, ret; - DWORD retval; + DWORD retval, attrs; UINT err; hr = CoCreateInstance(&CLSID_WshShell, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, @@ -238,9 +249,53 @@ static void test_wshshell(void) hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == DISP_E_TYPEMISMATCH, "got 0x%08x\n", hr); ok(retval == 10, "got %u\n", retval); + SysFreeString(str); + + V_VT(&arg2) = VT_BOOL; + V_BOOL(&arg2) = VARIANT_TRUE; + retval = 0xdeadbeef; + str = SysAllocString(cmdW); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); SysFreeString(str); + retval = 0xdeadbeef; + str = SysAllocString(cmd2W); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + GetSystemDirectoryW(path, ARRAY_SIZE(path)); + lstrcatW(path, cmdexeW); + attrs = GetFileAttributesW(path); + ok(attrs != INVALID_FILE_ATTRIBUTES, "cmd.exe not found\n"); + + /* copy cmd.exe to a path with spaces */ + GetTempPathW(ARRAY_SIZE(path2), path2); + lstrcatW(path2, testdirW); + CreateDirectoryW(path2, NULL); + lstrcatW(path2, cmdexeW); + CopyFileW(path, path2, FALSE); + + buf[0] = '"'; + lstrcpyW(buf + 1, path2); + buf[lstrlenW(buf)] = '"'; + lstrcpyW(buf + lstrlenW(path2) + 2, paramsW); + + retval = 0xdeadbeef; + str = SysAllocString(buf); + hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); + SysFreeString(str); + + DeleteFileW(path2); + path2[lstrlenW(path2) - lstrlenW(cmdexeW)] = 0; + RemoveDirectoryW(path2); + /* current directory */ if (0) /* crashes on native */ hr = IWshShell3_get_CurrentDirectory(sh3, NULL);

1 0

Jacek Caban : widl: Check for actual function name when handling call_as attribute.
by Alexandre Julliard Nov. 2, 2018

Nov. 2, 2018

Module: wine Branch: master Commit: b78de971f674f7be8b078f0e7f14112a9a892f33 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b78de971f674f7be8b078f0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Nov 2 16:53:08 2018 +0100 widl: Check for actual function name when handling call_as attribute. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index b8e11bb..92bd391 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1291,7 +1291,7 @@ static void write_locals(FILE *fp, const type_t *iface, int body) if (cas) { const statement_t *stmt2 = NULL; STATEMENTS_FOR_EACH_FUNC(stmt2, type_iface_get_stmts(iface)) - if (!strcmp(stmt2->u.var->name, cas->name)) + if (!strcmp(get_name(stmt2->u.var), cas->name)) break; if (&stmt2->entry != type_iface_get_stmts(iface)) { const var_t *m = stmt2->u.var;

1 0