wine-devel March 2019

wine-devel@winehq.org

76 participants
1010 discussions

Start a nNew thread

[PATCH] winecfg: Correct comment issues.
by Isira Seneviratne 12 Mar '19

12 Mar '19

2 1

[PATCH 4/4] dxgi: Factor out d3d11_swapchain_get_hwnd().
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 1998e480333e..47f71961768a 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -150,6 +150,17 @@ static HRESULT dxgi_get_output_from_window(IDXGIAdapter *adapter, HWND window, I return DXGI_ERROR_NOT_FOUND; } +static HWND d3d11_swapchain_get_hwnd(struct d3d11_swapchain *swapchain) +{ + struct wined3d_swapchain_desc wined3d_desc; + + wined3d_mutex_lock(); + wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); + wined3d_mutex_unlock(); + + return wined3d_desc.device_window; +} + static inline struct d3d11_swapchain *d3d11_swapchain_from_IDXGISwapChain1(IDXGISwapChain1 *iface) { return CONTAINING_RECORD(iface, struct d3d11_swapchain, IDXGISwapChain1_iface); @@ -490,7 +501,6 @@ 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; @@ -511,11 +521,8 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetContainingOutput(IDXGISwapCh 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); + HWND hwnd = d3d11_swapchain_get_hwnd(swapchain); + hr = dxgi_get_output_from_window(adapter, hwnd, output); IDXGIAdapter_Release(adapter); } else @@ -611,7 +618,6 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetFullscreenDesc(IDXGISwapChai static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetHwnd(IDXGISwapChain1 *iface, HWND *hwnd) { struct d3d11_swapchain *swapchain = d3d11_swapchain_from_IDXGISwapChain1(iface); - struct wined3d_swapchain_desc wined3d_desc; TRACE("iface %p, hwnd %p.\n", iface, hwnd); @@ -621,11 +627,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_swapchain_GetHwnd(IDXGISwapChain1 *iface, return DXGI_ERROR_INVALID_CALL; } - wined3d_mutex_lock(); - wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc); - wined3d_mutex_unlock(); - - *hwnd = wined3d_desc.device_window; + *hwnd = d3d11_swapchain_get_hwnd(swapchain); return S_OK; } -- 2.19.2

3 2

