March 2024 - Wine-Commits - list.winehq.org

Paul Gofman : ddraw: Store wined3d state in d3d_device.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: aa8487a4b3cec77ae38ada57bf81634cd2eaa6d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/aa8487a4b3cec77ae38ada57bf8163… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 11:27:42 2024 -0600 ddraw: Store wined3d state in d3d_device. --- dlls/ddraw/ddraw.c | 19 +++++------------ dlls/ddraw/ddraw_private.h | 3 --- dlls/ddraw/device.c | 53 +++++++++++++++++++++++++++------------------- dlls/ddraw/surface.c | 36 +++++++++++++++++++------------ dlls/ddraw/vertexbuffer.c | 9 ++++++-- dlls/wined3d/stateblock.c | 10 +++++++++ dlls/wined3d/wined3d.spec | 2 ++ include/wine/wined3d.h | 2 ++ 8 files changed, 79 insertions(+), 55 deletions(-)

1 0

Paul Gofman : wined3d: Factor out wined3d_texture_set_lod() function.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 9492a10f4438b3f7878250f3b3906e5dfc53ac6d URL: https://gitlab.winehq.org/wine/wine/-/commit/9492a10f4438b3f7878250f3b3906e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 15:54:03 2024 -0600 wined3d: Factor out wined3d_texture_set_lod() function. --- dlls/wined3d/stateblock.c | 20 +++----------------- dlls/wined3d/texture.c | 24 ++++++++++++++++++++++++ include/wine/wined3d.h | 1 + 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 0cf8e91c3c9..a834a02fddf 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -3321,28 +3321,14 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device, unsigned int CDECL wined3d_stateblock_set_texture_lod(struct wined3d_stateblock *stateblock, struct wined3d_texture *texture, unsigned int lod) { - struct wined3d_resource *resource; - unsigned int old = texture->lod; + unsigned int old; TRACE("texture %p, lod %u.\n", texture, lod); - /* The d3d9:texture test shows that SetLOD is ignored on non-managed - * textures. The call always returns 0, and GetLOD always returns 0. */ - resource = &texture->resource; - if (!(resource->usage & WINED3DUSAGE_MANAGED)) - { - TRACE("Ignoring LOD on texture with resource access %s.\n", - wined3d_debug_resource_access(resource->access)); - return 0; - } + old = wined3d_texture_set_lod(texture, lod); - if (lod >= texture->level_count) - lod = texture->level_count - 1; - - if (texture->lod != lod) + if (old != lod) { - texture->lod = lod; - for (unsigned int i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) { /* Mark the texture as changed. The next time the appplication diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a9c8e152cf2..7fb06d71dcd 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1784,6 +1784,30 @@ unsigned int CDECL wined3d_texture_get_lod(const struct wined3d_texture *texture return texture->lod; } +unsigned int CDECL wined3d_texture_set_lod(struct wined3d_texture *texture, unsigned int lod) +{ + struct wined3d_resource *resource; + unsigned int old = texture->lod; + + TRACE("texture %p, returning %u.\n", texture, texture->lod); + + /* The d3d9:texture test shows that SetLOD is ignored on non-managed + * textures. The call always returns 0, and GetLOD always returns 0. */ + resource = &texture->resource; + if (!(resource->usage & WINED3DUSAGE_MANAGED)) + { + TRACE("Ignoring LOD on texture with resource access %s.\n", + wined3d_debug_resource_access(resource->access)); + return 0; + } + + if (lod >= texture->level_count) + lod = texture->level_count - 1; + + texture->lod = lod; + return old; +} + UINT CDECL wined3d_texture_get_level_count(const struct wined3d_texture *texture) { TRACE("texture %p, returning %u.\n", texture, texture->level_count); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 492065711f3..0b906886585 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2883,6 +2883,7 @@ ULONG __cdecl wined3d_texture_decref(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_get_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC *dc); unsigned int __cdecl wined3d_texture_get_level_count(const struct wined3d_texture *texture); unsigned int __cdecl wined3d_texture_get_lod(const struct wined3d_texture *texture); +unsigned int __cdecl wined3d_texture_set_lod(struct wined3d_texture *texture, unsigned int lod); HRESULT __cdecl wined3d_texture_get_overlay_position(const struct wined3d_texture *texture, unsigned int sub_resource_idx, LONG *x, LONG *y); void * __cdecl wined3d_texture_get_parent(const struct wined3d_texture *texture);

