September 2023 - Wine-commits

Paul Gofman : d3dx9/tests: Add a basic test for d3dx9_mesh_OptimizeInplace().
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: e802019d478cfbfea1cfff8ce8ba31399e1ff09a URL: https://gitlab.winehq.org/wine/wine/-/commit/e802019d478cfbfea1cfff8ce8ba31… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 14 16:20:36 2023 -0600 d3dx9/tests: Add a basic test for d3dx9_mesh_OptimizeInplace(). --- dlls/d3dx9_36/tests/mesh.c | 117 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/d3dx9_36/tests/mesh.c b/dlls/d3dx9_36/tests/mesh.c index f87a65cd0d8..e5ba6e24996 100644 --- a/dlls/d3dx9_36/tests/mesh.c +++ b/dlls/d3dx9_36/tests/mesh.c @@ -11439,6 +11439,122 @@ static void test_load_skin_mesh_from_xof(void) DestroyWindow(hwnd); } +static void test_mesh_optimize(void) +{ +/* + * . _ . + * / \ / \ + * . _ . _ . + * \ / \ / + * . _ . + */ + static const struct + { + float c[3]; + float n[3]; + float t[2]; + } + vertices[] = + { + { {-0.5f, -1.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, {-0.5f, -1.0f} }, + { { 0.5f, -1.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, { 0.5f, -1.0f} }, + + { {-1.0f, 0.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, {-1.0f, 0.0f} }, + { { 0.0f, 0.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, { 0.0f, 0.0f} }, + { { 1.0f, 0.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, { 1.0f, 0.0f} }, + + { {-0.5f, 1.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, {-0.5f, 1.0f} }, + { { 0.5f, 1.0f, 0.0f,}, {0.0f, 0.0f, 1.0f}, { 0.5f, 1.0f} }, + }; + static const unsigned short indices[] = + { + 3, 0, 2, + 3, 2, 5, + 3, 5, 6, + 3, 6, 4, + 3, 4, 1, + 3, 1, 0, + }; + static const DWORD attrs[] = { 1, 2, 1, 2, 1, 2 }; + static const DWORD expected_adjacency[] = + { + 5, 0xffffffff, 1, + 0, 0xffffffff, 2, + 1, 0xffffffff, 3, + 2, 0xffffffff, 4, + 3, 0xffffffff, 5, + 4, 0xffffffff, 0, + }; + static const DWORD expected_adjacency_out[] = + { + 5, 0xffffffff, 3, + 3, 0xffffffff, 4, + 4, 0xffffffff, 5, + 0, 0xffffffff, 1, + 1, 0xffffffff, 2, + 2, 0xffffffff, 0, + }; + + DWORD adjacency[6 * 3], adjacency_out[6 * 3]; + struct test_context *test_context; + IDirect3DDevice9 *device; + ID3DXBuffer *buffer; + ID3DXMesh *mesh; + unsigned int i; + DWORD size; + HRESULT hr; + void *data; + + test_context = new_test_context(); + if (!test_context) + { + skip("Couldn't create test context\n"); + return; + } + device = test_context->device; + + hr = D3DXCreateMeshFVF(ARRAY_SIZE(attrs), ARRAY_SIZE(vertices), D3DXMESH_VB_MANAGED | D3DXMESH_IB_MANAGED, + D3DFVF_XYZ | D3DFVF_NORMAL | D3DFVF_TEX1, device, &mesh); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = mesh->lpVtbl->LockVertexBuffer(mesh, 0, &data); + ok(hr == S_OK, "got %#lx.\n", hr); + memcpy(data, vertices, sizeof(vertices)); + hr = mesh->lpVtbl->UnlockVertexBuffer(mesh); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = mesh->lpVtbl->LockIndexBuffer(mesh, 0, &data); + ok(hr == S_OK, "got %#lx.\n", hr); + memcpy(data, indices, sizeof(indices)); + hr = mesh->lpVtbl->UnlockIndexBuffer(mesh); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = mesh->lpVtbl->LockAttributeBuffer(mesh, 0, (DWORD **)&data); + ok(hr == S_OK, "got %#lx.\n", hr); + memcpy(data, attrs, sizeof(attrs)); + hr = mesh->lpVtbl->UnlockAttributeBuffer(mesh); + ok(hr == S_OK, "got %#lx.\n", hr); + + hr = mesh->lpVtbl->GenerateAdjacency(mesh, 0.0f, adjacency); + ok(hr == S_OK, "got %#lx.\n", hr); + ok(!memcmp(adjacency, expected_adjacency, sizeof(adjacency)), "data mismatch.\n"); + + hr = mesh->lpVtbl->OptimizeInplace(mesh, D3DXMESHOPT_IGNOREVERTS | D3DXMESHOPT_ATTRSORT | D3DXMESHOPT_DONOTSPLIT, + adjacency, adjacency_out, NULL, &buffer); + ok(hr == S_OK, "got %#lx.\n", hr); + + size = buffer->lpVtbl->GetBufferSize(buffer); + ok(size == sizeof(DWORD) * ARRAY_SIZE(vertices), "got %lu.\n", size); + data = buffer->lpVtbl->GetBufferPointer(buffer); + for (i = 0; i < ARRAY_SIZE(vertices); ++i) + ok(((DWORD *)data)[i] == i, "i %u, got %lu.\n", i, ((DWORD *)data)[i]); + ok(!memcmp(adjacency_out, expected_adjacency_out, sizeof(adjacency)), "data mismatch.\n"); + + buffer->lpVtbl->Release(buffer); + mesh->lpVtbl->Release(mesh); + free_test_context(test_context); +} + START_TEST(mesh) { D3DXBoundProbeTest(); @@ -11472,4 +11588,5 @@ START_TEST(mesh) test_compute_normals(); test_D3DXFrameFind(); test_load_skin_mesh_from_xof(); + test_mesh_optimize(); }

