wine-commits August 2018

2 participants
618 discussions

Józef Kucia : dxgi/tests: Run test_swapchain_resize() on D3D12.

by Alexandre Julliard

Module: wine Branch: master Commit: f28a82bf577703e706bf6a040bbf0f69c6423bbb URL: https://source.winehq.org/git/wine.git/?a=commit;h=f28a82bf577703e706bf6a04… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:38 2018 +0200 dxgi/tests: Run test_swapchain_resize() on D3D12. 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/dxgi.c | 266 +++++++++++++++++++++++++++++-------------------- 1 file changed, 159 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f28a82bf577703e706bf…

5 years, 9 months

Józef Kucia : dxgi: Implement d3d12_swapchain_ResizeBuffers().

by Alexandre Julliard

Module: wine Branch: master Commit: d10a9faa46382a86cec53996e5ffa3d5c6d7307d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d10a9faa46382a86cec53996… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:37 2018 +0200 dxgi: Implement d3d12_swapchain_ResizeBuffers(). 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 | 118 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 88 insertions(+), 30 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 71183f6..b285f3d 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1344,6 +1344,34 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } +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 hresult_from_vk_result(vr); + } + + if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) + { + 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 hresult_from_vk_result(vr); + } + + return S_OK; +} + static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; @@ -1700,10 +1728,68 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetDesc(IDXGISwapChain3 *iface, static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeBuffers(IDXGISwapChain3 *iface, UINT buffer_count, UINT width, UINT height, DXGI_FORMAT format, UINT flags) { - FIXME("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x stub!\n", + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + DXGI_SWAP_CHAIN_DESC1 *desc; + unsigned int i; + ULONG refcount; + HRESULT hr; + + TRACE("iface %p, buffer_count %u, width %u, height %u, format %s, flags %#x.\n", iface, buffer_count, width, height, debug_dxgi_format(format), flags); - return E_NOTIMPL; + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + for (i = 0; i < swapchain->buffer_count; ++i) + { + ID3D12Resource_AddRef(swapchain->buffers[i]); + if ((refcount = ID3D12Resource_Release(swapchain->buffers[i]))) + { + WARN("Buffer %p has %u references left.\n", swapchain->buffers[i], refcount); + return DXGI_ERROR_INVALID_CALL; + } + } + + desc = &swapchain->desc; + + if (!buffer_count) + buffer_count = desc->BufferCount; + if (!width || !height) + { + RECT client_rect; + + if (!GetClientRect(swapchain->window, &client_rect)) + { + WARN("Failed to get client rect, last error %#x.\n", GetLastError()); + return DXGI_ERROR_INVALID_CALL; + } + + if (!width) + width = client_rect.right; + if (!height) + height = client_rect.bottom; + } + if (!format) + format = desc->Format; + + if (desc->Width == width && desc->Height == height + && desc->Format == format && desc->BufferCount == buffer_count) + return S_OK; + + d3d12_swapchain_destroy_buffers(swapchain); + + desc->Width = width; + desc->Height = height; + desc->Format = format; + desc->BufferCount = buffer_count; + + if (FAILED(hr = d3d12_swapchain_create_vulkan_swapchain(swapchain))) + { + ERR("Failed to recreate Vulkan swapchain, hr %#x.\n", hr); + return hr; + } + + return d3d12_swapchain_acquire_next_image(swapchain); } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *iface, @@ -1800,34 +1886,6 @@ 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 hresult_from_vk_result(vr); - } - - if ((vr = vk_funcs->p_vkWaitForFences(vk_device, 1, &vk_fence, VK_TRUE, UINT64_MAX)) != VK_SUCCESS) - { - 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 hresult_from_vk_result(vr); - } - - return S_OK; -} - static HRESULT d3d12_swapchain_blit_buffer(struct d3d12_swapchain *swapchain, VkQueue vk_queue) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs;

5 years, 9 months

Józef Kucia : dxgi: Factor out d3d12_swapchain_create_vulkan_swapchain().

by Alexandre Julliard

Module: wine Branch: master Commit: 9902af08ce45baa672b04d7e7eac3e1979e140f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9902af08ce45baa672b04d7e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:36 2018 +0200 dxgi: Factor out d3d12_swapchain_create_vulkan_swapchain(). 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 | 228 ++++++++++++++++++++++++++------------------------ 1 file changed, 119 insertions(+), 109 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9902af08ce45baa672b0…

5 years, 9 months

Józef Kucia : dxgi: Factor out d3d12_swapchain_destroy_buffers().

by Alexandre Julliard