1 0

Paul Gofman : ddraw: Sync wined3d render target in d3d_device_sync_rendertarget().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 6fe8e64c1a2cfdb748afa7d9a23dbcbfacc33a95 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fe8e64c1a2cfdb748afa7d9a23dbc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 18:41:45 2024 -0600 ddraw: Sync wined3d render target in d3d_device_sync_rendertarget(). --- dlls/ddraw/ddraw.c | 23 --------------------- dlls/ddraw/ddraw_private.h | 1 + dlls/ddraw/device.c | 51 ++++++++++++++++++++++++++++++++++++++-------- dlls/ddraw/viewport.c | 6 ++++-- 4 files changed, 48 insertions(+), 33 deletions(-)

1 0

Paul Gofman : wintypes: Report some API contracts as present in api_information_statics_IsApiContractPresentByMajor().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 2799c95dd254f9dcd63430c98e35e7c763407f6e URL: https://gitlab.winehq.org/wine/wine/-/commit/2799c95dd254f9dcd63430c98e35e7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 25 16:24:01 2024 -0600 wintypes: Report some API contracts as present in api_information_statics_IsApiContractPresentByMajor(). --- dlls/wintypes/main.c | 25 +++++++++++++++++++++++-- dlls/wintypes/tests/wintypes.c | 26 ++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/wintypes/main.c b/dlls/wintypes/main.c index d5bfb5ad11c..7d59ab92c41 100644 --- a/dlls/wintypes/main.c +++ b/dlls/wintypes/main.c @@ -34,6 +34,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(wintypes); +static const struct +{ + const WCHAR *name; + unsigned int max_major; +} +present_contracts[] = +{ + { L"Windows.Foundation.UniversalApiContract", 10, }, +}; + +static BOOLEAN is_api_contract_present( const HSTRING hname, unsigned int version ) +{ + const WCHAR *name = WindowsGetStringRawBuffer( hname, NULL ); + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(present_contracts); ++i) + if (!wcsicmp( name, present_contracts[i].name )) return version <= present_contracts[i].max_major; + + return FALSE; +} + struct wintypes { IActivationFactory IActivationFactory_iface; @@ -280,13 +301,13 @@ static HRESULT STDMETHODCALLTYPE api_information_statics_IsEnumNamedValuePresent static HRESULT STDMETHODCALLTYPE api_information_statics_IsApiContractPresentByMajor( IApiInformationStatics *iface, HSTRING contract_name, UINT16 major_version, BOOLEAN *value) { - FIXME("iface %p, contract_name %s, major_version %u, value %p stub!\n", iface, + FIXME("iface %p, contract_name %s, major_version %u, value %p semi-stub.\n", iface, debugstr_hstring(contract_name), major_version, value); if (!contract_name) return E_INVALIDARG; - *value = FALSE; + *value = is_api_contract_present( contract_name, major_version ); return S_OK; } diff --git a/dlls/wintypes/tests/wintypes.c b/dlls/wintypes/tests/wintypes.c index dd6401c212b..0703582d325 100644 --- a/dlls/wintypes/tests/wintypes.c +++ b/dlls/wintypes/tests/wintypes.c @@ -33,12 +33,23 @@ static void test_IApiInformationStatics(void) { + static const struct + { + const WCHAR *name; + unsigned int max_major; + } + present_contracts[] = + { + { L"Windows.Foundation.UniversalApiContract", 10, }, + }; + static const WCHAR *class_name = L"Windows.Foundation.Metadata.ApiInformation"; IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; IInspectable *inspectable = NULL, *tmp_inspectable = NULL; IApiInformationStatics *statics = NULL; IActivationFactory *factory = NULL; HSTRING str, str2; + unsigned int i, j; BOOLEAN ret; HRESULT hr; @@ -424,6 +435,21 @@ static void test_IApiInformationStatics(void) WindowsDeleteString(str); + /* Test API contracts presence. */ + for (i = 0; i < ARRAY_SIZE(present_contracts); ++i) + { + hr = WindowsCreateString(present_contracts[i].name, wcslen(present_contracts[i].name), &str); + ok(hr == S_OK, "WindowsCreateString failed, hr %#lx.\n", hr); + for (j = 0; j <= present_contracts[i].max_major; ++j) + { + ret = FALSE; + hr = IApiInformationStatics_IsApiContractPresentByMajor(statics, str, i, &ret); + ok(hr == S_OK, "IsApiContractPresentByMajor failed, hr %#lx, i %u, major %u.\n", hr, i, j); + ok(ret == TRUE, "IsApiContractPresentByMajor returned FALSE, i %u, major %u.\n", i, j); + } + WindowsDeleteString(str); + } + IApiInformationStatics_Release(statics); IAgileObject_Release(agile_object); IInspectable_Release(inspectable);

