- Wine-devel - list.winehq.org

[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

[PATCH v4 0/10] MR79: wined3d: Refactor format flags into two groups.
by Chip Davis (＠cdavis5e) 23 May '22

23 May '22

There are only three unused format flags left. I will soon submit changes which add four more format flags. I've noticed that format flags generally fall into two groups: * The first group consists of flags describing the content of a pixel format, e.g. whether or not this is a depth format, or whether this is a blocked format. These flags are the same for all resource types. * The second group consists of flags describing capabilities of the implementation with this format. These can and do vary by resource type. Only the second group needs to be stored per-resource-type. -- v4: wined3d: Rename format flags to caps. wined3d: Move WINED3DFMT_FLAG_CAST_TO_BLOCK to the attributes group. wined3d: Move WINED3DFMT_FLAG_MAPPABLE to the attributes group. wined3d: Move WINED3DFMT_FLAG_COMPRESSED and HEIGHT_SCALE to the attributes group. wined3d: Move WINED3DFMT_FLAG_BLOCKS, BROKEN_PITCH, and BLOCKS_NO_VERIFY to the attributes group. wined3d: Move WINED3DFMT_FLAG_EXTENSION to the attributes group. wined3d: Move WINED3DFMT_FLAG_BUMPMAP to the attributes group. wined3d: Move WINED3DFMT_FLAG_NORMALISED to the attributes group. wined3d: Move WINED3DFMT_FLAG_INTEGER to the attributes group. wined3d: Move WINED3DFMT_FLAG_FLOAT to a separate group. https://gitlab.winehq.org/wine/wine/-/merge_requests/79

6 17

[PATCH] conhost: Split first font code path from font update code path
by Hugh McMaster 23 May '22

23 May '22

This change prevents calls to update_console_font() setting any defaults. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/window.c | 120 ++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index c115e42a282..582badf43b5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -736,6 +736,8 @@ struct font_chooser { struct console *console; int pass; + unsigned int font_height; + unsigned int font_width; BOOL done; }; @@ -791,93 +793,82 @@ static BOOL validate_font( struct console *console, const LOGFONTW *lf, int pass return TRUE; } -/* helper functions to get a decent font for the renderer */ -static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam) +static int CALLBACK enum_first_font_proc( const LOGFONTW *lf, const TEXTMETRICW *tm, + DWORD font_type, LPARAM lparam ) { struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW mlf; + + if (font_type != TRUETYPE_FONTTYPE) return 1; + + TRACE( "%s\n", debugstr_logfont( lf, font_type )); + + if (!validate_font( fc->console, lf, fc->pass )) + return 1; TRACE( "%s\n", debugstr_textmetric( tm, font_type )); - if (validate_font_metric( fc->console, tm, font_type, fc->pass )) - { - LOGFONTW mlf = *lf; + if (!validate_font_metric( fc->console, tm, font_type, fc->pass )) + return 1; - /* Use the default sizes for the font (this is needed, especially for - * TrueType fonts, so that we get a decent size, not the max size) - */ - mlf.lfWidth = fc->console->active->font.width; - mlf.lfHeight = fc->console->active->font.height; - if (!mlf.lfHeight) - mlf.lfHeight = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + /* set default font size */ + mlf = *lf; + mlf.lfHeight = fc->font_height; + mlf.lfWidth = fc->font_width; - if (set_console_font( fc->console, &mlf )) - { - struct console_config config; + if (!set_console_font( fc->console, &mlf )) + return 1; - fc->done = 1; + fc->done = TRUE; - /* since we've modified the current config with new font information, - * set this information as the new default. - */ - load_config( fc->console->window->config_key, &config ); - config.cell_width = fc->console->active->font.width; - config.cell_height = fc->console->active->font.height; - config.font_pitch_family = fc->console->active->font.pitch_family; - memcpy( config.face_name, fc->console->active->font.face_name, - fc->console->active->font.face_len * sizeof(WCHAR) ); - config.face_name[fc->console->active->font.face_len] = 0; - - /* Force also its writing back to the registry so that we can get it - * the next time. - */ - save_config( fc->console->window->config_key, &config ); - return 0; - } - } - return 1; + return 0; } -static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam ) +static void set_first_font( struct console *console, struct console_config *config ) { - struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW lf; + struct font_chooser fc; - TRACE("%s\n", debugstr_logfont( lf, font_type )); + TRACE("Looking for a suitable console font\n"); - if (validate_font( fc->console, lf, fc->pass )) + memset( &lf, 0, sizeof(lf) ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + + fc.console = console; + fc.font_height = config->cell_height; + fc.font_width = config->cell_width; + fc.done = FALSE; + + for (fc.pass = 0; fc.pass <= 5; fc.pass++) { - EnumFontFamiliesW( fc->console->window->mem_dc, lf->lfFaceName, - get_first_font_sub_enum, lparam ); - return !fc->done; /* we just need the first matching one... */ + EnumFontFamiliesExW( console->window->mem_dc, &lf, enum_first_font_proc, (LPARAM)&fc, 0); + if (fc.done) break; } - return 1; -} + if (fc.pass > 5) + ERR("Unable to find a valid console font\n"); + + /* Save font configuration to the registry */ + config->cell_width = console->active->font.width; + config->cell_height = console->active->font.height; + config->font_pitch_family = console->active->font.pitch_family; + memcpy( config->face_name, console->active->font.face_name, + console->active->font.face_len * sizeof(WCHAR) ); + config->face_name[console->active->font.face_len] = 0; + + save_config( console->window->config_key, config ); +} -/* sets logfont as the new font for the console */ +/* Sets the font specified in the LOGFONT as the new console font */ void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, unsigned int height, unsigned int weight ) { - struct font_chooser fc; LOGFONTW lf; - if (face_name[0] && height && weight) - { - fill_logfont( &lf, face_name, face_name_size, height, weight ); - if (set_console_font( console, &lf )) return; - } + fill_logfont( &lf, face_name, face_name_size, height, weight ); - /* try to find an acceptable font */ - WARN( "Couldn't match the font from registry, trying to find one\n" ); - fc.console = console; - fc.done = FALSE; - for (fc.pass = 0; fc.pass <= 5; fc.pass++) - { - EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); - if (fc.done) return; - } - ERR( "Couldn't find a decent font\n" ); + set_console_font( console, &lf ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */ @@ -2440,6 +2431,9 @@ BOOL init_window( struct console *console ) 0, 0, 0, 0, wndclass.hInstance, console )) return FALSE; + if (!config.face_name[0]) + set_first_font( console, &config ); + apply_config( console, &config ); return TRUE; } -- 2.36.1

