wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Michael Stefaniuc : dmusic/tests: Fix an object leak.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 7192bbce8f5531d91c9b5c3b5ccb94df14fa195f URL: https://source.winehq.org/git/wine.git/?a=commit;h=7192bbce8f5531d91c9b5c3b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Jan 21 18:41:07 2022 +0100 dmusic/tests: Fix an object leak. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/dmusic.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index c7de6c5326e..cf648228a43 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -553,6 +553,8 @@ static void test_COM_synthport(void) ok(hr == E_NOINTERFACE, "QueryInterface for IID_IReferenceClock failed: %08x\n", hr); while (IDirectMusicPort_Release(port)); + refcount = IDirectMusic_Release(dmusic); + ok(!refcount, "Got outstanding refcount %d.\n", refcount); } struct chunk {

1 0

Nikolay Sivov : comctl32/listview: Add partial implementation of LVM_GETNEXTITEMINDEX.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: c16b65cdd99c13a1531ca41233c7587dba4cd49f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c16b65cdd99c13a1531ca412… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 21 19:08:24 2022 +0300 comctl32/listview: Add partial implementation of LVM_GETNEXTITEMINDEX. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 14 ++++++++++++++ dlls/comctl32/tests/listview.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 044e64bfa53..4176fb72c63 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7452,6 +7452,17 @@ static INT LISTVIEW_GetNextItem(const LISTVIEW_INFO *infoPtr, INT nItem, UINT uF return -1; } +static BOOL LISTVIEW_GetNextItemIndex(const LISTVIEW_INFO *infoPtr, LVITEMINDEX *index, UINT flags) +{ + /* FIXME: specified item group is ignored */ + + if (!index) + return FALSE; + + index->iItem = LISTVIEW_GetNextItem(infoPtr, index->iItem, flags); + return index->iItem != -1; +} + /* LISTVIEW_GetNumberOfWorkAreas */ /*** @@ -11426,6 +11437,9 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case LVM_GETNEXTITEM: return LISTVIEW_GetNextItem(infoPtr, (INT)wParam, LOWORD(lParam)); + case LVM_GETNEXTITEMINDEX: + return LISTVIEW_GetNextItemIndex(infoPtr, (LVITEMINDEX *)wParam, lParam); + case LVM_GETNUMBEROFWORKAREAS: FIXME("LVM_GETNUMBEROFWORKAREAS: unimplemented\n"); return 1; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e95b81f5bb1..5b40cea1fce 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -6624,6 +6624,37 @@ static void test_selected_column(void) } } +static void test_LVM_GETNEXTITEMINDEX(void) +{ + LVITEMINDEX index; + HWND hwnd; + BOOL ret; + + hwnd = create_listview_control(LVS_REPORT); + + insert_item(hwnd, 0); + insert_item(hwnd, 1); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, 0, LVNI_ALL); + ok(!ret, "Unexpected return value %d.\n", ret); + + index.iItem = -1; + index.iGroup = 0; + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, (WPARAM)&index, LVNI_ALL); + ok(ret, "Unexpected return value %d.\n", ret); + ok(index.iItem == 0, "Unexpected item index %d.\n", index.iItem); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, (WPARAM)&index, LVNI_ALL); + ok(ret, "Unexpected return value %d.\n", ret); + ok(index.iItem == 1, "Unexpected item index %d.\n", index.iItem); + + ret = SendMessageA(hwnd, LVM_GETNEXTITEMINDEX, (WPARAM)&index, LVNI_ALL); + ok(!ret, "Unexpected return value %d.\n", ret); + ok(index.iItem == -1, "Unexpected item index %d.\n", index.iItem); + + DestroyWindow(hwnd); +} + START_TEST(listview) { ULONG_PTR ctx_cookie; @@ -6730,6 +6761,7 @@ START_TEST(listview) test_LVM_GETCOUNTPERPAGE(); test_item_state_change(); test_selected_column(); + test_LVM_GETNEXTITEMINDEX(); unload_v6_module(ctx_cookie, hCtx);

1 0

Hans Leidekker : msi: Use custom action name for MsiBreak handling.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: b74b634335c8d843e6dc2ef21e5d9248ca05bae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b74b634335c8d843e6dc2ef2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 21 16:45:32 2022 +0100 msi: Use custom action name for MsiBreak handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50433 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/custom.c | 31 ++++++++++++++----------------- dlls/msi/winemsi.idl | 4 ++-- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 19ad3917265..ee4f59b5faa 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -449,21 +449,15 @@ static msi_custom_action_info *find_action_by_guid( const GUID *guid ) return info; } -static void handle_msi_break(LPCSTR target) +static void handle_msi_break( const WCHAR *action ) { - char format[] = "To debug your custom action, attach your debugger to " - "process %i (0x%X) and press OK"; - char val[MAX_PATH]; - char msg[100]; + const WCHAR fmt[] = L"To debug your custom action, attach your debugger to process %u (0x%x) and press OK"; + WCHAR val[MAX_PATH], msg[100]; - if (!GetEnvironmentVariableA("MsiBreak", val, MAX_PATH)) - return; + if (!GetEnvironmentVariableW( L"MsiBreak", val, MAX_PATH ) || wcscmp( val, action )) return; - if (strcmp(val, target)) - return; - - sprintf(msg, format, GetCurrentProcessId(), GetCurrentProcessId()); - MessageBoxA(NULL, msg, "Windows Installer", MB_OK); + swprintf( msg, ARRAY_SIZE(msg), fmt, GetCurrentProcessId(), GetCurrentProcessId() ); + MessageBoxW( NULL, msg, L"Windows Installer", MB_OK ); DebugBreak(); } @@ -497,7 +491,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) RPC_WSTR binding_str; MSIHANDLE hPackage; RPC_STATUS status; - LPWSTR dll = NULL; + WCHAR *dll = NULL, *action = NULL; LPSTR proc = NULL; HANDLE hModule; INT type; @@ -525,7 +519,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) RpcStringFreeW(&binding_str); } - r = remote_GetActionInfo(guid, &type, &dll, &proc, &remote_package); + r = remote_GetActionInfo(guid, &action, &type, &dll, &proc, &remote_package); if (r != ERROR_SUCCESS) return r; @@ -533,6 +527,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) if (!hPackage) { ERR( "failed to create handle for %x\n", remote_package ); + midl_user_free( action ); midl_user_free( dll ); midl_user_free( proc ); return ERROR_INSTALL_FAILURE; @@ -542,6 +537,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) if (!hModule) { ERR( "failed to load dll %s (%u)\n", debugstr_w( dll ), GetLastError() ); + midl_user_free( action ); midl_user_free( dll ); midl_user_free( proc ); MsiCloseHandle( hPackage ); @@ -552,7 +548,7 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) if (!fn) WARN( "GetProcAddress(%s) failed\n", debugstr_a(proc) ); else { - handle_msi_break(proc); + handle_msi_break(action); __TRY { @@ -569,11 +565,11 @@ UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) FreeLibrary(hModule); + midl_user_free(action); midl_user_free(dll); midl_user_free(proc); MsiCloseAllHandles(); - return r; } @@ -1612,7 +1608,7 @@ void ACTION_FinishCustomActions(const MSIPACKAGE* package) LeaveCriticalSection( &msi_custom_action_cs ); } -UINT __cdecl s_remote_GetActionInfo(const GUID *guid, int *type, LPWSTR *dll, LPSTR *func, MSIHANDLE *hinst) +UINT __cdecl s_remote_GetActionInfo(const GUID *guid, WCHAR **name, int *type, WCHAR **dll, char **func, MSIHANDLE *hinst) { msi_custom_action_info *info; @@ -1620,6 +1616,7 @@ UINT __cdecl s_remote_GetActionInfo(const GUID *guid, int *type, LPWSTR *dll, LP if (!info) return ERROR_INVALID_DATA; + *name = strdupW(info->action); *type = info->type; *hinst = alloc_msihandle(&info->package->hdr); *dll = strdupW(info->source); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index 7888b0ceb40..e9f0f9e6e59 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -105,7 +105,7 @@ interface IWineMsiRemote UINT remote_EnumComponentCosts( [in] MSIHANDLE hinst, [in, string, unique] LPCWSTR component, [in] DWORD index, [in] INSTALLSTATE state, [out, string, size_is(3)] LPWSTR drive, [out] INT *cost, [out] INT *temp ); - UINT remote_GetActionInfo( [in] const GUID *guid, [out] int *type, [out, string] LPWSTR *dllname, - [out, string] LPSTR *function, [out] MSIHANDLE *hinst ); + UINT remote_GetActionInfo( [in] const GUID *guid, [out, string] WCHAR **action, [out] int *type, [out, string] WCHAR **dllname, + [out, string] char **function, [out] MSIHANDLE *hinst ); UINT remote_CloseHandle( [in] MSIHANDLE handle ); }

1 0

Jan Sikorski : wined3d: Acquire references to shader resource views for command lists by inspecting CS packets.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 06ce7001bd24a284f3faca4af5c98dfdc835022a URL: https://source.winehq.org/git/wine.git/?a=commit;h=06ce7001bd24a284f3faca4a… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jan 21 16:43:53 2022 +0100 wined3d: Acquire references to shader resource views for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index cae6e238ed0..914941d18ae 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3558,6 +3558,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEWS: + { + struct wined3d_cs_set_shader_resource_views *op; + + op = (struct wined3d_cs_set_shader_resource_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_shader_resource_view_decref(op->views[i]); + } + break; + } + default: break; } @@ -3634,6 +3647,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_SHADER_RESOURCE_VIEWS: + { + struct wined3d_cs_set_shader_resource_views *op; + + op = (struct wined3d_cs_set_shader_resource_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_shader_resource_view_incref(op->views[i]); + } + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire references to render-target views for command lists by inspecting CS packets.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 2991180e4723b206d3beda559dccb44a509f900b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2991180e4723b206d3beda55… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jan 21 16:43:52 2022 +0100 wined3d: Acquire references to render-target views for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7e3237e2543..cae6e238ed0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3545,6 +3545,19 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_RENDERTARGET_VIEWS: + { + struct wined3d_cs_set_rendertarget_views *op; + + op = (struct wined3d_cs_set_rendertarget_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_rendertarget_view_decref(op->views[i]); + } + break; + } + default: break; } @@ -3608,6 +3621,19 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_RENDERTARGET_VIEWS: + { + struct wined3d_cs_set_rendertarget_views *op; + + op = (struct wined3d_cs_set_rendertarget_views *)packet->data; + for (i = 0; i < op->count; ++i) + { + if (op->views[i]) + wined3d_rendertarget_view_incref(op->views[i]); + } + break; + } + default: break; }

1 0

Jan Sikorski : wined3d: Acquire blend state references for command lists by inspecting CS packets.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: c976f8fb95c5f88fa2ad0f3df21ebc1c5a47e7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c976f8fb95c5f88fa2ad0f3d… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jan 21 16:43:51 2022 +0100 wined3d: Acquire blend state references for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 68 +++++++++++++----------------------------- dlls/wined3d/wined3d_private.h | 1 - 2 files changed, 20 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 00be0776323..7e3237e2543 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -63,9 +63,6 @@ struct wined3d_command_list SIZE_T query_count; struct wined3d_deferred_query_issue *queries; - - SIZE_T blend_state_count; - struct wined3d_blend_state **blend_states; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -541,12 +538,6 @@ static inline void wined3d_device_context_acquire_resource(struct wined3d_device context->ops->acquire_resource(context, resource); } -static inline void wined3d_device_context_acquire_blend_state(struct wined3d_device_context *context, - struct wined3d_blend_state *blend_state) -{ - context->ops->acquire_blend_state(context, blend_state); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1801,8 +1792,6 @@ void wined3d_device_context_emit_set_blend_state(struct wined3d_device_context * op->factor = *blend_factor; op->sample_mask = sample_mask; - if (state) - wined3d_device_context_acquire_blend_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2929,11 +2918,6 @@ static void wined3d_cs_acquire_resource(struct wined3d_device_context *context, wined3d_resource_acquire(resource); } -static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *context, - struct wined3d_blend_state *blend_state) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3171,7 +3155,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, - wined3d_cs_acquire_blend_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3300,7 +3283,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_flush, wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, - wined3d_cs_acquire_blend_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3553,6 +3535,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_BLEND_STATE: + { + struct wined3d_cs_set_blend_state *op; + + op = (struct wined3d_cs_set_blend_state *)packet->data; + if (op->state) + wined3d_blend_state_decref(op->state); + break; + } + default: break; } @@ -3606,6 +3598,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_BLEND_STATE: + { + struct wined3d_cs_set_blend_state *op; + + op = (struct wined3d_cs_set_blend_state *)packet->data; + if (op->state) + wined3d_blend_state_incref(op->state); + break; + } + default: break; } @@ -3632,9 +3634,6 @@ struct wined3d_deferred_context SIZE_T query_count, queries_capacity; struct wined3d_deferred_query_issue *queries; - - SIZE_T blend_state_count, blend_states_capacity; - struct wined3d_blend_state **blend_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3835,18 +3834,6 @@ static void wined3d_deferred_context_acquire_command_list(struct wined3d_device_ wined3d_command_list_incref(deferred->command_lists[deferred->command_list_count++] = list); } -static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_context *context, - struct wined3d_blend_state *blend_state) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->blend_states, &deferred->blend_states_capacity, - deferred->blend_state_count + 1, sizeof(*deferred->blend_states))) - return; - - deferred->blend_states[deferred->blend_state_count++] = blend_state; - wined3d_blend_state_incref(blend_state); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3859,7 +3846,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_flush, wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, - wined3d_deferred_context_acquire_blend_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3918,10 +3904,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_query_decref(deferred->queries[i].query); heap_free(deferred->queries); - for (i = 0; i < deferred->blend_state_count; ++i) - wined3d_blend_state_decref(deferred->blend_states[i]); - heap_free(deferred->blend_states); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -3947,7 +3929,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->upload_count * sizeof(*object->uploads) + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) - + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->data_size); if (!memory) @@ -3987,12 +3968,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->queries, deferred->queries, deferred->query_count * sizeof(*object->queries)); /* Transfer our references to the queries to the command list. */ - object->blend_states = memory; - memory = &object->blend_states[deferred->blend_state_count]; - object->blend_state_count = deferred->blend_state_count; - memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); - /* Transfer our references to the blend states to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4002,7 +3977,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->upload_count = 0; deferred->command_list_count = 0; deferred->query_count = 0; - deferred->blend_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4058,8 +4032,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_resource_decref(list->uploads[i].resource); for (i = 0; i < list->query_count; ++i) wined3d_query_decref(list->queries[i].query); - for (i = 0; i < list->blend_state_count; ++i) - wined3d_blend_state_decref(list->blend_states[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 822c3324b3f..e297169b6e1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4874,7 +4874,6 @@ struct wined3d_device_context_ops void (*flush)(struct wined3d_device_context *context); void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); - void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire rasterizer state references for command lists by inspecting CS packets.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 7c0d1595e042655ef0d7344c4009076140c547ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c0d1595e042655ef0d7344c… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jan 21 16:43:50 2022 +0100 wined3d: Acquire rasterizer state references for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 69 ++++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 20 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 0132af721ef..00be0776323 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -66,9 +66,6 @@ struct wined3d_command_list SIZE_T blend_state_count; struct wined3d_blend_state **blend_states; - - SIZE_T rasterizer_state_count; - struct wined3d_rasterizer_state **rasterizer_states; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -550,12 +547,6 @@ static inline void wined3d_device_context_acquire_blend_state(struct wined3d_dev context->ops->acquire_blend_state(context, blend_state); } -static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state) -{ - context->ops->acquire_rasterizer_state(context, rasterizer_state); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1859,8 +1850,6 @@ void wined3d_device_context_emit_set_rasterizer_state(struct wined3d_device_cont op->opcode = WINED3D_CS_OP_SET_RASTERIZER_STATE; op->state = rasterizer_state; - if (rasterizer_state) - wined3d_device_context_acquire_rasterizer_state(context, rasterizer_state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2945,11 +2934,6 @@ static void wined3d_cs_acquire_blend_state(struct wined3d_device_context *contex { } -static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3188,7 +3172,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, - wined3d_cs_acquire_rasterizer_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3318,7 +3301,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_resource, wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, - wined3d_cs_acquire_rasterizer_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3561,6 +3543,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_RASTERIZER_STATE: + { + struct wined3d_cs_set_rasterizer_state *op; + + op = (struct wined3d_cs_set_rasterizer_state *)packet->data; + if (op->state) + wined3d_rasterizer_state_decref(op->state); + break; + } + default: break; } @@ -3604,6 +3596,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_RASTERIZER_STATE: + { + struct wined3d_cs_set_rasterizer_state *op; + + op = (struct wined3d_cs_set_rasterizer_state *)packet->data; + if (op->state) + wined3d_rasterizer_state_incref(op->state); + break; + } + default: break; } @@ -3633,9 +3635,6 @@ struct wined3d_deferred_context SIZE_T blend_state_count, blend_states_capacity; struct wined3d_blend_state **blend_states; - - SIZE_T rasterizer_state_count, rasterizer_states_capacity; - struct wined3d_rasterizer_state **rasterizer_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3848,18 +3847,6 @@ static void wined3d_deferred_context_acquire_blend_state(struct wined3d_device_c wined3d_blend_state_incref(blend_state); } -static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->rasterizer_states, &deferred->rasterizer_states_capacity, - deferred->rasterizer_state_count + 1, sizeof(*deferred->rasterizer_states))) - return; - - deferred->rasterizer_states[deferred->rasterizer_state_count++] = rasterizer_state; - wined3d_rasterizer_state_incref(rasterizer_state); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3873,7 +3860,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_resource, wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, - wined3d_deferred_context_acquire_rasterizer_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3936,10 +3922,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_blend_state_decref(deferred->blend_states[i]); heap_free(deferred->blend_states); - for (i = 0; i < deferred->rasterizer_state_count; ++i) - wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); - heap_free(deferred->rasterizer_states); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -3966,7 +3948,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->command_list_count * sizeof(*object->command_lists) + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) - + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) + deferred->data_size); if (!memory) @@ -4012,13 +3993,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device memcpy(object->blend_states, deferred->blend_states, deferred->blend_state_count * sizeof(*object->blend_states)); /* Transfer our references to the blend states to the command list. */ - object->rasterizer_states = memory; - memory = &object->rasterizer_states[deferred->rasterizer_state_count]; - object->rasterizer_state_count = deferred->rasterizer_state_count; - memcpy(object->rasterizer_states, deferred->rasterizer_states, - deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); - /* Transfer our references to the rasterizer states to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4029,7 +4003,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->command_list_count = 0; deferred->query_count = 0; deferred->blend_state_count = 0; - deferred->rasterizer_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4087,8 +4060,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_query_decref(list->queries[i].query); for (i = 0; i < list->blend_state_count; ++i) wined3d_blend_state_decref(list->blend_states[i]); - for (i = 0; i < list->rasterizer_state_count; ++i) - wined3d_rasterizer_state_decref(list->rasterizer_states[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2b8596ba9d7..822c3324b3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4875,8 +4875,6 @@ struct wined3d_device_context_ops void (*acquire_resource)(struct wined3d_device_context *context, struct wined3d_resource *resource); void (*acquire_command_list)(struct wined3d_device_context *context, struct wined3d_command_list *list); void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); - void (*acquire_rasterizer_state)(struct wined3d_device_context *context, - struct wined3d_rasterizer_state *rasterizer_state); }; struct wined3d_device_context

1 0

Jan Sikorski : wined3d: Acquire depth/stencil state references for command lists by inspecting CS packets.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: cb853ec2cde7c17c9c639bf4ce8098a659d5109c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb853ec2cde7c17c9c639bf4… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Fri Jan 21 16:43:49 2022 +0100 wined3d: Acquire depth/stencil state references for command lists by inspecting CS packets. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 69 ++++++++++++------------------------------ dlls/wined3d/wined3d_private.h | 2 -- 2 files changed, 20 insertions(+), 51 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 009ad561be7..0132af721ef 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -69,9 +69,6 @@ struct wined3d_command_list SIZE_T rasterizer_state_count; struct wined3d_rasterizer_state **rasterizer_states; - - SIZE_T depth_stencil_state_count; - struct wined3d_depth_stencil_state **depth_stencil_states; }; static void invalidate_client_address(struct wined3d_resource *resource) @@ -559,12 +556,6 @@ static inline void wined3d_device_context_acquire_rasterizer_state(struct wined3 context->ops->acquire_rasterizer_state(context, rasterizer_state); } -static inline void wined3d_device_context_acquire_depth_stencil_state(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state) -{ - context->ops->acquire_depth_stencil_state(context, depth_stencil_state); -} - static struct wined3d_cs *wined3d_cs_from_context(struct wined3d_device_context *context) { return CONTAINING_RECORD(context, struct wined3d_cs, c); @@ -1848,8 +1839,6 @@ void wined3d_device_context_emit_set_depth_stencil_state(struct wined3d_device_c op->state = state; op->stencil_ref = stencil_ref; - if (state) - wined3d_device_context_acquire_depth_stencil_state(context, state); wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } @@ -2961,11 +2950,6 @@ static void wined3d_cs_acquire_rasterizer_state(struct wined3d_device_context *c { } -static void wined3d_cs_acquire_depth_stencil_state(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state) -{ -} - static void wined3d_cs_exec_execute_command_list(struct wined3d_cs *cs, const void *data); static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = @@ -3205,7 +3189,6 @@ static const struct wined3d_device_context_ops wined3d_cs_st_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, - wined3d_cs_acquire_depth_stencil_state, }; static BOOL wined3d_cs_queue_is_empty(const struct wined3d_cs *cs, const struct wined3d_cs_queue *queue) @@ -3336,7 +3319,6 @@ static const struct wined3d_device_context_ops wined3d_cs_mt_ops = wined3d_cs_acquire_command_list, wined3d_cs_acquire_blend_state, wined3d_cs_acquire_rasterizer_state, - wined3d_cs_acquire_depth_stencil_state, }; static void poll_queries(struct wined3d_cs *cs) @@ -3569,6 +3551,16 @@ static void wined3d_cs_packet_decref_objects(const struct wined3d_cs_packet *pac break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE: + { + struct wined3d_cs_set_depth_stencil_state *op; + + op = (struct wined3d_cs_set_depth_stencil_state *)packet->data; + if (op->state) + wined3d_depth_stencil_state_decref(op->state); + break; + } + default: break; } @@ -3602,6 +3594,16 @@ static void wined3d_cs_packet_incref_objects(struct wined3d_cs_packet *packet) break; } + case WINED3D_CS_OP_SET_DEPTH_STENCIL_STATE: + { + struct wined3d_cs_set_depth_stencil_state *op; + + op = (struct wined3d_cs_set_depth_stencil_state *)packet->data; + if (op->state) + wined3d_depth_stencil_state_incref(op->state); + break; + } + default: break; } @@ -3634,9 +3636,6 @@ struct wined3d_deferred_context SIZE_T rasterizer_state_count, rasterizer_states_capacity; struct wined3d_rasterizer_state **rasterizer_states; - - SIZE_T depth_stencil_state_count, depth_stencil_states_capacity; - struct wined3d_depth_stencil_state **depth_stencil_states; }; static struct wined3d_deferred_context *wined3d_deferred_context_from_context(struct wined3d_device_context *context) @@ -3861,18 +3860,6 @@ static void wined3d_deferred_context_acquire_rasterizer_state(struct wined3d_dev wined3d_rasterizer_state_incref(rasterizer_state); } -static void wined3d_deferred_context_acquire_depth_stencil_state(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state) -{ - struct wined3d_deferred_context *deferred = wined3d_deferred_context_from_context(context); - if (!wined3d_array_reserve((void **)&deferred->depth_stencil_states, &deferred->depth_stencil_states_capacity, - deferred->depth_stencil_state_count + 1, sizeof(*deferred->depth_stencil_states))) - return; - - deferred->depth_stencil_states[deferred->depth_stencil_state_count++] = depth_stencil_state; - wined3d_depth_stencil_state_incref(depth_stencil_state); -} - static const struct wined3d_device_context_ops wined3d_deferred_context_ops = { wined3d_deferred_context_require_space, @@ -3887,7 +3874,6 @@ static const struct wined3d_device_context_ops wined3d_deferred_context_ops = wined3d_deferred_context_acquire_command_list, wined3d_deferred_context_acquire_blend_state, wined3d_deferred_context_acquire_rasterizer_state, - wined3d_deferred_context_acquire_depth_stencil_state, }; HRESULT CDECL wined3d_deferred_context_create(struct wined3d_device *device, struct wined3d_device_context **context) @@ -3954,10 +3940,6 @@ void CDECL wined3d_deferred_context_destroy(struct wined3d_device_context *conte wined3d_rasterizer_state_decref(deferred->rasterizer_states[i]); heap_free(deferred->rasterizer_states); - for (i = 0; i < deferred->depth_stencil_state_count; ++i) - wined3d_depth_stencil_state_decref(deferred->depth_stencil_states[i]); - heap_free(deferred->depth_stencil_states); - while (offset < deferred->data_size) { packet = wined3d_next_cs_packet(deferred->data, &offset); @@ -3985,7 +3967,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device + deferred->query_count * sizeof(*object->queries) + deferred->blend_state_count * sizeof(*object->blend_states) + deferred->rasterizer_state_count * sizeof(*object->rasterizer_states) - + deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states) + deferred->data_size); if (!memory) @@ -4038,13 +4019,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->rasterizer_state_count * sizeof(*object->rasterizer_states)); /* Transfer our references to the rasterizer states to the command list. */ - object->depth_stencil_states = memory; - memory = &object->depth_stencil_states[deferred->depth_stencil_state_count]; - object->depth_stencil_state_count = deferred->depth_stencil_state_count; - memcpy(object->depth_stencil_states, deferred->depth_stencil_states, - deferred->depth_stencil_state_count * sizeof(*object->depth_stencil_states)); - /* Transfer our references to the depth stencil states to the command list. */ - object->data = memory; object->data_size = deferred->data_size; memcpy(object->data, deferred->data, deferred->data_size); @@ -4056,7 +4030,6 @@ HRESULT CDECL wined3d_deferred_context_record_command_list(struct wined3d_device deferred->query_count = 0; deferred->blend_state_count = 0; deferred->rasterizer_state_count = 0; - deferred->depth_stencil_state_count = 0; /* This is in fact recorded into a subsequent command list. */ if (restore) @@ -4116,8 +4089,6 @@ ULONG CDECL wined3d_command_list_decref(struct wined3d_command_list *list) wined3d_blend_state_decref(list->blend_states[i]); for (i = 0; i < list->rasterizer_state_count; ++i) wined3d_rasterizer_state_decref(list->rasterizer_states[i]); - for (i = 0; i < list->depth_stencil_state_count; ++i) - wined3d_depth_stencil_state_decref(list->depth_stencil_states[i]); offset = 0; while (offset < list->data_size) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c9d83b3fbc7..2b8596ba9d7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4877,8 +4877,6 @@ struct wined3d_device_context_ops void (*acquire_blend_state)(struct wined3d_device_context *context, struct wined3d_blend_state *blend_state); void (*acquire_rasterizer_state)(struct wined3d_device_context *context, struct wined3d_rasterizer_state *rasterizer_state); - void (*acquire_depth_stencil_state)(struct wined3d_device_context *context, - struct wined3d_depth_stencil_state *depth_stencil_state); }; struct wined3d_device_context

