June 2018 - Wine-Devel - list.winehq.org

[PATCH] winevulkan: Introduce WINE_VK_HOST to explicitly request 'host' Vulkan headers.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/d3d12_main.c | 2 +- dlls/dxgi/swapchain.c | 3 +-- dlls/winevulkan/make_vulkan | 7 ++++++- dlls/winex11.drv/vulkan.c | 3 +-- include/wine/vulkan.h | 7 ++++++- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 91525b49a790..be0bd7acdf74 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -23,7 +23,7 @@ #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/debug.h" #include "wine/heap.h" diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..080541c90462 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -24,11 +24,10 @@ #ifdef SONAME_LIBVKD3D #define VK_NO_PROTOTYPES -#define VKAPI_CALL #define VKD3D_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES -#define WINE_VK_ALIGN(x) +#define WINE_VK_HOST #include "wine/library.h" #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index f0583b400385..2265ddc80b7d 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2009,6 +2009,12 @@ class VkGenerator(object): f.write("#include <windef.h>\n") f.write("#include <stdint.h>\n\n") + f.write("/* Define WINE_VK_HOST to get 'host' headers. */\n") + f.write("#ifdef WINE_VK_HOST\n") + f.write("#define VKAPI_CALL\n") + f.write('#define WINE_VK_ALIGN(x)\n') + f.write("#endif\n\n") + f.write("#ifndef VKAPI_CALL\n") f.write("#define VKAPI_CALL __stdcall\n") f.write("#endif\n\n") @@ -2017,7 +2023,6 @@ class VkGenerator(object): f.write("#define VKAPI_PTR VKAPI_CALL\n") f.write("#endif\n\n") - f.write("/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */\n") f.write("#ifndef WINE_VK_ALIGN\n") f.write("#define WINE_VK_ALIGN DECLSPEC_ALIGN\n") f.write("#endif\n\n") diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index a72be33be341..7e252326b5ac 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -31,9 +31,8 @@ #include "wine/library.h" #include "x11drv.h" -/* We only want host compatible structures and don't need alignment. */ -#define WINE_VK_ALIGN(x) #define VK_NO_PROTOTYPES +#define WINE_VK_HOST #include "wine/vulkan.h" #include "wine/vulkan_driver.h" diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7c938cd88fb2..d44687fabf7b 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -6,6 +6,12 @@ #include <windef.h> #include <stdint.h> +/* Define WINE_VK_HOST to get 'host' headers. */ +#ifdef WINE_VK_HOST +#define VKAPI_CALL +#define WINE_VK_ALIGN(x) +#endif + #ifndef VKAPI_CALL #define VKAPI_CALL __stdcall #endif @@ -14,7 +20,6 @@ #define VKAPI_PTR VKAPI_CALL #endif -/* Callers can override WINE_VK_ALIGN if they want 'host' headers. */ #ifndef WINE_VK_ALIGN #define WINE_VK_ALIGN DECLSPEC_ALIGN #endif -- 2.16.4

June 1, 2018

Re: [PATCH 5/5] d3d12/tests: Add visual test for rendering to swapchain.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=38891 Your paranoid android. === build (build) === Could not determine the test executable's base name

June 1, 2018