[PATCH 3/4] d3d12: Use VkPhysicalDevice corresponding to IDXGIAdapter.
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d12/Makefile.in | 2 +- dlls/d3d12/d3d12_main.c | 197 +++++++++++++++++++++++++++++++++++----- 2 files changed, 174 insertions(+), 25 deletions(-) diff --git a/dlls/d3d12/Makefile.in b/dlls/d3d12/Makefile.in index ba51960f2c74..5b92997ecdef 100644 --- a/dlls/d3d12/Makefile.in +++ b/dlls/d3d12/Makefile.in @@ -1,6 +1,6 @@ MODULE = d3d12.dll IMPORTLIB = d3d12 -IMPORTS = dxgi dxguid gdi32 user32 +IMPORTS = dxgi dxguid gdi32 user32 uuid EXTRALIBS = $(VKD3D_LIBS) EXTRAINCL = $(VKD3D_CFLAGS) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index dace4142ab63..9eef3ad92ddf 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -36,6 +36,10 @@ #include <vkd3d.h> +#include "initguid.h" +#include "wine/wined3d.h" +#include "wine/winedxgi.h" + WINE_DEFAULT_DEBUG_CHANNEL(d3d12); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -118,14 +122,13 @@ static const struct vulkan_funcs *get_vk_funcs(void) return vk_funcs; } -static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) +static HRESULT d3d12_get_adapter(IWineDXGIAdapter **wine_adapter, IUnknown *adapter) { - DXGI_ADAPTER_DESC adapter_desc; + IDXGIAdapter *dxgi_adapter = NULL; IDXGIFactory4 *factory = NULL; - IDXGIAdapter *dxgi_adapter; HRESULT hr; - if (!*adapter) + if (!adapter) { if (FAILED(hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory))) { @@ -138,37 +141,153 @@ static HRESULT d3d12_get_adapter(IUnknown **adapter, LUID *luid) WARN("Failed to enumerate primary adapter, hr %#x.\n", hr); goto done; } + + adapter = (IUnknown *)dxgi_adapter; } - else if (FAILED(hr = IUnknown_QueryInterface(*adapter, &IID_IDXGIAdapter, (void **)&dxgi_adapter))) - { + + if (FAILED(hr = IUnknown_QueryInterface(adapter, &IID_IWineDXGIAdapter, (void **)wine_adapter))) WARN("Invalid adapter %p, hr %#x.\n", adapter, hr); + +done: + if (dxgi_adapter) + IDXGIAdapter_Release(dxgi_adapter); + if (factory) + IDXGIFactory4_Release(factory); + + return hr; +} + +static BOOL check_vk_instance_extension(const struct vulkan_funcs *vk_funcs, const char *name) +{ + VkExtensionProperties *properties; + BOOL ret = FALSE; + unsigned int i; + uint32_t count; + + if (vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &count, NULL) < 0) + return FALSE; + + if (!(properties = heap_calloc(count, sizeof(*properties)))) + return FALSE; + + if (vk_funcs->p_vkEnumerateInstanceExtensionProperties(NULL, &count, properties) >= 0) + { + for (i = 0; i < count; ++i) + { + if (!strcmp(properties[i].extensionName, name)) + { + ret = TRUE; + break; + } + } + } + + heap_free(properties); + return ret; +} + +static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *instance, + const struct vulkan_funcs *vk_funcs, const struct wine_dxgi_adapter_info *adapter_info) +{ + PFN_vkGetPhysicalDeviceProperties2 pfn_vkGetPhysicalDeviceProperties2 = NULL; + PFN_vkGetPhysicalDeviceProperties pfn_vkGetPhysicalDeviceProperties; + PFN_vkEnumeratePhysicalDevices pfn_vkEnumeratePhysicalDevices; + VkPhysicalDevice vk_physical_device = VK_NULL_HANDLE; + VkPhysicalDeviceIDProperties id_properties; + VkPhysicalDeviceProperties2 properties2; + VkPhysicalDeviceProperties properties; + VkPhysicalDevice *vk_physical_devices; + VkInstance vk_instance; + unsigned int i; + uint32_t count; + VkResult vr; + + vk_instance = vkd3d_instance_get_vk_instance(instance); + + pfn_vkEnumeratePhysicalDevices = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkEnumeratePhysicalDevices"); + + pfn_vkGetPhysicalDeviceProperties = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties"); + if (check_vk_instance_extension(vk_funcs, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME)) + pfn_vkGetPhysicalDeviceProperties2 = vk_funcs->p_vkGetInstanceProcAddr(vk_instance, "vkGetPhysicalDeviceProperties2KHR"); + + if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, NULL)) < 0) + { + WARN("Failed to get device count, vr %d.\n", vr); + return VK_NULL_HANDLE; + } + if (!count) + { + WARN("No physical device available.\n"); + return VK_NULL_HANDLE; + } + + if (!(vk_physical_devices = heap_calloc(count, sizeof(*vk_physical_devices)))) + return VK_NULL_HANDLE; + + if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices)) < 0) goto done; + + if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2) + { + TRACE("Matching adapters by UUIDs.\n"); + + for (i = 0; i < count; ++i) + { + memset(&id_properties, 0, sizeof(id_properties)); + id_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES; + + properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + properties2.pNext = &id_properties; + + pfn_vkGetPhysicalDeviceProperties2(vk_physical_devices[i], &properties2); + + if (!memcmp(id_properties.driverUUID, &adapter_info->driver_uuid, VK_UUID_SIZE) + && !memcmp(id_properties.deviceUUID, &adapter_info->device_uuid, VK_UUID_SIZE)) + { + vk_physical_device = vk_physical_devices[i]; + break; + } + } } - if (SUCCEEDED(hr = IDXGIAdapter_GetDesc(dxgi_adapter, &adapter_desc))) + if (!vk_physical_device) { - *adapter = (IUnknown *)dxgi_adapter; - *luid = adapter_desc.AdapterLuid; + WARN("Matching adapters by PCI IDs.\n"); + + for (i = 0; i < count; ++i) + { + pfn_vkGetPhysicalDeviceProperties(vk_physical_devices[i], &properties); + + if (properties.vendorID == adapter_info->vendor_id && properties.deviceID == adapter_info->device_id) + { + vk_physical_device = vk_physical_devices[i]; + break; + } + } } - else + + if (!vk_physical_device) { - IDXGIAdapter_Release(dxgi_adapter); + FIXME("Could not find Vulkan physical device for DXGI adapter.\n"); + vk_physical_device = vk_physical_devices[0]; } done: - if (factory) - IDXGIFactory4_Release(factory); - - return hr; + heap_free(vk_physical_devices); + return vk_physical_device; } HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_feature_level, REFIID iid, void **device) { + struct vkd3d_optional_instance_extensions_info optional_extensions_info; struct vkd3d_instance_create_info instance_create_info; struct vkd3d_device_create_info device_create_info; + struct wine_dxgi_adapter_info adapter_info; + VkPhysicalDevice vk_physical_device; const struct vulkan_funcs *vk_funcs; - LUID adapter_luid; + struct vkd3d_instance *instance; + IWineDXGIAdapter *wine_adapter; HRESULT hr; static const char * const instance_extensions[] = @@ -176,6 +295,10 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe VK_KHR_SURFACE_EXTENSION_NAME, VK_KHR_WIN32_SURFACE_EXTENSION_NAME, }; + static const char * const optional_instance_extensions[] = + { + VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, + }; static const char * const device_extensions[] = { VK_KHR_SWAPCHAIN_EXTENSION_NAME, @@ -190,12 +313,22 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe return E_FAIL; } - /* FIXME: Get VkPhysicalDevice for IDXGIAdapter. */ - if (FAILED(hr = d3d12_get_adapter(&adapter, &adapter_luid))) + if (FAILED(hr = d3d12_get_adapter(&wine_adapter, adapter))) return hr; - memset(&instance_create_info, 0, sizeof(instance_create_info)); + if (FAILED(hr = IWineDXGIAdapter_get_adapter_info(wine_adapter, &adapter_info))) + { + WARN("Failed to get adapter info, hr %#x.\n", hr); + goto done; + } + + optional_extensions_info.type = VKD3D_STRUCTURE_TYPE_OPTIONAL_INSTANCE_EXTENSIONS_INFO; + optional_extensions_info.next = NULL; + optional_extensions_info.extensions = optional_instance_extensions; + optional_extensions_info.extension_count = ARRAY_SIZE(optional_instance_extensions); + instance_create_info.type = VKD3D_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + instance_create_info.next = &optional_extensions_info; instance_create_info.pfn_signal_event = d3d12_signal_event; instance_create_info.pfn_create_thread = d3d12_create_thread; instance_create_info.pfn_join_thread = d3d12_join_thread; @@ -205,17 +338,33 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe instance_create_info.instance_extensions = instance_extensions; instance_create_info.instance_extension_count = ARRAY_SIZE(instance_extensions); - memset(&device_create_info, 0, sizeof(device_create_info)); + if (FAILED(hr = vkd3d_create_instance(&instance_create_info, &instance))) + { + WARN("Failed to create vkd3d instance, hr %#x.\n", hr); + goto done; + } + + if (!(vk_physical_device = d3d12_get_vk_physical_device(instance, vk_funcs, &adapter_info))) + goto done_instance; + device_create_info.type = VKD3D_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_create_info.next = NULL; device_create_info.minimum_feature_level = minimum_feature_level; - device_create_info.instance_create_info = &instance_create_info; + device_create_info.instance = instance; + device_create_info.instance_create_info = NULL; + device_create_info.vk_physical_device = vk_physical_device; 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; + device_create_info.parent = (IUnknown *)wine_adapter; + device_create_info.adapter_luid = adapter_info.luid; hr = vkd3d_create_device(&device_create_info, iid, device); - IUnknown_Release(adapter); + +done_instance: + vkd3d_instance_decref(instance); + +done: + IWineDXGIAdapter_Release(wine_adapter); return hr; } -- 2.19.2