Module: wine Branch: master Commit: 7343aec0cd4ea6447b523b0b09e8487ced1316b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7343aec0cd4ea6447b523b0b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:35 2018 +0200 dxgi: Factor out d3d12_swapchain_destroy_buffers(). 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 | 84 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index a2fc37d..0b651c4 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -1345,6 +1345,52 @@ static HRESULT d3d12_swapchain_create_buffers(struct d3d12_swapchain *swapchain, return S_OK; } +static void d3d12_swapchain_destroy_buffers(struct d3d12_swapchain *swapchain) +{ + const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; + VkQueue vk_queue; + unsigned int i; + + if (swapchain->command_queue) + { + if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) + { + vk_funcs->p_vkQueueWaitIdle(vk_queue); + + vkd3d_release_vk_queue(swapchain->command_queue); + } + else + { + WARN("Failed to acquire Vulkan queue.\n"); + } + } + + for (i = 0; i < swapchain->buffer_count; ++i) + { + if (swapchain->buffers[i]) + { + vkd3d_resource_decref(swapchain->buffers[i]); + swapchain->buffers[i] = NULL; + } + + if (swapchain->vk_device) + { + vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); + swapchain->vk_images[i] = VK_NULL_HANDLE; + vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); + swapchain->vk_semaphores[i] = VK_NULL_HANDLE; + } + } + + if (swapchain->vk_device) + { + vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); + swapchain->vk_memory = VK_NULL_HANDLE; + vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); + swapchain->vk_cmd_pool = VK_NULL_HANDLE; + } +} + static inline struct d3d12_swapchain *d3d12_swapchain_from_IDXGISwapChain3(IDXGISwapChain3 *iface) { return CONTAINING_RECORD(iface, struct d3d12_swapchain, IDXGISwapChain3_iface); @@ -1388,49 +1434,18 @@ static ULONG STDMETHODCALLTYPE d3d12_swapchain_AddRef(IDXGISwapChain3 *iface) static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) { const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; - VkQueue vk_queue; - unsigned int i; - - if (swapchain->command_queue) - { - if ((vk_queue = vkd3d_acquire_vk_queue(swapchain->command_queue))) - { - vk_funcs->p_vkQueueWaitIdle(vk_queue); - vkd3d_release_vk_queue(swapchain->command_queue); - } - else - { - WARN("Failed to acquire Vulkan queue.\n"); - } + d3d12_swapchain_destroy_buffers(swapchain); + if (swapchain->command_queue) ID3D12CommandQueue_Release(swapchain->command_queue); - } - - if (swapchain->factory) - IWineDXGIFactory_Release(swapchain->factory); wined3d_private_store_cleanup(&swapchain->private_store); - for (i = 0; i < swapchain->buffer_count; ++i) - { - if (swapchain->buffers[i]) - vkd3d_resource_decref(swapchain->buffers[i]); - - if (swapchain->vk_device) - { - vk_funcs->p_vkDestroyImage(swapchain->vk_device, swapchain->vk_images[i], NULL); - vk_funcs->p_vkDestroySemaphore(swapchain->vk_device, swapchain->vk_semaphores[i], NULL); - } - } - if (swapchain->vk_device) { vk_funcs->p_vkDestroyFence(swapchain->vk_device, swapchain->vk_fence, NULL); vk_funcs->p_vkDestroySwapchainKHR(swapchain->vk_device, swapchain->vk_swapchain, NULL); - - vk_funcs->p_vkFreeMemory(swapchain->vk_device, swapchain->vk_memory, NULL); - vk_funcs->p_vkDestroyCommandPool(swapchain->vk_device, swapchain->vk_cmd_pool, NULL); } if (swapchain->vk_instance) @@ -1438,6 +1453,9 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) if (swapchain->device) ID3D12Device_Release(swapchain->device); + + if (swapchain->factory) + IWineDXGIFactory_Release(swapchain->factory); } static ULONG STDMETHODCALLTYPE d3d12_swapchain_Release(IDXGISwapChain3 *iface)

5 years, 9 months

Józef Kucia : dxgi: Move D3D12 helper functions closer to the top of the file.

by Alexandre Julliard

Module: wine Branch: master Commit: 278ddcbfba3f39a06a2ea00590cd237fda9e0cfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=278ddcbfba3f39a06a2ea005… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Aug 29 12:53:34 2018 +0200 dxgi: Move D3D12 helper functions closer to the top of the file. We need to re-create a Vulkan swapchain in ResizeBuffers(). 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 | 1190 ++++++++++++++++++++++++------------------------- 1 file changed, 595 insertions(+), 595 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=278ddcbfba3f39a06a2e…

