May 2022 - Wine-devel - list.winehq.org

Re: [PATCH v2 0/5] MR113: include: Fix malloc attributes, and a few related warnings. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/113

1 0

Re: [PATCH v2 0/6] MR114: ntdll: More heap code cleanup. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/114

1 0

Re: [PATCH v3 0/2] MR106: Avoid mpg123 functions with suffix - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/106

1 0

Re: [PATCH v3 0/6] MR117: winemac: PE conversion preparation - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/117

1 0

Re: [PATCH v2 0/1] MR108: wmphoto: Zero user buffer before calling jxrlib Copy. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/108

1 0

Re: [PATCH v2 0/1] MR107: mscoree/tests: Use wait_child_process for csc process. - approved
by Alexandre Julliard (＠julliard) 23 May '22

23 May '22

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/107

1 0

[PATCH v3 resend] d2d1/tests: Add tests for effect register.
by Ziqing Hui 23 May '22

23 May '22

Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> --- This patch is resend to see the its result on test bot. dlls/d2d1/tests/d2d1.c | 301 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 301 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 663fc150df8..0a8245d6805 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -21,6 +21,7 @@ #include <math.h> #include <float.h> #include "d2d1_3.h" +#include "d2d1effectauthor.h" #include "d3d11.h" #include "wincrypt.h" #include "wine/test.h" @@ -29,6 +30,62 @@ #include "wincodec.h" #include "wine/heap.h" +DEFINE_GUID(CLSID_TestEffect, 0xb9ee12e9,0x32d9,0xe659,0xac,0x61,0x2d,0x7c,0xea,0x69,0x28,0x78); + +static const WCHAR *effect_xml_a = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Integer' type='uint32'> \ + <Property name='DisplayName' type='string' value='Integer'/> \ + <Property name='Min' type='uint32' value='0'/> \ + <Property name='Max' type='uint32' value='100'/> \ + <Property name='Default' type='uint32' value='10'/> \ + </Property> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_b = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Context' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Context'/> \ + </Property> \ + </Effect> \ +"; + +static const WCHAR *effect_xml_c = +L"<?xml version='1.0'?> \ + <Effect> \ + <Property name='DisplayName' type='string' value='TestEffect'/> \ + <Property name='Author' type='string' value='The Wine Project'/> \ + <Property name='Category' type='string' value='Test'/> \ + <Property name='Description' type='string' value='Test effect.'/> \ + <Inputs> \ + <Input name='Source'/> \ + </Inputs> \ + <Property name='Context' type='iunknown'> \ + <Property name='DisplayName' type='string' value='Context'/> \ + </Property> \ + <Property name='Integer' type='uint32'> \ + <Property name='DisplayName' type='string' value='Integer'/> \ + </Property> \ + </Effect> \ +"; + static HRESULT (WINAPI *pD2D1CreateDevice)(IDXGIDevice *dxgi_device, const D2D1_CREATION_PROPERTIES *properties, ID2D1Device **device); static void (WINAPI *pD2D1SinCos)(float angle, float *s, float *c); @@ -118,6 +175,14 @@ struct expected_geometry_figure const struct geometry_segment *segments; }; +struct effect_impl +{ + ID2D1EffectImpl ID2D1EffectImpl_iface; + LONG refcount; + UINT integer; + ID2D1EffectContext *effect_context; +}; + static void queue_d3d1x_test(void (*test)(BOOL d3d11), BOOL d3d11) { if (mt_test_count >= mt_tests_size) @@ -10296,6 +10361,241 @@ static void test_effect(BOOL d3d11) release_test_context(&ctx); } +static inline struct effect_impl *impl_from_ID2D1EffectImpl(ID2D1EffectImpl *iface) +{ + return CONTAINING_RECORD(iface, struct effect_impl, ID2D1EffectImpl_iface); +} + +static HRESULT STDMETHODCALLTYPE effect_impl_QueryInterface(ID2D1EffectImpl *iface, REFIID iid, void **out) +{ + if (IsEqualGUID(iid, &IID_ID2D1EffectImpl) + || IsEqualGUID(iid, &IID_IUnknown)) + { + ID2D1EffectImpl_AddRef(iface); + *out = iface; + return S_OK; + } + + *out = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE effect_impl_AddRef(ID2D1EffectImpl *iface) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ULONG refcount = InterlockedIncrement(&effect_impl->refcount); + return refcount; +} + +static ULONG STDMETHODCALLTYPE effect_impl_Release(ID2D1EffectImpl *iface) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ULONG refcount = InterlockedDecrement(&effect_impl->refcount); + + if (!refcount) + { + if (effect_impl->effect_context) + ID2D1EffectContext_Release(effect_impl->effect_context); + heap_free(effect_impl); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_Initialize(ID2D1EffectImpl *iface, + ID2D1EffectContext *context,ID2D1TransformGraph *graph) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl(iface); + ID2D1EffectContext_AddRef(effect_impl->effect_context = context); + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_PrepareForRender(ID2D1EffectImpl *iface, D2D1_CHANGE_TYPE type) +{ + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_SetGraph(ID2D1EffectImpl *iface, ID2D1TransformGraph *graph) +{ + return E_NOTIMPL; +} + +static const ID2D1EffectImplVtbl effect_impl_vtbl = +{ + effect_impl_QueryInterface, + effect_impl_AddRef, + effect_impl_Release, + effect_impl_Initialize, + effect_impl_PrepareForRender, + effect_impl_SetGraph, +}; + +static HRESULT STDMETHODCALLTYPE effect_impl_create(IUnknown **effect_impl) +{ + struct effect_impl *object; + + if (!(object = heap_alloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + object->ID2D1EffectImpl_iface.lpVtbl = &effect_impl_vtbl; + object->refcount = 1; + object->integer = 0; + object->effect_context = NULL; + + *effect_impl = (IUnknown *)&object->ID2D1EffectImpl_iface; + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_set_integer(IUnknown *iface, const BYTE *data, UINT32 data_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->integer)) + return E_INVALIDARG; + + effect_impl->integer = *((UINT *)data); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_get_integer(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->integer)) + return E_INVALIDARG; + + *((UINT *)data) = effect_impl->integer; + if (actual_size) + *actual_size = sizeof(effect_impl->integer); + + return S_OK; +} + +static HRESULT STDMETHODCALLTYPE effect_impl_get_context(const IUnknown *iface, + BYTE *data, UINT32 data_size, UINT32 *actual_size) +{ + struct effect_impl *effect_impl = impl_from_ID2D1EffectImpl((ID2D1EffectImpl *)iface); + + if (!data || data_size != sizeof(effect_impl->effect_context)) + return E_INVALIDARG; + + *((ID2D1EffectContext **)data) = effect_impl->effect_context; + if (actual_size) + *actual_size = sizeof(effect_impl->effect_context); + + return S_OK; +} + +static void test_effect_register(BOOL d3d11) +{ + struct d2d1_test_context ctx; + ID2D1Factory1 *factory; + unsigned int i; + HRESULT hr; + + const D2D1_PROPERTY_BINDING binding[] = + { + {L"Integer", effect_impl_set_integer, effect_impl_get_integer}, + {L"Context", NULL, effect_impl_get_context}, + {L"Integer", NULL, effect_impl_get_integer}, + {L"Integer", effect_impl_set_integer, NULL}, + {L"Integer", NULL, NULL}, + {L"DeadBeef", effect_impl_set_integer, effect_impl_get_integer}, + }; + + const struct binding_test + { + const D2D1_PROPERTY_BINDING *binding; + UINT32 binding_count; + const WCHAR *effect_xml; + HRESULT hr; + } + binding_tests[] = + { + {NULL, 0, effect_xml_a, S_OK}, + {NULL, 0, effect_xml_b, S_OK}, + {binding, 1, effect_xml_a, S_OK}, + {binding, 1, effect_xml_b, D2DERR_INVALID_PROPERTY}, + {binding + 1, 1, effect_xml_b, S_OK}, + {binding + 2, 1, effect_xml_a, S_OK}, + {binding + 3, 1, effect_xml_a, S_OK}, + {binding + 4, 1, effect_xml_a, S_OK}, + {binding + 5, 1, effect_xml_a, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_a, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_b, D2DERR_INVALID_PROPERTY}, + {binding, 2, effect_xml_c, S_OK}, + }; + + if (!init_test_context(&ctx, d3d11)) + return; + + if (!(factory = create_factory(&IID_ID2D1Factory1, NULL))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + release_test_context(&ctx); + return; + } + + /* Register effect once */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + /* Register effect multiple times */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + /* Register effect multiple times with different xml */ + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_a, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + effect_xml_b, NULL, 0, effect_impl_create); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + + /* Register effect with property binding */ + for (i = 0; i < ARRAY_SIZE(binding_tests); ++i) + { + const struct binding_test *test = &binding_tests[i]; + winetest_push_context("Test %u", i); + + hr = ID2D1Factory1_RegisterEffectFromString(factory, &CLSID_TestEffect, + test->effect_xml, test->binding, test->binding_count, effect_impl_create); + todo_wine_if(test->hr != S_OK) + ok(hr == test->hr, "Got unexpected hr %#lx, expected %#lx.\n", hr, test->hr); + ID2D1Factory1_UnregisterEffect(factory, &CLSID_TestEffect); + + winetest_pop_context(); + } + + /* Unregister builtin effect */ + hr = ID2D1Factory1_UnregisterEffect(factory, &CLSID_D2D1Composite); + todo_wine ok(hr == D2DERR_EFFECT_IS_NOT_REGISTERED, "Got unexpected hr %#lx.\n", hr); + + ID2D1Factory1_Release(factory); + release_test_context(&ctx); +} + static void test_effect_2d_affine(BOOL d3d11) { D2D1_MATRIX_3X2_F rotate, scale, skew; @@ -11088,6 +11388,7 @@ START_TEST(d2d1) queue_d3d10_test(test_colour_space); queue_test(test_geometry_group); queue_test(test_mt_factory); + queue_test(test_effect_register); queue_test(test_effect); queue_test(test_effect_2d_affine); queue_test(test_effect_crop); -- 2.25.1