3 2

[PATCH 2/4] dxgi: Introduce IWineDXGIAdapter::get_adapter_info().
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/dxgi/adapter.c | 24 ++++++++++++++++++++++++ include/wine/winedxgi.idl | 12 ++++++++++++ 2 files changed, 36 insertions(+) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 31baae6f49ff..d96cb1e5b237 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -364,6 +364,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, return dxgi_adapter_get_desc(adapter, desc); } +static HRESULT STDMETHODCALLTYPE dxgi_adapter_get_adapter_info(IWineDXGIAdapter *iface, + struct wine_dxgi_adapter_info *info) +{ + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); + struct wined3d_adapter_identifier adapter_id; + HRESULT hr; + + TRACE("iface %p, info %p.\n", iface, info); + + memset(&adapter_id, 0, sizeof(adapter_id)); + if (SUCCEEDED(hr = wined3d_get_adapter_identifier(adapter->factory->wined3d, adapter->ordinal, 0, &adapter_id))) + { + info->driver_uuid = adapter_id.driver_uuid; + info->device_uuid = adapter_id.device_uuid; + info->vendor_id = adapter_id.vendor_id; + info->device_id = adapter_id.device_id; + info->luid = adapter_id.adapter_luid; + } + + return hr; +} + static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = { dxgi_adapter_QueryInterface, @@ -390,6 +412,8 @@ static const struct IWineDXGIAdapterVtbl dxgi_adapter_vtbl = dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification, /* IDXGIAdapter4 methods */ dxgi_adapter_GetDesc3, + /* IWineDXGIAdapter methods */ + dxgi_adapter_get_adapter_info, }; struct dxgi_adapter *unsafe_impl_from_IDXGIAdapter(IDXGIAdapter *iface) diff --git a/include/wine/winedxgi.idl b/include/wine/winedxgi.idl index f300eb928b62..84440901a9e9 100644 --- a/include/wine/winedxgi.idl +++ b/include/wine/winedxgi.idl @@ -68,6 +68,17 @@ interface IWineDXGIDeviceParent : IUnknown struct wined3d_device_parent *get_wined3d_device_parent(); } +struct wine_dxgi_adapter_info +{ + GUID driver_uuid; + GUID device_uuid; + + DWORD vendor_id; + DWORD device_id; + + LUID luid; +}; + [ object, local, @@ -75,6 +86,7 @@ interface IWineDXGIDeviceParent : IUnknown ] interface IWineDXGIAdapter : IDXGIAdapter4 { + HRESULT get_adapter_info([out] struct wine_dxgi_adapter_info *info); } [ -- 2.19.2

3 2

Google Season of Docs
by André Hentschel 12 Mar '19

12 Mar '19

Hi all, This is the first year of GSoS and organizations can apply in April. In short GSoS is about creating/improving documentation, but have a look at the project site for more info. So the main questions are: Is that interesting for us? Do we want to apply? Who would like to volunteer as a mentor? Who could start an ideas list? If you wish I could handle the registration process which hopefully is similar to GSoC See: https://developers.google.com/season-of-docs/ and https://developers.google.com/season-of-docs/docs/project-ideas

1 0

[PATCH 1/4] wined3d: Add driver and device UUIDs to adapter identifiers.
by Józef Kucia 12 Mar '19

12 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 26 ++++++++++++++++++++++++++ dlls/wined3d/directx.c | 7 ++++++- dlls/wined3d/wined3d_gl.h | 3 ++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 8 +++++--- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 492d7f952305..5bcb39f59c14 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -179,6 +179,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_EXT_framebuffer_blit", EXT_FRAMEBUFFER_BLIT }, {"GL_EXT_framebuffer_multisample", EXT_FRAMEBUFFER_MULTISAMPLE }, {"GL_EXT_framebuffer_object", EXT_FRAMEBUFFER_OBJECT }, + {"GL_EXT_memory_object", EXT_MEMORY_OBJECT }, {"GL_EXT_gpu_program_parameters", EXT_GPU_PROGRAM_PARAMETERS }, {"GL_EXT_gpu_shader4", EXT_GPU_SHADER4 }, {"GL_EXT_packed_depth_stencil", EXT_PACKED_DEPTH_STENCIL }, @@ -2499,6 +2500,9 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttribI4uivEXT) USE_GL_FUNC(glVertexAttribI4usvEXT) USE_GL_FUNC(glVertexAttribIPointerEXT) + /* GL_EXT_memory_object */ + USE_GL_FUNC(glGetUnsignedBytei_vEXT) + USE_GL_FUNC(glGetUnsignedBytevEXT) /* GL_EXT_point_parameters */ USE_GL_FUNC(glPointParameterfEXT) USE_GL_FUNC(glPointParameterfvEXT) @@ -3871,6 +3875,28 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(driver_info->vram_bytes)); + if (gl_info->supported[EXT_MEMORY_OBJECT]) + { + GLint device_count = 0; + + gl_info->gl_ops.gl.p_glGetIntegerv(GL_NUM_DEVICE_UUIDS_EXT, &device_count); + if (device_count > 0) + { + if (device_count > 1) + FIXME("A set of %d devices is not supported.\n", device_count); + + GL_EXTCALL(glGetUnsignedBytevEXT(GL_DRIVER_UUID_EXT, (GLubyte *)&adapter->driver_uuid)); + GL_EXTCALL(glGetUnsignedBytei_vEXT(GL_DEVICE_UUID_EXT, 0, (GLubyte *)&adapter->device_uuid)); + + TRACE("Driver UUID: %s, device UUID %s.\n", + debugstr_guid(&adapter->driver_uuid), debugstr_guid(&adapter->device_uuid)); + } + else + { + WARN("Unexpected device count %d.\n", device_count); + } + } + gl_ext_emul_mask = adapter->vertex_pipe->vp_get_emul_mask(gl_info) | adapter->fragment_pipe->get_emul_mask(gl_info); if (gl_ext_emul_mask & GL_EXT_EMUL_ARB_MULTITEXTURE) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a05f6cccdc4a..d51e672a137e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1211,7 +1211,9 @@ HRESULT CDECL wined3d_get_adapter_identifier(const struct wined3d *wined3d, identifier->device_id = adapter->driver_info.device; identifier->subsystem_id = 0; identifier->revision = 0; - memcpy(&identifier->device_identifier, &IID_D3DDEVICE_D3DUID, sizeof(identifier->device_identifier)); + identifier->device_identifier = IID_D3DDEVICE_D3DUID; + identifier->driver_uuid = adapter->driver_uuid; + identifier->device_uuid = adapter->device_uuid; identifier->whql_level = (flags & WINED3DENUM_NO_WHQL_LEVEL) ? 0 : 1; identifier->adapter_luid = adapter->luid; identifier->video_memory = min(~(SIZE_T)0, adapter->driver_info.vram_bytes); @@ -2548,6 +2550,9 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int o TRACE("Allocated LUID %08x:%08x for adapter %p.\n", adapter->luid.HighPart, adapter->luid.LowPart, adapter); + memset(&adapter->driver_uuid, 0, sizeof(adapter->driver_uuid)); + memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); + adapter->formats = NULL; if (wined3d_creation_flags & WINED3D_NO3D) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a02073c28af1..ae067e65805a 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -157,14 +157,15 @@ enum wined3d_gl_extension EXT_BLEND_FUNC_SEPARATE, EXT_BLEND_MINMAX, EXT_BLEND_SUBTRACT, - EXT_DRAW_BUFFERS2, EXT_DEPTH_BOUNDS_TEST, + EXT_DRAW_BUFFERS2, EXT_FOG_COORD, EXT_FRAMEBUFFER_BLIT, EXT_FRAMEBUFFER_MULTISAMPLE, EXT_FRAMEBUFFER_OBJECT, EXT_GPU_PROGRAM_PARAMETERS, EXT_GPU_SHADER4, + EXT_MEMORY_OBJECT, EXT_PACKED_DEPTH_STENCIL, EXT_PACKED_FLOAT, EXT_POINT_PARAMETERS, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6907c7b2e926..d0edb8c8bd86 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2686,7 +2686,7 @@ BOOL wined3d_adapter_gl_create_context(struct wined3d_context *context, /* The adapter structure */ struct wined3d_adapter { - UINT ordinal; + unsigned int ordinal; POINT monitor_position; enum wined3d_format_id screen_format; @@ -2694,6 +2694,8 @@ struct wined3d_adapter struct wined3d_d3d_info d3d_info; struct wined3d_driver_info driver_info; UINT64 vram_bytes_used; + GUID driver_uuid; + GUID device_uuid; LUID luid; WCHAR device_name[CCHDEVICENAME]; /* for use with e.g. ChangeDisplaySettings() */ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 07329024fefb..2f8ed5efc77f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1719,17 +1719,19 @@ struct wined3d_tri_patch_info struct wined3d_adapter_identifier { char *driver; - UINT driver_size; + unsigned int driver_size; char *description; - UINT description_size; + unsigned int description_size; char *device_name; - UINT device_name_size; + unsigned int device_name_size; LARGE_INTEGER driver_version; DWORD vendor_id; DWORD device_id; DWORD subsystem_id; DWORD revision; GUID device_identifier; + GUID driver_uuid; + GUID device_uuid; DWORD whql_level; LUID adapter_luid; SIZE_T video_memory; -- 2.19.2

2 1

[PATCH] comctl32/combo: Fix misleading indentation
by Fabian Maurer 12 Mar '19

12 Mar '19

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/comctl32/combo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/combo.c b/dlls/comctl32/combo.c index 12ea7bbff6..8a533e65b1 100644 --- a/dlls/comctl32/combo.c +++ b/dlls/comctl32/combo.c @@ -1020,7 +1020,7 @@ static void CBDropDown( LPHEADCOMBO lphc ) else { if (nItems > lphc->visibleItems) - nItems = lphc->visibleItems; + nItems = lphc->visibleItems; nDroppedHeight = nItems * nIHeight + COMBO_YBORDERSIZE(); } } -- 2.21.0

