- Wine-Devel - list.winehq.org

[PATCH 4/5] winmm: Destroy timer after calling callback.
by Piotr Caban Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)

1 0

[PATCH 3/5] winmm: Avoid allocations in timeSetEvent.
by Piotr Caban Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 118 +++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 64 deletions(-)

1 0

[PATCH 2/5] winmm: Don't reuse old timer IDs.
by Piotr Caban Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)

1 0

[PATCH 1/5] winmm: Remove unneeded TIME_TimeToDie, the thread ends when list is empty.
by Piotr Caban Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winmm/time.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)

1 0

[PATCH] mfreadwrite/tests: Add return value test (Coverity).
by Nikolay Sivov Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/tests/mfplat.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 8ed94289703..84581f9be9a 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -438,11 +438,13 @@ static struct test_media_stream *create_test_stream(DWORD stream_index, IMFMedia struct test_media_stream *stream; IMFPresentationDescriptor *pd; BOOL selected; + HRESULT hr; stream = heap_alloc_zero(sizeof(*stream)); stream->IMFMediaStream_iface.lpVtbl = &test_media_stream_vtbl; stream->refcount = 1; - MFCreateEventQueue(&stream->event_queue); + hr = MFCreateEventQueue(&stream->event_queue); + ok(hr == S_OK, "Failed to create event queue, hr %#x.\n", hr); stream->source = source; IMFMediaSource_AddRef(stream->source); stream->is_new = TRUE; -- 2.28.0

1 0

[PATCH 1/3] d3dx10: Implement D3DX10GetImageInfoFromFileW().
by Matteo Bruni Sept. 30, 2020

Sept. 30, 2020

From: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx10_43/tests/d3dx10.c | 4 +- dlls/d3dx10_43/texture.c | 70 ++++++++++++++++++++++++++++++++++- 2 files changed, 69 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 640e83fcd0fb..e33b8326461d 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -1383,12 +1383,10 @@ static void test_get_image_info(void) check_image_info(&image_info, i, __LINE__); } - todo_wine { hr = D3DX10GetImageInfoFromFileW(NULL, NULL, &image_info, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); hr = D3DX10GetImageInfoFromFileW(L"deadbeaf", NULL, &image_info, NULL); ok(hr == D3D10_ERROR_FILE_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - } for (i = 0; i < ARRAY_SIZE(test_image); ++i) { @@ -1396,7 +1394,7 @@ static void test_get_image_info(void) hr = D3DX10GetImageInfoFromFileW(path, NULL, &image_info, NULL); delete_file(test_filename); - todo_wine + todo_wine_if(test_image[i].expected.ImageFileFormat == D3DX10_IFF_WMP) ok(hr == S_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); if (hr != S_OK) continue; diff --git a/dlls/d3dx10_43/texture.c b/dlls/d3dx10_43/texture.c index 63e6d71546da..b87134514814 100644 --- a/dlls/d3dx10_43/texture.c +++ b/dlls/d3dx10_43/texture.c @@ -17,6 +17,7 @@ */ #include "wine/debug.h" +#include "wine/heap.h" #define COBJMACROS @@ -96,6 +97,57 @@ static DXGI_FORMAT get_d3dx10_dds_format(DXGI_FORMAT format) return format; } +static HRESULT load_file(const WCHAR *filename, void **buffer, DWORD *size) +{ + HRESULT hr = S_OK; + DWORD bytes_read; + HANDLE file; + BOOL ret; + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *size = GetFileSize(file, NULL); + if (*size == INVALID_FILE_SIZE) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + + *buffer = heap_alloc(*size); + if (!*buffer) + { + hr = E_OUTOFMEMORY; + goto done; + } + + ret = ReadFile(file, *buffer, *size, &bytes_read, NULL); + if (!ret) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto done; + } + if (bytes_read != *size) + { + hr = E_FAIL; + goto done; + } + +done: + if (FAILED(hr)) + { + heap_free(*buffer); + *buffer = NULL; + } + if (file != INVALID_HANDLE_VALUE) + CloseHandle(file); + return hr; +} + HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { @@ -107,9 +159,23 @@ HRESULT WINAPI D3DX10GetImageInfoFromFileA(const char *src_file, ID3DX10ThreadPu HRESULT WINAPI D3DX10GetImageInfoFromFileW(const WCHAR *src_file, ID3DX10ThreadPump *pump, D3DX10_IMAGE_INFO *info, HRESULT *result) { - FIXME("src_file %s, pump %p, info %p, result %p\n", debugstr_w(src_file), pump, info, result); + void *buffer = NULL; + DWORD size = 0; + HRESULT hr; - return E_NOTIMPL; + TRACE("src_file %s, pump %p, info %p, result %p.\n", debugstr_w(src_file), pump, info, result); + + if (!src_file || !info) + return E_FAIL; + + if (FAILED(load_file(src_file, &buffer, &size))) + return D3D10_ERROR_FILE_NOT_FOUND; + + hr = D3DX10GetImageInfoFromMemory(buffer, size, pump, info, result); + + heap_free(buffer); + + return hr; } HRESULT WINAPI D3DX10GetImageInfoFromResourceA(HMODULE module, const char *resource, ID3DX10ThreadPump *pump, -- 2.26.2

1 2

[PATCH] combase: Remove dead assignment (Coverity).
by Nikolay Sivov Sept. 30, 2020

Sept. 30, 2020

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/hglobalstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/combase/hglobalstream.c b/dlls/combase/hglobalstream.c index 5cbb280fd5e..d957fae2c7d 100644 --- a/dlls/combase/hglobalstream.c +++ b/dlls/combase/hglobalstream.c @@ -299,7 +299,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE while (cb.QuadPart > 0) { - ULONG chunk_size = chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; + ULONG chunk_size = cb.QuadPart >= sizeof(buffer) ? sizeof(buffer) : cb.u.LowPart; ULONG chunk_read, chunk_written; hr = IStream_Read(iface, buffer, chunk_size, &chunk_read); -- 2.28.0

1 0

[PATCH 2/2] wbemprox: Report 4095MiB video memory if it overflows.
by Hans Leidekker Sept. 30, 2020

Sept. 30, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> That's what Windows do apparently. Anything with more than 4GiB of VRAM would report less otherwise, confusing the VRAM detection in some games. The Mafia III launcher is trying to open a warning popup with a 8GiB VRAM GPU for instance, as the reported value overflows to 0. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 43268221936..8daa55eaeb4 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3878,8 +3878,9 @@ static enum fill_status fill_videocontroller( struct table *table, const struct hr = IDXGIAdapter_GetDesc( adapter, &desc ); if (SUCCEEDED(hr)) { - vidmem = desc.DedicatedVideoMemory; - name = desc.Description; + if (desc.DedicatedVideoMemory > UINT_MAX) vidmem = 0xfff00000; + else vidmem = desc.DedicatedVideoMemory; + name = desc.Description; } done: -- 2.20.1

1 0

[PATCH 1/2] wbemprox: Set variant type to VT_NULL if BSTR is NULL.
by Hans Leidekker Sept. 30, 2020

Sept. 30, 2020

From: Rémi Bernon <rbernon(a)codeweavers.com> Mafia III launcher crashes when querying video controllers when it passes the NULL __PATH value through COM marshalling. v2: Don't read the AdapterRAM property, it returns differently on w2008. v3: Fix all BSTR system properties. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 12 ++++++++---- dlls/wbemprox/tests/query.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 6ac5ad5b770..525381d88d2 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -946,22 +946,24 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, L"__NAMESPACE" )) + if (!wcsicmp( name, L"__NAMESPACE" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = view->proplist ? NULL : build_namespace(); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, L"__PATH" )) + if (!wcsicmp( name, L"__PATH" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_path( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; @@ -976,22 +978,24 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_SINT32; return S_OK; } - else if (!wcsicmp( name, L"__RELPATH" )) + if (!wcsicmp( name, L"__RELPATH" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = build_relpath( view, table_index, result_index, name ); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; } - else if (!wcsicmp( name, L"__SERVER" )) + if (!wcsicmp( name, L"__SERVER" )) { if (ret) { V_VT( ret ) = VT_BSTR; V_BSTR( ret ) = view->proplist ? NULL : build_servername(); + if (!V_BSTR( ret )) V_VT( ret ) = VT_NULL; } if (type) *type = CIM_STRING; return S_OK; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 74fdfaa9bc8..d1ce42d64cb 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1414,6 +1414,13 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); + check_property( obj, L"__PATH", VT_BSTR, CIM_STRING ); + check_property( obj, L"__PROPERTY_COUNT", VT_I4, CIM_SINT32 ); + check_property( obj, L"__RELPATH", VT_BSTR, CIM_STRING ); + check_property( obj, L"__SERVER", VT_BSTR, CIM_STRING ); check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING ); check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); @@ -1432,6 +1439,31 @@ static void test_Win32_VideoController( IWbemServices *services ) IWbemClassObject_Release( obj ); } + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + + query = SysAllocString( L"SELECT AdapterRAM FROM Win32_VideoController" ); + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + if (hr != S_OK) + { + win_skip( "Win32_VideoController not available\n" ); + return; + } + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); + check_property( obj, L"__NAMESPACE", VT_NULL, CIM_STRING ); + check_property( obj, L"__PATH", VT_NULL, CIM_STRING ); + check_property( obj, L"__PROPERTY_COUNT", VT_I4, CIM_SINT32 ); + check_property( obj, L"__RELPATH", VT_NULL, CIM_STRING ); + check_property( obj, L"__SERVER", VT_NULL, CIM_STRING ); + IWbemClassObject_Release( obj ); + } + IEnumWbemClassObject_Release( result ); SysFreeString( query ); SysFreeString( wql ); -- 2.20.1

1 0

[PATCH] dxgi/tests: Check that the last adapter is always WARP.
by Rémi Bernon Sept. 30, 2020

Sept. 30, 2020

Some games specifically ignore the last adapter from the adapter list, as it's always WARP on Windows. This makes them fail to detect GPUs correctly on Wine, as they drop one of the reported adapters. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I also have a patch to add a WARP adapter to the list in wined3d, but I think there's some multi-adapter work under way that will conflict, so I'll wait before sending it. dlls/dxgi/tests/dxgi.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index ce1aee5ee3b..589364271b1 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5325,11 +5325,14 @@ static void test_multi_adapter(void) { unsigned int output_count = 0, expected_output_count = 0; unsigned int adapter_index, output_index, device_index; + DXGI_ADAPTER_DESC1 adapter_desc1; + DXGI_ADAPTER_DESC adapter_desc; DXGI_OUTPUT_DESC old_output_desc, output_desc; DISPLAY_DEVICEW display_device; MONITORINFO monitor_info; DEVMODEW old_mode, mode; IDXGIFactory *factory; + IDXGIAdapter1 *adapter1; IDXGIAdapter *adapter; IDXGIOutput *output; HMONITOR monitor; @@ -5530,6 +5533,35 @@ static void test_multi_adapter(void) IDXGIAdapter_Release(adapter); } + todo_wine ok(adapter_index >= 2, "Unexpected adapter count %u\n", adapter_index); + + hr = IDXGIFactory_EnumAdapters(factory, adapter_index - 1, &adapter); + ok(SUCCEEDED(hr), "Failed to get last adapter %u, hr %#x.\n", adapter_index - 1, hr); + + hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + ok(SUCCEEDED(hr), "GetDesc failed, hr %#x.\n", hr); + + todo_wine ok(!lstrcmpW(adapter_desc.Description, L"Microsoft Basic Render Driver"), + "Unexpected name for last adapter %s\n", wine_dbgstr_w(adapter_desc.Description)); + ok(adapter_desc.SubSysId == 0x0000, "Expected SubSysId 0x0000, got %#x\n", adapter_desc.SubSysId); + todo_wine ok(adapter_desc.VendorId == 0x1414, "Expected VendorId 0x1414, got %#x\n", adapter_desc.VendorId); + todo_wine ok(adapter_desc.DeviceId == 0x008c, "Expected DeviceId 0x008c, got %#x\n", adapter_desc.DeviceId); + ok(adapter_desc.Revision == 0x0000, "Expected Revision 0x0000, got %#x\n", adapter_desc.Revision); + todo_wine ok(adapter_desc.DedicatedVideoMemory == 0, "Expected DedicatedVideoMemory 0, got %#lx\n", adapter_desc.DedicatedVideoMemory); + ok(adapter_desc.DedicatedSystemMemory == 0, "Expected DedicatedSystemMemory 0, got %#lx\n", adapter_desc.DedicatedSystemMemory); + + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter1, (void **)&adapter1); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE), "Got unexpected hr %#x.\n", hr); + if (hr != E_NOINTERFACE) + { + hr = IDXGIAdapter1_GetDesc1(adapter1, &adapter_desc1); + ok(SUCCEEDED(hr), "GetDesc1 failed, hr %#x.\n", hr); + todo_wine ok(adapter_desc1.Flags == DXGI_ADAPTER_FLAG_SOFTWARE, "Expected flags DXGI_ADAPTER_FLAG_SOFTWARE, got %#x\n", adapter_desc1.Flags); + IDXGIAdapter1_Release(adapter1); + } + + IDXGIAdapter_Release(adapter); + IDXGIFactory_Release(factory); expected_output_count = GetSystemMetrics(SM_CMONITORS); -- 2.28.0

3 3