5 years, 9 months

Alistair Leslie-Hughes : comsvcs: Add DispenserManager stubbed interface.

by Alexandre Julliard

Module: wine Branch: master Commit: 9b9b4c0dda66f4f950df489bb982b2ebbc4bbc31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b9b4c0dda66f4f950df489b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 29 01:30:04 2018 +0000 comsvcs: Add DispenserManager stubbed interface. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42998 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comsvcs/Makefile.in | 2 +- dlls/comsvcs/main.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 165 insertions(+), 4 deletions(-) diff --git a/dlls/comsvcs/Makefile.in b/dlls/comsvcs/Makefile.in index bd71e7d..b01c4f2 100644 --- a/dlls/comsvcs/Makefile.in +++ b/dlls/comsvcs/Makefile.in @@ -1,6 +1,6 @@ MODULE = comsvcs.dll IMPORTLIB = comsvcs -IMPORTS = ole32 +IMPORTS = ole32 uuid C_SRCS = \ main.c diff --git a/dlls/comsvcs/main.c b/dlls/comsvcs/main.c index 3fc69de..6b7ec14 100644 --- a/dlls/comsvcs/main.c +++ b/dlls/comsvcs/main.c @@ -28,13 +28,120 @@ #include "winbase.h" #include "ole2.h" #include "rpcproxy.h" - +#include "comsvcs.h" +#include "wine/heap.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(comsvcs); static HINSTANCE COMSVCS_hInstance; +typedef struct dispensermanager +{ + IDispenserManager IDispenserManager_iface; + LONG ref; + +} dispensermanager; + +static inline dispensermanager *impl_from_IDispenserManager(IDispenserManager *iface) +{ + return CONTAINING_RECORD(iface, dispensermanager, IDispenserManager_iface); +} + +static HRESULT WINAPI dismanager_QueryInterface(IDispenserManager *iface, REFIID riid, void **object) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), object); + + *object = NULL; + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IDispenserManager)) + { + *object = &This->IDispenserManager_iface; + IUnknown_AddRef( (IUnknown*)*object); + + return S_OK; + } + + WARN("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),object); + return E_NOINTERFACE; +} + +static ULONG WINAPI dismanager_AddRef(IDispenserManager *iface) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + return ref; +} + +static ULONG WINAPI dismanager_Release(IDispenserManager *iface) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + ULONG ref = InterlockedDecrement(&This->ref); + TRACE("(%p)->(%d)\n", This, ref); + + if (!ref) + { + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI dismanager_RegisterDispenser(IDispenserManager *iface, IDispenserDriver *driver, + LPCOLESTR name, IHolder **dispenser) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + FIXME("(%p)->(%p, %s, %p) stub\n", This, driver, debugstr_w(name), dispenser); + + return E_NOTIMPL; +} + +static HRESULT WINAPI dismanager_GetContext(IDispenserManager *iface, INSTID *id, TRANSID *transid) +{ + dispensermanager *This = impl_from_IDispenserManager(iface); + + FIXME("(%p)->(%p, %p) stub\n", This, id, transid); + + return E_NOTIMPL; +} + +struct IDispenserManagerVtbl dismanager_vtbl = +{ + dismanager_QueryInterface, + dismanager_AddRef, + dismanager_Release, + dismanager_RegisterDispenser, + dismanager_GetContext +}; + +static HRESULT WINAPI comsvcscf_CreateInstance(IClassFactory *cf,IUnknown* outer, REFIID riid,void **object) +{ + dispensermanager *dismanager; + HRESULT ret; + + TRACE("(%p %s %p)\n", outer, debugstr_guid(riid), object); + + dismanager = heap_alloc(sizeof(*dismanager)); + if (!dismanager) + { + *object = NULL; + return E_OUTOFMEMORY; + } + + dismanager->IDispenserManager_iface.lpVtbl = &dismanager_vtbl; + dismanager->ref = 1; + + ret = dismanager_QueryInterface(&dismanager->IDispenserManager_iface, riid, object); + dismanager_Release(&dismanager->IDispenserManager_iface); + + return ret; +} + BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) { switch(reason) @@ -49,13 +156,67 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, LPVOID lpv) return TRUE; } +static HRESULT WINAPI comsvcscf_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv ) +{ + *ppv = NULL; + + if(IsEqualGUID(&IID_IUnknown, riid)) { + TRACE("(%p)->(IID_IUnknown %p)\n", iface, ppv); + *ppv = iface; + }else if(IsEqualGUID(&IID_IClassFactory, riid)) { + TRACE("(%p)->(IID_IClassFactory %p)\n", iface, ppv); + *ppv = iface; + } + + if(*ppv) { + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + return E_NOINTERFACE; +} + +static ULONG WINAPI comsvcscf_AddRef(IClassFactory *iface ) +{ + TRACE("(%p)\n", iface); + return 2; +} + +static ULONG WINAPI comsvcscf_Release(IClassFactory *iface ) +{ + TRACE("(%p)\n", iface); + return 1; +} + +static HRESULT WINAPI comsvcscf_LockServer(IClassFactory *iface, BOOL fLock) +{ + TRACE("(%p)->(%x)\n", iface, fLock); + return S_OK; +} + +static const struct IClassFactoryVtbl comsvcscf_vtbl = +{ + comsvcscf_QueryInterface, + comsvcscf_AddRef, + comsvcscf_Release, + comsvcscf_CreateInstance, + comsvcscf_LockServer +}; + +static IClassFactory DispenserManageFactory = { &comsvcscf_vtbl }; + /****************************************************************** * DllGetClassObject */ -HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) +HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - FIXME("(%s,%s,%p) stub\n", debugstr_guid(rclsid), debugstr_guid(iid), ppv); + if(IsEqualGUID(&CLSID_DispenserManager, rclsid)) { + TRACE("(CLSID_DispenserManager %s %p)\n", debugstr_guid(riid), ppv); + return IClassFactory_QueryInterface(&DispenserManageFactory, riid, ppv); + } + FIXME("%s %s %p\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv); return CLASS_E_CLASSNOTAVAILABLE; }

