September 2023 - Wine-Commits

Henri Verbeet : d3d11/tests: Properly mark the indexed sample position test as succeeding with the Vulkan backend.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: d8c3b778a5ff680c138de27d1f4d71b088edb96a URL: https://gitlab.winehq.org/wine/wine/-/commit/d8c3b778a5ff680c138de27d1f4d71… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 14 19:07:35 2023 +0200 d3d11/tests: Properly mark the indexed sample position test as succeeding with the Vulkan backend. It almost works as-is; we set "sample_shading" to FALSE when running with the Vulkan backend, which causes the "(1024 <= data && data <= 1056)" test to be applied, which fails and avoids a "Test succeeded inside todo block" result. It'll mark the tests as a todo though, while it actually succeeds. --- dlls/d3d11/tests/d3d11.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index cd36780ddcd..3bf3fa44d97 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -31734,7 +31734,7 @@ static void test_sample_shading(void) {&ps_sample_index, TRUE}, {&ps_samplepos, FALSE}, {&ps_samplepos_rasterizer, FALSE}, - {&ps_samplepos_indexed, !damavand, TRUE}, + {&ps_samplepos_indexed, TRUE, !damavand}, {&ps_sampleinfo, FALSE}, {&ps_sampleinfo_rasterizer, FALSE}, {&ps_sample, TRUE, TRUE, TRUE /* broken on Intel */},

1 0

Zebediah Figura : wined3d: Pass a wined3d_stateblock_state to wined3d_device_validate_device().
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 3e51b67e31a707dc734a884318cc7b930ced8532 URL: https://gitlab.winehq.org/wine/wine/-/commit/3e51b67e31a707dc734a884318cc7b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Dec 29 17:46:54 2022 -0600 wined3d: Pass a wined3d_stateblock_state to wined3d_device_validate_device(). Revert the use of wined3d_state_uses_depth_buffer() in this function to the version before 8b4e07d5f3ab. --- dlls/d3d8/device.c | 3 +-- dlls/d3d9/device.c | 3 +-- dlls/ddraw/device.c | 3 +-- dlls/wined3d/device.c | 11 +++++------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 ++- 6 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e13a1ad465a..3f0af7ab6f0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2424,8 +2424,7 @@ static HRESULT WINAPI d3d8_device_ValidateDevice(IDirect3DDevice8 *iface, DWORD TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_validate_device(device->wined3d_device, pass_count); + hr = wined3d_device_validate_device(device->wined3d_device, device->stateblock_state, pass_count); wined3d_mutex_unlock(); /* In d3d8, texture filters are not validated, so errors concerning diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4351f005eb9..0a031f854af 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2899,8 +2899,7 @@ static HRESULT WINAPI d3d9_device_ValidateDevice(IDirect3DDevice9Ex *iface, DWOR TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_validate_device(device->wined3d_device, pass_count); + hr = wined3d_device_validate_device(device->wined3d_device, device->stateblock_state, pass_count); wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 80556e96787..dee7f2c8cb9 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5079,8 +5079,7 @@ static HRESULT d3d_device7_ValidateDevice(IDirect3DDevice7 *iface, DWORD *pass_c TRACE("iface %p, pass_count %p.\n", iface, pass_count); wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); - hr = wined3d_device_validate_device(device->wined3d_device, pass_count); + hr = wined3d_device_validate_device(device->wined3d_device, device->stateblock_state, pass_count); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4b9ea98a04d..21848f9cea4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3701,9 +3701,9 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes) +HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device, const struct wined3d_stateblock_state *state, DWORD *num_passes) { - const struct wined3d_state *state = device->cs->c.state; + const struct wined3d_state *device_state = device->cs->c.state; struct wined3d_texture *texture; unsigned i; @@ -3744,11 +3744,10 @@ HRESULT CDECL wined3d_device_validate_device(const struct wined3d_device *device } } - if (wined3d_state_uses_depth_buffer(state) - || (state->depth_stencil_state && state->depth_stencil_state->desc.stencil)) + if (state->rs[WINED3D_RS_ZENABLE] || state->rs[WINED3D_RS_ZWRITEENABLE] || state->rs[WINED3D_RS_STENCILENABLE]) { - struct wined3d_rendertarget_view *rt = state->fb.render_targets[0]; - struct wined3d_rendertarget_view *ds = state->fb.depth_stencil; + struct wined3d_rendertarget_view *rt = device_state->fb.render_targets[0]; + struct wined3d_rendertarget_view *ds = device_state->fb.depth_stencil; if (ds && rt && (ds->width < rt->width || ds->height < rt->height)) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3094fac6f3c..7ab1d8c5804 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -87,7 +87,7 @@ @ cdecl wined3d_device_set_software_vertex_processing(ptr long) @ cdecl wined3d_device_show_cursor(ptr long) @ cdecl wined3d_device_update_texture(ptr ptr ptr) -@ cdecl wined3d_device_validate_device(ptr ptr) +@ cdecl wined3d_device_validate_device(ptr ptr ptr) @ cdecl wined3d_device_context_blt(ptr ptr long ptr ptr long ptr long ptr long) @ cdecl wined3d_device_context_clear_rendertarget_view(ptr ptr ptr long ptr float long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ee2eb02902f..7bc9559526e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2419,7 +2419,8 @@ void __cdecl wined3d_device_set_software_vertex_processing(struct wined3d_device BOOL __cdecl wined3d_device_show_cursor(struct wined3d_device *device, BOOL show); HRESULT __cdecl wined3d_device_update_texture(struct wined3d_device *device, struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture); -HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, DWORD *num_passes); +HRESULT __cdecl wined3d_device_validate_device(const struct wined3d_device *device, + const struct wined3d_stateblock_state *state, DWORD *num_passes); HRESULT __cdecl wined3d_device_context_blt(struct wined3d_device_context *context, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, const RECT *dst_rect,

