July 2020 - Wine-Devel - list.winehq.org

[PATCH V3 2/2] xactengine3_7: Implement IXACT3Engine interface.
by Vijay Kiran Kamuju July 8, 2020

July 8, 2020

Based on patch from Ethan Lee. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 2

[PATCH v2 2/2] wined3d: Use valid adapter LUIDs if they are available.
by Zhiyi Zhang July 8, 2020

July 8, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/d3d12/tests/d3d12.c | 2 +- dlls/dxgi/tests/dxgi.c | 4 ++-- dlls/wined3d/adapter_gl.c | 6 +++++- dlls/wined3d/adapter_vk.c | 18 ++++++++++------- dlls/wined3d/directx.c | 31 ++++++++++++++++++++---------- dlls/wined3d/utils.c | 35 ++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 3 ++- 7 files changed, 77 insertions(+), 22 deletions(-) diff --git a/dlls/d3d12/tests/d3d12.c b/dlls/d3d12/tests/d3d12.c index 0200047fd17..8c57f07357c 100644 --- a/dlls/d3d12/tests/d3d12.c +++ b/dlls/d3d12/tests/d3d12.c @@ -139,7 +139,7 @@ static void print_adapter_info(void) hr = CreateDXGIFactory2(0, &IID_IDXGIFactory4, (void **)&factory); ok(hr == S_OK, "Failed to create factory, hr %#x.\n", hr); hr = IDXGIFactory4_EnumAdapterByLuid(factory, luid, &IID_IDXGIAdapter, (void **)&adapter); - todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); IDXGIFactory4_Release(factory); if (FAILED(hr)) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ea896260c76..59b23918de3 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -973,7 +973,7 @@ static void test_adapter_luid(void) ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); /* Older versions of WARP aren't enumerated by IDXGIFactory_EnumAdapters(). */ - todo_wine ok(found_adapter_count == 1 || broken(is_null_luid_adapter), + ok(found_adapter_count == 1 || broken(is_null_luid_adapter), "Found %u adapters for LUID %08x:%08x.\n", found_adapter_count, device_adapter_desc.AdapterLuid.HighPart, device_adapter_desc.AdapterLuid.LowPart); @@ -996,7 +996,7 @@ static void test_adapter_luid(void) hr = IDXGIFactory4_EnumAdapterByLuid(factory4, device_adapter_desc.AdapterLuid, &IID_IDXGIAdapter, (void **)&adapter); - todo_wine ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to enum adapter by LUID, hr %#x.\n", hr); if (SUCCEEDED(hr)) { hr = IDXGIAdapter_GetDesc(adapter, &desc); diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a97e7bd7a41..bc59d1b7439 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5136,12 +5136,16 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, }; struct wined3d_gl_info *gl_info = &adapter_gl->a.gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; + LUID primary_luid, *luid = NULL; unsigned int i; TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(&adapter_gl->a, ordinal, &wined3d_adapter_gl_ops)) + if (ordinal == 0 && wined3d_get_primary_adapter_luid(&primary_luid)) + luid = &primary_luid; + + if (!wined3d_adapter_init(&adapter_gl->a, ordinal, luid, &wined3d_adapter_gl_ops)) return FALSE; /* Dynamically load all GL core functions */ diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 1e4d663dcb4..57972dbb7e7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -2166,17 +2166,15 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, struct wined3d_adapter *adapter = &adapter_vk->a; VkPhysicalDeviceIDProperties id_properties; VkPhysicalDeviceProperties2 properties2; + LUID *luid = NULL; TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_vk_ops)) - return FALSE; - if (!wined3d_init_vulkan(vk_info)) { WARN("Failed to initialize Vulkan.\n"); - goto fail; + return FALSE; } if (!(adapter_vk->physical_device = get_vulkan_physical_device(vk_info))) @@ -2195,6 +2193,12 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, VK_CALL(vkGetPhysicalDeviceMemoryProperties(adapter_vk->physical_device, &adapter_vk->memory_properties)); + if (id_properties.deviceLUIDValid) + luid = (LUID *)id_properties.deviceLUID; + + if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_vk_ops)) + goto fail_vulkan; + adapter_vk_init_driver_info(adapter_vk, &properties2.properties); adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); @@ -2203,7 +2207,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, memcpy(&adapter->device_uuid, id_properties.deviceUUID, sizeof(adapter->device_uuid)); if (!wined3d_adapter_vk_init_format_info(adapter_vk, vk_info)) - goto fail_vulkan; + goto fail; adapter->vertex_pipe = wined3d_spirv_vertex_pipe_init_vk(); adapter->fragment_pipe = wined3d_spirv_fragment_pipe_init_vk(); @@ -2214,11 +2218,11 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, return TRUE; +fail: + wined3d_adapter_cleanup(adapter); fail_vulkan: VK_CALL(vkDestroyInstance(vk_info->instance, NULL)); wined3d_unload_vulkan(vk_info); -fail: - wined3d_adapter_cleanup(adapter); return FALSE; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b5de589d33c..454125c1462 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2903,6 +2903,7 @@ static void wined3d_adapter_no3d_init_d3d_info(struct wined3d_adapter *adapter, static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, unsigned int wined3d_creation_flags) { struct wined3d_adapter *adapter; + LUID primary_luid, *luid = NULL; static const struct wined3d_gpu_description gpu_description = { @@ -2914,7 +2915,10 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) + if (ordinal == 0 && wined3d_get_primary_adapter_luid(&primary_luid)) + luid = &primary_luid; + + if (!wined3d_adapter_init(adapter, ordinal, luid, &wined3d_adapter_no3d_ops)) { heap_free(adapter); return NULL; @@ -2942,7 +2946,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return adapter; } -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const LUID *luid, const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; @@ -2953,6 +2957,21 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, adapter->ordinal = ordinal; adapter->output_count = 0; + if (luid) + { + adapter->luid = *luid; + } + else + { + WARN("Allocating a random LUID.\n"); + if (!AllocateLocallyUniqueId(&adapter->luid)) + { + ERR("Failed to allocate a LUID, error %#x.\n", GetLastError()); + return FALSE; + } + } + TRACE("adapter %p LUID %08x:%08x.\n", adapter, adapter->luid.HighPart, adapter->luid.LowPart); + display_device.cb = sizeof(display_device); EnumDisplayDevicesW(NULL, ordinal, &display_device, 0); TRACE("Display device: %s.\n", debugstr_w(display_device.DeviceName)); @@ -2972,14 +2991,6 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, } adapter->output_count = 1; - if (!AllocateLocallyUniqueId(&adapter->luid)) - { - ERR("Failed to set adapter LUID (%#x).\n", GetLastError()); - goto done; - } - 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)); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index da17ee7296b..eaa391fafbe 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5719,6 +5719,41 @@ void get_fog_start_end(const struct wined3d_context *context, const struct wined } } +static BOOL wined3d_get_primary_display(WCHAR *display) +{ + DISPLAY_DEVICEW display_device; + DWORD device_idx = 0; + + display_device.cb = sizeof(display_device); + while (EnumDisplayDevicesW(NULL, device_idx++, &display_device, 0)) + { + if (display_device.StateFlags & DISPLAY_DEVICE_PRIMARY_DEVICE) + { + lstrcpyW(display, display_device.DeviceName); + return TRUE; + } + } + + return FALSE; +} + +BOOL wined3d_get_primary_adapter_luid(LUID *luid) +{ + D3DKMT_OPENADAPTERFROMGDIDISPLAYNAME open_adapter_param; + D3DKMT_CLOSEADAPTER close_adapter_param; + + if (!wined3d_get_primary_display(open_adapter_param.DeviceName)) + return FALSE; + + if (D3DKMTOpenAdapterFromGdiDisplayName(&open_adapter_param)) + return FALSE; + + *luid = open_adapter_param.AdapterLuid; + close_adapter_param.hAdapter = open_adapter_param.hAdapter; + D3DKMTCloseAdapter(&close_adapter_param); + return TRUE; +} + /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ceb6794db0b..342aee64f31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3300,9 +3300,10 @@ struct wined3d_adapter const struct wined3d_adapter_ops *adapter_ops; }; -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, const LUID *luid, const struct wined3d_adapter_ops *adapter_ops) DECLSPEC_HIDDEN; void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; +BOOL wined3d_get_primary_adapter_luid(LUID *luid) DECLSPEC_HIDDEN; struct wined3d_adapter_gl { -- 2.25.1

3 2

[PATCH v2 1/2] wined3d: Call wined3d_adapter_init() before initialising any adapter field.
by Zhiyi Zhang July 8, 2020

July 8, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Use a parameter to pass LUID in wined3d_adapter_init(). Supersede 188392~188394. dlls/wined3d/directx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 456cb9ad124..b5de589d33c 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2914,10 +2914,6 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); - adapter->vram_bytes_used = 0; - TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); - if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) { heap_free(adapter); @@ -2930,6 +2926,10 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return NULL; } + wined3d_driver_info_init(&adapter->driver_info, &gpu_description, 0, 0); + adapter->vram_bytes_used = 0; + TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); + adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->misc_state_template = misc_state_template_no3d; -- 2.25.1