5 years, 9 months

Zebediah Figura : winedevice: Reimplement (un) loading drivers on top of ZwLoadDriver()/ZwUnloadDriver().

by Alexandre Julliard

Module: wine Branch: master Commit: c18f8e4c3235d0417bfb9fdba2d938bf2e42ee65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c18f8e4c3235d0417bfb9fdb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 24 22:42:58 2018 -0500 winedevice: Reimplement (un)loading drivers on top of ZwLoadDriver()/ZwUnloadDriver(). We can't implement ZwLoadDriver() on top of StartService(), since the latter takes the service database lock. Instead simply move the entire body of create_driver()/unload_driver() into ZwLoadDriver()/ZwUnloadDriver(). Similarly, clean up the list of loaded drivers in ntoskrnl rather than winedevice. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45084 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 376 +++++++++++++++++++++++++++++++++++-------- programs/winedevice/device.c | 356 +++------------------------------------- 2 files changed, 330 insertions(+), 402 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c18f8e4c3235d0417bfb…

5 years, 9 months

Zebediah Figura : winedevice: Make driver (un)loading synchronous.

by Alexandre Julliard

Module: wine Branch: master Commit: 44e794327436effc75478ff68def40f9d8801a82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e794327436effc75478ff6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 24 22:42:57 2018 -0500 winedevice: Make driver (un)loading synchronous. This essentially reverts 440482d2ef31333d1bc3ce15b0aad4ceec60466c. 440482d was aimed towards making it possible to load multiple drivers asynchronously, as well as to allow reentrancy. Unfortunately, asynchronicity is incorrect, as demonstrated by bug 38836, and some trivial testing shows that the SCM database lock is held for the entirety of the driver entry and exit routines, and that StartService() and ControlService() block until they complete. 5726824 and dd2624a nullified the effects of 440482d, making driver loading all but synchronous (with the exception of the added 30 second timeout, but this is actually incorrect: drivers can block indefinitely). This patch therefore does not change any behaviour, but rather removes the use of threadpools and "async" functions, essentially reverting back to the implementation prior to 440482d. The incidental change to unload_driver() made by that patch (viz. never to unload a driver without a DriverUnload() routine) is kept. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedevice/device.c | 213 ++++++++++--------------------------------- 1 file changed, 46 insertions(+), 167 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44e794327436effc7547…

5 years, 9 months

Zebediah Figura : ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ ZwUnloadDriver().

by Alexandre Julliard