1 0

Piotr Caban : wineps: Remove dynamic glyph list.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: a59336bc31a762f972ba8b960c6dc5010bd5cff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a59336bc31a762f972ba8b960c6dc5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 25 20:00:01 2023 +0200 wineps: Remove dynamic glyph list. We can't do much without unicode mapping. --- dlls/wineps.drv/Makefile.in | 1 - dlls/wineps.drv/afm.c | 5 -- dlls/wineps.drv/glyphlist.c | 201 -------------------------------------------- dlls/wineps.drv/psdrv.h | 3 - dlls/wineps.drv/type1afm.c | 82 ++++++++---------- 5 files changed, 33 insertions(+), 259 deletions(-)

1 0

Piotr Caban : wineps: Fix EMRPOLYDRAW16 printing.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 4d26d30574b2162eabde73140ab0fac18cfb46ff URL: https://gitlab.winehq.org/wine/wine/-/commit/4d26d30574b2162eabde73140ab0fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Sep 14 20:47:35 2023 +0200 wineps: Fix EMRPOLYDRAW16 printing. It fixes EMRPOLYDRAW16 printing when -O2 option is used (in GCC 12.3.1). The compiler assumes that apts table has 0 or 1 elements and optimizes the loop out. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55486 --- dlls/wineps.drv/printproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index b899814f8c1..74f43b6d27c 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -2738,8 +2738,8 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, if (!pts) return 0; for (i = 0; i < p->cpts; i++) { - pts[i].x = p->apts[i].x; - pts[i].y = p->apts[i].y; + pts[i].x = ((const POINTS *)p->apts)[i].x; + pts[i].y = ((const POINTS *)p->apts)[i].y; } i = poly_draw(data->ctx, pts, (BYTE *)(p->apts + p->cpts), p->cpts) && MoveToEx(data->ctx->hdc, pts[p->cpts - 1].x, pts[p->cpts - 1].y, NULL);

1 0