1 0

[PATCH v2 1/2] kernel32/path: Allow renaming a file/directory to a different capitalization of itself
by Gabriel Ivăncescu 12 Mar '19

12 Mar '19

Renaming a file or directory from e.g. foobar to FooBar (or any other caps-only change) should work and capitalize it, like on Windows, instead of being a no-op. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46203 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Use CP_UNIXCP instead of the hack. (thanks Zeb!). But I can't reproduce the testbot failures with MoveFile on my wine install, even on a totally fresh prefix, and I can't use the testbot either since it is a Wine failure not a Windows test failure. Is it a false positive or pre-existing failure? dlls/kernel32/path.c | 73 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 68 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index cf1c768..f5ba38a 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1136,6 +1136,16 @@ static BOOL is_same_file(HANDLE h1, HANDLE h2) return ret; } +static ULONG get_handle_attr(HANDLE handle) +{ + FILE_BASIC_INFORMATION info; + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtQueryInformationFile(handle, &io, &info, sizeof(info), FileBasicInformation); + return status != STATUS_SUCCESS ? 0 : info.FileAttributes; +} + /************************************************************************** * CopyFileW (KERNEL32.@) */ @@ -1317,6 +1327,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, NTSTATUS status; HANDLE source_handle = 0, dest_handle = 0; ANSI_STRING source_unix, dest_unix; + BOOL same_file = FALSE; DWORD options; TRACE("(%s,%s,%p,%p,%04x)\n", @@ -1369,18 +1380,22 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_PATH_NOT_FOUND ); goto error; } - options = FILE_NON_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT; + options = FILE_SYNCHRONOUS_IO_NONALERT; if (flag & MOVEFILE_WRITE_THROUGH) options |= FILE_WRITE_THROUGH; status = NtOpenFile( &dest_handle, GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, &attr, &io, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, options ); if (status == STATUS_SUCCESS) /* destination exists */ { - if (!(flag & MOVEFILE_REPLACE_EXISTING)) + ULONG attrib = 0; + + if (!(flag & MOVEFILE_REPLACE_EXISTING) || + ((attrib = get_handle_attr(dest_handle)) & FILE_ATTRIBUTE_DIRECTORY)) { - if (!is_same_file( source_handle, dest_handle )) + if (!(same_file = is_same_file( source_handle, dest_handle ))) { - SetLastError( ERROR_ALREADY_EXISTS ); + SetLastError( (attrib & FILE_ATTRIBUTE_DIRECTORY) + ? ERROR_ACCESS_DENIED : ERROR_ALREADY_EXISTS ); RtlFreeUnicodeString( &nt_name ); goto error; } @@ -1390,6 +1405,7 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, SetLastError( ERROR_ACCESS_DENIED ); goto error; } + else same_file = is_same_file( source_handle, dest_handle ); NtClose( dest_handle ); dest_handle = NULL; @@ -1402,13 +1418,60 @@ BOOL WINAPI MoveFileWithProgressW( LPCWSTR source, LPCWSTR dest, } status = wine_nt_to_unix_file_name( &nt_name, &dest_unix, FILE_OPEN_IF, FALSE ); - RtlFreeUnicodeString( &nt_name ); if (status != STATUS_SUCCESS && status != STATUS_NO_SUCH_FILE) { + RtlFreeUnicodeString( &nt_name ); SetLastError( RtlNtStatusToDosError(status) ); goto error; } + /* When it's renaming to the same file, preserve the case sensitivity of the last + component, so that renaming a\b\c\foobar to a\b\c\Foobar works correctly like + on Windows, but note that due to hard links the paths must be exactly identical */ + if (same_file && source_unix.Length == dest_unix.Length && + !memcmp(source_unix.Buffer, dest_unix.Buffer, dest_unix.Length)) + { + size_t nt_filename_len, pathlen; + const WCHAR *nt_filename; + BOOL used_default; + char *tmp; + INT num; + + nt_filename = memrchrW(nt_name.Buffer, '\\', nt_name.Length) + 1; + nt_filename_len = nt_name.Length - (nt_filename - nt_name.Buffer); + + /* Build it from path + filename (the latter converted from nt_name) */ + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, &used_default); + if (!num && GetLastError() == ERROR_INVALID_PARAMETER) + { + num = WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + NULL, 0, NULL, NULL); + used_default = FALSE; + } + + if (!used_default && num > 0) + { + for (pathlen = dest_unix.Length; --pathlen > 0;) + if (dest_unix.Buffer[pathlen] == '/') { pathlen++; break; } + + tmp = dest_unix.Buffer; + if (dest_unix.MaximumLength < pathlen + num + 1) + tmp = RtlReAllocateHeap(GetProcessHeap(), 0, tmp, pathlen + num + 1); + if (tmp) + { + dest_unix.Buffer = tmp; + dest_unix.Length = pathlen + num; + dest_unix.MaximumLength = dest_unix.Length + 1; + dest_unix.Buffer[dest_unix.Length] = '\0'; + + WideCharToMultiByte(CP_UNIXCP, 0, nt_filename, nt_filename_len, + dest_unix.Buffer + pathlen, num, NULL, NULL); + } + } + } + RtlFreeUnicodeString( &nt_name ); + /* now perform the rename */ if (rename( source_unix.Buffer, dest_unix.Buffer ) == -1) -- 2.20.1