[PATCH 5/5] d3d12/tests: Add visual test for rendering to swapchain.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/tests/Makefile.in | 2 +- dlls/d3d12/tests/d3d12.c | 96 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/d3d12/tests/Makefile.in b/dlls/d3d12/tests/Makefile.in index d055aba108ad..b3406f9e6c11 100644 --- a/dlls/d3d12/tests/Makefile.in +++ b/dlls/d3d12/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3d12.dll -IMPORTS = d3d12 +IMPORTS = d3d12 dxgi user32 C_SRCS = \ d3d12.c diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 27a6b2798265..c8f17f314ce1 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -237,7 +237,7 @@ static void create_render_target_(unsigned int line, struct test_context *contex resource_desc.Height = 32; resource_desc.DepthOrArraySize = 1; resource_desc.MipLevels = 1; - resource_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + resource_desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; resource_desc.SampleDesc.Count = 1; resource_desc.SampleDesc.Quality = 0; resource_desc.Layout = D3D12_TEXTURE_LAYOUT_UNKNOWN; @@ -443,6 +443,46 @@ static ID3D12Resource *create_readback_buffer_(unsigned int line, ID3D12Device * D3D12_RESOURCE_FLAG_DENY_SHADER_RESOURCE, D3D12_RESOURCE_STATE_COPY_DEST); } +static HWND create_window(DWORD style) +{ + return CreateWindowA("static", "d3d12_test", style, 0, 0, 256, 256, NULL, NULL, NULL, NULL); +} + +static IDXGISwapChain3 *create_swapchain(ID3D12CommandQueue *queue, HWND window, + unsigned int width, unsigned int height) +{ + IDXGISwapChain1 *swapchain1; + DXGI_SWAP_CHAIN_DESC1 desc; + IDXGISwapChain3 *swapchain; + IDXGIFactory4 *factory; + HRESULT hr; + + hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); + ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + + desc.Width = width; + desc.Height = height; + desc.Format = DXGI_FORMAT_B8G8R8A8_UNORM; + desc.Stereo = FALSE; + desc.SampleDesc.Count = 1; + desc.SampleDesc.Quality = 0; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = 2; + desc.Scaling = DXGI_SCALING_STRETCH; + desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + desc.AlphaMode = DXGI_ALPHA_MODE_UNSPECIFIED; + desc.Flags = 0; + hr = IDXGIFactory4_CreateSwapChainForHwnd(factory, (IUnknown *)queue, window, &desc, NULL, NULL, &swapchain1); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + IDXGIFactory4_Release(factory); + + hr = IDXGISwapChain1_QueryInterface(swapchain1, &IID_IDXGISwapChain3, (void **)&swapchain); + ok(hr == S_OK, "Failed to query IDXGISwapChain3, hr %#x.\n", hr); + IDXGISwapChain1_Release(swapchain1); + return swapchain; +} + struct resource_readback { unsigned int width; @@ -651,8 +691,62 @@ static void test_draw(void) destroy_test_context(&context); } +static void test_swapchain_draw(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + ID3D12GraphicsCommandList *command_list; + struct test_context context; + ID3D12Resource *backbuffer; + IDXGISwapChain3 *swapchain; + ID3D12CommandQueue *queue; + unsigned int index; + ULONG refcount; + HWND window; + HRESULT hr; + RECT rect; + BOOL ret; + + if (!init_test_context(&context)) + return; + command_list = context.list; + queue = context.queue; + + window = create_window(0); + ret = GetClientRect(window, &rect); + ok(ret, "Failed to get client rect.\n"); + set_viewport(&context.viewport, 0.0f, 0.0f, rect.right, rect.bottom, 0.0f, 1.0f); + swapchain = create_swapchain(queue, window, rect.right, rect.bottom); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain); + hr = IDXGISwapChain3_GetBuffer(swapchain, index, &IID_ID3D12Resource, (void **)&backbuffer); + ok(hr == S_OK, "Failed to get swapchain buffer %u, hr %#x.\n", index, hr); + ID3D12Device_CreateRenderTargetView(context.device, backbuffer, NULL, context.rtv); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_sub_resource_state(command_list, backbuffer, 0, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(backbuffer, 0, queue, command_list, 0xff00ff00, 0); + + refcount = ID3D12Resource_Release(backbuffer); + ok(!refcount, "Backbuffer has %u references left.\n", refcount); + refcount = IDXGISwapChain3_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + DestroyWindow(window); + destroy_test_context(&context); +} + START_TEST(d3d12) { test_interfaces(); test_draw(); + test_swapchain_draw(); } -- 2.16.4

June 1, 2018