1 0

Henri Verbeet : wined3d: Don't validate the frontbuffer's DRAWABLE location in wined3d_swapchain_resize_buffers() when NO3D is set.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: da574ed9f320cd8d768096931f5d51ac7e984242 URL: https://gitlab.winehq.org/wine/wine/-/commit/da574ed9f320cd8d768096931f5d51… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 14 16:29:48 2023 +0200 wined3d: Don't validate the frontbuffer's DRAWABLE location in wined3d_swapchain_resize_buffers() when NO3D is set. In general, NO3D surfaces are always in SYSMEM. More importantly though, validating DRAWABLE will evict SYSMEM, but a subsequent wined3d_texture_no3d_load_location() won't recreate it because it's always supposed to be current. This fixes a regression introduced by commit ebaa0a9426864cfa6e36955f26ff4c66c1d5af76, and exposed by running the ddraw tests with the "no3d" renderer. --- dlls/wined3d/swapchain.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 84dcdb5b110..99d717641e1 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -2004,8 +2004,11 @@ HRESULT CDECL wined3d_swapchain_resize_buffers(struct wined3d_swapchain *swapcha ERR("Something's still holding the front buffer (%p).\n", swapchain->front_buffer); swapchain->front_buffer = new_texture; - wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); - wined3d_texture_invalidate_location(swapchain->front_buffer, 0, ~WINED3D_LOCATION_DRAWABLE); + if (!(swapchain->device->wined3d->flags & WINED3D_NO3D)) + { + wined3d_texture_validate_location(swapchain->front_buffer, 0, WINED3D_LOCATION_DRAWABLE); + wined3d_texture_invalidate_location(swapchain->front_buffer, 0, ~WINED3D_LOCATION_DRAWABLE); + } for (i = 0; i < desc->backbuffer_count; ++i) {

1 0

Alistair Leslie-Hughes : d3drm: Correctly query for the returned interface.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: fa4be54777517c93c6058cc23efdb63fbca37b35 URL: https://gitlab.winehq.org/wine/wine/-/commit/fa4be54777517c93c6058cc23efdb6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Sep 15 20:39:14 2023 +1000 d3drm: Correctly query for the returned interface. IDirect3DRM2::CreateTextureFromSurface is expected to return an IDirect3DRMTexture2 object. --- dlls/d3drm/d3drm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 761132b3bd1..39b5b0fcb20 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1064,7 +1064,7 @@ static HRESULT WINAPI d3drm2_CreateTextureFromSurface(IDirect3DRM2 *iface, return hr; } - hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture, (void **)texture); + hr = IDirect3DRMTexture3_QueryInterface(texture3, &IID_IDirect3DRMTexture2, (void **)texture); IDirect3DRMTexture3_Release(texture3); return hr;

