August 2019 - Wine-commits - list.winehq.org

Conor McCarthy : dxgi: Implement d3d12_swapchain_GetFullscreenState().
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 712d3ca1e4d615f7d8e8bf5b3cacda0694041eb6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=712d3ca1e4d615f7d8e8bf5b… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 1 01:17:48 2019 +0430 dxgi: Implement d3d12_swapchain_GetFullscreenState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 12 ++++++++++-- dlls/dxgi/tests/dxgi.c | 26 +++++++++++++------------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 728fcac..0871200 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -2173,9 +2173,17 @@ static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreen static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFullscreenState(IDXGISwapChain3 *iface, BOOL *fullscreen, IDXGIOutput **target) { - FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); - return E_NOTIMPL; + TRACE("iface %p, fullscreen %p, target %p.\n", iface, fullscreen, target); + + if (fullscreen) + *fullscreen = !swapchain->fullscreen_desc.Windowed; + + if (target) + *target = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, DXGI_SWAP_CHAIN_DESC *desc) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ab33caf..5f5bb1e 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -4163,7 +4163,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) output = NULL; fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &output); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); todo_wine_if(is_d3d12) ok(!!output, "Test %u: Got unexpected output.\n", i); @@ -4172,20 +4172,20 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) /* Still fullscreen. */ fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* Calling IDXGISwapChain_Present() will exit fullscreen. */ hr = IDXGISwapChain_Present(swapchain, 0, flags[i]); ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); /* Now fullscreen mode is exited. */ if (!flags[i] && !is_d3d12) /* Still fullscreen on vista and 2008. */ todo_wine ok(!fullscreen || broken(fullscreen), "Test %u: Got unexpected fullscreen status.\n", i); else - ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); if (output) IDXGIOutput_Release(output); @@ -4201,7 +4201,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); todo_wine_if(!is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); @@ -4217,7 +4217,7 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); fullscreen = FALSE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); todo_wine_if(is_d3d12) ok(fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* A visible, but with bottom z-order window still causes the * swapchain to exit fullscreen mode. */ @@ -4231,8 +4231,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) * for d3d12. */ fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0); @@ -4243,12 +4243,12 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (flags[i] == DXGI_PRESENT_TEST) - todo_wine_if(!is_d3d12) ok(is_d3d12 ? fullscreen : !fullscreen, + todo_wine ok(is_d3d12 ? fullscreen : !fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); else - todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + todo_wine_if(!is_d3d12) ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); /* Even though d3d12 doesn't exit fullscreen, a * IDXGISwapChain_ResizeBuffers() is still needed for subsequent @@ -4302,8 +4302,8 @@ static void test_swapchain_present(IUnknown *device, BOOL is_d3d12) } fullscreen = TRUE; hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, NULL); - todo_wine_if(is_d3d12) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); - todo_wine ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); + ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + todo_wine_if(!is_d3d12) ok(!fullscreen, "Test %u: Got unexpected fullscreen status.\n", i); DestroyWindow(occluding_window); hr = IDXGISwapChain_ResizeBuffers(swapchain, 0, 0, 0, DXGI_FORMAT_UNKNOWN, 0);

1 0

Conor McCarthy : dxgi: Implement d3d12_swapchain_SetFullscreenState().
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 9b493d42c452c32eebe0e6fd8477c3a3756bcfa7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b493d42c452c32eebe0e6fd… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 1 01:17:49 2019 +0430 dxgi: Implement d3d12_swapchain_SetFullscreenState(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 146 ++++++++++++++++++++++++++++++++++------- dlls/dxgi/tests/dxgi.c | 34 +++++----- dlls/wined3d/device.c | 3 +- dlls/wined3d/swapchain.c | 137 +++++++++++++++++++++----------------- dlls/wined3d/wined3d.spec | 4 +- dlls/wined3d/wined3d_main.c | 3 +- dlls/wined3d/wined3d_private.h | 5 +- include/wine/wined3d.h | 7 +- 8 files changed, 230 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9b493d42c452c32eebe0…

1 0

Conor McCarthy : dxgi/tests: Run test_resize_target() on d3d12 as well.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: e9c5dda48af6ff871dd7ba593e04095cd1e06827 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9c5dda48af6ff871dd7ba59… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 1 01:17:50 2019 +0430 dxgi/tests: Run test_resize_target() on d3d12 as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 44 +++++++++++++------------------------------- 1 file changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 2d4a5d4..e420d0a 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -380,7 +380,7 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain HRESULT hr; hr = IDXGISwapChain_GetDesc(swapchain, &swapchain_desc); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get swapchain desc, hr %#x.\n", hr); check_window_fullscreen_state_(line, swapchain_desc.OutputWindow, &expected_state->fullscreen_state); ok_(__FILE__, line)(swapchain_desc.Windowed == !expected_state->fullscreen, @@ -388,23 +388,19 @@ static void check_swapchain_fullscreen_state_(unsigned int line, IDXGISwapChain swapchain_desc.Windowed, !expected_state->fullscreen); hr = IDXGISwapChain_GetFullscreenState(swapchain, &fullscreen, &target); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetFullscreenState failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get fullscreen state, hr %#x.\n", hr); ok_(__FILE__, line)(fullscreen == expected_state->fullscreen, "Got fullscreen %#x, expected %#x.\n", fullscreen, expected_state->fullscreen); if (!swapchain_desc.Windowed && expected_state->fullscreen) { IDXGIAdapter *adapter; - IDXGIDevice *device; - - hr = IDXGISwapChain_GetDevice(swapchain, &IID_IDXGIDevice, (void **)&device); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetDevice failed, hr %#x.\n", hr); - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - IDXGIDevice_Release(device); hr = IDXGISwapChain_GetContainingOutput(swapchain, &containing_output); - ok_(__FILE__, line)(SUCCEEDED(hr), "GetContainingOutput failed, hr %#x.\n", hr); + ok_(__FILE__, line)(hr == S_OK, "Failed to get containing output, hr %#x.\n", hr); + + hr = IDXGIOutput_GetParent(containing_output, &IID_IDXGIAdapter, (void **)&adapter); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); check_output_equal_(line, target, expected_state->target); ok_(__FILE__, line)(target == containing_output, "Got target %p, expected %p.\n", @@ -2688,14 +2684,12 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, IDXGIOutput_Release(target); } -static void test_resize_target(void) +static void test_resize_target(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state, expected_state; DXGI_SWAP_CHAIN_DESC swapchain_desc; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; unsigned int i; ULONG refcount; HRESULT hr; @@ -2723,17 +2717,7 @@ static void test_resize_target(void) {{10, 10}, FALSE, TRUE, DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH}, }; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -2745,9 +2729,9 @@ static void test_resize_target(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; for (i = 0; i < ARRAY_SIZE(tests); ++i) @@ -2829,11 +2813,8 @@ static void test_resize_target(void) DestroyWindow(swapchain_desc.OutputWindow); } - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static LRESULT CALLBACK resize_target_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) @@ -5723,13 +5704,13 @@ START_TEST(dxgi) test_create_swapchain(); test_set_fullscreen(); test_default_fullscreen_target_output(); - test_resize_target(); test_inexact_modes(); test_gamma_control(); test_swapchain_parameters(); test_swapchain_window_messages(); test_swapchain_window_styles(); test_window_association(); + run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); run_on_d3d10(test_swapchain_backbuffer_index); @@ -5751,6 +5732,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_resize_target); run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_present); run_on_d3d12(test_swapchain_backbuffer_index);

1 0

Conor McCarthy : dxgi/tests: Run test_set_fullscreen() on d3d12 as well.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 5a593f43f3da032b0db068d0f55cefc920c2f731 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a593f43f3da032b0db068d0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Aug 1 01:17:51 2019 +0430 dxgi/tests: Run test_set_fullscreen() on d3d12 as well. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index e420d0a..f8136a4 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -2295,28 +2295,18 @@ static void test_swapchain_fullscreen_state(IDXGISwapChain *swapchain, heap_free(output_monitor_info); } -static void test_set_fullscreen(void) +static void test_set_fullscreen(IUnknown *device, BOOL is_d3d12) { struct swapchain_fullscreen_state initial_state; DXGI_SWAP_CHAIN_DESC swapchain_desc; + IDXGIAdapter *adapter = NULL; IDXGISwapChain *swapchain; IDXGIFactory *factory; - IDXGIAdapter *adapter; - IDXGIDevice *device; + IDXGIOutput *output; ULONG refcount; HRESULT hr; - if (!(device = create_device(0))) - { - skip("Failed to create device.\n"); - return; - } - - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.Width = 800; swapchain_desc.BufferDesc.Height = 600; @@ -2328,16 +2318,28 @@ static void test_set_fullscreen(void) swapchain_desc.SampleDesc.Count = 1; swapchain_desc.SampleDesc.Quality = 0; swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; - swapchain_desc.BufferCount = 1; + swapchain_desc.BufferCount = is_d3d12 ? 2 : 1; swapchain_desc.OutputWindow = CreateWindowA("static", "dxgi_test", 0, 0, 0, 400, 200, 0, 0, 0, 0); swapchain_desc.Windowed = TRUE; - swapchain_desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + swapchain_desc.SwapEffect = is_d3d12 ? DXGI_SWAP_EFFECT_FLIP_DISCARD : DXGI_SWAP_EFFECT_DISCARD; swapchain_desc.Flags = 0; memset(&initial_state, 0, sizeof(initial_state)); capture_fullscreen_state(&initial_state.fullscreen_state, swapchain_desc.OutputWindow); hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + hr = IDXGISwapChain_GetContainingOutput(swapchain, &output); + ok(SUCCEEDED(hr) || broken(hr == DXGI_ERROR_UNSUPPORTED), /* Win 7 testbot */ + "Failed to get containing output, hr %#x.\n", hr); + if (FAILED(hr)) + { + skip("Could not get output.\n"); + goto done; + } + hr = IDXGIOutput_GetParent(output, &IID_IDXGIAdapter, (void **)&adapter); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIOutput_Release(output); + check_swapchain_fullscreen_state(swapchain, &initial_state); hr = IDXGISwapChain_SetFullscreenState(swapchain, TRUE, NULL); ok(SUCCEEDED(hr) || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE @@ -2407,16 +2409,15 @@ static void test_set_fullscreen(void) test_swapchain_fullscreen_state(swapchain, adapter, &initial_state); done: + if (adapter) + IDXGIAdapter_Release(adapter); refcount = IDXGISwapChain_Release(swapchain); ok(!refcount, "IDXGISwapChain has %u references left.\n", refcount); check_window_fullscreen_state(swapchain_desc.OutputWindow, &initial_state.fullscreen_state); DestroyWindow(swapchain_desc.OutputWindow); - IDXGIAdapter_Release(adapter); - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); refcount = IDXGIFactory_Release(factory); - ok(!refcount, "Factory has %u references left.\n", refcount); + ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } static void test_default_fullscreen_target_output(void) @@ -5702,7 +5703,6 @@ START_TEST(dxgi) /* These tests use full-screen swapchains, so shouldn't run in parallel. */ test_create_swapchain(); - test_set_fullscreen(); test_default_fullscreen_target_output(); test_inexact_modes(); test_gamma_control(); @@ -5710,6 +5710,7 @@ START_TEST(dxgi) test_swapchain_window_messages(); test_swapchain_window_styles(); test_window_association(); + run_on_d3d10(test_set_fullscreen); run_on_d3d10(test_resize_target); run_on_d3d10(test_swapchain_resize); run_on_d3d10(test_swapchain_present); @@ -5732,6 +5733,7 @@ START_TEST(dxgi) ID3D12Debug_Release(debug); } + run_on_d3d12(test_set_fullscreen); run_on_d3d12(test_resize_target); run_on_d3d12(test_swapchain_resize); run_on_d3d12(test_swapchain_present);