2 3

[PATCH] mfplat/tests: Fix the trailing '\n's in ok() messages.
by Francois Gouget 12 Mar '19

12 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mfplat/tests/mfplat.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa729b50ee..4eaa1c18993 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -990,9 +990,9 @@ static void test_MFCreateAsyncResult(void) ok(state == (IUnknown *)result, "Unexpected state.\n"); refcount = IMFAsyncResult_Release(result2); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); /* Event handle is closed on release. */ hr = MFCreateAsyncResult(NULL, NULL, NULL, &result); @@ -1005,7 +1005,7 @@ static void test_MFCreateAsyncResult(void) ok(ret, "Failed to get handle info.\n"); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); ret = GetHandleInformation(event, &flags); ok(!ret, "Expected handle to be closed.\n"); @@ -1019,7 +1019,7 @@ static void test_MFCreateAsyncResult(void) ok(ret, "Failed to get handle info.\n"); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); ret = GetHandleInformation(event, &flags); ok(!ret, "Expected handle to be closed.\n"); } @@ -1752,7 +1752,7 @@ static void test_MFInvokeCallback(void) ok(ret == WAIT_TIMEOUT, "Expected timeout, ret %#x.\n", ret); refcount = IMFAsyncResult_Release(result); - ok(!refcount, "Unexpected refcount %u\n.", refcount); + ok(!refcount, "Unexpected refcount %u.\n", refcount); hr = MFShutdown(); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); -- 2.20.1

2 1

[PATCH] ws2_32: Handle EISCONN from sendmsg
by Rob Hughes 12 Mar '19

12 Mar '19

When calling sendmsg on a socket that's already connected, some implementations will return EISCONN if you specify a recipient (notably, Darwin/OSX with UDP connections). Newer versions of Linux and Windows will simply ignore the destination parameter. Signed-off-by: Rob Hughes <rbhughes(a)gmail.com> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3755338ee8..c75a7047ce 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2628,6 +2628,11 @@ static int WS2_send( int fd, struct ws2_async *wsa, int flags ) while ((ret = sendmsg(fd, &hdr, flags)) == -1) { + if (errno == EISCONN) { + hdr.msg_name = 0; + hdr.msg_namelen = 0; + continue; + } if (errno != EINTR) return -1; } -- 2.19.1

1 0

Jump to page:

2025

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-devel March 2019