1 0

Alex Henrie : dsound: Use malloc and free instead of _recalloc.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 269ce609d9523ab8f4f595bd4336f22a5fbff7c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/269ce609d9523ab8f4f595bd4336f2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sat Sep 16 11:43:50 2023 -0600 dsound: Use malloc and free instead of _recalloc. The memory is completely overwritten a few lines later, so there is no reason to preserve its original contents. Furthermore, _recalloc will not be available if this DLL switches from ucrtbase to msvcrt, and the code as written would leak memory if _recalloc failed. --- dlls/dsound/capture.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index ca01543f358..5956da792af 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -178,7 +178,8 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions(IDirectSou if (howmuch > 0) { /* Make an internal copy of the caller-supplied array. * Replace the existing copy if one is already present. */ - This->notifies = _recalloc(This->notifies, howmuch, sizeof(DSBPOSITIONNOTIFY)); + free(This->notifies); + This->notifies = malloc(howmuch * sizeof(DSBPOSITIONNOTIFY)); if (!This->notifies) { WARN("out of memory\n"); return DSERR_OUTOFMEMORY;

1 0

Piotr Caban : wineps.drv: Don't crash if specified font is missing required table in T42_download_header.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: d5988259c110dca1e24d12b6114ed1d2e0f7fea6 URL: https://gitlab.winehq.org/wine/wine/-/commit/d5988259c110dca1e24d12b6114ed1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 19 19:41:45 2023 +0200 wineps.drv: Don't crash if specified font is missing required table in T42_download_header. --- dlls/wineps.drv/type42.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index e495ddc0394..0867881b68e 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -170,7 +170,6 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name, t42 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t42)); memcpy(t42->tables, tables_templ, sizeof(tables_templ)); - t42->loca_tab = t42->glyf_tab = t42->head_tab = -1; t42->emsize = emsize; t42->num_of_written_tables = 0; @@ -186,6 +185,9 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name, t42->head_tab = i; else if(t42->tables[i].MS_tag == MS_MAKE_TAG('m','a','x','p')) t42->maxp_tab = i; + else + continue; + if(!t42->tables[i].len) break; } if(i < num_of_tables) { TRACE("Table %ld has length %ld. Will use Type 1 font instead.\n", i, t42->tables[i].len);

1 0

Alexandre Julliard : kernel32/tests: Update dll characteristics to make the module loadable on ARM64.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 30229d47e9894cb1366033e0c57dd9d3ac4da720 URL: https://gitlab.winehq.org/wine/wine/-/commit/30229d47e9894cb1366033e0c57dd9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 19:19:48 2023 +0200 kernel32/tests: Update dll characteristics to make the module loadable on ARM64. --- dlls/kernel32/tests/module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/module.c b/dlls/kernel32/tests/module.c index 956595bf2a1..35c7c552dd5 100644 --- a/dlls/kernel32/tests/module.c +++ b/dlls/kernel32/tests/module.c @@ -115,7 +115,7 @@ static const struct sizeof(IMAGE_DOS_HEADER) + sizeof(IMAGE_NT_HEADERS), /* SizeOfHeaders */ 0, /* CheckSum */ IMAGE_SUBSYSTEM_WINDOWS_CUI, /* Subsystem */ - 0, /* DllCharacteristics */ + IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE | IMAGE_DLLCHARACTERISTICS_NX_COMPAT, /* DllCharacteristics */ 0, /* SizeOfStackReserve */ 0, /* SizeOfStackCommit */ 0, /* SizeOfHeapReserve */

1 0

Piotr Caban : wineps.drv: Remove unused hmtx_tab field from TYPE42 structure.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 8f890d412d999ccf3d2763c7973a9285c940fcdc URL: https://gitlab.winehq.org/wine/wine/-/commit/8f890d412d999ccf3d2763c7973a92… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 19 19:28:17 2023 +0200 wineps.drv: Remove unused hmtx_tab field from TYPE42 structure. --- dlls/wineps.drv/type42.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wineps.drv/type42.c b/dlls/wineps.drv/type42.c index 9e75d24eca4..e495ddc0394 100644 --- a/dlls/wineps.drv/type42.c +++ b/dlls/wineps.drv/type42.c @@ -69,7 +69,7 @@ static const OTTable tables_templ[] = { struct tagTYPE42 { OTTable tables[ARRAY_SIZE(tables_templ)]; int glyf_tab, loca_tab, head_tab; /* indices of glyf, loca and head tables */ - int hmtx_tab, maxp_tab; + int maxp_tab; int num_of_written_tables; DWORD glyph_sent_size; BOOL *glyph_sent; @@ -170,7 +170,7 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name, t42 = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*t42)); memcpy(t42->tables, tables_templ, sizeof(tables_templ)); - t42->loca_tab = t42->glyf_tab = t42->head_tab = t42->hmtx_tab = -1; + t42->loca_tab = t42->glyf_tab = t42->head_tab = -1; t42->emsize = emsize; t42->num_of_written_tables = 0; @@ -184,8 +184,6 @@ TYPE42 *T42_download_header(print_ctx *ctx, char *ps_name, t42->glyf_tab = i; else if(t42->tables[i].MS_tag == MS_MAKE_TAG('h','e','a','d')) t42->head_tab = i; - else if(t42->tables[i].MS_tag == MS_MAKE_TAG('h','m','t','x')) - t42->hmtx_tab = i; else if(t42->tables[i].MS_tag == MS_MAKE_TAG('m','a','x','p')) t42->maxp_tab = i; }

1 0

Alexandre Julliard : kernel32/tests: Comment out one more test that can crash on Windows.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: 74559aaa7f44dd5e281df5add62d1f6bcfc074fe URL: https://gitlab.winehq.org/wine/wine/-/commit/74559aaa7f44dd5e281df5add62d1f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 13:49:10 2023 +0200 kernel32/tests: Comment out one more test that can crash on Windows. --- dlls/kernel32/tests/heap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 24ce6b792da..d05eac33174 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -264,6 +264,9 @@ static void test_HeapCreate(void) ptr1 = HeapReAlloc( heap, 0, (void *)0xdeadbe00, 1 ); ok( !ptr1, "HeapReAlloc succeeded\n" ); ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); + ret = HeapValidate( heap, 0, (void *)0xdeadbe00 ); + ok( !ret, "HeapValidate succeeded\n" ); + ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); SetLastError( 0xdeadbeef ); ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; ptr1 = HeapReAlloc( heap, 0, ptr, 1 ); @@ -275,12 +278,6 @@ static void test_HeapCreate(void) ret = HeapValidate( heap, 0, NULL ); ok( ret, "HeapValidate failed, error %lu\n", GetLastError() ); ok( GetLastError() == 0xdeadbeef, "got error %lu\n", GetLastError() ); - SetLastError( 0xdeadbeef ); - ret = HeapValidate( heap, 0, (void *)0xdeadbe00 ); - ok( !ret, "HeapValidate succeeded\n" ); - todo_wine - ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() ); - SetLastError( 0xdeadbeef ); ptr = (BYTE *)((UINT_PTR)buffer & ~63) + 64; ret = HeapValidate( heap, 0, ptr ); ok( !ret, "HeapValidate succeeded\n" );

1 0

Alexandre Julliard : kernel32/tests: Don't make assumptions about argv[0] of the main process.
by Alexandre Julliard Sept. 20, 2023

Sept. 20, 2023

Module: wine Branch: master Commit: fc6b9399db0d9f9a8ab1bfa9baf737381cc5284f URL: https://gitlab.winehq.org/wine/wine/-/commit/fc6b9399db0d9f9a8ab1bfa9baf737… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 20 13:49:27 2023 +0200 kernel32/tests: Don't make assumptions about argv[0] of the main process. --- dlls/kernel32/tests/process.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c298b9ab0fa..8bb2748f8e1 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -237,7 +237,7 @@ static BOOL init(void) myARGC = winetest_get_mainargs( &myARGV ); if (!GetCurrentDirectoryA(sizeof(base), base)) return FALSE; - strcpy(selfname, myARGV[0]); + GetModuleFileNameA( 0, selfname, sizeof(selfname) ); /* Strip the path of selfname */ if ((p = strrchr(selfname, '\\')) != NULL) exename = p + 1;

1 0