1 0

Alistair Leslie-Hughes : include: Added thumbcache.idl.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: be059eaa89451e0e776c2cd6380a981fa4ee1af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be059eaa89451e0e776c2cd6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:52 2019 +0000 include: Added thumbcache.idl. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/thumbcache.idl | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 02ee45d..856d52d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -626,6 +626,7 @@ SOURCES = \ tcpmib.h \ textserv.h \ textstor.idl \ + thumbcache.idl \ timezoneapi.h \ tlhelp32.h \ tlogstg.idl \ diff --git a/include/thumbcache.idl b/include/thumbcache.idl new file mode 100644 index 0000000..f79d879 --- /dev/null +++ b/include/thumbcache.idl @@ -0,0 +1,48 @@ +/* + * Copyright 2019 Alistair Leslie-Hughes + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "oaidl.idl"; +import "shtypes.idl"; + +typedef [v1_enum] enum WTS_FLAGS +{ + WTS_NONE = 0x00000000, + WTS_EXTRACT = 0x00000000, + WTS_INCACHEONLY = 0x00000001, + WTS_FASTEXTRACT = 0x00000002, + WTS_FORCEEXTRACTION = 0x00000004, + WTS_SLOWRECLAIM = 0x00000008, + WTS_EXTRACTDONOTCACHE = 0x00000020, + WTS_SCALETOREQUESTEDSIZE = 0x00000040, + WTS_SKIPFASTEXTRACT = 0x00000080, + WTS_EXTRACTINPROC = 0x00000100, + WTS_CROPTOSQUARE = 0x00000200, + WTS_INSTANCESURROGATE = 0x00000400, + WTS_REQUIRESURROGATE = 0x00000800, + WTS_APPSTYLE = 0x00002000, + WTS_WIDETHUMBNAILS = 0x00004000, + WTS_IDEALCACHESIZEONLY = 0x00008000, + WTS_SCALEUP = 0x00010000, +} WTS_FLAGS; + +typedef [v1_enum] enum WTS_ALPHATYPE +{ + WTSAT_UNKNOWN = 0, + WTSAT_RGB = 1, + WTSAT_ARGB = 2 +} WTS_ALPHATYPE;

1 0

Alistair Leslie-Hughes : include: Add PF_INET6 define.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 558437e73bb498a63268dc44a6bfba406e8d4c94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=558437e73bb498a63268dc44… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:53 2019 +0000 include: Add PF_INET6 define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsock2.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/winsock2.h b/include/winsock2.h index a2563f4..e8d0339 100644 --- a/include/winsock2.h +++ b/include/winsock2.h @@ -92,6 +92,12 @@ extern "C" { #define WS_SOCK_SEQPACKET 5 #endif /* USE_WS_PREFIX */ +/* protocol families */ + +#ifndef USE_WS_PREFIX +#define PF_INET6 AF_INET6 +#endif + /* option flags per socket */ #define FD_MAX_EVENTS 10

