May 2018 - Wine-Commits - list.winehq.org

Hans Leidekker : msi/tests: Remove duplicate service tests.
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: f655bb7ee71a5e271fc7091013a60bb799b315df URL: https://source.winehq.org/git/wine.git/?a=commit;h=f655bb7ee71a5e271fc70910… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 31 11:12:17 2018 +0200 msi/tests: Remove duplicate service tests. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/install.c | 86 +++--------------------------------------------- 1 file changed, 5 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f655bb7ee71a5e271fc7…

1 0

Józef Kucia : dxgi: Implement d3d12_swapchain_GetBuffer().
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: 9ff8fe174a5e86f35c5ec2308b66c5c501984c2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ff8fe174a5e86f35c5ec230… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 31 12:04:33 2018 +0200 dxgi: Implement d3d12_swapchain_GetBuffer(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a50a878..d7b7288 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1012,10 +1012,18 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present(IDXGISwapChain3 *iface, static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetBuffer(IDXGISwapChain3 *iface, UINT buffer_idx, REFIID iid, void **surface) { - FIXME("iface %p, buffer_idx %u, iid %s, surface %p stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + + TRACE("iface %p, buffer_idx %u, iid %s, surface %p.\n", iface, buffer_idx, debugstr_guid(iid), surface); - return E_NOTIMPL; + if (buffer_idx >= swapchain->buffer_count) + { + WARN("Invalid buffer index %u.\n", buffer_idx); + return DXGI_ERROR_INVALID_CALL; + } + + return ID3D12Resource_QueryInterface(swapchain->buffers[buffer_idx], iid, surface); } static HRESULT STDMETHODCALLTYPE DECLSPEC_HOTPATCH d3d12_swapchain_SetFullscreenState(IDXGISwapChain3 *iface,

1 0

Józef Kucia : dxgi: Implement d3d12_swapchain_Present1().
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: cba2a33129d6bd253aa8fd60a8736c1670ba798b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cba2a33129d6bd253aa8fd60… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 31 12:04:35 2018 +0200 dxgi: Implement d3d12_swapchain_Present1(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/swapchain.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 76c674a..57862ac 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1176,13 +1176,82 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetCoreWindow(IDXGISwapChain3 * return DXGI_ERROR_INVALID_CALL; } +static HRESULT d3d12_swapchain_acquire_next_image(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkDevice vk_device = swapchain->vk_device; + VkFence vk_fence = swapchain->vk_fence; + VkResult vr; + + if ((vr = vk_funcs->p_vkAcquireNextImageKHR(vk_device, swapchain->vk_swapchain, UINT64_MAX, + VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index)) < 0) + { + ERR("Failed to acquire next Vulkan image, vr %d.\n", vr); + return E_FAIL; + } + + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) < 0) + { + ERR("Failed to wait for fences, vr %d.\n", vr); + return E_FAIL; + } + 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 S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_swapchain_Present1(IDXGISwapChain3 *iface, UINT sync_interval, UINT flags, const DXGI_PRESENT_PARAMETERS *present_parameters) { - FIXME("iface %p, sync_interval %u, flags %#x, present_parameters %p stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkPresentInfoKHR present_desc; + VkQueue vk_queue; + + TRACE("iface %p, sync_interval %u, flags %#x, present_parameters %p.\n", iface, sync_interval, flags, present_parameters); - return E_NOTIMPL; + if (sync_interval > 4) + { + WARN("Invalid sync interval %u.\n", sync_interval); + return DXGI_ERROR_INVALID_CALL; + } + if (sync_interval != 1) + FIXME("Ignoring sync interval %u.\n", sync_interval); + + if (flags & ~DXGI_PRESENT_TEST) + FIXME("Unimplemented flags %#x.\n", flags); + if (flags & DXGI_PRESENT_TEST) + { + WARN("Returning S_OK for DXGI_PRESENT_TEST.\n"); + return S_OK; + } + + if (present_parameters) + FIXME("Ignored present parameters %p.\n", present_parameters); + + present_desc.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR; + present_desc.pNext = NULL; + present_desc.waitSemaphoreCount = 0; + present_desc.pWaitSemaphores = NULL; + present_desc.swapchainCount = 1; + present_desc.pSwapchains = &swapchain->vk_swapchain; + present_desc.pImageIndices = &swapchain->current_buffer_index; + present_desc.pResults = NULL; + + if (!(vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + ERR("Failed to acquire Vulkan queue.\n"); + return E_FAIL; + } + vk_funcs->p_vkQueuePresentKHR(vk_queue, &present_desc); + vkd3d_release_vk_queue(swapchain->command_queue); + + return d3d12_swapchain_acquire_next_image(swapchain); } static BOOL STDMETHODCALLTYPE d3d12_swapchain_IsTemporaryMonoSupported(IDXGISwapChain3 *iface) @@ -1707,10 +1776,11 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI swapchain->vk_instance = vk_instance; swapchain->vk_device = vk_device; - vk_funcs->p_vkAcquireNextImageKHR(vk_device, vk_swapchain, UINT64_MAX, - VK_NULL_HANDLE, vk_fence, &swapchain->current_buffer_index); - vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX); - vk_funcs->p_vkResetFences(vk_device, 1, &vk_fence); + if (FAILED(hr = d3d12_swapchain_acquire_next_image(swapchain))) + { + WARN("Failed to acquire Vulkan image, hr %#x.\n", hr); + goto fail; + } resource_info.type = VKD3D_STRUCTURE_TYPE_IMAGE_RESOURCE_CREATE_INFO; resource_info.next = NULL;

1 0

Józef Kucia : dxgi/tests: Add test for creating swapchains with multisampling.
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: b79e55c7d4dcec28528aa3c4bcf2526ea7f7a995 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b79e55c7d4dcec28528aa3c4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 31 12:04:38 2018 +0200 dxgi/tests: Add test for creating swapchains with multisampling. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 57 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index a395a69..b8dda1c 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -70,6 +70,22 @@ static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, return hr; } +static unsigned int check_multisample_quality_levels(IDXGIDevice *dxgi_device, + DXGI_FORMAT format, unsigned int sample_count) +{ + ID3D10Device *device; + unsigned int levels; + HRESULT hr; + + hr = IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D10Device, (void **)&device); + ok(hr == S_OK, "Failed to query ID3D10Device, hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, format, sample_count, &levels); + ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); + ID3D10Device_Release(device); + + return levels; +} + #define MODE_DESC_IGNORE_RESOLUTION 0x00000001u #define MODE_DESC_IGNORE_REFRESH_RATE 0x00000002u #define MODE_DESC_IGNORE_FORMAT 0x00000004u @@ -3213,13 +3229,13 @@ static void test_swapchain_parameters(void) 0, 0, 640, 480, 0, 0, 0, 0); hr = IDXGIDevice_QueryInterface(device, &IID_IUnknown, (void **)&obj); - ok(SUCCEEDED(hr), "IDXGIDevice does not implement IUnknown.\n"); + ok(hr == S_OK, "IDXGIDevice does not implement IUnknown.\n"); hr = IDXGIDevice_GetAdapter(device, &adapter); - ok(SUCCEEDED(hr), "GetAdapter failed, hr %#x.\n", hr); - + ok(hr == S_OK, "Failed to get adapter, hr %#x.\n", hr); hr = IDXGIAdapter_GetParent(adapter, &IID_IDXGIFactory, (void **)&factory); - ok(SUCCEEDED(hr), "GetParent failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get parent, hr %#x.\n", hr); + IDXGIAdapter_Release(adapter); for (i = 0; i < ARRAY_SIZE(tests); ++i) { @@ -3372,8 +3388,39 @@ static void test_swapchain_parameters(void) IDXGISwapChain_Release(swapchain); } + /* multisampling */ + memset(&desc, 0, sizeof(desc)); + desc.BufferDesc.Width = registry_mode.dmPelsWidth; + desc.BufferDesc.Height = registry_mode.dmPelsHeight; + desc.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.SampleDesc.Count = 4; + desc.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT; + desc.BufferCount = 4; + desc.OutputWindow = window; + desc.Windowed = TRUE; + desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + desc.SwapEffect = DXGI_SWAP_EFFECT_FLIP_DISCARD; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + if (check_multisample_quality_levels(device, desc.BufferDesc.Format, desc.SampleDesc.Count)) + { + desc.SwapEffect = DXGI_SWAP_EFFECT_DISCARD; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_Release(swapchain); + desc.SwapEffect = DXGI_SWAP_EFFECT_SEQUENTIAL; + hr = IDXGIFactory_CreateSwapChain(factory, obj, &desc, &swapchain); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + IDXGISwapChain_Release(swapchain); + } + else + { + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM.\n"); + } + IDXGIFactory_Release(factory); - IDXGIAdapter_Release(adapter); IUnknown_Release(obj); refcount = IDXGIDevice_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : dxgi/tests: Add option to use selected adapter.
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: db46a1a1b926cb70e9cf2e444781b84c74880a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=db46a1a1b926cb70e9cf2e44… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 31 12:04:39 2018 +0200 dxgi/tests: Add option to use selected adapter. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 69 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 65 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index b8dda1c..8ad4935 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -390,15 +390,63 @@ static void compute_expected_swapchain_fullscreen_state_after_fullscreen_change_ } } -static IDXGIDevice *create_device(UINT flags) +static BOOL use_warp_adapter; +static unsigned int use_adapter_idx; + +static IDXGIAdapter *create_adapter(void) +{ + IDXGIFactory4 *factory4; + IDXGIFactory *factory; + IDXGIAdapter *adapter; + HRESULT hr; + + if (!use_warp_adapter && !use_adapter_idx) + return NULL; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory, (void **)&factory))) + { + trace("Failed to create IDXGIFactory, hr %#x.\n", hr); + return NULL; + } + + adapter = NULL; + if (use_warp_adapter) + { + if (SUCCEEDED(hr = IDXGIFactory_QueryInterface(factory, &IID_IDXGIFactory4, (void **)&factory4))) + { + hr = IDXGIFactory4_EnumWarpAdapter(factory4, &IID_IDXGIAdapter, (void **)&adapter); + IDXGIFactory4_Release(factory4); + } + else + { + trace("Failed to get IDXGIFactory4, hr %#x.\n", hr); + } + } + else + { + hr = IDXGIFactory_EnumAdapters(factory, use_adapter_idx, &adapter); + } + IDXGIFactory_Release(factory); + if (FAILED(hr)) + trace("Failed to get adapter, hr %#x.\n", hr); + return adapter; +} + +static IDXGIDevice *create_device(unsigned int flags) { IDXGIDevice *dxgi_device; ID3D10Device1 *device; + IDXGIAdapter *adapter; HRESULT hr; - if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, - flags, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) + adapter = create_adapter(); + hr = D3D10CreateDevice1(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, + flags, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device); + if (adapter) + IDXGIAdapter_Release(adapter); + if (SUCCEEDED(hr)) goto success; + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, flags, D3D10_FEATURE_LEVEL_10_0, D3D10_1_SDK_VERSION, &device))) goto success; @@ -3766,13 +3814,26 @@ static void test_object_wrapping(void) START_TEST(device) { - HMODULE dxgi_module = GetModuleHandleA("dxgi.dll"); + unsigned int argc, i; + HMODULE dxgi_module; + char **argv; + + dxgi_module = GetModuleHandleA("dxgi.dll"); pCreateDXGIFactory1 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory1"); pCreateDXGIFactory2 = (void *)GetProcAddress(dxgi_module, "CreateDXGIFactory2"); registry_mode.dmSize = sizeof(registry_mode); ok(EnumDisplaySettingsW(NULL, ENUM_REGISTRY_SETTINGS, &registry_mode), "Failed to get display mode.\n"); + argc = winetest_get_mainargs(&argv); + for (i = 2; i < argc; ++i) + { + if (!strcmp(argv[i], "--warp")) + use_warp_adapter = TRUE; + else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) + use_adapter_idx = atoi(argv[++i]); + } + test_adapter_desc(); test_adapter_luid(); test_check_interface_support();

1 0

Józef Kucia : dxgi/tests: Handle DXGI_ERROR_NOT_CURRENTLY_AVAILABLE in test_fullscreen_resize_target ().
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: c199cc9ad55cf55cbe7a519ad85025ce334bb0c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c199cc9ad55cf55cbe7a519a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 31 12:04:36 2018 +0200 dxgi/tests: Handle DXGI_ERROR_NOT_CURRENTLY_AVAILABLE in test_fullscreen_resize_target(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/device.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index c192992..784f6d2 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -2200,17 +2200,22 @@ static void test_fullscreen_resize_target(IDXGISwapChain *swapchain, continue; hr = IDXGIOutput_GetDesc(target, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); compute_expected_swapchain_fullscreen_state_after_fullscreen_change(&expected_state, &swapchain_desc, &output_desc.DesktopCoordinates, modes[i].Width, modes[i].Height, NULL); hr = IDXGISwapChain_ResizeTarget(swapchain, &modes[i]); - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK || hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE, "Got unexpected hr %#x.\n", hr); + if (hr == DXGI_ERROR_NOT_CURRENTLY_AVAILABLE) + { + skip("Failed to change to video mode %u.\n", i); + break; + } check_swapchain_fullscreen_state(swapchain, &expected_state); hr = IDXGIOutput_GetDesc(target, &output_desc); - ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to get desc, hr %#x.\n", hr); ok(EqualRect(&output_desc.DesktopCoordinates, &expected_state.fullscreen_state.monitor_rect), "Got desktop coordinates %s, expected %s.\n", wine_dbgstr_rect(&output_desc.DesktopCoordinates),

1 0

Michael Stefaniuc : d3dx10/tests: Use the available ARRAY_SIZE() macro.
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: c64185214f8dae75c8734d1817fbad5b85f70c98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c64185214f8dae75c8734d18… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 30 01:15:27 2018 +0200 d3dx10/tests: Use the available ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/tests/d3dx10.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 9c84a76..2bf92cd 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -269,8 +269,8 @@ float4 main(float4 color : COLOR) : SV_TARGET hr = ID3D10Device_CreatePixelShader(device, simple_ps, sizeof(simple_ps), &ps); ok(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); - hr = ID3D10Device_CreateInputLayout(device, layout_desc, sizeof(layout_desc) / sizeof(*layout_desc), - simple_vs, sizeof(simple_vs), &input_layout); + hr = ID3D10Device_CreateInputLayout(device, layout_desc, ARRAY_SIZE(layout_desc), simple_vs, + sizeof(simple_vs), &input_layout); ok(SUCCEEDED(hr), "Failed to create input layout, hr %#x.\n", hr); blend_desc.AlphaToCoverageEnable = FALSE;

1 0

Dmitry Timoshkov : mstask: Implement ITask::GetMostRecentRunTime().
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: 5f895673dfa80e4a34fd7c65f5e3505888f4a7f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f895673dfa80e4a34fd7c65… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 12:20:14 2018 +0800 mstask: Implement ITask::GetMostRecentRunTime(). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/task.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58be83e..91d2cb6 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -63,6 +63,7 @@ typedef struct HRESULT status; WORD idle_minutes, deadline_minutes; DWORD flags, priority, maxRunTime, exit_code; + SYSTEMTIME last_runtime; LPWSTR accountName; DWORD trigger_count; TASK_TRIGGER *trigger; @@ -654,10 +655,18 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, st); + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, st); + + if (This->status == SCHED_S_TASK_NOT_SCHEDULED) + { + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_HAS_NOT_RUN; + } - memset(st, 0, sizeof(*st)); - return SCHED_S_TASK_HAS_NOT_RUN; + *st = This->last_runtime; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) @@ -1262,8 +1271,9 @@ static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) This->status = fixed->status; TRACE("flags %08x\n", fixed->flags); This->flags = fixed->flags; + This->last_runtime = fixed->last_runtime; st = &fixed->last_runtime; - TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", + TRACE("last_runtime %u/%u/%u wday %u %u:%02u:%02u.%03u\n", st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); @@ -1617,7 +1627,7 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta This->status = SCHED_S_TASK_HAS_NOT_RUN; fixed.status = This->status; fixed.flags = This->flags; - memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); + fixed.last_runtime = This->last_runtime; try = 1; for (;;) @@ -1855,6 +1865,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->is_dirty = FALSE; This->instance_count = 0; + memset(&This->last_runtime, 0, sizeof(This->last_runtime)); CoCreateGuid(&This->uuid); /* Default time is 3 days = 259200000 ms */