2 1

[PATCH 3/3] windowscodecs: Add support for decoding uncompressed DDS image.
by Ziqing Hui July 8, 2020

July 8, 2020

For uncompressed DDS image, a block means a pixel. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- dlls/windowscodecs/ddsformat.c | 78 ++++++++++++++++++---------- dlls/windowscodecs/tests/ddsformat.c | 10 ---- 2 files changed, 50 insertions(+), 38 deletions(-)

2 1

[PATCH 2/3] windowscodecs/tests: Add tests for decoding uncompressed DDS image.
by Ziqing Hui July 8, 2020

July 8, 2020

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- Although uncompressed DDS is not supported in native WIC, WIC chapter of MSDN has some notes about uncompressed DDS image. see https://docs.microsoft.com/en-us/windows/win32/api/wincodec/ns-wincodec-wic… MSDN says that for uncompressed DDS image, a block means a pixel, blockWidth=1, blockHeight=1, bytesPerBlock=bytesPerPixel, widthInBlocks=widthInPixels, widthInBlocks=widthInPixels. dlls/windowscodecs/tests/ddsformat.c | 96 +++++++++++++++------------- 1 file changed, 53 insertions(+), 43 deletions(-)

2 1

[PATCH 1/4] ntdll: Set the process creation time in NtQuerySystemInformation(SystemProcessInformation).
by Zebediah Figura July 8, 2020