[PATCH 4/5] dxgi/tests: Run test_swapchain_backbuffer_index() also on D3D12.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 172 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 140 insertions(+), 32 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index e67883e3338f..2e68511137a7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -21,6 +21,7 @@ #include "initguid.h" #include "dxgi1_6.h" #include "d3d11.h" +#include "d3d12.h" #include "wine/heap.h" #include "wine/test.h" @@ -35,6 +36,8 @@ static DEVMODEW registry_mode; static HRESULT (WINAPI *pCreateDXGIFactory1)(REFIID iid, void **factory); static HRESULT (WINAPI *pCreateDXGIFactory2)(UINT flags, REFIID iid, void **factory); +static PFN_D3D12_CREATE_DEVICE pD3D12CreateDevice; + static ULONG get_refcount(IUnknown *iface) { IUnknown_AddRef(iface); @@ -464,6 +467,64 @@ success: return dxgi_device; } +static ID3D12Device *create_d3d12_device(void) +{ + IDXGIAdapter *adapter; + ID3D12Device *device; + HRESULT hr; + + if (!pD3D12CreateDevice) + return NULL; + + adapter = create_adapter(); + hr = pD3D12CreateDevice((IUnknown *)adapter, D3D_FEATURE_LEVEL_11_0, &IID_ID3D12Device, (void **)&device); + if (adapter) + IDXGIAdapter_Release(adapter); + if (FAILED(hr)) + return NULL; + + return device; +} + +static ID3D12CommandQueue *create_d3d12_direct_queue(ID3D12Device *device) +{ + D3D12_COMMAND_QUEUE_DESC command_queue_desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; + command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; + command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + command_queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, + &IID_ID3D12CommandQueue, (void **)&queue); + ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + return queue; +} + +#define get_factory(a, b, c) get_factory_(__LINE__, a, b, c) +static void get_factory_(unsigned int line, IUnknown *device, BOOL is_d3d12, IDXGIFactory **factory) +{ + IDXGIDevice *dxgi_device; + IDXGIAdapter *adapter; + HRESULT hr; + + if (is_d3d12) + { + hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)factory); + ok_(__FILE__, line)(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); + } + else + { + dxgi_device = (IDXGIDevice *)device; + hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); + ok_(__FILE__, line)(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)factory); + ok_(__FILE__, line)(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + } +} + static void test_adapter_desc(void) { DXGI_ADAPTER_DESC1 desc1; @@ -3534,40 +3595,33 @@ static void test_swapchain_present(void) ok(!refcount, "Factory has %u references left.\n", refcount); } -static void test_swapchain_backbuffer_index(void) +static void test_swapchain_backbuffer_index(IUnknown *device, BOOL is_d3d12) { DXGI_SWAP_CHAIN_DESC swapchain_desc; - unsigned int backbuffer_index; + unsigned int index, expected_index; IDXGISwapChain3 *swapchain3; IDXGISwapChain *swapchain; - IDXGIAdapter *adapter; + HRESULT hr, expected_hr; IDXGIFactory *factory; - IDXGIDevice *device; unsigned int i, j; ULONG refcount; - HRESULT hr; RECT rect; BOOL ret; - static const DXGI_SWAP_EFFECT swap_effects[] = - { - DXGI_SWAP_EFFECT_DISCARD, - DXGI_SWAP_EFFECT_SEQUENTIAL, - DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, - DXGI_SWAP_EFFECT_FLIP_DISCARD, - }; - - if (!(device = create_device(0))) + static const struct { - skip("Failed to create device.\n"); - return; + DXGI_SWAP_EFFECT swap_effect; + BOOL supported_in_d3d12; } + tests[] = + { + {DXGI_SWAP_EFFECT_DISCARD, FALSE}, + {DXGI_SWAP_EFFECT_SEQUENTIAL, FALSE}, + {DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, TRUE}, + {DXGI_SWAP_EFFECT_FLIP_DISCARD, TRUE}, + }; - hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); - hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); - IDXGIAdapter_Release(adapter); + get_factory(device, is_d3d12, &factory); swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; @@ -3588,11 +3642,15 @@ static void test_swapchain_backbuffer_index(void) swapchain_desc.BufferDesc.Width = rect.right; swapchain_desc.BufferDesc.Height = rect.bottom; - for (i = 0; i < ARRAY_SIZE(swap_effects); ++i) + for (i = 0; i < ARRAY_SIZE(tests); ++i) { - swapchain_desc.SwapEffect = swap_effects[i]; + swapchain_desc.SwapEffect = tests[i].swap_effect; + expected_hr = !is_d3d12 || tests[i].supported_in_d3d12 ? S_OK : DXGI_ERROR_INVALID_CALL; hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); - ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + todo_wine_if(is_d3d12 && tests[i].supported_in_d3d12) + ok(hr == expected_hr, "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (FAILED(hr)) + continue; hr = IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain3, (void **)&swapchain3); if (hr == E_NOINTERFACE) @@ -3602,10 +3660,11 @@ static void test_swapchain_backbuffer_index(void) goto done; } - for (j = 0; j < swapchain_desc.BufferCount; ++j) + for (j = 0; j < 2 * swapchain_desc.BufferCount; ++j) { - backbuffer_index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain3); - ok(!backbuffer_index, "Got unexpected back buffer index %u.\n", backbuffer_index); + index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain3); + expected_index = is_d3d12 ? j % swapchain_desc.BufferCount : 0; + ok(index == expected_index, "Got back buffer index %u, expected %u.\n", index, expected_index); hr = IDXGISwapChain3_Present(swapchain3, 0, 0); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } @@ -3616,11 +3675,9 @@ static void test_swapchain_backbuffer_index(void) } done: - refcount = IDXGIDevice_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); DestroyWindow(swapchain_desc.OutputWindow); 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_maximum_frame_latency(void) @@ -3901,10 +3958,49 @@ static void test_object_wrapping(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) +{ + IDXGIDevice *device; + ULONG refcount; + + if (!(device = create_device(0))) + { + skip("Failed to create Direct3D 10 device.\n"); + return; + } + + test_func((IUnknown *)device, FALSE); + + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +static void run_on_d3d12(void (*test_func)(IUnknown *device, BOOL is_d3d12)) +{ + ID3D12CommandQueue *queue; + ID3D12Device *device; + ULONG refcount; + + if (!(device = create_d3d12_device())) + { + skip("Failed to create Direct3D 12 device.\n"); + return; + } + + queue = create_d3d12_direct_queue(device); + + test_func((IUnknown *)queue, TRUE); + + refcount = ID3D12CommandQueue_Release(queue); + ok(!refcount, "Command queue has %u references left.\n", refcount); + refcount = ID3D12Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(device) { + HMODULE dxgi_module, d3d12_module; unsigned int argc, i; - HMODULE dxgi_module; char **argv; dxgi_module = GetModuleHandleA("dxgi.dll"); @@ -3941,8 +4037,20 @@ START_TEST(device) test_swapchain_resize(); test_swapchain_parameters(); test_swapchain_present(); - test_swapchain_backbuffer_index(); + run_on_d3d10(test_swapchain_backbuffer_index); test_maximum_frame_latency(); test_output_desc(); test_object_wrapping(); + + if (!(d3d12_module = LoadLibraryA("d3d12.dll"))) + { + skip("Direct3D 12 is not available.\n"); + return; + } + + pD3D12CreateDevice = (void *)GetProcAddress(d3d12_module, "D3D12CreateDevice"); + + run_on_d3d12(test_swapchain_backbuffer_index); + + FreeLibrary(d3d12_module); } -- 2.16.4

June 1, 2018

[PATCH 3/5] include/d3d12: Add PFN_D3D12_CREATE_DEVICE.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/d3d12.idl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/d3d12.idl b/include/d3d12.idl index e9dd22158036..69220e674cd7 100644 --- a/include/d3d12.idl +++ b/include/d3d12.idl @@ -2171,6 +2171,9 @@ interface ID3D12RootSignatureDeserializer : IUnknown const D3D12_VERSIONED_ROOT_SIGNATURE_DESC *root_signature_desc, ID3DBlob **blob, ID3DBlob **error_blob); +typedef HRESULT (__stdcall *PFN_D3D12_CREATE_DEVICE)(IUnknown *adapter, + D3D_FEATURE_LEVEL minmum_feature_level, REFIID iid, void **device); + [local] HRESULT __stdcall D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device); -- 2.16.4