Alexandre Julliard : ntdll: Fix the hardcoded selector values for ARM64.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 75b3022aaa706663d968f7203a59ec9a38544dc3 URL: https://gitlab.winehq.org/wine/wine/-/commit/75b3022aaa706663d968f7203a59ec… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 15:56:37 2023 +0200 ntdll: Fix the hardcoded selector values for ARM64. --- dlls/ntdll/process.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 4ddf3ad59bd..3ca4195ab3d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -249,13 +249,14 @@ NTSTATUS WINAPI RtlWow64GetThreadSelectorEntry( HANDLE handle, THREAD_DESCRIPTOR if (RtlWow64GetThreadContext( handle, &context )) { /* hardcoded values */ - context.SegCs = 0x23; #ifdef __x86_64__ + context.SegCs = 0x23; __asm__( "movw %%fs,%0" : "=m" (context.SegFs) ); __asm__( "movw %%ss,%0" : "=m" (context.SegSs) ); #else - context.SegSs = 0x2b; - context.SegFs = 0x53; + context.SegCs = 0x1b; + context.SegSs = 0x23; + context.SegFs = 0x3b; #endif }

1 0

Gerald Pfeifer : ntdll: Fix leave_handler for FreeBSD and NetBSD.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 4ae4accac55e5e0e1e1a2cf8efc93634f8bb82e1 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae4accac55e5e0e1e1a2cf8efc936… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Fri Sep 15 02:55:28 2023 +0000 ntdll: Fix leave_handler for FreeBSD and NetBSD. With recent changes leave_handler writes to some of its parameter's fields (via DS_sig and ES_sig) on FreeBSD and NetBSD - which fails since it is declared const. Accordingly strip const-ness. --- dlls/ntdll/unix/signal_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 71e23ae46fc..48b5b4d5de9 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -812,7 +812,7 @@ static inline ucontext_t *init_handler( void *sigcontext ) /*********************************************************************** * leave_handler */ -static inline void leave_handler( const ucontext_t *sigcontext ) +static inline void leave_handler( ucontext_t *sigcontext ) { #ifdef __linux__ if (fs32_sel && !is_inside_signal_stack( (void *)RSP_sig(sigcontext )) && !is_inside_syscall(sigcontext))

1 0

Brendan Shanks : capi2032: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 59267189255c24c0a05a45c4fcb5439a58dd3aad URL: https://gitlab.winehq.org/wine/wine/-/commit/59267189255c24c0a05a45c4fcb543… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:35:25 2023 -0700 capi2032: Ensure unixlib function tables and enum stay in sync. --- dlls/capi2032/unixlib.c | 4 +++- dlls/capi2032/unixlib.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/capi2032/unixlib.c b/dlls/capi2032/unixlib.c index 03706d99b32..a75fdd67000 100644 --- a/dlls/capi2032/unixlib.c +++ b/dlls/capi2032/unixlib.c @@ -117,7 +117,7 @@ static NTSTATUS capi_isinstalled( void *args ) return capi20_isinstalled(); } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { capi_register, capi_release, @@ -130,3 +130,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = capi_get_profile, capi_isinstalled, }; + +C_ASSERT( ARRAYSIZE(__wine_unix_call_funcs) == unix_funcs_count ); diff --git a/dlls/capi2032/unixlib.h b/dlls/capi2032/unixlib.h index f4191313a9c..55d45864822 100644 --- a/dlls/capi2032/unixlib.h +++ b/dlls/capi2032/unixlib.h @@ -93,4 +93,5 @@ enum capi20_funcs unix_get_serial_number, unix_get_profile, unix_isinstalled, + unix_funcs_count };

1 0