July 8, 2020

Process Hacker displays this information. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/system.c | 1 + server/process.c | 1 + server/protocol.def | 2 ++ server/trace.c | 3 ++- 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 29c133e6562..051bd37fa3d 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2140,6 +2140,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, memset(nt_process, 0, sizeof(*nt_process)); if (i < process_count - 1) nt_process->NextEntryOffset = proc_len; + nt_process->CreationTime.QuadPart = server_process->start_time; nt_process->dwThreadCount = server_process->thread_count; nt_process->dwBasePriority = server_process->priority; nt_process->UniqueProcessId = UlongToHandle(server_process->pid); diff --git a/server/process.c b/server/process.c index 9482da98be5..8d57879cc19 100644 --- a/server/process.c +++ b/server/process.c @@ -1829,6 +1829,7 @@ DECL_HANDLER(list_processes) pos = (pos + 7) & ~7; process_info = (struct process_info *)(buffer + pos); + process_info->start_time = process->start_time; process_info->name_len = exe ? exe->namelen : 0; process_info->thread_count = process->running_threads; process_info->priority = process->priority; diff --git a/server/protocol.def b/server/protocol.def index bad8fef7903..bf91637e9de 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1870,6 +1870,7 @@ struct thread_info struct process_info { + timeout_t start_time; data_size_t name_len; int thread_count; int priority; @@ -1877,6 +1878,7 @@ struct process_info process_id_t parent_pid; int handle_count; int unix_pid; + int __pad; /* VARARG(name,unicode_str,name_len); */ /* VARARG(threads,struct thread_info,thread_count); */ }; diff --git a/server/trace.c b/server/trace.c index dfb39300668..288dad718df 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1113,7 +1113,8 @@ static void dump_varargs_process_info( const char *prefix, data_size_t size ) process = (const struct process_info *)((const char *)cur_data + pos); if (size - pos < sizeof(*process)) break; if (pos) fputc( ',', stderr ); - fprintf( stderr, "{thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", + dump_timeout( "{start_time=", &process->start_time ); + fprintf( stderr, ",thread_count=%u,priority=%d,pid=%04x,parent_pid=%04x,handle_count=%u,unix_pid=%d,", process->thread_count, process->priority, process->pid, process->parent_pid, process->handle_count, process->unix_pid ); pos += sizeof(*process); -- 2.27.0

2 4

[PATCH V4 1/2] xactengine3_7: Add new dll.
by Vijay Kiran Kamuju July 8, 2020

July 8, 2020

Based on original patch from Ethan Lee Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH v2 2/2] wbemprox/tests: Add Win32_SoundDevice tests.
by Hans Leidekker July 8, 2020