June 1, 2018

[PATCH 2/5] dxgi/tests: Add test for IDXGISwapChain3::GetCurrentBackBufferIndex().

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/tests/device.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 8ad4935b1622..e67883e3338f 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -3534,6 +3534,95 @@ static void test_swapchain_present(void) ok(!refcount, "Factory has %u references left.\n", refcount); } +static void test_swapchain_backbuffer_index(void) +{ + DXGI_SWAP_CHAIN_DESC swapchain_desc; + unsigned int backbuffer_index; + IDXGISwapChain3 *swapchain3; + IDXGISwapChain *swapchain; + IDXGIAdapter *adapter; + IDXGIFactory *factory; + IDXGIDevice *device; + unsigned int i, j; + ULONG refcount; + HRESULT hr; + RECT rect; + BOOL ret; + + static const DXGI_SWAP_EFFECT swap_effects[] = + { + DXGI_SWAP_EFFECT_DISCARD, + DXGI_SWAP_EFFECT_SEQUENTIAL, + DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL, + DXGI_SWAP_EFFECT_FLIP_DISCARD, + }; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); + hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); + + swapchain_desc.BufferDesc.RefreshRate.Numerator = 60; + swapchain_desc.BufferDesc.RefreshRate.Denominator = 60; + swapchain_desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + swapchain_desc.BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED; + swapchain_desc.BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED; + swapchain_desc.SampleDesc.Count = 1; + swapchain_desc.SampleDesc.Quality = 0; + swapchain_desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + swapchain_desc.BufferCount = 4; + 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.Flags = 0; + + ret = GetClientRect(swapchain_desc.OutputWindow, &rect); + ok(ret, "Failed to get client rect.\n"); + swapchain_desc.BufferDesc.Width = rect.right; + swapchain_desc.BufferDesc.Height = rect.bottom; + + for (i = 0; i < ARRAY_SIZE(swap_effects); ++i) + { + swapchain_desc.SwapEffect = swap_effects[i]; + hr = IDXGIFactory_CreateSwapChain(factory, (IUnknown *)device, &swapchain_desc, &swapchain); + ok(hr == S_OK, "Failed to create swapchain, hr %#x.\n", hr); + + hr = IDXGISwapChain_QueryInterface(swapchain, &IID_IDXGISwapChain3, (void **)&swapchain3); + if (hr == E_NOINTERFACE) + { + skip("IDXGISwapChain3 is not supported.\n"); + IDXGISwapChain_Release(swapchain); + goto done; + } + + for (j = 0; j < swapchain_desc.BufferCount; ++j) + { + backbuffer_index = IDXGISwapChain3_GetCurrentBackBufferIndex(swapchain3); + ok(!backbuffer_index, "Got unexpected back buffer index %u.\n", backbuffer_index); + hr = IDXGISwapChain3_Present(swapchain3, 0, 0); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + } + + IDXGISwapChain3_Release(swapchain3); + refcount = IDXGISwapChain_Release(swapchain); + ok(!refcount, "Swapchain has %u references left.\n", refcount); + } + +done: + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + DestroyWindow(swapchain_desc.OutputWindow); + refcount = IDXGIFactory_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + static void test_maximum_frame_latency(void) { IDXGIDevice1 *device1; @@ -3852,6 +3941,7 @@ START_TEST(device) test_swapchain_resize(); test_swapchain_parameters(); test_swapchain_present(); + test_swapchain_backbuffer_index(); test_maximum_frame_latency(); test_output_desc(); test_object_wrapping(); -- 2.16.4

June 1, 2018

[PATCH 1/5] dxgi: Translate VkResults to HRESULTs.

by Józef Kucia

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b2..a775df2446e5 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -847,6 +847,21 @@ struct dxgi_vk_funcs PFN_vkDestroyFence p_vkDestroyFence; }; +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + return E_OUTOFMEMORY; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + struct d3d12_swapchain { IDXGISwapChain3 IDXGISwapChain3_iface; @@ -1187,18 +1202,18 @@ static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapch VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) { ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) < 0) + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) { - ERR("Failed to wait for fences, vr %d.\n", vr); - return E_FAIL; + ERR("Failed to wait for fence, vr %d.\n", vr); + return hresult_from_vk_result(vr); } if ((vr = vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence)) < 0) { ERR("Failed to reset fence, vr %d.\n", vr); - return E_FAIL; + return hresult_from_vk_result(vr); } return S_OK; @@ -1574,7 +1589,7 @@ static HRESULT select_vk_format(const struct dxgi_vk_funcs *vk_funcs, { WARN("Failed to enumerate supported surface formats, vr %d.\n", vr); heap_free(formats); - return DXGI_ERROR_INVALID_CALL; + return hresult_from_vk_result(vr); } for (i = 0; i < format_count; ++i) @@ -1612,11 +1627,11 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI VkFenceCreateInfo fence_desc; uint32_t queue_family_index; VkInstance vk_instance; - HRESULT hr = E_FAIL; VkBool32 supported; VkDevice vk_device; VkFormat vk_format; VkResult vr; + HRESULT hr; swapchain->IDXGISwapChain3_iface.lpVtbl = &d3d12_swapchain_vtbl; swapchain->refcount = 1; @@ -1674,6 +1689,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateWin32SurfaceKHR(vk_instance, &surface_desc, NULL, &vk_surface)) < 0) { WARN("Failed to create Vulkan surface, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1682,17 +1698,18 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI queue_family_index, vk_surface, &supported)) < 0 || !supported) { FIXME("Queue family does not support presentation, vr %d.\n", vr); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } if (FAILED(hr = select_vk_format(vk_funcs, vk_physical_device, vk_surface, swapchain_desc, &vk_format))) goto fail; - hr = E_FAIL; if ((vr = vk_funcs->p_vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical_device, vk_surface, &surface_caps)) < 0) { WARN("Failed to get surface capabilities, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1701,6 +1718,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI { WARN("Buffer count %u is not supported (%u-%u).\n", swapchain_desc->BufferCount, surface_caps.minImageCount, surface_caps.maxImageCount); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1718,6 +1736,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if (!(surface_caps.supportedCompositeAlpha & VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR)) { FIXME("Unsupported alpha mode.\n"); + hr = DXGI_ERROR_UNSUPPORTED; goto fail; } @@ -1743,6 +1762,7 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateSwapchainKHR(vk_device, &vk_swapchain_desc, NULL, &vk_swapchain)) < 0) { WARN("Failed to create Vulkan swapchain, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } @@ -1752,21 +1772,27 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI if ((vr = vk_funcs->p_vkCreateFence(vk_device, &fence_desc, NULL, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, NULL)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } if (image_count != swapchain_desc->BufferCount) FIXME("Got %u swapchain images, expected %u.\n", image_count, swapchain_desc->BufferCount); if (image_count > ARRAY_SIZE(vk_images)) + { + hr = E_FAIL; goto fail; + } if ((vr = vk_funcs->p_vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &image_count, vk_images)) < 0) { WARN("Failed to get Vulkan swapchain images, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); goto fail; } -- 2.16.4

June 1, 2018

Re: [PATCH] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Huw Davies

On Thu, May 31, 2018 at 11:03:36PM -0600, Alex Henrie wrote: > Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> > --- > CID 716634 (#1 of 1): Resource leak (RESOURCE_LEAK) > > leaked_storage: Variable pStrokes going out of scope leaks the storage > it points to. > > dlls/gdi32/path.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c > index 41cab60515..ceb8d29977 100644 > --- a/dlls/gdi32/path.c > +++ b/dlls/gdi32/path.c > @@ -1749,6 +1749,8 @@ static struct gdi_path *PATH_WidenPath(DC *dc) > break; > default: > ERR("Got path flag %c\n", flat_path->flags[i]); > + HeapFree(GetProcessHeap(), 0, pStrokes); > + free_gdi_path(flat_path); > return NULL; > } > } Not that this really matters, but since you're doing it, we should also free the paths stored in the pStrokes array. Huw.

June 1, 2018

Re: [PATCH] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

June 1, 2018

[PATCH] dxgi: Fix a trailing '\n' in a FIXME() trace.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 57862ac689b..5f151a86579 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1037,7 +1037,7 @@ 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); + FIXME("iface %p, fullscreen %p, target %p stub!\n", iface, fullscreen, target); return E_NOTIMPL; } -- 2.17.0

