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

Paul Gofman : ddraw: Store material handles in the global table.
by Alexandre Julliard 26 Mar '24

26 Mar '24

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 surface handles in the global table.
by Alexandre Julliard 26 Mar '24

26 Mar '24

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

Paul Gofman : ddraw: Store matrix handle in the global table.
by Alexandre Julliard 26 Mar '24

26 Mar '24

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: Don't apply state in ddraw_surface_blt().
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: 2e088045b5ac4f3e0644b103d8c0346ba230c892 URL: https://gitlab.winehq.org/wine/wine/-/commit/2e088045b5ac4f3e0644b103d8c034… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 19 14:01:59 2024 -0600 ddraw: Don't apply state in ddraw_surface_blt(). --- dlls/ddraw/surface.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 46fefb2f727..1231fac05c8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1563,7 +1563,6 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * const struct wined3d_blt_fx *fx, enum wined3d_texture_filter_type filter) { struct ddraw *ddraw = dst_surface->ddraw; - struct wined3d_device *wined3d_device = ddraw->wined3d_device; struct wined3d_color colour; DWORD wined3d_flags; HRESULT hr; @@ -1578,7 +1577,6 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; - wined3d_device_apply_stateblock(wined3d_device, ddraw->state); ddraw_surface_get_draw_texture(dst_surface, dst_rect ? DDRAW_SURFACE_RW : DDRAW_SURFACE_WRITE); hr = wined3d_device_context_clear_rendertarget_view(ddraw->immediate_context, ddraw_surface_get_rendertarget_view(dst_surface), @@ -1597,7 +1595,6 @@ static HRESULT ddraw_surface_blt(struct ddraw_surface *dst_surface, const RECT * dst_surface->palette, fill_colour, &colour)) return DDERR_INVALIDPARAMS; - wined3d_device_apply_stateblock(wined3d_device, ddraw->state); ddraw_surface_get_draw_texture(dst_surface, dst_rect ? DDRAW_SURFACE_RW : DDRAW_SURFACE_WRITE); return wined3d_device_context_clear_rendertarget_view(ddraw->immediate_context, ddraw_surface_get_rendertarget_view(dst_surface),

1 0

Paul Gofman : wined3d: Factor out wined3d_texture_set_lod() function.
by Alexandre Julliard 26 Mar '24

26 Mar '24

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: Store wined3d state in d3d_device.
by Alexandre Julliard 26 Mar '24

26 Mar '24

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 : ddraw: Sync wined3d render target in d3d_device_sync_rendertarget().
by Alexandre Julliard 26 Mar '24

26 Mar '24

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 : ddraw: Support multiple devices per ddraw object.
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: 9d95bd5f4b54a392d97f0b58db8f78d675495544 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d95bd5f4b54a392d97f0b58db8f78… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 15 20:12:04 2024 -0600 ddraw: Support multiple devices per ddraw object. --- dlls/ddraw/ddraw.c | 40 +++++++++++++++++++++++++++++----------- dlls/ddraw/ddraw_private.h | 6 +++++- dlls/ddraw/device.c | 10 ++-------- dlls/ddraw/main.c | 4 ++-- dlls/ddraw/surface.c | 16 +++++++++++----- dlls/ddraw/tests/d3d.c | 9 ++------- dlls/ddraw/vertexbuffer.c | 2 +- 7 files changed, 52 insertions(+), 35 deletions(-)

1 0

Paul Gofman : ddraw/tests: Add tests for multiple devices.
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: 8b7ac24752f3c2d29f6f44aa5da1cc1203d53e55 URL: https://gitlab.winehq.org/wine/wine/-/commit/8b7ac24752f3c2d29f6f44aa5da1cc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 15 21:40:03 2024 -0600 ddraw/tests: Add tests for multiple devices. --- dlls/ddraw/tests/ddraw1.c | 104 ++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 160 +++++++++++++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/ddraw4.c | 125 ++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 88 ++++++++++++++++++++++--- 4 files changed, 454 insertions(+), 23 deletions(-)