1 0

Paul Gofman : ddraw: Store material handles in the global table.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: b9eb9a74538e9360b0d2987d75c1c63a3e087588 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9eb9a74538e9360b0d2987d75c1c6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 15 19:52:04 2024 -0600 ddraw: Store material handles in the global table. --- dlls/ddraw/device.c | 10 +--------- dlls/ddraw/main.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/ddraw/material.c | 4 ++-- dlls/ddraw/viewport.c | 2 +- 4 files changed, 42 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index bc1d91ee00b..725c925e602 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -303,14 +303,6 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) case DDRAW_HANDLE_FREE: break; - case DDRAW_HANDLE_MATERIAL: - { - struct d3d_material *m = entry->object; - FIXME("Material handle %#lx (%p) not unset properly.\n", i + 1, m); - m->Handle = 0; - break; - } - case DDRAW_HANDLE_MATRIX: { /* No FIXME here because this might happen because of sloppy applications. */ @@ -2936,7 +2928,7 @@ static HRESULT WINAPI d3d_device3_SetLightState(IDirect3DDevice3 *iface, { struct d3d_material *m; - if (!(m = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_MATERIAL))) + if (!(m = ddraw_get_object(NULL, value - 1, DDRAW_HANDLE_MATERIAL))) { WARN("Invalid material handle.\n"); wined3d_mutex_unlock(); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 1ba2900704f..b4e6b3d4893 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -37,6 +37,8 @@ static HINSTANCE instance; /* value of ForceRefreshRate */ DWORD force_refresh_rate = 0; +static struct ddraw_handle_table global_handle_table; + /* Structure for converting DirectDrawEnumerateA to DirectDrawEnumerateExA */ struct callback_info { @@ -137,6 +139,9 @@ DWORD ddraw_allocate_handle(struct ddraw_handle_table *t, void *object, enum ddr { struct ddraw_handle_entry *entry; + if (!t) + t = &global_handle_table; + if (t->free_entries) { DWORD idx = t->free_entries - t->entries; @@ -181,6 +186,9 @@ void *ddraw_free_handle(struct ddraw_handle_table *t, DWORD handle, enum ddraw_h struct ddraw_handle_entry *entry; void *object; + if (!t) + t = &global_handle_table; + if (handle == DDRAW_INVALID_HANDLE || handle >= t->entry_count) { WARN("Invalid handle %#lx passed.\n", handle); @@ -206,6 +214,9 @@ void *ddraw_get_object(struct ddraw_handle_table *t, DWORD handle, enum ddraw_ha { struct ddraw_handle_entry *entry; + if (!t) + t = &global_handle_table; + if (handle == DDRAW_INVALID_HANDLE || handle >= t->entry_count) { WARN("Invalid handle %#lx passed.\n", handle); @@ -815,6 +826,12 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return FALSE; } + if (!ddraw_handle_table_init(&global_handle_table, 64)) + { + UnregisterClassA(DDRAW_WINDOW_CLASS_NAME, inst); + return FALSE; + } + /* On Windows one can force the refresh rate that DirectDraw uses by * setting an override value in dxdiag. This is documented in KB315614 * (main article), KB230002, and KB217348. By comparing registry dumps @@ -866,6 +883,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) if (WARN_ON(ddraw)) { struct ddraw *ddraw; + unsigned int i; LIST_FOR_EACH_ENTRY(ddraw, &global_ddraw_list, struct ddraw, ddraw_list_entry) { @@ -884,6 +902,26 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) surface->ref2, surface->ref1, surface->gamma_count); } } + + for (i = 0; i < global_handle_table.entry_count; ++i) + { + struct ddraw_handle_entry *entry = &global_handle_table.entries[i]; + + switch (entry->type) + { + case DDRAW_HANDLE_FREE: + break; + + case DDRAW_HANDLE_MATERIAL: + WARN("Material handle %#x (%p) not unset properly.\n", i + 1, entry->object); + break; + + default: + WARN("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type); + break; + } + } + ddraw_handle_table_destroy(&global_handle_table); } if (reserved) break; diff --git a/dlls/ddraw/material.c b/dlls/ddraw/material.c index d8cb41f1733..efc739c8dbb 100644 --- a/dlls/ddraw/material.c +++ b/dlls/ddraw/material.c @@ -143,7 +143,7 @@ static ULONG WINAPI d3d_material3_Release(IDirect3DMaterial3 *iface) if (material->Handle) { wined3d_mutex_lock(); - ddraw_free_handle(&material->ddraw->d3ddevice->handle_table, material->Handle - 1, DDRAW_HANDLE_MATERIAL); + ddraw_free_handle(NULL, material->Handle - 1, DDRAW_HANDLE_MATERIAL); wined3d_mutex_unlock(); } @@ -300,7 +300,7 @@ static HRESULT WINAPI d3d_material3_GetHandle(IDirect3DMaterial3 *iface, material->active_device = device_impl; if (!material->Handle) { - DWORD h = ddraw_allocate_handle(&device_impl->handle_table, material, DDRAW_HANDLE_MATERIAL); + DWORD h = ddraw_allocate_handle(NULL, material, DDRAW_HANDLE_MATERIAL); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a material handle.\n"); diff --git a/dlls/ddraw/viewport.c b/dlls/ddraw/viewport.c index 4eda2fe4763..98b03c60d72 100644 --- a/dlls/ddraw/viewport.c +++ b/dlls/ddraw/viewport.c @@ -627,7 +627,7 @@ static HRESULT WINAPI d3d_viewport_SetBackground(IDirect3DViewport3 *iface, D3DM wined3d_mutex_lock(); - if (!(m = ddraw_get_object(&viewport->ddraw->d3ddevice->handle_table, material - 1, DDRAW_HANDLE_MATERIAL))) + if (!(m = ddraw_get_object(NULL, material - 1, DDRAW_HANDLE_MATERIAL))) { WARN("Invalid material handle %#lx.\n", material); wined3d_mutex_unlock();

1 0

Paul Gofman : ddraw: Store matrix handle in the global table.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 4e81f661274a96ab41e9e475f786c1f568e6e4d1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4e81f661274a96ab41e9e475f786c1… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 09:53:23 2024 -0600 ddraw: Store matrix handle in the global table. --- dlls/ddraw/device.c | 19 ++++--------------- dlls/ddraw/executebuffer.c | 8 ++++---- dlls/ddraw/main.c | 4 ++++ 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 9677c352258..f903455a177 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -303,14 +303,6 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) case DDRAW_HANDLE_FREE: break; - case DDRAW_HANDLE_MATRIX: - { - /* No FIXME here because this might happen because of sloppy applications. */ - WARN("Leftover matrix handle %#lx (%p), deleting.\n", i + 1, entry->object); - IDirect3DDevice_DeleteMatrix(&This->IDirect3DDevice_iface, i + 1); - break; - } - case DDRAW_HANDLE_STATEBLOCK: { /* No FIXME here because this might happen because of sloppy applications. */ @@ -1304,7 +1296,6 @@ static HRESULT WINAPI d3d_device1_EnumTextureFormats(IDirect3DDevice *iface, *****************************************************************************/ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE *D3DMatHandle) { - struct d3d_device *device = impl_from_IDirect3DDevice(iface); D3DMATRIX *matrix; DWORD h; @@ -1321,7 +1312,7 @@ static HRESULT WINAPI d3d_device1_CreateMatrix(IDirect3DDevice *iface, D3DMATRIX wined3d_mutex_lock(); - h = ddraw_allocate_handle(&device->handle_table, matrix, DDRAW_HANDLE_MATRIX); + h = ddraw_allocate_handle(NULL, matrix, DDRAW_HANDLE_MATRIX); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a matrix handle.\n"); @@ -1370,7 +1361,7 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, wined3d_mutex_lock(); - m = ddraw_get_object(&device->handle_table, matrix_handle - 1, DDRAW_HANDLE_MATRIX); + m = ddraw_get_object(NULL, matrix_handle - 1, DDRAW_HANDLE_MATRIX); if (!m) { WARN("Invalid matrix handle.\n"); @@ -1419,7 +1410,6 @@ static HRESULT WINAPI d3d_device1_SetMatrix(IDirect3DDevice *iface, static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE D3DMatHandle, D3DMATRIX *D3DMatrix) { - struct d3d_device *device = impl_from_IDirect3DDevice(iface); D3DMATRIX *m; TRACE("iface %p, matrix_handle %#lx, matrix %p.\n", iface, D3DMatHandle, D3DMatrix); @@ -1428,7 +1418,7 @@ static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface, wined3d_mutex_lock(); - m = ddraw_get_object(&device->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX); + m = ddraw_get_object(NULL, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX); if (!m) { WARN("Invalid matrix handle.\n"); @@ -1460,14 +1450,13 @@ static HRESULT WINAPI d3d_device1_GetMatrix(IDirect3DDevice *iface, *****************************************************************************/ static HRESULT WINAPI d3d_device1_DeleteMatrix(IDirect3DDevice *iface, D3DMATRIXHANDLE D3DMatHandle) { - struct d3d_device *device = impl_from_IDirect3DDevice(iface); D3DMATRIX *m; TRACE("iface %p, matrix_handle %#lx.\n", iface, D3DMatHandle); wined3d_mutex_lock(); - m = ddraw_free_handle(&device->handle_table, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX); + m = ddraw_free_handle(NULL, D3DMatHandle - 1, DDRAW_HANDLE_MATRIX); if (!m) { WARN("Invalid matrix handle.\n"); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index c6988a3347b..0cf0bf121f3 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -209,9 +209,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d D3DMATRIXMULTIPLY *ci = (D3DMATRIXMULTIPLY *)instr; struct wined3d_matrix *a, *b, *c; - a = ddraw_get_object(&device->handle_table, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX); - b = ddraw_get_object(&device->handle_table, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX); - c = ddraw_get_object(&device->handle_table, ci->hSrcMatrix2 - 1, DDRAW_HANDLE_MATRIX); + a = ddraw_get_object(NULL, ci->hDestMatrix - 1, DDRAW_HANDLE_MATRIX); + b = ddraw_get_object(NULL, ci->hSrcMatrix1 - 1, DDRAW_HANDLE_MATRIX); + c = ddraw_get_object(NULL, ci->hSrcMatrix2 - 1, DDRAW_HANDLE_MATRIX); if (!a || !b || !c) { @@ -235,7 +235,7 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d D3DSTATE *ci = (D3DSTATE *)instr; D3DMATRIX *m; - m = ddraw_get_object(&device->handle_table, ci->dwArg[0] - 1, DDRAW_HANDLE_MATRIX); + m = ddraw_get_object(NULL, ci->dwArg[0] - 1, DDRAW_HANDLE_MATRIX); if (!m) { ERR("Invalid matrix handle %#lx.\n", ci->dwArg[0]); diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index a08cfd12613..1b03f950cef 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -920,6 +920,10 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) WARN("Texture handle %#x (%p) not unset properly.\n", i + 1, entry->object); break; + case DDRAW_HANDLE_MATRIX: + WARN("Leftover matrix handle %#x (%p), deleting.\n", i + 1, entry->object); + break; + default: WARN("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type); break;

1 0

Paul Gofman : ddraw: Store surface handles in the global table.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 5a7ff3b45c78784dca0a465d9e21483f72bce6e5 URL: https://gitlab.winehq.org/wine/wine/-/commit/5a7ff3b45c78784dca0a465d9e2148… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 15 19:56:46 2024 -0600 ddraw: Store surface handles in the global table. --- dlls/ddraw/device.c | 10 +--------- dlls/ddraw/executebuffer.c | 6 ++---- dlls/ddraw/main.c | 4 ++++ dlls/ddraw/surface.c | 5 ++--- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 725c925e602..9677c352258 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -319,14 +319,6 @@ static ULONG WINAPI d3d_device_inner_Release(IUnknown *iface) break; } - case DDRAW_HANDLE_SURFACE: - { - struct ddraw_surface *surf = entry->object; - FIXME("Texture handle %#lx (%p) not unset properly.\n", i + 1, surf); - surf->Handle = 0; - break; - } - default: FIXME("Handle %#lx (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type); break; @@ -2760,7 +2752,7 @@ static HRESULT WINAPI d3d_device3_SetRenderState(IDirect3DDevice3 *iface, break; } - surf = ddraw_get_object(&device->handle_table, value - 1, DDRAW_HANDLE_SURFACE); + surf = ddraw_get_object(NULL, value - 1, DDRAW_HANDLE_SURFACE); if (!surf) { WARN("Invalid texture handle.\n"); diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 320ce6649d4..c6988a3347b 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -347,14 +347,12 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, struct d3d instr += size; - if (!(dst = ddraw_get_object(&device->handle_table, - ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE))) + if (!(dst = ddraw_get_object(NULL, ci->hDestTexture - 1, DDRAW_HANDLE_SURFACE))) { WARN("Invalid destination texture handle %#lx.\n", ci->hDestTexture); continue; } - if (!(src = ddraw_get_object(&device->handle_table, - ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE))) + if (!(src = ddraw_get_object(NULL, ci->hSrcTexture - 1, DDRAW_HANDLE_SURFACE))) { WARN("Invalid source texture handle %#lx.\n", ci->hSrcTexture); continue; diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index b4e6b3d4893..a08cfd12613 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -916,6 +916,10 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) WARN("Material handle %#x (%p) not unset properly.\n", i + 1, entry->object); break; + case DDRAW_HANDLE_SURFACE: + WARN("Texture handle %#x (%p) not unset properly.\n", i + 1, entry->object); + break; + default: WARN("Handle %#x (%p) has unknown type %#x.\n", i + 1, entry->object, entry->type); break; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a096c5d7d8e..46fefb2f727 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5441,7 +5441,6 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, IDirect3DDevice2 *device, D3DTEXTUREHANDLE *handle) { struct ddraw_surface *surface = impl_from_IDirect3DTexture2(iface); - struct d3d_device *device_impl = unsafe_impl_from_IDirect3DDevice2(device); TRACE("iface %p, device %p, handle %p.\n", iface, device, handle); @@ -5449,7 +5448,7 @@ static HRESULT WINAPI d3d_texture2_GetHandle(IDirect3DTexture2 *iface, if (!surface->Handle) { - DWORD h = ddraw_allocate_handle(&device_impl->handle_table, surface, DDRAW_HANDLE_SURFACE); + DWORD h = ddraw_allocate_handle(NULL, surface, DDRAW_HANDLE_SURFACE); if (h == DDRAW_INVALID_HANDLE) { ERR("Failed to allocate a texture handle.\n"); @@ -6060,7 +6059,7 @@ static void STDMETHODCALLTYPE ddraw_surface_wined3d_object_destroyed(void *paren /* Having a texture handle set implies that the device still exists. */ if (surface->Handle) - ddraw_free_handle(&surface->ddraw->d3ddevice->handle_table, surface->Handle - 1, DDRAW_HANDLE_SURFACE); + ddraw_free_handle(NULL, surface->Handle - 1, DDRAW_HANDLE_SURFACE); /* Reduce the ddraw surface count. */ list_remove(&surface->surface_list_entry);

1 0

Eric Pouech : evr: Fix YUY2 image copy in evr_copy_sample_buffer().
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: 1304bf7fb93ffae171e957ab734b7f48b44cddfd URL: https://gitlab.winehq.org/wine/wine/-/commit/1304bf7fb93ffae171e957ab734b7f… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Mar 6 16:02:21 2024 +0100 evr: Fix YUY2 image copy in evr_copy_sample_buffer(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/evr/evr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 362c4f1e76f..108f13cdc89 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -388,8 +388,8 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, const GUID *subtype, I if (IsEqualGUID(subtype, &MFVideoFormat_YUY2)) { - width = (3 * width + 3) & ~3; - MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width, lines); + width = (width + 1) & ~1; + MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 2, lines); } else if (IsEqualGUID(subtype, &MFVideoFormat_NV12)) {

1 0

Hans Leidekker : bcrypt: Add support for RSA OAEP padding.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: ce2ae79f9d9c64bbac54701e6538cd9dca1b8ae7 URL: https://gitlab.winehq.org/wine/wine/-/commit/ce2ae79f9d9c64bbac54701e6538cd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 26 11:56:22 2024 +0100 bcrypt: Add support for RSA OAEP padding. Needs GnuTLS 3.8.4. --- dlls/bcrypt/bcrypt_internal.h | 8 ++- dlls/bcrypt/bcrypt_main.c | 10 +++- dlls/bcrypt/gnutls.c | 127 +++++++++++++++++++++++++++++++++++++++++- dlls/bcrypt/tests/bcrypt.c | 115 ++++++++++++++++++++++++-------------- 4 files changed, 209 insertions(+), 51 deletions(-)

1 0

Tuomas Räsänen : winebus: Ignore udev events of devices which do not have devnodes.
by Alexandre Julliard March 26, 2024

March 26, 2024

Module: wine Branch: master Commit: ef58b8c770023c13652954103b2a0b117e2deb94 URL: https://gitlab.winehq.org/wine/wine/-/commit/ef58b8c770023c13652954103b2a0b… Author: Tuomas Räsänen <tuomas.rasanen(a)opinsys.fi> Date: Fri Mar 22 11:41:25 2024 +0200 winebus: Ignore udev events of devices which do not have devnodes. Udev monitor monitors the whole input subsystem, but not all devices in the input subsystem have devnodes associated to them. This commit makes the event processing ignore such devices. All device handling assumes devices have devnodes, so here we just simply ignore all devices which do not have one. Previously, udev bus thread aborted when an event for a device without a devnode was processed: 10111.330:0068:0084:trace:hid:process_monitor_event Received action "remove" for udev device (null) 10111.330:0068:0084:warn:hid:bus_main_thread L"UDEV" bus wait returned status 0xc0000005 Just plugging in and out a normal mouse was enough cause this. This was because root input devices (which do not have devnodes) were handled too and find_device_from_devnode() choked on NULL argument. --- dlls/winebus.sys/bus_udev.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 419de2e7af3..2cd995a4178 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1710,26 +1710,38 @@ static void process_monitor_event(struct udev_monitor *monitor) { struct base_device *impl; struct udev_device *dev; - const char *action; + const char *action, *devnode, *syspath; dev = udev_monitor_receive_device(monitor); if (!dev) { - FIXME("Failed to get device that has changed\n"); + ERR("Failed to get device that has changed\n"); return; } action = udev_device_get_action(dev); - TRACE("Received action %s for udev device %s\n", debugstr_a(action), - debugstr_a(udev_device_get_devnode(dev))); - - if (!action) - WARN("No action received\n"); + syspath = udev_device_get_syspath(dev); + devnode = udev_device_get_devnode(dev); + TRACE("Received action %s for udev device %s (%p) devnode %s\n", + debugstr_a(action), debugstr_a(syspath), dev, debugstr_a(devnode)); + + if (!syspath) + ERR("udev device %p does not have syspath!\n", dev); + else if (!action) + ERR("event for udev device %s does not have any action!\n", syspath); + else if (!devnode) + { + /* Pretty normal case, not all devices have associated + * devnodes. For example root input devices do not, but + * related/child mouse and event devices do. + */ + TRACE("udev device %s does not have devnode, ignoring\n", syspath); + } else if (strcmp(action, "remove")) udev_add_device(dev, -1); else { - impl = find_device_from_devnode(udev_device_get_devnode(dev)); + impl = find_device_from_devnode(devnode); if (impl) bus_event_queue_device_removed(&event_queue, &impl->unix_device); else WARN("failed to find device for udev device %p\n", dev); }

1 0