June 1, 2018

[PATCH] wsdapi/tests: Add a trailing '\n' to an ok() call.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/wsdapi/tests/discovery.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c index cfdd41fe83c..96c2ead7f9a 100644 --- a/dlls/wsdapi/tests/discovery.c +++ b/dlls/wsdapi/tests/discovery.c @@ -540,7 +540,7 @@ static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ProbeHandler(IWSDiscoveryP ok(pSoap->Header.Action != NULL && lstrcmpW(pSoap->Header.Action, actionProbe) == 0, "pSoap->Header.Action == '%s'\n", wine_dbgstr_w(pSoap->Header.Action)); - ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL"); + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL\n"); /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) -- 2.17.0

June 1, 2018

[PATCH] schedsvc: Add a trailing '\n' to some ERR() messages.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/schedsvc/svc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/svc_main.c b/dlls/schedsvc/svc_main.c index 9342b50e4b9..22989261935 100644 --- a/dlls/schedsvc/svc_main.c +++ b/dlls/schedsvc/svc_main.c @@ -39,7 +39,7 @@ static HANDLE done_event, hjob_queue; void add_process_to_queue(HANDLE process) { if (!AssignProcessToJobObject(hjob_queue, process)) - ERR("AssignProcessToJobObject failed"); + ERR("AssignProcessToJobObject failed\n"); } static DWORD WINAPI tasks_monitor_thread(void *arg) @@ -69,14 +69,14 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) hjob_queue = CreateJobObjectW(NULL, NULL); if (!hjob_queue) { - ERR("CreateJobObject failed"); + ERR("CreateJobObject failed\n"); return -1; } hport = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 1); if (!hport) { - ERR("CreateIoCompletionPort failed"); + ERR("CreateIoCompletionPort failed\n"); return -1; } @@ -84,7 +84,7 @@ static DWORD WINAPI tasks_monitor_thread(void *arg) info.CompletionPort = hport; if (!SetInformationJobObject(hjob_queue, JobObjectAssociateCompletionPortInformation, &info, sizeof(info))) { - ERR("SetInformationJobObject failed"); + ERR("SetInformationJobObject failed\n"); return -1; } -- 2.17.0