1 0

Stefan Dösinger : d3d8/tests: Accept new WARP test failure in test_updatetexture().
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 6768c4e1dcddd33c835be2ba722465dff3524587 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6768c4e1dcddd33c835be2ba… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 21 14:41:24 2022 +0300 d3d8/tests: Accept new WARP test failure in test_updatetexture(). Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index de86b7bc07d..b7f6dd62e9c 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -6775,7 +6775,7 @@ static void test_updatetexture(void) UINT dst_width, dst_height; UINT src_levels, dst_levels; D3DFORMAT src_format, dst_format; - BOOL broken; + BOOL broken_result, broken_updatetex; } tests[] = { @@ -6793,7 +6793,8 @@ static void test_updatetexture(void) * one or something like that). */ /* {8, 8, 7, 7, 4, 2, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ {8, 8, 8, 8, 1, 4, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 8 */ - {4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, /* 9 */ + /* For this one UpdateTexture() returns failure on WARP on > Win 10 1709. */ + {4, 4, 8, 8, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE, TRUE}, /* 9 */ /* This one causes weird behavior on Windows (it probably writes out * of the texture memory). */ /* {8, 8, 4, 4, 1, 1, D3DFMT_A8R8G8B8, D3DFMT_A8R8G8B8, FALSE}, */ @@ -7020,7 +7021,8 @@ static void test_updatetexture(void) hr = IDirect3DDevice8_UpdateTexture(device, src, dst); if (FAILED(hr)) { - todo_wine ok(SUCCEEDED(hr), "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); + todo_wine ok(SUCCEEDED(hr) || broken(tests[i].broken_updatetex), + "Failed to update texture, hr %#x, case %u, %u.\n", hr, t, i); IDirect3DBaseTexture8_Release(src); IDirect3DBaseTexture8_Release(dst); continue; @@ -7044,7 +7046,7 @@ static void test_updatetexture(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken) + ok (color_match(color, 0x007f7f00, 3) || broken(tests[i].broken_result) || broken(color == 0x00adbeef), /* WARP device often just breaks down. */ "Got unexpected color 0x%08x, case %u, %u.\n", color, t, i); }

1 0

Stefan Dösinger : d3d8/tests: Accept a broken Windows 10 20H? result.
by Alexandre Julliard 21 Jan '22

21 Jan '22

Module: wine Branch: master Commit: 18e2d36d96a0c66191867d64b07b51952c62377a URL: https://source.winehq.org/git/wine.git/?a=commit;h=18e2d36d96a0c66191867d64… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 21 12:58:14 2022 +0300 d3d8/tests: Accept a broken Windows 10 20H? result. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 8d5f9d39df8..de86b7bc07d 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -459,15 +459,22 @@ static void lighting_test(void) const D3DMATRIX *world_matrix; const void *quad; unsigned int size; - DWORD expected; + DWORD expected, broken; const char *message; } tests[] = { - {&mat, nquad, sizeof(nquad[0]), 0x000000ff, "Lit quad with light"}, - {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, "Lit quad with singular world matrix"}, - {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, "Lit quad with transformation matrix"}, - {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, "Lit quad with non-affine matrix"}, + {&mat, nquad, sizeof(nquad[0]), 0x000000ff, 0xdeadbeef, + "Lit quad with light"}, + /* Starting around Win10 20H? this test returns 0x00000000, but only + * in d3d8. In ddraw and d3d9 it works like in older windows versions. + * The behavior is GPU independent. */ + {&mat_singular, nquad, sizeof(nquad[0]), 0x000000ff, 0x00000000, + "Lit quad with singular world matrix"}, + {&mat_transf, rotatedquad, sizeof(rotatedquad[0]), 0x000000ff, 0xdeadbeef, + "Lit quad with transformation matrix"}, + {&mat_nonaffine, translatedquad, sizeof(translatedquad[0]), 0x00000000, 0xdeadbeef, + "Lit quad with non-affine matrix"}, }; window = create_window(); @@ -569,7 +576,8 @@ static void lighting_test(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color == tests[i].expected, "%s has color 0x%08x.\n", tests[i].message, color); + ok(color == tests[i].expected || broken(color == tests[i].broken), + "%s has color 0x%08x.\n", tests[i].message, color); } refcount = IDirect3DDevice8_Release(device);

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2022