3 2

[PATCH 0/5] MR109: wined3d: Add a memory_colour_fill path for clearing the entire level to zero.
by Stefan Dösinger 23 May '22

23 May '22

Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/109

3 12

[PATCH v2] dxgi: Implement adapter video memory budget change notification.
by Zhiyi Zhang 23 May '22

23 May '22

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51665 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Supersede 235995. Simplify thread creation. dlls/dxgi/adapter.c | 13 +++- dlls/dxgi/tests/dxgi.c | 4 -- dlls/wined3d/directx.c | 139 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 + 5 files changed, 154 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 20c017eba08..b178376341b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -333,15 +333,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXG static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent( IWineDXGIAdapter *iface, HANDLE event, DWORD *cookie) { - FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - return E_NOTIMPL; + TRACE("iface %p, event %p, cookie %p.\n", iface, event, cookie); + + if (!event || !cookie) + return DXGI_ERROR_INVALID_CALL; + + return wined3d_adapter_register_budget_change_notification(adapter->wined3d_adapter, event, cookie); } static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification( IWineDXGIAdapter *iface, DWORD cookie) { - FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); + TRACE("iface %p, cookie %#lx.\n", iface, cookie); + + wined3d_adapter_unregister_budget_change_notification(cookie); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 04bba29e8e5..33e9ead31ad 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7539,16 +7539,13 @@ static void test_video_memory_budget_notification(void) goto done; hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, NULL, &cookie); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); event = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, &cookie); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7560,7 +7557,6 @@ static void test_video_memory_budget_notification(void) if (memory_info.Budget) { ret = WaitForSingleObject(event, 1000); - todo_wine ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c58a346add..fb588b88098 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,6 +23,7 @@ #include "wined3d_private.h" #include "winternl.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -38,6 +39,19 @@ enum wined3d_driver_model DRIVER_MODEL_NT6X }; +struct wined3d_adapter_budget_change_notification +{ + const struct wined3d_adapter *adapter; + HANDLE event; + DWORD cookie; + UINT64 last_local_budget; + UINT64 last_non_local_budget; + struct list entry; +}; + +static struct list adapter_budget_change_notifications = LIST_INIT( adapter_budget_change_notifications ); +static HANDLE notification_thread, notification_thread_stop_event; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; @@ -1046,6 +1060,131 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter return WINED3D_OK; } +static DWORD CALLBACK notification_thread_func(void *stop_event) +{ + struct wined3d_adapter_budget_change_notification *notification; + struct wined3d_video_memory_info info; + HRESULT hr; + + while (TRUE) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_local_budget) + { + notification->last_local_budget = info.budget; + SetEvent(notification->event); + continue; + } + + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_non_local_budget) + { + notification->last_non_local_budget = info.budget; + SetEvent(notification->event); + } + } + wined3d_mutex_unlock(); + + if (WaitForSingleObject(stop_event, 1000) == WAIT_OBJECT_0) + break; + } + + return TRUE; +} + +HRESULT CDECL wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie) +{ + static DWORD cookie_counter; + static BOOL wrapped; + struct wined3d_adapter_budget_change_notification *notification, *new_notification; + BOOL found = FALSE; + + new_notification = heap_alloc_zero(sizeof(*new_notification)); + if (!new_notification) + return E_OUTOFMEMORY; + + wined3d_mutex_lock(); + new_notification->adapter = adapter; + new_notification->event = event; + new_notification->cookie = cookie_counter++; + if (cookie_counter < new_notification->cookie) + wrapped = TRUE; + if (wrapped) + { + while (TRUE) + { + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == new_notification->cookie) + { + found = TRUE; + break; + } + } + + if (!found) + break; + + new_notification->cookie = cookie_counter++; + } + } + + *cookie = new_notification->cookie; + list_add_head(&adapter_budget_change_notifications, &new_notification->entry); + + if (!notification_thread) + { + notification_thread_stop_event = CreateEventW(0, FALSE, FALSE, NULL); + notification_thread = CreateThread(NULL, 0, notification_thread_func, + notification_thread_stop_event, 0, NULL); + } + wined3d_mutex_unlock(); + return WINED3D_OK; +} + +HRESULT CDECL wined3d_adapter_unregister_budget_change_notification(DWORD cookie) +{ + struct wined3d_adapter_budget_change_notification *notification; + HANDLE thread, thread_stop_event; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == cookie) + { + list_remove(&notification->entry); + heap_free(notification); + break; + } + } + + if (!list_empty(&adapter_budget_change_notifications)) + { + wined3d_mutex_unlock(); + return WINED3D_OK; + } + + thread = notification_thread; + thread_stop_event = notification_thread_stop_event; + notification_thread = NULL; + notification_thread_stop_event = NULL; + wined3d_mutex_unlock(); + SetEvent(thread_stop_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(thread_stop_event); + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 845ca0fb170..63220e1222c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -22,6 +22,8 @@ @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) @ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) +@ cdecl wined3d_adapter_register_budget_change_notification(ptr ptr ptr) +@ cdecl wined3d_adapter_unregister_budget_change_notification(long) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b7a626f751..116aea82348 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,6 +2364,9 @@ unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapt HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, unsigned int node_idx, enum wined3d_memory_segment_group group, struct wined3d_video_memory_info *info); +HRESULT __cdecl wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie); +HRESULT __cdecl wined3d_adapter_unregister_budget_change_notification(DWORD cookie); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, -- 2.34.1

3 2

[PATCH] d3drm/tests: Use test context for test ran in a loop.
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3drm/tests/d3drm.c | 184 +++++++++++++++++++++------------------ 1 file changed, 100 insertions(+), 84 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 426aa1fd28d..72c71ebae09 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1657,80 +1657,84 @@ static void test_object(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + winetest_push_context("Test %u", i); + unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, NULL, NULL, tests[i].iid, (void **)&unknown); - ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr); ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); unknown = (IUnknown *)0xdeadbeef; hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, (void **)&unknown); - ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr); ok(!unknown, "Expected object returned == NULL, got %p.\n", unknown); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, NULL, NULL); - ok(hr == D3DRMERR_BADVALUE, "Test %u: expected hr == D3DRMERR_BADVALUE, got %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADVALUE, "Unexpected hr %#lx.\n", hr); hr = IDirect3DRM_CreateObject(d3drm1, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) { ref2 = get_refcount((IUnknown *)d3drm1); if (tests[i].takes_d3drm_ref) - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Unexpected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); else - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); IUnknown_Release(unknown); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); /* test Add/Destroy callbacks */ test_destroy_callback(i, tests[i].clsid, tests[i].iid); hr = IDirect3DRM2_CreateObject(d3drm2, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); if (tests[i].takes_d3drm_ref) - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Unexpected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); else - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); IUnknown_Release(unknown); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); hr = IDirect3DRM3_CreateObject(d3drm3, tests[i].clsid, NULL, tests[i].iid, (void **)&unknown); - ok(SUCCEEDED(hr), "Test %u: expected hr == D3DRM_OK, got %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Unexpected hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); if (tests[i].takes_d3drm_ref) - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Unexpected ref2 > ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); else - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); IUnknown_Release(unknown); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 == ref1, "Test %u: expected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref2 == ref1, "Unexpected ref2 == ref1, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); ref3 = get_refcount((IUnknown *)d3drm2); - ok(ref3 == ref1, "Test %u: expected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", i, ref1, ref3); + ok(ref3 == ref1, "Unexpected ref3 == ref1, got ref1 = %lu, ref3 = %lu.\n", ref1, ref3); ref4 = get_refcount((IUnknown *)d3drm3); - ok(ref4 == ref1, "Test %u: expected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", i, ref1, ref4); + ok(ref4 == ref1, "Unexpected ref4 == ref1, got ref1 = %lu, ref4 = %lu.\n", ref1, ref4); } + + winetest_pop_context(); } IDirect3DRM_Release(d3drm1); @@ -3501,7 +3505,7 @@ static void test_frame_mesh_materials(void) ULONG size; IDirect3DRMMaterial *material; IDirect3DRMTexture *texture; - int i; + unsigned int i; hr = Direct3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); @@ -3524,40 +3528,44 @@ static void test_frame_mesh_materials(void) unsigned vertex_count, face_count, vertex_per_face; DWORD face_data_size; + winetest_push_context("Group %u", i); + hr = IDirect3DRMMesh_GetGroup(mesh, i, &vertex_count, &face_count, &vertex_per_face, &face_data_size, NULL); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(vertex_count == groups[i].vertex_count, "Group %d: Wrong vertex count %d, expected %d\n", i, vertex_count, groups[i].vertex_count); - ok(face_count == groups[i].face_count, "Group %d: Wrong face count %d; expected %d\n", i, face_count, groups[i].face_count); - ok(vertex_per_face == groups[i].vertex_per_face, "Group %d: Wrong vertex per face %d, expected %d\n", i, vertex_per_face, groups[i].vertex_per_face); - ok(face_data_size == groups[i].face_data_size, "Group %d: Wrong face data size %ld, expected %d\n", i, face_data_size, groups[i].face_data_size); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(vertex_count == groups[i].vertex_count, "Wrong vertex count %d, expected %d\n", vertex_count, groups[i].vertex_count); + ok(face_count == groups[i].face_count, "Wrong face count %d; expected %d\n", face_count, groups[i].face_count); + ok(vertex_per_face == groups[i].vertex_per_face, "Wrong vertex per face %d, expected %d\n", vertex_per_face, groups[i].vertex_per_face); + ok(face_data_size == groups[i].face_data_size, "Wrong face data size %ld, expected %d\n", face_data_size, groups[i].face_data_size); color = IDirect3DRMMesh_GetGroupColor(mesh, i); - ok(color == groups[i].color, "Group %d: Wrong color %lx, expected %lx.\n", i, color, groups[i].color); + ok(color == groups[i].color, "Wrong color %lx, expected %lx.\n", color, groups[i].color); hr = IDirect3DRMMesh_GetGroupMaterial(mesh, i, &material); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(material != NULL, "Group %d: No material\n", i); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(material != NULL, "No material.\n"); power = IDirect3DRMMaterial_GetPower(material); - ok(power == groups[i].power, "Group %d: Wrong power %f, expected %f\n", i, power, groups[i].power); + ok(power == groups[i].power, "Wrong power %f, expected %f\n", power, groups[i].power); hr = IDirect3DRMMaterial_GetSpecular(material, &red, &green, &blue); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(red == groups[i].specular[0], "Group %d: Wrong specular red %f, expected %f\n", i, red, groups[i].specular[0]); - ok(green == groups[i].specular[1], "Group %d: Wrong specular green %f, pD3DRMexpected %f\n", i, green, groups[i].specular[1]); - ok(blue == groups[i].specular[2], "Group %d: Wrong specular blue %f, expected %f\n", i, blue, groups[i].specular[2]); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(red == groups[i].specular[0], "Wrong specular red %f, expected %f\n", red, groups[i].specular[0]); + ok(green == groups[i].specular[1], "Wrong specular green %f, pD3DRMexpected %f\n", green, groups[i].specular[1]); + ok(blue == groups[i].specular[2], "Wrong specular blue %f, expected %f\n", blue, groups[i].specular[2]); hr = IDirect3DRMMaterial_GetEmissive(material, &red, &green, &blue); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(red == groups[i].emissive[0], "Group %d: Wrong emissive red %f, expected %f\n", i, red, groups[i].emissive[0]); - ok(green == groups[i].emissive[1], "Group %d: Wrong emissive green %f, expected %f\n", i, green, groups[i].emissive[1]); - ok(blue == groups[i].emissive[2], "Group %d: Wrong emissive blue %f, expected %f\n", i, blue, groups[i].emissive[2]); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(red == groups[i].emissive[0], "Wrong emissive red %f, expected %f\n", red, groups[i].emissive[0]); + ok(green == groups[i].emissive[1], "Wrong emissive green %f, expected %f\n", green, groups[i].emissive[1]); + ok(blue == groups[i].emissive[2], "Wrong emissive blue %f, expected %f\n", blue, groups[i].emissive[2]); hr = IDirect3DRMMesh_GetGroupTexture(mesh, i, &texture); - ok(hr == D3DRM_OK, "Group %d: unexpected hr %#lx.\n", i, hr); - ok(!texture, "Group %d: Unexpected texture\n", i); + ok(hr == D3DRM_OK, "Unexpected hr %#lx.\n", hr); + ok(!texture, "Unexpected texture\n"); if (material) IDirect3DRMMaterial_Release(material); if (texture) IDirect3DRMTexture_Release(texture); + + winetest_pop_context(); } IDirect3DRMMesh_Release(mesh); @@ -6371,105 +6379,109 @@ static void test_load_texture(void) for (i = 0; i < ARRAY_SIZE(tests); ++i) { + winetest_push_context("Test %u", i); + filename = create_bitmap(tests[i].w, tests[i].h, tests[i].palettized); hr = IDirect3DRM_LoadTexture(d3drm1, filename, &texture1); - ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", ref1, ref2); hr = IDirect3DRMTexture_InitFromFile(texture1, filename); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); /* InitFromFile() seems to AddRef() IDirect3DRM even if it fails. */ IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); hr = IDirect3DRM_CreateObject(d3drm1, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture, (void **)&texture1); - ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); hr = IDirect3DRMTexture_InitFromFile(texture1, NULL); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture_InitFromFile(texture1, ""); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture_InitFromFile(texture1, filename); - ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to initialise texture from file, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 1, d3drm_img, FALSE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); hr = IDirect3DRM2_LoadTexture(d3drm2, filename, &texture2); - ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", ref1, ref2); hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 2, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); hr = IDirect3DRM2_CreateObject(d3drm2, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture2, (void **)&texture2); - ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); hr = IDirect3DRMTexture2_InitFromFile(texture2, NULL); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture2_InitFromFile(texture2, ""); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture2_InitFromFile(texture2, filename); - ok(SUCCEEDED(hr), "Test %u: Failed to initialise texture from file, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to initialise texture from file, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture2_GetImage(texture2); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 3, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture2_Release(texture2); hr = IDirect3DRM3_LoadTexture(d3drm3, filename, &texture3); - ok(SUCCEEDED(hr), "Test %u: Failed to load texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to load texture, hr %#lx.\n", hr); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref2 > ref1, "Test %u: expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", i, ref1, ref2); + ok(ref2 > ref1, "Expected ref2 > ref1, got ref1 %lu, ref2 %lu.\n", ref1, ref2); hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); IDirect3DRM_Release(d3drm1); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 4, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); /* Test whether querying a version 1 texture from version 3 causes a * change in the loading behavior. */ hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)&texture1); ok(SUCCEEDED(hr), "Failed to get IDirect3DRMTexture interface, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture_GetImage(texture1); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 5, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture_Release(texture1); IDirect3DRMTexture3_Release(texture3); ref2 = get_refcount((IUnknown *)d3drm1); - ok(ref1 == ref2, "Test %u: expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", i, ref1, ref2); + ok(ref1 == ref2, "Expected ref1 == ref2, got ref1 = %lu, ref2 = %lu.\n", ref1, ref2); hr = IDirect3DRM3_CreateObject(d3drm3, &CLSID_CDirect3DRMTexture, NULL, &IID_IDirect3DRMTexture3, (void **)&texture3); - ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#lx.\n", hr); hr = IDirect3DRMTexture3_InitFromFile(texture3, NULL); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture3_InitFromFile(texture3, ""); - ok(hr == D3DRMERR_BADOBJECT, "Test %u: Got unexpected hr %#lx.\n", i, hr); + ok(hr == D3DRMERR_BADOBJECT, "Got unexpected hr %#lx.\n", hr); hr = IDirect3DRMTexture3_InitFromFile(texture3, filename); - ok(SUCCEEDED(hr), "Test %u: Failed to initialize texture from file, hr %#lx.\n", i, hr); + ok(SUCCEEDED(hr), "Failed to initialize texture from file, hr %#lx.\n", hr); d3drm_img = IDirect3DRMTexture3_GetImage(texture3); - ok(!!d3drm_img, "Test %u: Failed to get image.\n", i); + ok(!!d3drm_img, "Failed to get image.\n"); test_bitmap_data(i * 7 + 6, d3drm_img, TRUE, tests[i].w, tests[i].h, tests[i].palettized); IDirect3DRMTexture3_Release(texture3); ret = DeleteFileA(filename); - ok(ret, "Test %u: Failed to delete bitmap \"%s\".\n", i, filename); + ok(ret, "Failed to delete bitmap \"%s\".\n", filename); HeapFree(GetProcessHeap(), 0, filename); + + winetest_pop_context(); } IDirect3DRM3_Release(d3drm3); @@ -7773,25 +7785,29 @@ static void test_animation(void) for (i = 0; i < count; i++) { - ok(keys[i].dwSize == sizeof(*keys), "%lu: unexpected dwSize value %lu.\n", i, keys[i].dwSize); + winetest_push_context("%lu", i); + + ok(keys[i].dwSize == sizeof(*keys), "Unexpected dwSize value %lu.\n", keys[i].dwSize); todo_wine { switch (keys[i].dwKeyType) { case D3DRMANIMATION_ROTATEKEY: - ok((keys[i].dwID & 0xf0000000) == 0x40000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID); + ok((keys[i].dwID & 0xf0000000) == 0x40000000, "Unexpected id mask %#lx.\n", keys[i].dwID); break; case D3DRMANIMATION_POSITIONKEY: - ok((keys[i].dwID & 0xf0000000) == 0x80000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID); + ok((keys[i].dwID & 0xf0000000) == 0x80000000, "Unexpected id mask %#lx.\n", keys[i].dwID); break; case D3DRMANIMATION_SCALEKEY: - ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "%lu: unexpected id mask %#lx.\n", i, keys[i].dwID); + ok((keys[i].dwID & 0xf0000000) == 0xc0000000, "Unexpected id mask %#lx.\n", keys[i].dwID); break; default: - ok(0, "%lu: unknown key type %ld.\n", i, keys[i].dwKeyType); + ok(0, "Unknown key type %ld.\n", keys[i].dwKeyType); } } + + winetest_pop_context(); } /* No keys in this range. */ -- 2.35.1

2 1