1 0

Paul Gofman : windows.perception.stub: Add stub IHolographicSpaceInterop interface.
by Alexandre Julliard 26 Mar '24

26 Mar '24

Module: wine Branch: master Commit: ddff86335502a7c3aa55bb8794e3635daab7a50c URL: https://gitlab.winehq.org/wine/wine/-/commit/ddff86335502a7c3aa55bb8794e363… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Mar 25 16:02:02 2024 -0600 windows.perception.stub: Add stub IHolographicSpaceInterop interface. --- dlls/windows.perception.stub/holographicspace.c | 33 +++++++++++++++++++++++++ dlls/windows.perception.stub/private.h | 1 + dlls/windows.perception.stub/tests/perception.c | 25 ++++++++++--------- include/Makefile.in | 1 + include/holographicspaceinterop.idl | 27 ++++++++++++++++++++ 5 files changed, 76 insertions(+), 11 deletions(-) diff --git a/dlls/windows.perception.stub/holographicspace.c b/dlls/windows.perception.stub/holographicspace.c index 8a12147f4a8..53e6be0e712 100644 --- a/dlls/windows.perception.stub/holographicspace.c +++ b/dlls/windows.perception.stub/holographicspace.c @@ -27,6 +27,7 @@ struct holographicspace IActivationFactory IActivationFactory_iface; IHolographicSpaceStatics2 IHolographicSpaceStatics2_iface; IHolographicSpaceStatics3 IHolographicSpaceStatics3_iface; + IHolographicSpaceInterop IHolographicSpaceInterop_iface; LONG ref; }; @@ -65,6 +66,13 @@ static HRESULT WINAPI factory_QueryInterface( IActivationFactory *iface, REFIID return S_OK; } + if (IsEqualGUID( iid, &IID_IHolographicSpaceInterop )) + { + *out = &impl->IHolographicSpaceInterop_iface; + IInspectable_AddRef( *out ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -193,11 +201,36 @@ static const struct IHolographicSpaceStatics3Vtbl holographicspace_statics3_vtbl holographicspace_statics3_get_IsConfigured, }; +DEFINE_IINSPECTABLE( holographicspace_interop, IHolographicSpaceInterop, struct holographicspace, IActivationFactory_iface ) + +static HRESULT WINAPI holographicspace_interop_CreateForWindow( IHolographicSpaceInterop *iface, + HWND window, REFIID iid, void **holographic_space ) +{ + FIXME( "iface %p, window %p, iid %s, holographic_space %p.\n", iface, window, debugstr_guid( iid ), holographic_space ); + + *holographic_space = NULL; + return E_NOTIMPL; +} + +static const struct IHolographicSpaceInteropVtbl holographicspace_interop_vtbl = +{ + holographicspace_interop_QueryInterface, + holographicspace_interop_AddRef, + holographicspace_interop_Release, + /* IInspectable methods */ + holographicspace_interop_GetIids, + holographicspace_interop_GetRuntimeClassName, + holographicspace_interop_GetTrustLevel, + /* IHolographicSpaceInterop methods */ + holographicspace_interop_CreateForWindow, +}; + static struct holographicspace holographicspace_statics = { {&factory_vtbl}, {&holographicspace_statics2_vtbl}, {&holographicspace_statics3_vtbl}, + {&holographicspace_interop_vtbl}, 1, }; diff --git a/dlls/windows.perception.stub/private.h b/dlls/windows.perception.stub/private.h index a6ae62916e1..ceaa2944174 100644 --- a/dlls/windows.perception.stub/private.h +++ b/dlls/windows.perception.stub/private.h @@ -36,6 +36,7 @@ #include "windows.perception.spatial.surfaces.h" #define WIDL_using_Windows_Graphics_Holographic #include "windows.graphics.holographic.h" +#include "holographicspaceinterop.h" extern IActivationFactory *observer_factory; extern IActivationFactory *holographicspace_factory; diff --git a/dlls/windows.perception.stub/tests/perception.c b/dlls/windows.perception.stub/tests/perception.c index d0bee4eb247..29d7f1ea475 100644 --- a/dlls/windows.perception.stub/tests/perception.c +++ b/dlls/windows.perception.stub/tests/perception.c @@ -32,19 +32,21 @@ #include "windows.perception.spatial.surfaces.h" #define WIDL_using_Windows_Graphics_Holographic #include "windows.graphics.holographic.h" +#include "holographicspaceinterop.h" #include "wine/test.h" -#define check_interface( obj, iid ) check_interface_( __LINE__, obj, iid ) -static void check_interface_( unsigned int line, void *obj, const IID *iid ) +#define check_interface( obj, iid, can_be_broken ) check_interface_( __LINE__, obj, iid, can_be_broken ) +static void check_interface_( unsigned int line, void *obj, const IID *iid, BOOL can_be_broken ) { IUnknown *iface = obj; IUnknown *unk; HRESULT hr; hr = IUnknown_QueryInterface( iface, iid, (void **)&unk ); - ok_(__FILE__, line)( hr == S_OK, "got hr %#lx.\n", hr ); - IUnknown_Release( unk ); + ok_(__FILE__, line)( hr == S_OK || broken( can_be_broken && hr == E_NOINTERFACE ), "got hr %#lx.\n", hr ); + if (SUCCEEDED(hr)) + IUnknown_Release( unk ); } static void test_ObserverStatics(void) @@ -69,10 +71,10 @@ static void test_ObserverStatics(void) return; } - check_interface( factory, &IID_IUnknown ); - check_interface( factory, &IID_IInspectable ); - check_interface( factory, &IID_IAgileObject ); - check_interface( factory, &IID_ISpatialSurfaceObserverStatics ); + check_interface( factory, &IID_IUnknown, FALSE ); + check_interface( factory, &IID_IInspectable, FALSE ); + check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_ISpatialSurfaceObserverStatics, FALSE ); hr = IActivationFactory_QueryInterface( factory, &IID_ISpatialSurfaceObserverStatics2, (void **)&observer_statics2 ); if (hr == E_NOINTERFACE) /* win1607 */ @@ -118,9 +120,10 @@ static void test_HolographicSpaceStatics(void) return; } - check_interface( factory, &IID_IUnknown ); - check_interface( factory, &IID_IInspectable ); - check_interface( factory, &IID_IAgileObject ); + check_interface( factory, &IID_IUnknown, FALSE ); + check_interface( factory, &IID_IInspectable, FALSE ); + check_interface( factory, &IID_IAgileObject, FALSE ); + check_interface( factory, &IID_IHolographicSpaceInterop, TRUE /* broken on Testbot Win1607 */ ); hr = IActivationFactory_QueryInterface( factory, &IID_IHolographicSpaceStatics2, (void **)&holographicspace_statics2 ); if (hr == E_NOINTERFACE) /* win1607 */ diff --git a/include/Makefile.in b/include/Makefile.in index 391ce3c190b..c527a17cec4 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -345,6 +345,7 @@ SOURCES = \ highlevelmonitorconfigurationapi.h \ hlguids.h \ hlink.idl \ + holographicspaceinterop.idl \ hrtfapoapi.idl \ hstring.idl \ htiface.idl \ diff --git a/include/holographicspaceinterop.idl b/include/holographicspaceinterop.idl new file mode 100644 index 00000000000..913f60bc7a0 --- /dev/null +++ b/include/holographicspaceinterop.idl @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2024 Paul Gofman for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +import "inspectable.idl"; + +[ + uuid(5c4ee536-6a98-4b86-a170-587013d6fd4b), +] +interface IHolographicSpaceInterop : IInspectable +{ + HRESULT CreateForWindow( [in] HWND window, [in] REFIID iid, [out, iid_is(iid)] void **holographic_space); +}

1 0