June 1, 2018

[PATCH] shell32: Fix a typo in a comment.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/shell32/shlview_cmenu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index fc761e18d53..04ac0b6fd3c 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -502,7 +502,7 @@ static INT_PTR CALLBACK file_properties_proc(HWND hwndDlg, UINT uMsg, WPARAM wPa ERR("failed to update file attributes of %s\n", debugstr_w(props->path)); } - /* Update filename it it was changed */ + /* Update filename if it was changed */ if (GetDlgItemTextW(hwndDlg, IDC_FPROP_PATH, newname, ARRAY_SIZE(newname)) && strcmpW(props->filename, newname) && strlenW(props->dir) + strlenW(newname) + 2 < ARRAY_SIZE(newpath)) -- 2.17.0

June 1, 2018

[PATCH] dwrite: Fix typos in a couple of idl parameter names.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- include/dwrite_3.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index de14b910ee3..5958e6fb1bc 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -281,7 +281,7 @@ interface IDWriteFontSet1 : IDWriteFontSet UINT32 *actual_num_ranges); HRESULT GetFontFaceReference( UINT32 index, - IDWriteFontFaceReference1 **referece); + IDWriteFontFaceReference1 **reference); HRESULT CreateFontResource( UINT32 index, IDWriteFontResource **resource); @@ -651,7 +651,7 @@ interface IDWriteFontSetBuilder2 : IDWriteFontSetBuilder1 DWRITE_FONT_AXIS_RANGE const *axis_ranges, UINT32 num_ranges, DWRITE_FONT_PROPERTY const *props, - UINT32 num_properies); + UINT32 num_properties); HRESULT AddFontFile(const WCHAR *filepath); } -- 2.17.0

June 1, 2018

[PATCH] wscript/tests: Fix a typo in the WScript.BuildVersion check.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- programs/wscript/tests/run.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js index 5a5539b1734..a812a85c9e0 100644 --- a/programs/wscript/tests/run.js +++ b/programs/wscript/tests/run.js @@ -27,7 +27,7 @@ ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH)); ok(WScript === WSH, "WScript !== WSH"); ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name); ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version)); -ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuldVersion) = " + typeof(WScript.BuldVersion)); +ok(typeof(WScript.BuildVersion) === "number", "typeof(WScript.BuildVersion) = " + typeof(WScript.BuildVersion)); ok(WScript.FullName.toUpperCase() === winetest.wscriptFullName.toUpperCase(), "WScript.FullName = " + WScript.FullName); ok(WScript.Path.toUpperCase() === winetest.wscriptPath.toUpperCase(), "WScript.Path = " + WScript.Path); ok(WScript.ScriptName === winetest.wscriptScriptName, "WScript.ScriptName = " + WScript.ScriptName); -- 2.17.0

June 1, 2018

[PATCH] Revert "testbot/web: Tweak VMDetails.pl to save the Item directly."

by Francois Gouget

Saving the item directly is ok when modifying it, but DBIBackend only supports saving new items through the collection. In particular the VMDetails page is also used to create new VMs so we have no choice but to go through the collection. This reverts commit 71a9602bb6eab2b54e930080b8ef728064d6a664. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/admin/VMDetails.pl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testbot/web/admin/VMDetails.pl b/testbot/web/admin/VMDetails.pl index 057147157..9603e346a 100644 --- a/testbot/web/admin/VMDetails.pl +++ b/testbot/web/admin/VMDetails.pl @@ -62,7 +62,8 @@ sub Save($) } } - ($self->{ErrField}, $self->{ErrMessage}) = $self->{Item}->Save(); + my $ErrKey; + ($ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); return ! defined($self->{ErrMessage}); } -- 2.17.0

June 1, 2018

[PATCH] dbghelp: Add a missing include to fix the build.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/dbghelp/macho_module.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c index 4018c9dbf2..7c40801d89 100644 --- a/dlls/dbghelp/macho_module.c +++ b/dlls/dbghelp/macho_module.c @@ -51,6 +51,7 @@ #include "winternl.h" #include "wine/library.h" #include "wine/debug.h" +#include "wine/heap.h" #include "image_private.h" #ifdef HAVE_MACH_O_LOADER_H -- 2.16.2

June 1, 2018

[PATCH] testbot/web: Fix the Submit.pl TestExecutable validation.

by Francois Gouget

Fix the parentheses and also make sure it does not contain a path. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 2a4521edc..757efd1f5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -476,12 +476,13 @@ sub Validate($) elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { if (($self->GetParam("FileType") eq "patchdlls" && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+_test\.exe/)) || - ($self->GetParam("FileType") eq "patchprograms") && - ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+\.exe_test\.exe/)) + $self->GetParam("TestExecutable") !~ m/^[\w_.]+_test\.exe$/) || + ($self->GetParam("FileType") eq "patchprograms" && + $self->GetParam("TestExecutable") !~ m/^[\w_.]+\.exe_test\.exe$/) || + ($self->GetParam("TestExecutable") =~ m=(?:[a-z]:|[/\\])=i)) { - $self->{ErrMessage} = "Invalid name for Test executable"; $self->{ErrField} = "TestExecutable"; + $self->{ErrMessage} = "Invalid test executable filename"; return !1; } -- 2.17.0

