- Wine-Devel - list.winehq.org

[PATCH 4/4] winex11.drv: Fill Vulkan device LUID property.
by Zhiyi Zhang June 17, 2020

June 17, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/vulkan-1/tests/vulkan.c | 2 +- dlls/winex11.drv/vulkan.c | 11 +++ dlls/winex11.drv/xrandr.c | 156 +++++++++++++++++++++++++++++++++++ 3 files changed, 168 insertions(+), 1 deletion(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 4ebfe6815bf..4f80a36cd1b 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -212,7 +212,7 @@ static void test_enumerate_physical_device2(void) trace("Device '%s', device UUID: %s, driver UUID: %s, device LUID: %08x:%08x.\n", properties2.properties.deviceName, wine_dbgstr_guid((const GUID *)id.deviceUUID), wine_dbgstr_guid((const GUID *)id.driverUUID), luid->HighPart, luid->LowPart); - todo_wine ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); + ok(id.deviceLUIDValid == VK_TRUE, "Expected valid device LUID.\n"); } } diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 9ee79220f76..28c53a98d14 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -504,12 +504,21 @@ static VkResult X11DRV_vkGetPhysicalDevicePresentRectanglesKHR(VkPhysicalDevice return pvkGetPhysicalDevicePresentRectanglesKHR(phys_dev, x11_surface->surface, count, rects); } +#if defined(SONAME_LIBXRANDR) && defined(HAVE_XRRGETPROVIDERRESOURCES) +extern void fill_vk_device_luid_property(VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties2 *properties) DECLSPEC_HIDDEN; +#else +#define fill_vk_device_luid_property(a, b) +#endif + static void X11DRV_vkGetPhysicalDeviceProperties2(VkPhysicalDevice phys_dev, VkPhysicalDeviceProperties2 *properties) { TRACE("%p, %p\n", phys_dev, properties); pvkGetPhysicalDeviceProperties2(phys_dev, properties); + + fill_vk_device_luid_property(phys_dev, properties); } static void X11DRV_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, @@ -521,6 +530,8 @@ static void X11DRV_vkGetPhysicalDeviceProperties2KHR(VkPhysicalDevice phys_dev, pvkGetPhysicalDeviceProperties2KHR(phys_dev, properties); else pvkGetPhysicalDeviceProperties2(phys_dev, properties); + + fill_vk_device_luid_property(phys_dev, properties); } static VkResult X11DRV_vkGetPhysicalDeviceSurfaceCapabilities2KHR(VkPhysicalDevice phys_dev, diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index ce7efc9deb4..161c053e659 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -35,8 +35,16 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #include <X11/extensions/Xrandr.h> #include "x11drv.h" +#define VK_NO_PROTOTYPES +#define WINE_VK_HOST + +#include "winreg.h" +#include "devguid.h" +#include "setupapi.h" #include "wine/heap.h" #include "wine/unicode.h" +#include "wine/vulkan.h" +#include "wine/vulkan_driver.h" static void *xrandr_handle; @@ -680,6 +688,154 @@ static BOOL is_crtc_primary( RECT primary, const XRRCrtcInfo *crtc ) crtc->y + crtc->height == primary.bottom; } +#ifdef SONAME_LIBVULKAN + +VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDisplayKHR) +DEFINE_DEVPROPKEY(DEVPROPKEY_GPU_LUID, 0x60b193cb, 0x5276, 0x4d0f, 0x96, 0xfc, 0xf1, 0x73, 0xab, 0xad, 0x3e, 0xc6, 2); +DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5c, 2); + +static BOOL get_provider_luid( RRProvider provider_id, LUID *luid ) +{ + static const WCHAR pci[] = {'P','C','I',0}; + SP_DEVINFO_DATA device_data; + DWORD type, device_idx = 0; + BOOL ret = FALSE; + HDEVINFO devinfo; + HANDLE mutex; + UINT64 id; + + mutex = get_display_device_init_mutex(); + devinfo = SetupDiGetClassDevsW( &GUID_DEVCLASS_DISPLAY, pci, NULL, 0 ); + device_data.cbSize = sizeof(device_data); + while (SetupDiEnumDeviceInfo( devinfo, device_idx++, &device_data) ) + { + if (!SetupDiGetDevicePropertyW( devinfo, &device_data, + &WINE_DEVPROPKEY_GPU_RANDR_PROVIDER_ID, &type, (BYTE *)&id, + sizeof(id), NULL, 0) ) + continue; + + if (id != provider_id) + continue; + + if (SetupDiGetDevicePropertyW( devinfo, &device_data, &DEVPROPKEY_GPU_LUID, &type, + (BYTE *)luid, sizeof(*luid), NULL, 0) ) + { + ret = TRUE; + break; + } + } + SetupDiDestroyDeviceInfoList( devinfo ); + release_display_device_init_mutex( mutex ); + + if (!ret) + WARN("Failed to get LUID for RandR provider %#lx.\n", provider_id); + return ret; +} + +static void set_luid_property( VkPhysicalDeviceProperties2 *properties, const LUID *luid ) +{ + VkPhysicalDeviceIDProperties *id; + VkBaseOutStructure *header; + + for (header = (VkBaseOutStructure *)properties; header; header = header->pNext) + { + if (header->sType != VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ID_PROPERTIES) + continue; + + id = (VkPhysicalDeviceIDProperties *)header; + memcpy( &id->deviceLUID, luid, sizeof(*luid) ); + id->deviceLUIDValid = VK_TRUE; + TRACE("Set LUID %08x:%08x for Vulkan physical device properties %p.\n", luid->HighPart, + luid->LowPart, properties); + return; + } +} + +void fill_vk_device_luid_property( VkPhysicalDevice physical_device, + VkPhysicalDeviceProperties2 *properties ) +{ + VkResult (*p_vkGetRandROutputDisplayEXT)( VkPhysicalDevice, Display *, RROutput, VkDisplayKHR * ); + const struct vulkan_funcs *vulkan_funcs = get_vulkan_driver( WINE_VULKAN_DRIVER_VERSION ); + static const char *extensions[] = { "VK_EXT_acquire_xlib_display" }; + XRRProviderResources *provider_resources = NULL; + XRRScreenResources *screen_resources = NULL; + XRRProviderInfo *provider_info = NULL; + unsigned int provider_idx, output_idx; + VkInstanceCreateInfo create_info; + VkDisplayKHR vk_display; + VkInstance vk_instance; + VkResult vr; + LUID luid; + + memset( &create_info, 0, sizeof(create_info) ); + create_info.sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO; + create_info.enabledExtensionCount = ARRAY_SIZE(extensions); + create_info.ppEnabledExtensionNames = extensions; + + vr = vulkan_funcs->p_vkCreateInstance( &create_info, NULL, &vk_instance ); + if (vr != VK_SUCCESS) + { + ERR("Failed to create a Vulkan instance, vr %d.\n", vr); + return; + } + + p_vkGetRandROutputDisplayEXT = (void *)vulkan_funcs->p_vkGetInstanceProcAddr( vk_instance, "vkGetRandROutputDisplayEXT" ); + if (!p_vkGetRandROutputDisplayEXT) + { + ERR("Failed to load vkGetRandROutputDisplayEXT.\n"); + goto done; + } + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + goto done; + + provider_resources = pXRRGetProviderResources( gdi_display, root_window ); + if (!provider_resources) + goto done; + + if (!provider_resources->nproviders && get_provider_luid( 1, &luid )) + { + set_luid_property( properties, &luid ); + goto done; + } + + for (provider_idx = 0; provider_idx < provider_resources->nproviders; ++provider_idx) + { + provider_info = pXRRGetProviderInfo( gdi_display, screen_resources, + provider_resources->providers[provider_idx] ); + if (!provider_info) + continue; + + for (output_idx = 0; output_idx < provider_info->noutputs; ++output_idx) + { + vr = p_vkGetRandROutputDisplayEXT( physical_device, gdi_display, + provider_info->outputs[output_idx], &vk_display); + if (vr != VK_SUCCESS || vk_display == VK_NULL_HANDLE) + continue; + + if (get_provider_luid( provider_resources->providers[provider_idx], &luid )) + { + set_luid_property( properties, &luid ); + goto done; + } + } + + pXRRFreeProviderInfo( provider_info ); + provider_info = NULL; + } + +done: + if (provider_info) + pXRRFreeProviderInfo( provider_info ); + if (provider_resources) + pXRRFreeProviderResources( provider_resources ); + if (screen_resources) + pXRRFreeScreenResources( screen_resources ); + vulkan_funcs->p_vkDestroyInstance( vk_instance, NULL ); +} +#endif /* SONAME_LIBVULKAN */ + static BOOL xrandr14_get_gpus( struct x11drv_gpu **new_gpus, int *count ) { static const WCHAR wine_adapterW[] = {'W','i','n','e',' ','A','d','a','p','t','e','r',0}; -- 2.25.1