1 0

Alistair Leslie-Hughes : include: Correct LVINSERTMARK define.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: 8a430feec4f481194da313403fe14b465a920ad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a430feec4f481194da31340… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:55 2019 +0000 include: Correct LVINSERTMARK define. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/commctrl.h b/include/commctrl.h index 14d40a2..745a028 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3756,7 +3756,7 @@ typedef struct LVINSERTMARK DWORD dwFlags; int iItem; DWORD dwReserved; -} LVINSERTMARK, *PLVINSERTMARK; +} LVINSERTMARK, *LPLVINSERTMARK; typedef struct tagTCHITTESTINFO {

1 0

Alistair Leslie-Hughes : include: Use macro SNDMSG to send messages.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: e2adb9b74c679ad06e9d75431d0f3ab51e736460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2adb9b74c679ad06e9d7543… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:56 2019 +0000 include: Use macro SNDMSG to send messages. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 745a028..66981a3 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -5166,9 +5166,9 @@ static const WCHAR WC_COMBOBOXW[] = { 'C','o','m','b','o','B','o','x',0 }; #define CB_GETCUEBANNER (CBM_FIRST + 4) #define ComboBox_GetMinVisible(hwnd) \ - ((int)SendMessage((hwnd), CB_GETMINVISIBLE, 0, 0)) + ((INT)SNDMSG((hwnd), CB_GETMINVISIBLE, 0, 0)) #define ComboBox_SetMinVisible(hwnd, count) \ - ((BOOL)SendMessage((hwnd), CB_SETMINVISIBLE, (WPARAM)(count), 0)) + ((BOOL)SNDMSG((hwnd), CB_SETMINVISIBLE, (WPARAM)(count), 0)) /************************************************************************** * Edit control

1 0

Alistair Leslie-Hughes : include: Added missing Header_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: cd74b1e76b5f3cda8b39982ff2abfc0558ada3d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd74b1e76b5f3cda8b39982f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:57 2019 +0000 include: Added missing Header_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 66981a3..84bdcad 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1002,6 +1002,14 @@ typedef struct tagNMHDFILTERBTNCLICK (BOOL)SNDMSG((hwnd),HDM_SETUNICODEFORMAT,(WPARAM)(fUnicode),0) #define Header_GetUnicodeFormat(hwnd) \ (BOOL)SNDMSG((hwnd),HDM_GETUNICODEFORMAT,0,0) +#define Header_GetItemDropDownRect(hwnd,iItem,lprc) \ + (BOOL)SNDMSG((hwnd), HDM_GETITEMDROPDOWNRECT, (WPARAM)iItem, (LPARAM)lprc) +#define Header_GetOverflowRect(hwnd, rc) \ + (BOOL)SNDMSG((hwnd), HDM_GETOVERFLOWRECT, 0, (LPARAM)(rc)) +#define Header_GetFocusedItem(hwnd) \ + (INT)SNDMSG((hwnd), HDM_GETFOCUSEDITEM, (WPARAM)(0), (LPARAM)(0)) +#define Header_SetFocusedItem(hwnd, item) \ + (BOOL)SNDMSG((hwnd), HDM_SETFOCUSEDITEM, (WPARAM)(0), (LPARAM)(item)) /* Win32 5.1 Button Theme */ #define WC_BUTTONA "Button"

1 0

Alistair Leslie-Hughes : include: Added missing Button_* defines.
by Alexandre Julliard 01 Aug '19

01 Aug '19

Module: wine Branch: master Commit: cd337b099ac6dcbf9efc33830b459bffaa8ff8b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd337b099ac6dcbf9efc3383… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Aug 1 03:28:58 2019 +0000 include: Added missing Button_* defines. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 84bdcad..203d3ea 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -1112,6 +1112,14 @@ typedef struct tagNMBCHOTITEM (BOOL)SNDMSG(button, BCM_SETTEXTMARGIN, 0, (LPARAM)(margin)) #define Button_GetIdealSize(button, size) \ (BOOL)SNDMSG(button, BCM_GETIDEALSIZE, 0, (LPARAM)(size)) +#define Button_SetSplitInfo(hwnd, info) \ + (BOOL)SNDMSG((hwnd), BCM_SETSPLITINFO, 0, (LPARAM)(info)) +#define Button_GetSplitInfo(hwnd, info) \ + (BOOL)SNDMSG((hwnd), BCM_GETSPLITINFO, 0, (LPARAM)(info)) +#define Button_SetElevationRequiredState(hwnd, required) \ + (LRESULT)SNDMSG((hwnd), BCM_SETSHIELD, 0, (LPARAM)required) +#define Button_SetDropDownState(hwnd, dropdown) \ + (BOOL)SNDMSG((hwnd), BCM_SETDROPDOWNSTATE, (WPARAM)(dropdown), 0) /* Toolbar */

1 0