1 0

Dmitry Timoshkov : schedsvc: Read parameters and current directory from the job file.
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: bfb0474e77b03be7dad9dbd18f804a47a63dc868 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bfb0474e77b03be7dad9dbd1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 31 12:20:46 2018 +0800 schedsvc: Read parameters and current directory from the job file. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/atsvc.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 542dfc3..05335de 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -59,6 +59,8 @@ struct job_t { struct list entry; WCHAR *name; + WCHAR *params; + WCHAR *curdir; AT_ENUM info; FIXDLEN_DATA data; USHORT instance_count; @@ -76,7 +78,7 @@ static CRITICAL_SECTION_DEBUG cs_debug = }; static CRITICAL_SECTION at_job_list_section = { &cs_debug, -1, 0, 0, 0, 0 }; -static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) +static DWORD load_unicode_strings(const char *data, DWORD limit, struct job_t *job) { DWORD i, data_size = 0; USHORT len; @@ -101,8 +103,23 @@ static DWORD load_unicode_strings(const char *data, DWORD limit, AT_ENUM *info) TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); - if (i == 0) - info->Command = heap_strdupW((const WCHAR *)data); + switch (i) + { + case 0: + job->info.Command = heap_strdupW((const WCHAR *)data); + break; + + case 1: + job->params = heap_strdupW((const WCHAR *)data); + break; + + case 2: + job->curdir = heap_strdupW((const WCHAR *)data); + break; + + default: + break; + } data += len * sizeof(WCHAR); data_size += len * sizeof(WCHAR); @@ -162,7 +179,7 @@ static BOOL load_job_data(const char *data, DWORD size, struct job_t *info) TRACE("instance count %u\n", info->instance_count); if (fixed->name_size_offset + sizeof(USHORT) < size) - unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, &info->info); + unicode_strings_size = load_unicode_strings(data + fixed->name_size_offset, size - fixed->name_size_offset, info); else { TRACE("invalid name_size_offset\n"); @@ -324,6 +341,8 @@ static void free_job(struct job_t *job) { free_job_info(&job->info); heap_free(job->name); + heap_free(job->params); + heap_free(job->curdir); heap_free(job); }

1 0

Zebediah Figura : msi/tests: Test deferral of WriteEnvironmentStrings and RemoveEnvironmentStrings.
by Alexandre Julliard May 31, 2018

May 31, 2018

Module: wine Branch: master Commit: aae3d6b5afaa67530ee62f922a301fce1967151a URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae3d6b5afaa67530ee62f92… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 30 20:47:34 2018 -0500 msi/tests: Test deferral of WriteEnvironmentStrings and RemoveEnvironmentStrings. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 14 ++++++++++++++ dlls/msi/tests/custom.c | 32 ++++++++++++++++++++++++++++++++ dlls/msi/tests/custom.spec | 2 ++ 3 files changed, 48 insertions(+) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 5747c935..0f7fb6c 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -196,12 +196,25 @@ static const char env_install_exec_seq_dat[] = "InstallInitialize\t\t500\n" "ProcessComponents\t\t600\n" "WriteEnvironmentStrings\t\t700\n" + "wes_immediate\tNOT REMOVE\t701\n" + "wes_deferred\tNOT REMOVE\t702\n" "RemoveEnvironmentStrings\t\t800\n" + "res_immediate\tREMOVE\t801\n" + "res_deferred\tREMOVE\t802\n" "RegisterProduct\t\t900\n" "PublishFeatures\t\t1000\n" "PublishProduct\t\t1100\n" "InstallFinalize\t\t1200\n"; +static const char env_custom_action_dat[] = + "Action\tType\tSource\tTarget\n" + "s72\ti2\tS64\tS0\n" + "CustomAction\tAction\n" + "wes_immediate\t1\tcustom.dll\tenv_absent\n" + "wes_deferred\t1025\tcustom.dll\tenv_present\n" + "res_immediate\t1\tcustom.dll\tenv_present\n" + "res_deferred\t1025\tcustom.dll\tenv_absent\n"; + static const char env_environment_dat[] = "Environment\tName\tValue\tComponent_\n" "s72\tl255\tL255\ts72\n" @@ -1950,6 +1963,7 @@ static const msi_table env_tables[] = ADD_TABLE(feature_comp), ADD_TABLE(file), ADD_TABLE(env_install_exec_seq), + ADD_TABLE(env_custom_action), ADD_TABLE(media), ADD_TABLE(property), ADD_TABLE(env_environment) diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 3fb5382..b182304 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1858,3 +1858,35 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) return ERROR_SUCCESS; } + +UINT WINAPI env_present(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, "MSITESTVAR3", "1"); + check_reg_str(hinst, key, "MSITESTVAR4", "1"); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} + +UINT WINAPI env_absent(MSIHANDLE hinst) +{ + HKEY key; + LONG res; + + res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); + ok(hinst, !res, "got %u\n", res); +todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { + check_reg_str(hinst, key, "MSITESTVAR3", NULL); + check_reg_str(hinst, key, "MSITESTVAR4", NULL); +} + RegCloseKey(key); + + return ERROR_SUCCESS; +} diff --git a/dlls/msi/tests/custom.spec b/dlls/msi/tests/custom.spec index 2ec5b6c..8b3c2fb 100644 --- a/dlls/msi/tests/custom.spec +++ b/dlls/msi/tests/custom.spec @@ -7,6 +7,8 @@ @ stdcall cf_absent(long) @ stdcall crs_present(long) @ stdcall crs_absent(long) +@ stdcall env_present(long) +@ stdcall env_absent(long) @ stdcall file_present(long) @ stdcall file_absent(long) @ stdcall font_present(long)

1 0