Module: wine Branch: master Commit: 0a648b272c197b4bc12aabd2ace11a23dbb409cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a648b272c197b4bc12aabd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Aug 24 23:08:52 2018 -0500 ntoskrnl.exe/tests: Add basic tests for ZwLoadDriver()/ZwUnloadDriver(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/Makefile.in | 4 ++ dlls/ntoskrnl.exe/tests/driver.c | 44 +++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/driver2.c | 45 +++++++++++++++++++++ dlls/ntoskrnl.exe/tests/driver2.spec | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 77 ++++++++++++++++++++++++++---------- 6 files changed, 151 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a648b272c197b4bc12a…

5 years, 9 months

Alistair Leslie-Hughes : dpnet: Implement IDirectPlay8Client SetSPCaps.

by Alexandre Julliard

Module: wine Branch: master Commit: 598b52ce38dc2b82910c390164eb95e8972df9b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598b52ce38dc2b82910c3901… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 28 02:13:33 2018 +0000 dpnet: Implement IDirectPlay8Client SetSPCaps. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dpnet/client.c | 14 +++++++++++--- dlls/dpnet/tests/client.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 3b3361f..ea491ef 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -309,9 +309,17 @@ static HRESULT WINAPI IDirectPlay8ClientImpl_SetCaps(IDirectPlay8Client *iface, static HRESULT WINAPI IDirectPlay8ClientImpl_SetSPCaps(IDirectPlay8Client *iface, const GUID * const pguidSP, const DPN_SP_CAPS * const pdpspCaps, const DWORD dwFlags) { - IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); - FIXME("(%p):(%x): Stub\n", This, dwFlags); - return DPN_OK; + IDirectPlay8ClientImpl *This = impl_from_IDirectPlay8Client(iface); + + TRACE("(%p)->(%p,%p,%x): stub\n", iface, pguidSP, pdpspCaps, dwFlags); + + if(!This->msghandler || pdpspCaps->dwSize != sizeof(DPN_SP_CAPS)) + return DPNERR_INVALIDPARAM; + + /* Only dwSystemBufferSize is set by this call. */ + This->spcaps.dwSystemBufferSize = pdpspCaps->dwSystemBufferSize; + + return DPN_OK; } static HRESULT WINAPI IDirectPlay8ClientImpl_GetSPCaps(IDirectPlay8Client *iface, diff --git a/dlls/dpnet/tests/client.c b/dlls/dpnet/tests/client.c index 47d8b01..af56d85 100644 --- a/dlls/dpnet/tests/client.c +++ b/dlls/dpnet/tests/client.c @@ -140,6 +140,9 @@ static BOOL test_init_dp(void) hr = IDirectPlay8Client_Initialize(client, NULL, NULL, 0); ok(hr == DPNERR_INVALIDPARAM, "got %x\n", hr); + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPNERR_INVALIDPARAM, "SetSPCaps failed with %x\n", hr); + hr = IDirectPlay8Client_Initialize(client, NULL, DirectPlayMessageHandler, 0); ok(hr == S_OK, "IDirectPlay8Client_Initialize failed with %x\n", hr); @@ -415,6 +418,33 @@ static void test_get_sp_caps(void) ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); ok(caps.dwSystemBufferSize == 0x10000 || broken(caps.dwSystemBufferSize == 0x2000 /* before Win8 */), "expected 0x10000, got 0x%x\n", caps.dwSystemBufferSize); + + caps.dwNumThreads = 2; + caps.dwDefaultEnumCount = 3; + caps.dwDefaultEnumRetryInterval = 1400; + caps.dwDefaultEnumTimeout = 1400; + caps.dwMaxEnumPayloadSize = 900; + caps.dwBuffersPerThread = 2; + caps.dwSystemBufferSize = 0x0ffff; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); + + hr = IDirectPlay8Client_GetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "GetSPCaps failed with %x\n", hr); + + ok(caps.dwSize == sizeof(DPN_SP_CAPS), "got %d\n", caps.dwSize); + ok(caps.dwNumThreads >= 3, "got %d\n", caps.dwNumThreads); + ok(caps.dwDefaultEnumCount == 5, "expected 5, got %d\n", caps.dwDefaultEnumCount); + ok(caps.dwDefaultEnumRetryInterval == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumRetryInterval); + ok(caps.dwDefaultEnumTimeout == 1500, "expected 1500, got %d\n", caps.dwDefaultEnumTimeout); + ok(caps.dwMaxEnumPayloadSize == 983, "expected 983, got %d\n", caps.dwMaxEnumPayloadSize); + ok(caps.dwBuffersPerThread == 1, "expected 1, got %d\n", caps.dwBuffersPerThread); + ok(caps.dwSystemBufferSize == 0x0ffff, "expected 0x0ffff, got 0x%x\n", caps.dwSystemBufferSize); + + /* Reset the System setting back to its default. */ + caps.dwSystemBufferSize = 0x10000; + hr = IDirectPlay8Client_SetSPCaps(client, &CLSID_DP8SP_TCPIP, &caps, 0); + ok(hr == DPN_OK, "SetSPCaps failed with %x\n", hr); } static void test_lobbyclient(void)

5 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
62
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018