2 1

[PATCH] vbscript: Handle negative argument in Space().
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 11 +++++++---- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 15c0bb0958e..80348a5288f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1586,14 +1586,17 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(arg, &n); if(FAILED(hres)) return hres; - if(n < 0) { - FIXME("n = %d\n", n); - return E_NOTIMPL; - } + if(n < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); if(!res) return S_OK; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3b67e920c3d..617589053c6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -747,6 +747,21 @@ Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +Call ok(Space(Empty) = "", "Space(Empty) = " & Space(Empty) & """") + +sub testSpaceError() + on error resume next + call Err.clear() + call Space(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space("-1") + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space(Null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testSpaceError() sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _ -- 2.35.1

2 1

[PATCH] vbscript: Fix a typo in sizeof() (Coverity).
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9a24657c848..15c0bb0958e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2028,7 +2028,7 @@ static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cn { /* vbUseSystemDayOfWeek */ GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, - sizeof(&first_day) / sizeof(WCHAR)); + sizeof(first_day) / sizeof(WCHAR)); first_day = (first_day + 1) % 7; } else if (first_day >= 1 && first_day <= 7) -- 2.35.1

2 1

[PATCH 1/3] include: Add some more process information classes constants.
by Nikolay Sivov 23 May '22

23 May '22

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/tests/process.c | 2 +- include/winternl.h | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c1312bd8916..4a6451a23fe 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3773,7 +3773,7 @@ static void test_process_info(HANDLE hproc) return; } - for (i = 0; i < MaxProcessInfoClass; i++) + for (i = 0; i < ARRAY_SIZE(info_size); i++) { ret_len = 0; status = pNtQueryInformationProcess(hproc, i, buf, info_size[i], &ret_len); diff --git a/include/winternl.h b/include/winternl.h index ca265cf074c..c992eaebf11 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -1566,6 +1566,14 @@ typedef enum _PROCESSINFOCLASS { ProcessThreadStackAllocation = 41, ProcessWorkingSetWatchEx = 42, ProcessImageFileNameWin32 = 43, + ProcessImageFileMapping = 44, + ProcessAffinityUpdateMode = 45, + ProcessMemoryAllocationMode = 46, + ProcessGroupInformation = 47, + ProcessTokenVirtualizationEnabled = 48, + ProcessConsoleHostProcess = 49, + ProcessWindowInformation = 50, + ProcessHandleInformation = 51, MaxProcessInfoClass, #ifdef __WINESRC__ ProcessWineMakeProcessSystem = 1000, -- 2.35.1

2 4

[PATCH v2] msadpm: Stop decoding instead of crashing for invalid adpcm data.
by Moore, Brandon A. 23 May '22

23 May '22

2 1

[PATCH 0/1] MR112: Revert "dbghelp: Don't bother trying to initialize loader backend if we can't...
by Jinoh Kang (＠iamahuman) 23 May '22

23 May '22

Revert "dbghelp: Don't bother trying to initialize loader backend if we can't get debug base address from PEB." This reverts commit 3047385437c7ef36996d0418ac378677f3e9d67c. ntdll.so puts the base address of the main Unix executable, called the "debug base address," inside an unused field of PEB. When debugging a WoW64 target process, obtaining the debug base address fails. This is because the architecture of PE modules differs from that of Unix modules. Specifically, dbghelp attempts to fetch it from the WoW64 PEB although it actually resides in the native PEB. However, this shouldn't be a reason to give up initializing dbghelp entirely. We do not expect a "user-mode" debugger to be able to debug Unix-side modules in a WoW64 process anyway. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/112

3 6