June 1, 2018

[PATCH] testbot/web: Don't trust the Submit.pl File / FileName field.

by Francois Gouget

Make sure the filename does not contain a path. Rename the variable to $BaseName to make that clearer. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Submit.pl | 68 +++++++++++++++++++++++++------------------ 1 file changed, 39 insertions(+), 29 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 757efd1f5..ae69e7ce5 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -506,6 +506,33 @@ sub Validate($) return $self->SUPER::Validate(); } +sub ValidateAndGetFileName($$) +{ + my ($self, $FieldName) = @_; + + my $FileName = $self->GetParam($FieldName); + if (!$FileName) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "You must provide a file to test"; + return undef; + } + if ($FileName =~ m=[/\\]=) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is invalid"; + return undef; + } + my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); + if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) + { + $self->{ErrField} = $FieldName; + $self->{ErrMessage} = "The filename is too long"; + return undef; + } + return $FileName; +} + sub DetermineFileType($$) { my ($self, $FileName) = @_; @@ -594,29 +621,13 @@ sub OnPage1Next($) { my ($self) = @_; - my $FileName = $self->GetParam("File"); - if (! $FileName) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "File: Must be entered"; - return !1; - } + my $BaseName = $self->ValidateAndGetFileName("File"); + return !1 if (!$BaseName); + my $Fh = $self->CGI->upload("File"); if (defined($Fh)) { - if ($FileName =~ /(\\|\/)/) - { - $FileName =~ m/^.*(\\|\/)(.*)/; - $FileName = $2; - } - my $PropertyDescriptor = CreateSteps()->GetPropertyDescriptorByName("FileName"); - if ($PropertyDescriptor->GetMaxLength() - 32 - 1 < length($FileName)) - { - $self->{ErrField} = "File"; - $self->{ErrMessage} = "The filename is too long"; - return !1; - } - my $StagingFile = $self->GetTmpStagingFullPath($FileName); + my $StagingFile = $self->GetTmpStagingFullPath($BaseName); my $OldUMask = umask(002); if (! open (OUTFILE,">$StagingFile")) { @@ -648,7 +659,7 @@ sub OnPage1Next($) return !1; } - $self->{FileName} = $FileName; + $self->{FileName} = $BaseName; $self->{FileType} = $FileType; if (defined($DllBaseName)) { @@ -706,10 +717,11 @@ sub OnPage2Prev($) { my ($self) = @_; - my $StagingFileName = $self->GetTmpStagingFullPath($self->GetParam("FileName")); - if ($StagingFileName) + my $FileName = $self->GetParam("File"); + if ($FileName) { - unlink($StagingFileName); + my $StagingFileName = $self->GetTmpStagingFullPath(basename($FileName)); + unlink($StagingFileName) if ($StagingFileName); } $self->{Page} = 1; @@ -737,16 +749,14 @@ sub OnSubmit($) { my ($self) = @_; - if (! $self->Validate()) - { - return !1; - } + return !1 if (!$self->Validate()); + my $BaseName = $self->ValidateAndGetFileName("FileName"); + return !1 if (!$BaseName); # Store the file in the staging directory until the relevant Job and Step # IDs are known and it can be moved to the jobs directory tree. But rename # it so it does not get overwritten if the user submits another one before # the Engine gets around to doing so. - my $BaseName = $self->GetParam("FileName"); my $StagingFileName = CreateNewFile("$DataDir/staging", "_$BaseName"); my $TmpStagingFullPath = $self->GetTmpStagingFullPath($BaseName); -- 2.17.0

June 1, 2018

[PATCH] testbot/build: Document the Reconfig.pl commands.

by Francois Gouget