July 8, 2020

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/tests/query.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 7dcfd35e938..da47773da22 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1551,6 +1551,35 @@ static void test_Win32_QuickFixEngineering( IWbemServices *services ) SysFreeString( wql ); } +static void test_Win32_SoundDevice( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ); + BSTR query = SysAllocString( L"SELECT * FROM Win32_SoundDevice" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK, "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + + check_property( obj, L"Name", VT_BSTR, CIM_STRING ); + check_property( obj, L"ProductName", VT_BSTR, CIM_STRING ); + check_property( obj, L"StatusInfo", VT_I4, CIM_UINT16 ); + check_property( obj, L"Manufacturer", VT_BSTR, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + START_TEST(query) { BSTR path = SysAllocString( L"ROOT\\CIMV2" ); @@ -1602,6 +1631,7 @@ START_TEST(query) test_Win32_Processor( services ); test_Win32_QuickFixEngineering( services ); test_Win32_Service( services ); + test_Win32_SoundDevice( services ); test_Win32_SystemEnclosure( services ); test_Win32_VideoController( services ); test_Win32_WinSAT( services ); -- 2.20.1

1 0

[PATCH v2 1/2] wbemprox: Implement Win32_SoundDevice.Manufacturer.
by Hans Leidekker July 8, 2020

July 8, 2020

From: Esme Povirk <esme(a)codeweavers.com> v2: Keep properties sorted. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index a94d41bfc45..f055547a6b9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -376,9 +376,10 @@ static const struct column col_sid[] = }; static const struct column col_sounddevice[] = { - { L"Name", CIM_STRING }, - { L"ProductName", CIM_STRING }, - { L"StatusInfo", CIM_UINT16 }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING }, + { L"ProductName", CIM_STRING }, + { L"StatusInfo", CIM_UINT16 }, }; static const struct column col_stdregprov[] = { @@ -764,6 +765,7 @@ struct record_sid }; struct record_sounddevice { + const WCHAR *manufacturer; const WCHAR *name; const WCHAR *productname; UINT16 statusinfo; @@ -884,7 +886,7 @@ static const struct record_quickfixengineering data_quickfixengineering[] = }; static const struct record_sounddevice data_sounddevice[] = { - { L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */ } + { L"The Wine Project", L"Wine Audio Device", L"Wine Audio Device", 3 /* enabled */ } }; static const struct record_stdregprov data_stdregprov[] = { -- 2.20.1

1 0

[PATCH v3 1/2] d3dx9: Ignore filter in LoadSurfaceFromSurface when rects match
by Robin Kertels July 8, 2020

July 8, 2020

This allows us to use IDirect3DDevice9_StretchRect and avoid GPU synchronization. It massively improves performance in Dead Space 1 which calls LoadSurfaceFromSurface every frame before presenting. Signed-off-by: Robin Kertels <robin.kertels(a)gmail.com> --- dlls/d3dx9_36/surface.c | 106 +++++++++++++++++++++++++++++++--------- 1 file changed, 84 insertions(+), 22 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a5143cbee4..d33e6fea87 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -2142,11 +2142,14 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, IDirect3DSurface9 *src_surface, const PALETTEENTRY *src_palette, const RECT *src_rect, DWORD filter, D3DCOLOR color_key) { + const struct pixel_format_desc *srcformatdesc, *destformatdesc; + D3DSURFACE_DESC src_desc, dst_desc; + struct volume src_size, dst_size; IDirect3DSurface9 *temp_surface; D3DTEXTUREFILTERTYPE d3d_filter; IDirect3DDevice9 *device; - D3DSURFACE_DESC src_desc; D3DLOCKED_RECT lock; + RECT dst_rect_temp; HRESULT hr; RECT s; @@ -2158,25 +2161,92 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, if (!dst_surface || !src_surface) return D3DERR_INVALIDCALL; + IDirect3DSurface9_GetDesc(src_surface, &src_desc); + srcformatdesc = get_format_info(src_desc.Format); + if (!src_rect) + { + SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); + src_rect = &s; + } + else if (src_rect->left == src_rect->right || src_rect->top == src_rect->bottom) + { + WARN("Empty src_rect specified.\n"); + return filter == D3DX_FILTER_NONE ? D3D_OK : E_FAIL; + } + else if (src_rect->left > src_rect->right || src_rect->right > src_desc.Width + || src_rect->left < 0 || src_rect->left > src_desc.Width + || src_rect->top > src_rect->bottom || src_rect->bottom > src_desc.Height + || src_rect->top < 0 || src_rect->top > src_desc.Height) + { + WARN("Invalid src_rect specified.\n"); + return D3DERR_INVALIDCALL; + } + + src_size.width = src_rect->right - src_rect->left; + src_size.height = src_rect->bottom - src_rect->top; + src_size.depth = 1; + + IDirect3DSurface9_GetDesc(dst_surface, &dst_desc); + destformatdesc = get_format_info(dst_desc.Format); + if (!dst_rect) + { + dst_rect = &dst_rect_temp; + dst_rect_temp.left = 0; + dst_rect_temp.top = 0; + dst_rect_temp.right = dst_desc.Width; + dst_rect_temp.bottom = dst_desc.Height; + } + else if (dst_rect->left == dst_rect->right || dst_rect->top == dst_rect->bottom) + { + WARN("Empty dst_rect specified.\n"); + return filter == D3DX_FILTER_NONE ? D3D_OK : E_FAIL; + } + else if (dst_rect->left > dst_rect->right || dst_rect->right > dst_desc.Width + || dst_rect->left < 0 || dst_rect->left > dst_desc.Width + || dst_rect->top > dst_rect->bottom || dst_rect->bottom > dst_desc.Height + || dst_rect->top < 0 || dst_rect->top > dst_desc.Height) + { + WARN("Invalid dst_rect specified.\n"); + return D3DERR_INVALIDCALL; + } + + dst_size.width = dst_rect->right - dst_rect->left; + dst_size.height = dst_rect->bottom - dst_rect->top; + dst_size.depth = 1; + if (!dst_palette && !src_palette && !color_key) { - switch (filter) + if (src_desc.Format == dst_desc.Format + && dst_size.width == src_size.width + && dst_size.height == src_size.height + && color_key == 0 + && !(src_rect->left & (srcformatdesc->block_width - 1)) + && !(src_rect->top & (srcformatdesc->block_height - 1)) + && !(dst_rect->left & (destformatdesc->block_width - 1)) + && !(dst_rect->top & (destformatdesc->block_height - 1))) + { + d3d_filter = D3DTEXF_NONE; + } + else { - case D3DX_FILTER_NONE: - d3d_filter = D3DTEXF_NONE; - break; + switch (filter) + { + case D3DX_FILTER_NONE: + d3d_filter = D3DTEXF_NONE; + break; - case D3DX_FILTER_POINT: - d3d_filter = D3DTEXF_POINT; - break; + case D3DX_FILTER_POINT: + d3d_filter = D3DTEXF_POINT; + break; - case D3DX_FILTER_LINEAR: - d3d_filter = D3DTEXF_LINEAR; - break; + case D3DX_FILTER_LINEAR: + d3d_filter = D3DTEXF_LINEAR; + break; - default: - d3d_filter = ~0u; - break; + default: + d3d_filter = ~0u; + break; + } } if (d3d_filter != ~0u) @@ -2189,14 +2259,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromSurface(IDirect3DSurface9 *dst_surface, } } - IDirect3DSurface9_GetDesc(src_surface, &src_desc); - - if (!src_rect) - { - SetRect(&s, 0, 0, src_desc.Width, src_desc.Height); - src_rect = &s; - } - if (FAILED(lock_surface(src_surface, NULL, &lock, &temp_surface, FALSE))) return D3DXERR_INVALIDDATA; -- 2.27.0

1 1