March 2019 - Wine-Devel - list.winehq.org

[PATCH 3/5] dxgi: Implement d3d12_swapchain_GetContainingOutput().
by Józef Kucia March 11, 2019

March 11, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 5e66a5fadfa9..1998e480333e 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -852,6 +852,7 @@ cleanup: static PFN_vkd3d_acquire_vk_queue vkd3d_acquire_vk_queue; static PFN_vkd3d_create_image_resource vkd3d_create_image_resource; +static PFN_vkd3d_get_device_parent vkd3d_get_device_parent; static PFN_vkd3d_get_vk_device vkd3d_get_vk_device; static PFN_vkd3d_get_vk_format vkd3d_get_vk_format; static PFN_vkd3d_get_vk_physical_device vkd3d_get_vk_physical_device; @@ -1936,9 +1937,26 @@ static HRESULT STDMETHODCALLTYPE d3d12_swapchain_ResizeTarget(IDXGISwapChain3 *i static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetContainingOutput(IDXGISwapChain3 *iface, IDXGIOutput **output) { - FIXME("iface %p, output %p stub!\n", iface, output); + struct d3d12_swapchain *swapchain = d3d12_swapchain_from_IDXGISwapChain3(iface); + IUnknown *device_parent; + IDXGIAdapter *adapter; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, output %p.\n", iface, output); + + device_parent = vkd3d_get_device_parent(swapchain->device); + + if (SUCCEEDED(hr = IUnknown_QueryInterface(device_parent, &IID_IDXGIAdapter, (void **)&adapter))) + { + hr = dxgi_get_output_from_window(adapter, swapchain->window, output); + IDXGIAdapter_Release(adapter); + } + else + { + WARN("Failed to get adapter, hr %#x.\n", hr); + } + + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_swapchain_GetFrameStatistics(IDXGISwapChain3 *iface, @@ -2407,6 +2425,7 @@ static BOOL load_vkd3d_functions(void *vkd3d_handle) #define LOAD_FUNCPTR(f) if (!(f = wine_dlsym(vkd3d_handle, #f, NULL, 0))) return FALSE; LOAD_FUNCPTR(vkd3d_acquire_vk_queue) LOAD_FUNCPTR(vkd3d_create_image_resource) + LOAD_FUNCPTR(vkd3d_get_device_parent) LOAD_FUNCPTR(vkd3d_get_vk_device) LOAD_FUNCPTR(vkd3d_get_vk_format) LOAD_FUNCPTR(vkd3d_get_vk_physical_device) -- 2.19.2

3 2

[PATCH 2/5] dxgi: Improve d3d11_swapchain_GetContainingOutput() implementation.
by Józef Kucia March 11, 2019

March 11, 2019

Use MonitorFromWindow() to find the containing IDXGIOutput. This matches our DXGI tests. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 68 ++++++++++++++++++++++++++++++++++--------- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 849b94ae9e09..5e66a5fadfa9 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -110,6 +110,46 @@ BOOL dxgi_validate_swapchain_desc(const DXGI_SWAP_CHAIN_DESC1 *desc) return TRUE; } +static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, IDXGIOutput **dxgi_output) +{ + DXGI_OUTPUT_DESC desc; + IDXGIOutput *output; + unsigned int index; + HMONITOR monitor; + HRESULT hr; + + if (!(monitor = MonitorFromWindow(window, MONITOR_DEFAULTTONEAREST))) + { + WARN("Failed to get monitor from window.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + index = 0; + while ((hr = IDXGIAdapter_EnumOutputs(adapter, index, &output)) == S_OK) + { + if (FAILED(hr = IDXGIOutput_GetDesc(output, &desc))) + { + WARN("Failed to get output desc %u, hr %#x.\n", index, hr); + ++index; + continue; + } + + if (desc.Monitor == monitor) + { + *dxgi_output = output; + return S_OK; + } + + IDXGIOutput_Release(output); + ++index; + } + if (hr != DXGI_ERROR_NOT_FOUND) + WARN("Failed to enumerate outputs, hr %#x.\n", hr); + + WARN("Output could not be found.\n"); + return DXGI_ERROR_NOT_FOUND; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -450,6 +490,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_ResizeTarget(IDXGISwapChain1 *i static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapChain1 *iface, IDXGIOutput **output) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); + struct wined3d_swapchain_desc swapchain_desc; IDXGIAdapter *adapter; IDXGIDevice *device; HRESULT hr; @@ -462,25 +503,26 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh return S_OK; } - if (FAILED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) - return hr; - - hr = IDXGIDevice_GetAdapter(device, &adapter); - IDXGIDevice_Release(device); - if (FAILED(hr)) + if (SUCCEEDED(hr = d3d11_swapchain_GetDevice(iface, &IID_IDXGIDevice, (void **)&device))) { - WARN("GetAdapter failed, hr %#x.\n", hr); - return hr; + hr = IDXGIDevice_GetAdapter(device, &adapter); + IDXGIDevice_Release(device); } - if (SUCCEEDED(IDXGIAdapter_EnumOutputs(adapter, 1, output))) + if (SUCCEEDED(hr)) + { + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &swapchain_desc); + wined3d_mutex_unlock(); + + hr = dxgi_get_output_from_window(adapter, swapchain_desc.device_window, output); + IDXGIAdapter_Release(adapter); + } + else { - FIXME("Adapter has got multiple outputs, returning the first one.\n"); - IDXGIOutput_Release(*output); + WARN("Failed to get adapter, hr %#x.\n", hr); } - hr = IDXGIAdapter_EnumOutputs(adapter, 0, output); - IDXGIAdapter_Release(adapter); return hr; } -- 2.19.2

4 3

[PATCH 1/5] d3d12: Pass IDXGIAdapter and adapter LUID to vkd3d.
by Józef Kucia March 11, 2019

March 11, 2019

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/Makefile.in | 2 +- dlls/d3d12/d3d12_main.c | 58 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index 62fb01a21270..ba51960f2c74 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = gdi32 user32 +IMPORTS = dxgi dxguid gdi32 user32 EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index d6d691c3c237..dace4142ab63 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#define COBJMACROS #define VK_NO_PROTOTYPES #define VKD3D_NO_VULKAN_H #define VKD3D_NO_WIN32_TYPES @@ -30,6 +31,7 @@ #include "wine/vulkan.h" #include "wine/vulkan_driver.h" +#include "dxgi1_6.h" #include "d3d12.h" #include <vkd3d.h> @@ -116,12 +118,58 @@ static const struct vulkan_funcs *get_vk_funcs(void) return vk_funcs; } +static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) +{ + DXGI_ADAPTER_DESC adapter_desc; + IDXGIFactory4 *factory = NULL; + IDXGIAdapter *dxgi_adapter; + HRESULT hr; + + if (!*adapter) + { + if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) + { + WARN("Failed to create DXGI factory, hr %#x.\n", hr); + goto done; + } + + if (FAILED(hr = IDXGIFactory4_EnumAdapters(factory, 0, &dxgi_adapter))) + { + WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); + goto done; + } + } + else if (FAILED(hr = IUnknown_QueryInterface(*adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter))) + { + WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + goto done; + } + + if (SUCCEEDED(hr = IDXGIAdapter_GetDesc(dxgi_adapter, &adapter_desc))) + { + *adapter = (IUnknown *)dxgi_adapter; + *luid = adapter_desc.AdapterLuid; + } + else + { + IDXGIAdapter_Release(dxgi_adapter); + } + +done: + if (factory) + IDXGIFactory4_Release(factory); + + return hr; +} + HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; const struct vulkan_funcs *vk_funcs; + LUID adapter_luid; + HRESULT hr; static const char * const instance_extensions[] = { @@ -142,7 +190,9 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_FAIL; } - FIXME("Ignoring adapter %p.\n", adapter); + /* FIXME: Get VkPhysicalDevice for IDXGIAdapter. */ + if (FAILED(hr = d3d12_get_adapter(&adapter, &adapter_luid))) + return hr; memset(&instance_create_info, 0, sizeof(instance_create_info)); instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; @@ -161,8 +211,12 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe device_create_info.instance_create_info = &instance_create_info; device_create_info.device_extensions = device_extensions; device_create_info.device_extension_count = ARRAY_SIZE(device_extensions); + device_create_info.parent = adapter; + device_create_info.adapter_luid = adapter_luid; - return vkd3d_create_device(&device_create_info, iid, device); + hr = vkd3d_create_device(&device_create_info, iid, device); + IUnknown_Release(adapter); + return hr; } HRESULT WINAPI D3D12CreateRootSignatureDeserializer(const void *data, SIZE_T data_size, -- 2.19.2

3 2

[PATCH v2 1/7] user32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa March 11, 2019

March 11, 2019

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true in the CJK charset font. This patch also contains a patch which uses GdiGetCodePage instead of GetTextCharset because GetTextCharset can't handle associated charset correctly seen in Chinese locale. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 54 ++++++++++++++++++++++++++++++------------------ 1 file changed, 34 insertions(+), 20 deletions(-)

2 1

[PATCH 3/3] ntdll: Add support for returning previous state argument in event functions.
by Jacek Caban March 11, 2019

March 11, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/sync.c | 10 +++------- dlls/ntdll/tests/om.c | 5 ----- server/event.c | 1 + server/protocol.def | 2 ++ 4 files changed, 6 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] ntdll/tests: Add more event op tests.
by Jacek Caban March 11, 2019

March 11, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 48 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-)

1 0

[PATCH 2/2] server: Wake waiters when new pipe server instance is created.
by Jacek Caban March 11, 2019

March 11, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 78 ++++++++++++++++++++++++++++++++++++++ server/named_pipe.c | 1 + 2 files changed, 79 insertions(+)

1 0

[PATCH 1/2] server: Connect pipe servers in order that they enter listening state.
by Jacek Caban March 11, 2019

March 11, 2019

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 114 ++++++++++++++++++++++++++++++++++--- server/named_pipe.c | 52 +++++------------ 2 files changed, 122 insertions(+), 44 deletions(-)

1 0

[PATCH 1/2] ntoskrnl.exe: Add MmBuildMdlForNonPagedPool stub.
by Gijs Vermeulen March 11, 2019

March 11, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46761 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 52e0228bae..caeb89b870 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2525,6 +2525,14 @@ PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS lowaddress, PHYSICAL_ADDRESS return NULL; } +/*********************************************************************** + * MmBuildMdlForNonPagedPool (NTOSKRNL.EXE.@) + */ +void WINAPI MmBuildMdlForNonPagedPool(MDL *mdl) +{ + FIXME("stub: %p\n", mdl); +} + /*********************************************************************** * MmCreateSection (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 438f720333..dbe381f2da 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -672,7 +672,7 @@ @ stub MmAllocateMappingAddress @ stdcall MmAllocateNonCachedMemory(long) @ stdcall MmAllocatePagesForMdl(int64 int64 int64 long) -@ stub MmBuildMdlForNonPagedPool +@ stdcall MmBuildMdlForNonPagedPool(ptr) @ stub MmCanFileBeTruncated @ stub MmCommitSessionMappedView @ stdcall MmCopyVirtualMemory(ptr ptr ptr ptr long long ptr) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 293da50cde..53e064fdd1 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1542,6 +1542,7 @@ NTSTATUS WINAPI KeWaitForSingleObject(void*,KWAIT_REASON,KPROCESSOR_MODE,BOOLEA PVOID WINAPI MmAllocateContiguousMemory(SIZE_T,PHYSICAL_ADDRESS); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); PMDL WINAPI MmAllocatePagesForMdl(PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,PHYSICAL_ADDRESS,SIZE_T); +void WINAPI MmBuildMdlForNonPagedPool(MDL*); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); void * WINAPI MmGetSystemRoutineAddress(UNICODE_STRING*); PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDL,KPROCESSOR_MODE,MEMORY_CACHING_TYPE,PVOID,ULONG,ULONG); -- 2.21.0

1 1

[PATCH] include/wine/unicode: Avoid scanning the entire string in memrchrW
by Gabriel Ivăncescu March 11, 2019

March 11, 2019

Scanning backwards can avoid a full scan of the entire string and makes more sense since we are looking for the last char. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- include/wine/unicode.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/wine/unicode.h b/include/wine/unicode.h index a4b483a..8ee84e4 100644 --- a/include/wine/unicode.h +++ b/include/wine/unicode.h @@ -291,10 +291,9 @@ WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { - const WCHAR *end; - WCHAR *ret = NULL; - for (end = ptr + n; ptr < end; ptr++) if (*ptr == ch) ret = (WCHAR *)(ULONG_PTR)ptr; - return ret; + const WCHAR *p; + for (p = ptr + n - 1; p >= ptr; p--) if (*p == ch) return (WCHAR *)(ULONG_PTR)p; + return NULL; } WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) -- 2.20.1

1 0