The information messages mirror those of Build.pl. They also add empty lines in the log, improving readability. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Reconfig.pl | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 6f461144e..f84c80458 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -41,6 +41,17 @@ sub BEGIN use WineTestBot::Config; +sub InfoMsg(@) +{ + my $OldUMask = umask(002); + if (open LOGFILE, ">>$LogDir/Reconfig.log") + { + print LOGFILE @_; + close LOGFILE; + } + umask($OldUMask); +} + sub LogMsg(@) { my $OldUMask = umask(002); @@ -61,6 +72,7 @@ sub FatalError(@) sub GitPull() { + InfoMsg "Updating the Wine source\n"; system("cd $DataDir/wine && git pull >> $LogDir/Reconfig.log 2>&1"); if ($? != 0) { @@ -105,6 +117,7 @@ sub BuildTestAgentd() # so don't rebuild it. if (! -x "$BinDir/build/testagentd") { + InfoMsg "\nBuilding the native testagentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus build " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -115,6 +128,7 @@ sub BuildTestAgentd() } } + InfoMsg "\nRebuilding the Windows TestAgentd\n"; system("( cd $::RootDir/src/testagentd && set -x && " . " time make -j$ncpus iso " . ") >>$LogDir/Reconfig.log 2>&1"); @@ -129,6 +143,7 @@ sub BuildTestAgentd() sub BuildTestLauncher() { + InfoMsg "\nRebuilding TestLauncher\n"; system("( cd $::RootDir/src/TestLauncher && set -x && " . " time make -j$ncpus" . ") >>$LogDir/Reconfig.log 2>&1"); @@ -146,6 +161,7 @@ sub BuildNative() mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " rm -rf * && " . " time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && " . @@ -169,6 +185,7 @@ sub BuildCross($) mkdir "$DataDir/build-mingw$Bits" if (! -d "$DataDir/build-mingw$Bits"); # Rebuild from scratch to make sure cruft will not accumulate + InfoMsg "\nRebuilding the $Bits-bit test executables\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " rm -rf * && " . " time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && " . -- 2.17.0

June 1, 2018

[PATCH] testbot/build: Tweak the Build.pl information messages for readability.

by Francois Gouget

Add an empty line before the information messages to make the log more readable. Also tweak the native tools build message. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/build/Build.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 03733cef6..77bc9ca9d 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -89,7 +89,7 @@ sub ApplyPatch($) my $Impacts = GetPatchImpact($PatchFile, "nounits"); if ($Impacts->{Makefiles}) { - InfoMsg "Running make_makefiles\n"; + InfoMsg "\nRunning make_makefiles\n"; system("( cd $DataDir/wine && set -x && " . " ./tools/make_makefiles " . ") >> $LogDir/Build.log 2>&1"); @@ -102,7 +102,7 @@ sub ApplyPatch($) if ($Impacts->{Autoconf} && !$Impacts->{HasConfigure}) { - InfoMsg "Running autoconf\n"; + InfoMsg "\nRunning autoconf\n"; system("( cd $DataDir/wine && set -x && " . " autoconf " . ") >>$LogDir/Build.log 2>&1"); @@ -131,6 +131,8 @@ sub CountCPUs() sub BuildNative() { mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + + InfoMsg "\nRebuilding native tools\n"; system("( cd $DataDir/build-native && set -x && " . " time make -j$ncpus __tooldeps__ " . ") >>$LogDir/Build.log 2>&1"); @@ -157,7 +159,7 @@ sub BuildTestExecutable($$$) $TestExecutable .= "_test.exe"; unlink("$DataDir/build-mingw${Bits}/$TestExecutable"); - InfoMsg "Building the $Bits-bit test executable\n"; + InfoMsg "\nBuilding the $Bits-bit test executable\n"; system("( cd $DataDir/build-mingw$Bits && set -x && " . " time make -j$ncpus $TestsDir " . ") >>$LogDir/Build.log 2>&1"); @@ -256,7 +258,6 @@ if (!ApplyPatch($PatchFile)) CountCPUs(); -InfoMsg "Building tools\n"; if (!BuildNative()) { exit(1); -- 2.17.0

June 1, 2018

[PATCH] testbot: Remove a debug function from PatchUtils.pm.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/PatchUtils.pm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index 611d883e4..b05fe0aa4 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -109,12 +109,6 @@ sub _AddTest($$$) $Tests->{$Module}->{Files}->{$File} = $Change; } -sub dumpstr($) -{ - my ($Str) = @_; - return defined $Str ? "[$Str]" : "<undef>"; -} - =pod =over 12 -- 2.17.0

June 1, 2018

[PATCH] gdi32: Fix memory leak on error in PATH_WidenPath (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- CID 716634 (#1 of 1): Resource leak (RESOURCE_LEAK) leaked_storage: Variable pStrokes going out of scope leaks the storage it points to. dlls/gdi32/path.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 41cab60515..ceb8d29977 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1749,6 +1749,8 @@ static struct gdi_path *PATH_WidenPath(DC *dc) break; default: ERR("Got path flag %c\n", flat_path->flags[i]); + HeapFree(GetProcessHeap(), 0, pStrokes); + free_gdi_path(flat_path); return NULL; } } -- 2.17.0

June 1, 2018

[PATCH] gdi32: Avoid awkward cast in GetGlyphOutlineA (Coverity)

by Alex Henrie

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- CID 713109 (#1 of 1): Reliance on integer endianness (INCOMPATIBLE_CAST) incompatible_cast: Pointer &uChar points to an object whose effective type is unsigned int (32 bits, unsigned) but is dereferenced as a narrower unsigned short (16 bits, unsigned). This may lead to unexpected results depending on machine endianness. dlls/gdi32/font.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 17b160d2dc..3347c9208c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2817,6 +2817,8 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, LPGLYPHMETRICS lpgm, DWORD cbBuffer, LPVOID lpBuffer, const MAT2 *lpmat2 ) { + WCHAR wChar; + if (!lpmat2) return GDI_ERROR; if(!(fuFormat & GGO_GLYPH_INDEX)) { @@ -2833,8 +2835,9 @@ DWORD WINAPI GetGlyphOutlineA( HDC hdc, UINT uChar, UINT fuFormat, len = 1; mbchs[0] = (uChar & 0xff); } - uChar = 0; - MultiByteToWideChar(cp, 0, mbchs, len, (LPWSTR)&uChar, 1); + wChar = 0; + MultiByteToWideChar(cp, 0, mbchs, len, &wChar, 1); + uChar = wChar; } return GetGlyphOutlineW(hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, -- 2.17.0

June 1, 2018