2 6

[PATCH 1/7] winemenubuilder: Change blacklist to a more neutral word
by André Hentschel June 16, 2020

June 16, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- programs/winemenubuilder/winemenubuilder.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index d6fc9e29234..8409035a8f0 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -2470,7 +2470,7 @@ static BOOL write_freedesktop_mime_type_entry(const char *packages_dir, const ch return ret; } -static BOOL is_extension_blacklisted(LPCWSTR extension) +static BOOL is_extension_blocklisted(LPCWSTR extension) { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ static const WCHAR comW[] = {'.','c','o','m',0}; @@ -2564,7 +2564,7 @@ static BOOL generate_associations(const char *xdg_data_home, const char *package size *= 2; } while (ret == ERROR_MORE_DATA); - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blacklisted(extensionW)) + if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_blocklisted(extensionW)) { char *extensionA = NULL; WCHAR *commandW = NULL; -- 2.17.1

3 4

[PATCH] ws2_32: add FreeAddrInfoEx
by Louis Lenders June 16, 2020

June 16, 2020

https://bugs.winehq.org/show_bug.cgi?id=48256 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ws2_32/socket.c | 18 ++++++++++++++++++ dlls/ws2_32/ws2_32.spec | 1 + include/ws2tcpip.h | 4 ++++ 3 files changed, 23 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 199b7187a8..ac37498eca 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7245,6 +7245,24 @@ void WINAPI FreeAddrInfoW(PADDRINFOW ai) } } +/*********************************************************************** + * FreeAddrInfoEx (WS2_32.@) + */ +void WINAPI FreeAddrInfoEx(ADDRINFOEXA *ai) +{ + TRACE("(%p)\n", ai); + + while (ai) + { + ADDRINFOEXA *next; + HeapFree(GetProcessHeap(), 0, ai->ai_canonname); + HeapFree(GetProcessHeap(), 0, ai->ai_addr); + next = ai->ai_next; + HeapFree(GetProcessHeap(), 0, ai); + ai = next; + } +} + /*********************************************************************** * FreeAddrInfoExW (WS2_32.@) */ diff --git a/dlls/ws2_32/ws2_32.spec b/dlls/ws2_32/ws2_32.spec index d3c1e6214a..87e0bdfa2f 100644 --- a/dlls/ws2_32/ws2_32.spec +++ b/dlls/ws2_32/ws2_32.spec @@ -50,6 +50,7 @@ 500 stub WEP +@ stdcall FreeAddrInfoEx(ptr) @ stdcall FreeAddrInfoExW(ptr) @ stdcall FreeAddrInfoW(ptr) @ stdcall GetAddrInfoExCancel(ptr) diff --git a/include/ws2tcpip.h b/include/ws2tcpip.h index 43c277fa0c..5a444dcb5f 100644 --- a/include/ws2tcpip.h +++ b/include/ws2tcpip.h @@ -177,7 +177,11 @@ void WINAPI WS(freeaddrinfo)(LPADDRINFO); #define FreeAddrInfoA WS(freeaddrinfo) void WINAPI FreeAddrInfoW(PADDRINFOW); #define FreeAddrInfo WINELIB_NAME_AW(FreeAddrInfo) +void WINAPI FreeAddrInfoEx(ADDRINFOEXA*); void WINAPI FreeAddrInfoExW(ADDRINFOEXW*); +#ifdef UNICODE +#define FreeAddrInfoEx FreeAddrInfoExW +#endif int WINAPI WS(getaddrinfo)(const char*,const char*,const struct WS(addrinfo)*,struct WS(addrinfo)**); #define GetAddrInfoA WS(getaddrinfo) int WINAPI GetAddrInfoW(PCWSTR,PCWSTR,const ADDRINFOW*,PADDRINFOW*); -- 2.27.0

1 0

[v2 PATCH] d2d1: Implement D2D1CreateDevice().
by Nikolay Sivov June 16, 2020

June 16, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/d2d1.spec | 2 +- dlls/d2d1/d2d1_private.h | 1 + dlls/d2d1/factory.c | 32 ++++++++++++++++++++++++++++++++ dlls/d2d1/tests/d2d1.c | 19 +++++++++++++++++++ include/d2d1_1.idl | 17 +++++++++++++++++ 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/d2d1.spec b/dlls/d2d1/d2d1.spec index fff6f1c9c81..0ebcd0af553 100644 --- a/dlls/d2d1/d2d1.spec +++ b/dlls/d2d1/d2d1.spec @@ -4,7 +4,7 @@ @ stdcall D2D1IsMatrixInvertible(ptr) @ stdcall D2D1InvertMatrix(ptr) @ stub D2D1ConvertColorSpace -@ stub D2D1CreateDevice +@ stdcall D2D1CreateDevice(ptr ptr ptr) @ stub D2D1CreateDeviceContext @ stub D2D1SinCos @ stub D2D1Tan diff --git a/dlls/d2d1/d2d1_private.h b/dlls/d2d1/d2d1_private.h index 4eb7e33142d..4546d5c1e3a 100644 --- a/dlls/d2d1/d2d1_private.h +++ b/dlls/d2d1/d2d1_private.h @@ -27,6 +27,7 @@ #include <math.h> #define COBJMACROS #include "d2d1_2.h" +#include "d3d11.h" #ifdef D2D1_INIT_GUID #include "initguid.h" #endif diff --git a/dlls/d2d1/factory.c b/dlls/d2d1/factory.c index 80334d82d02..28e959a8253 100644 --- a/dlls/d2d1/factory.c +++ b/dlls/d2d1/factory.c @@ -681,6 +681,38 @@ BOOL WINAPI D2D1InvertMatrix(D2D1_MATRIX_3X2_F *matrix) return d2d_matrix_invert(matrix, &m); } +HRESULT WINAPI D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, + ID2D1Device **device) +{ + D2D1_CREATION_PROPERTIES default_properties = { 0 }; + D2D1_FACTORY_OPTIONS factory_options; + ID3D11Device *d3d_device; + ID2D1Factory1 *factory; + HRESULT hr; + + TRACE("dxgi_device %p, properties %p, device %p.\n", dxgi_device, properties, device); + + if (!properties) + { + if (SUCCEEDED(IDXGIDevice_QueryInterface(dxgi_device, &IID_ID3D11Device, (void **)&d3d_device))) + { + if (!(ID3D11Device_GetCreationFlags(d3d_device) & D3D11_CREATE_DEVICE_SINGLETHREADED)) + default_properties.threadingMode = D2D1_THREADING_MODE_MULTI_THREADED; + ID3D11Device_Release(d3d_device); + } + properties = &default_properties; + } + + factory_options.debugLevel = properties->debugLevel; + if (FAILED(hr = D2D1CreateFactory(properties->threadingMode, &IID_ID2D1Factory1, + &factory_options, (void **)&factory))) + return hr; + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, device); + ID2D1Factory1_Release(factory); + return hr; +} + static BOOL get_config_key_dword(HKEY default_key, HKEY application_key, const char *name, DWORD *value) { DWORD type, data, size; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 87c87324f3d..b99f11d4ecf 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -28,6 +28,9 @@ #include "wincodec.h" #include "wine/heap.h" +static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, + ID2D1Device **device); + static BOOL use_mt = TRUE; static struct test_entry @@ -7911,6 +7914,7 @@ static void test_bezier_intersect(void) static void test_create_device(void) { + D2D1_CREATION_PROPERTIES properties = { 0 }; ID3D10Device1 *d3d_device; IDXGIDevice *dxgi_device; ID2D1Factory1 *factory; @@ -7943,6 +7947,19 @@ static void test_create_device(void) ID2D1Factory_Release(factory2); ID2D1Device_Release(device); + if (pD2D1CreateDevice) + { + hr = pD2D1CreateDevice(dxgi_device, NULL, &device); + ok(SUCCEEDED(hr), "Failed to create d2d device, hr %#x.\n", hr); + ID2D1Device_Release(device); + + hr = pD2D1CreateDevice(dxgi_device, &properties, &device); + ok(SUCCEEDED(hr), "Failed to create d2d device, hr %#x.\n", hr); + ID2D1Device_Release(device); + } + else + win_skip("D2D1CreateDevice() is unavailable.\n"); + IDXGIDevice_Release(dxgi_device); ID3D10Device1_Release(d3d_device); @@ -9416,6 +9433,8 @@ START_TEST(d2d1) unsigned int argc, i; char **argv; + pD2D1CreateDevice = (void *)GetProcAddress(GetModuleHandleA("d2d1.dll"), "D2D1CreateDevice"); + use_mt = !getenv("WINETEST_NO_MT_D3D"); argc = winetest_get_mainargs(&argv); diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index 4a644ffd4ca..493224569e7 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -187,6 +187,20 @@ typedef enum D2D1_PROPERTY_TYPE D2D1_PROPERTY_TYPE_FORCE_DWORD = 0xffffffff, } D2D1_PROPERTY_TYPE; +typedef enum D2D1_THREADING_MODE +{ + D2D1_THREADING_MODE_SINGLE_THREADED = D2D1_FACTORY_TYPE_SINGLE_THREADED, + D2D1_THREADING_MODE_MULTI_THREADED = D2D1_FACTORY_TYPE_MULTI_THREADED, + D2D1_THREADING_MODE_FORCE_DWORD = 0xffffffff, +} D2D1_THREADING_MODE; + +typedef struct D2D1_CREATION_PROPERTIES +{ + D2D1_THREADING_MODE threadingMode; + D2D1_DEBUG_LEVEL debugLevel; + D2D1_DEVICE_CONTEXT_OPTIONS options; +} D2D1_CREATION_PROPERTIES; + typedef struct D2D1_STROKE_STYLE_PROPERTIES1 { D2D1_CAP_STYLE startCap; @@ -777,3 +791,6 @@ interface ID2D1Factory1 : ID2D1Factory [out] ID2D1Properties **props ); } + +[local] HRESULT __stdcall D2D1CreateDevice(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *creation_properties, + ID2D1Device **device); -- 2.27.0

1 0

[PATCH 2/7] wined3d: Change black-/whitelist to more neutral words
by André Hentschel June 16, 2020

June 16, 2020

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/directx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 0c7f953702c..c46acfe97ff 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -964,7 +964,7 @@ static void quirk_texcoord_w(struct wined3d_gl_info *gl_info) * application. * * ATI Radeon HD 2xxx cards on macOS have the issue. Instead of checking - * for the buggy cards, blacklist all Radeon cards on macOS and whitelist + * for the buggy cards, blocklist all Radeon cards on macOS and allowlist * the good ones. That way we're prepared for the future. If this * workaround is activated on cards that do not need it, it won't break * things, just affect performance negatively. */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index efae3444eec..ca4f8a02127 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1506,11 +1506,11 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada if (!ds_format->depth_size && !ds_format->stencil_size) return FALSE; - /* Blacklist formats not supported on Windows */ + /* Blocklist formats not supported on Windows */ if (ds_format->id == WINED3DFMT_S1_UINT_D15_UNORM /* Breaks the shadowvol2 dx7 sdk sample */ || ds_format->id == WINED3DFMT_S4X4_UINT_D24_UNORM) { - TRACE("Format %s is blacklisted.\n", debug_d3dformat(ds_format->id)); + TRACE("Format %s is blocklisted.\n", debug_d3dformat(ds_format->id)); return FALSE; } -- 2.17.1

2 2

[PATCH v2] ddraw: Update texture_memory when setting new texture parent in ddraw_surface7_Flip().
by Paul Gofman June 16, 2020

June 16, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49391 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ddraw/surface.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index da71d07b4e2..7b7f16e2a3c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1288,11 +1288,12 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 { struct ddraw_surface *dst_impl = impl_from_IDirectDrawSurface7(iface); struct ddraw_surface *src_impl = unsafe_impl_from_IDirectDrawSurface7(src); + struct ddraw_texture *dst_ddraw_texture, *src_ddraw_texture; struct wined3d_rendertarget_view *tmp_rtv, *src_rtv, *rtv; - struct ddraw_texture *ddraw_texture, *prev_ddraw_texture; DDSCAPS2 caps = {DDSCAPS_FLIP, 0, 0, {0}}; struct wined3d_texture *texture; IDirectDrawSurface7 *current; + void *texture_memory; HRESULT hr; TRACE("iface %p, src %p, flags %#x.\n", iface, src, flags); @@ -1318,7 +1319,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 ERR("Invalid sub-resource index %u on surface %p.\n", dst_impl->sub_resource_idx, dst_impl); texture = dst_impl->wined3d_texture; rtv = wined3d_device_get_rendertarget_view(dst_impl->ddraw->wined3d_device, 0); - ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); + dst_ddraw_texture = wined3d_texture_get_parent(dst_impl->wined3d_texture); + texture_memory = dst_ddraw_texture->texture_memory; if (src_impl) { @@ -1345,12 +1347,13 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); + src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); + dst_ddraw_texture = src_ddraw_texture; if (src_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; - ddraw_texture = prev_ddraw_texture; } else { @@ -1376,9 +1379,10 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(src_rtv, dst_impl); dst_impl->wined3d_rtv = src_rtv; wined3d_texture_set_sub_resource_parent(src_impl->wined3d_texture, 0, dst_impl); - prev_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); - wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), ddraw_texture); - ddraw_texture = prev_ddraw_texture; + src_ddraw_texture = wined3d_texture_get_parent(src_impl->wined3d_texture); + dst_ddraw_texture->texture_memory = src_ddraw_texture->texture_memory; + wined3d_resource_set_parent(wined3d_texture_get_resource(src_impl->wined3d_texture), dst_ddraw_texture); + dst_ddraw_texture = src_ddraw_texture; if (src_impl->sub_resource_idx) ERR("Invalid sub-resource index %u on surface %p.\n", src_impl->sub_resource_idx, src_impl); dst_impl->wined3d_texture = src_impl->wined3d_texture; @@ -1393,7 +1397,8 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Flip(IDirectDrawSurface7 wined3d_rendertarget_view_set_parent(tmp_rtv, src_impl); src_impl->wined3d_rtv = tmp_rtv; wined3d_texture_set_sub_resource_parent(texture, 0, src_impl); - wined3d_resource_set_parent(wined3d_texture_get_resource(texture), ddraw_texture); + dst_ddraw_texture->texture_memory = texture_memory; + wined3d_resource_set_parent(wined3d_texture_get_resource(texture), dst_ddraw_texture); src_impl->wined3d_texture = texture; if (flags & ~(DDFLIP_NOVSYNC | DDFLIP_INTERVAL2 | DDFLIP_INTERVAL3 | DDFLIP_INTERVAL4)) -- 2.26.2

2 1

[PATCH 1/3] wined3d: Merge _USER_MEMORY and _SYSMEM locations.
by Paul Gofman June 16, 2020

June 16, 2020

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49375 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 186963-186967. dlls/wined3d/surface.c | 3 +- dlls/wined3d/texture.c | 72 ++++++++++++---------------------- dlls/wined3d/utils.c | 1 - dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 25 insertions(+), 52 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 652f6070b93..af2ab36d273 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -33,8 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM - | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER; +static const DWORD surface_simple_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; /* Works correctly only for <= 4 bpp formats. */ static void get_color_masks(const struct wined3d_format *format, DWORD *masks) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 84020f17c95..b1e08383f62 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -30,8 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_TEXTURE_DYNAMIC_MAP_THRESHOLD 50 -static const uint32_t wined3d_texture_sysmem_locations = WINED3D_LOCATION_SYSMEM - | WINED3D_LOCATION_USER_MEMORY | WINED3D_LOCATION_BUFFER; +static const uint32_t wined3d_texture_sysmem_locations = WINED3D_LOCATION_SYSMEM | WINED3D_LOCATION_BUFFER; static const struct wined3d_texture_ops texture_gl_ops; struct wined3d_texture_idx @@ -132,7 +131,6 @@ static DWORD wined3d_resource_access_from_location(DWORD location) return 0; case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_USER_MEMORY: return WINED3D_RESOURCE_ACCESS_CPU; case WINED3D_LOCATION_BUFFER: @@ -733,16 +731,18 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su data->buffer_object = (uintptr_t)&sub_resource->bo; return; } - if (locations & WINED3D_LOCATION_USER_MEMORY) - { - data->addr = texture->user_memory; - data->buffer_object = 0; - return; - } + if (locations & WINED3D_LOCATION_SYSMEM) { - data->addr = texture->resource.heap_memory; - data->addr += sub_resource->offset; + if (texture->user_memory) + { + data->addr = texture->user_memory; + } + else + { + data->addr = texture->resource.heap_memory; + data->addr += sub_resource->offset; + } data->buffer_object = 0; return; } @@ -1741,7 +1741,6 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT unsigned int resource_size; const struct wined3d *d3d; unsigned int slice_pitch; - DWORD valid_location = 0; bool update_memory_only; bool create_dib = false; @@ -1872,16 +1871,10 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } } - if ((texture->user_memory = mem)) - { - texture->resource.map_binding = WINED3D_LOCATION_USER_MEMORY; - valid_location = WINED3D_LOCATION_USER_MEMORY; - } - else + if (!(texture->user_memory = mem)) { if (!wined3d_resource_prepare_sysmem(&texture->resource)) ERR("Failed to allocate resource memory.\n"); - valid_location = WINED3D_LOCATION_SYSMEM; } /* The format might be changed to a format that needs conversion. @@ -1891,8 +1884,8 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER && !wined3d_texture_use_pbo(texture, gl_info)) texture->resource.map_binding = WINED3D_LOCATION_SYSMEM; - wined3d_texture_validate_location(texture, 0, valid_location); - wined3d_texture_invalidate_location(texture, 0, ~valid_location); + wined3d_texture_validate_location(texture, 0, WINED3D_LOCATION_SYSMEM); + wined3d_texture_invalidate_location(texture, 0, ~WINED3D_LOCATION_SYSMEM); if (create_dib) { @@ -3123,12 +3116,8 @@ static BOOL wined3d_texture_gl_prepare_location(struct wined3d_texture *texture, switch (location) { case WINED3D_LOCATION_SYSMEM: - return wined3d_resource_prepare_sysmem(&texture->resource); - - case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) - ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n"); - return TRUE; + return texture->user_memory ? TRUE + : wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_BUFFER: wined3d_texture_prepare_buffer_object(texture, sub_resource_idx, context_gl->gl_info); @@ -3176,7 +3165,6 @@ static BOOL wined3d_texture_gl_load_location(struct wined3d_texture *texture, switch (location) { - case WINED3D_LOCATION_USER_MEMORY: case WINED3D_LOCATION_SYSMEM: case WINED3D_LOCATION_BUFFER: return wined3d_texture_gl_load_sysmem(texture_gl, sub_resource_idx, context_gl, location); @@ -4431,20 +4419,12 @@ static void wined3d_texture_no3d_download_data(struct wined3d_context *context, static BOOL wined3d_texture_no3d_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, unsigned int location) { - switch (location) - { - case WINED3D_LOCATION_SYSMEM: - return wined3d_resource_prepare_sysmem(&texture->resource); - - case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) - ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n"); - return TRUE; + if (location == WINED3D_LOCATION_SYSMEM) + return texture->user_memory ? TRUE + : wined3d_resource_prepare_sysmem(&texture->resource); - default: - FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); - return FALSE; - } + FIXME("Unhandled location %s.\n", wined3d_debug_location(location)); + return FALSE; } static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture, @@ -4453,7 +4433,7 @@ static BOOL wined3d_texture_no3d_load_location(struct wined3d_texture *texture, TRACE("texture %p, sub_resource_idx %u, context %p, location %s.\n", texture, sub_resource_idx, context, wined3d_debug_location(location)); - if (location == WINED3D_LOCATION_USER_MEMORY || location == WINED3D_LOCATION_SYSMEM) + if (location == WINED3D_LOCATION_SYSMEM) return TRUE; ERR("Unhandled location %s.\n", wined3d_debug_location(location)); @@ -5078,12 +5058,8 @@ static BOOL wined3d_texture_vk_prepare_location(struct wined3d_texture *texture, switch (location) { case WINED3D_LOCATION_SYSMEM: - return wined3d_resource_prepare_sysmem(&texture->resource); - - case WINED3D_LOCATION_USER_MEMORY: - if (!texture->user_memory) - ERR("Preparing WINED3D_LOCATION_USER_MEMORY, but texture->user_memory is NULL.\n"); - return TRUE; + return texture->user_memory ? TRUE + : wined3d_resource_prepare_sysmem(&texture->resource); case WINED3D_LOCATION_TEXTURE_RGB: return wined3d_texture_vk_prepare_texture(wined3d_texture_vk(texture), wined3d_context_vk(context)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d078c503df3..2a3c04f4352 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6643,7 +6643,6 @@ const char *wined3d_debug_location(DWORD location) #define LOCATION_TO_STR(x) if (location & x) { debug_append(&buffer, #x, " | "); location &= ~x; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); - LOCATION_TO_STR(WINED3D_LOCATION_USER_MEMORY); LOCATION_TO_STR(WINED3D_LOCATION_BUFFER); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_RGB); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_SRGB); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 17acd4be4d5..9556f8c0abb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3988,7 +3988,6 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 -#define WINED3D_LOCATION_USER_MEMORY 0x00000004 #define WINED3D_LOCATION_BUFFER 0x00000008 #define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 #define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020 -- 2.26.2

4 6

[PATCH 5/5] d3drm: Get rid of the "partial stub" FIXMEs in the light creation functions.
by Henri Verbeet June 16, 2020

June 16, 2020

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 187065. dlls/d3drm/d3drm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 0b3af02a5ab..8edcd7bd692 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1549,7 +1549,7 @@ static HRESULT WINAPI d3drm3_CreateLight(IDirect3DRM3 *iface, struct d3drm_light *object; HRESULT hr; - FIXME("iface %p, type %#x, color 0x%08x, light %p partial stub!\n", iface, type, color, light); + TRACE("iface %p, type %#x, color 0x%08x, light %p.\n", iface, type, color, light); if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) { @@ -1569,7 +1569,7 @@ static HRESULT WINAPI d3drm3_CreateLightRGB(IDirect3DRM3 *iface, D3DRMLIGHTTYPE struct d3drm_light *object; HRESULT hr; - FIXME("iface %p, type %#x, red %.8e, green %.8e, blue %.8e, light %p partial stub!\n", + TRACE("iface %p, type %#x, red %.8e, green %.8e, blue %.8e, light %p.\n", iface, type, red, green, blue, light); if (SUCCEEDED(hr = d3drm_light_create(&object, &d3drm->IDirect3DRM_iface))) -- 2.20.1

1 0

[PATCH 4/5] d3drm/tests: Test IDirect3DRM_CreateLight().
by Henri Verbeet June 16, 2020

June 16, 2020

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 187064. dlls/d3drm/tests/d3drm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 87ad50a39db..d854ebcc56d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2601,6 +2601,17 @@ static void test_Light(void) IDirect3DRMLight_Release(light); + hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + + type = IDirect3DRMLight_GetType(light); + ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type); + + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color); + + IDirect3DRMLight_Release(light); + IDirect3DRM_Release(d3drm); } -- 2.20.1

1 0

[PATCH 3/5] d3drm: Set light alpha to 1.0 in d3drm_light_SetColor().
by Henri Verbeet June 16, 2020

June 16, 2020

From: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 187063. dlls/d3drm/light.c | 2 +- dlls/d3drm/tests/d3drm.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 2f53f200aad..675dcaa0b54 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -165,7 +165,7 @@ static HRESULT WINAPI d3drm_light_SetColor(IDirect3DRMLight *iface, D3DCOLOR col TRACE("iface %p, color 0x%08x.\n", iface, color); - light->color = color; + light->color = 0xff000000 | color; return D3DRM_OK; } diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 25e9b4e0ac8..87ad50a39db 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2589,6 +2589,11 @@ static void test_Light(void) color = IDirect3DRMLight_GetColor(light); ok(color == 0xff180587, "wrong color (%x)\n", color); + hr = IDirect3DRMLight_SetColor(light, 0x00c0c0c0); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color); + hr = IDirect3DRMLight_SetColorRGB(light, 0.5, 0.5, 0.5); ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(light); -- 2.20.1

1 0