Brendan Shanks : winealsa: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 63c0f01c96233dc6a27e8dbfe08abcce23e0ee52 URL: https://gitlab.winehq.org/wine/wine/-/commit/63c0f01c96233dc6a27e8dbfe08abc… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:21:48 2023 -0700 winealsa: Ensure unixlib function tables and enum stay in sync. --- dlls/mmdevapi/unixlib.h | 1 + dlls/winealsa.drv/alsa.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/unixlib.h b/dlls/mmdevapi/unixlib.h index b1e025a512b..d83ed918a51 100644 --- a/dlls/mmdevapi/unixlib.h +++ b/dlls/mmdevapi/unixlib.h @@ -332,4 +332,5 @@ enum unix_funcs midi_in_message, midi_notify_wait, aux_message, + funcs_count }; diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 17737012579..94fc3c6fa4b 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -2504,7 +2504,7 @@ static NTSTATUS alsa_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { alsa_process_attach, alsa_not_implemented, @@ -2542,6 +2542,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = alsa_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2958,7 +2960,7 @@ static NTSTATUS alsa_wow64_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { alsa_process_attach, alsa_not_implemented, @@ -2996,4 +2998,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = alsa_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0

Brendan Shanks : winecoreaudio: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 111e0cbd22a2e7976d612ab4e37f68b9eb4b3186 URL: https://gitlab.winehq.org/wine/wine/-/commit/111e0cbd22a2e7976d612ab4e37f68… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:23:00 2023 -0700 winecoreaudio: Ensure unixlib function tables and enum stay in sync. --- dlls/winecoreaudio.drv/coreaudio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index e2bce64ea14..5cdb3a4f676 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -1796,7 +1796,7 @@ static NTSTATUS unix_set_event_handle(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { unix_process_attach, unix_not_implemented, @@ -1834,6 +1834,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = unix_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2249,7 +2251,7 @@ static NTSTATUS unix_wow64_get_prop_value(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_process_attach, unix_not_implemented, @@ -2287,4 +2289,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = unix_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0

Brendan Shanks : wineoss: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: 39864e80e6f1dcad27d7d69134c74d814f164d24 URL: https://gitlab.winehq.org/wine/wine/-/commit/39864e80e6f1dcad27d7d69134c74d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:23:21 2023 -0700 wineoss: Ensure unixlib function tables and enum stay in sync. --- dlls/wineoss.drv/oss.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 1e839c57f5f..9a7a0fbb5d9 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -1704,7 +1704,7 @@ static NTSTATUS oss_aux_message(void *args) return STATUS_SUCCESS; } -unixlib_entry_t __wine_unix_call_funcs[] = +const unixlib_entry_t __wine_unix_call_funcs[] = { oss_process_attach, oss_not_implemented, @@ -1742,6 +1742,8 @@ unixlib_entry_t __wine_unix_call_funcs[] = oss_aux_message, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -2197,7 +2199,7 @@ static NTSTATUS oss_wow64_aux_message(void *args) return oss_aux_message(&params); } -unixlib_entry_t __wine_unix_call_wow64_funcs[] = +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = { oss_process_attach, oss_not_implemented, @@ -2235,4 +2237,6 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = oss_wow64_aux_message, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0

Brendan Shanks : winepulse: Ensure unixlib function tables and enum stay in sync.
by Alexandre Julliard 15 Sep '23

15 Sep '23

Module: wine Branch: master Commit: ca86155b1acc6e3ce5cd47d00fd95d5e0958ae5e URL: https://gitlab.winehq.org/wine/wine/-/commit/ca86155b1acc6e3ce5cd47d00fd95d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Sep 14 21:23:32 2023 -0700 winepulse: Ensure unixlib function tables and enum stay in sync. --- dlls/winepulse.drv/pulse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 370c361b02f..0ddddb00185 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -2572,6 +2572,8 @@ const unixlib_entry_t __wine_unix_call_funcs[] = pulse_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == funcs_count); + #ifdef _WIN64 typedef UINT PTR32; @@ -3041,4 +3043,6 @@ const unixlib_entry_t __wine_unix_call_wow64_funcs[] = pulse_not_implemented, }; +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == funcs_count); + #endif /* _WIN64 */

1 0