September 2023 - Wine-Commits

Matteo Bruni : wined3d: Prepare/load the destination resource location in arbfp_blitter_blit().
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: f57158c2401400714a7ed7c44b4a908c39163540 URL: https://gitlab.winehq.org/wine/wine/-/commit/f57158c2401400714a7ed7c44b4a90… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 12 22:19:23 2023 +0200 wined3d: Prepare/load the destination resource location in arbfp_blitter_blit(). Port of c0ab55700f681ace7ac13f9fdaa6075185fef35c to the ARB FP blitter. --- dlls/wined3d/arb_program_shader.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index ea15294262a..165d9fd5094 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7907,6 +7907,11 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl wined3d_texture_load(src_texture, context, FALSE); } + if (wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + else + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_context_gl_apply_ffp_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE)

1 0

Matteo Bruni : wined3d: Don't bind the FBO to GL_READ_FRAMEBUFFER in wined3d_context_gl_apply_blit_state().
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 512ceb0856c3a4571124d342c99ca510c08d63e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/512ceb0856c3a4571124d342c99ca5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 6 20:14:52 2023 +0200 wined3d: Don't bind the FBO to GL_READ_FRAMEBUFFER in wined3d_context_gl_apply_blit_state(). --- dlls/wined3d/context_gl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5a45ae7dc72..a32fc4ceb78 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3254,7 +3254,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, { wined3d_texture_load(rt, context, FALSE); - wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_FRAMEBUFFER, &rt->resource, + wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_DRAW_FRAMEBUFFER, &rt->resource, context->current_rt.sub_resource_idx, NULL, 0, rt->resource.draw_binding); if (rt->resource.format->id != WINED3DFMT_NULL) rt_mask = 1; @@ -3264,7 +3264,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, else { context_gl->current_fbo = NULL; - wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); + wined3d_context_gl_bind_fbo(context_gl, GL_DRAW_FRAMEBUFFER, 0); rt_mask = context_generate_rt_mask_from_resource(&rt->resource); } } @@ -3282,7 +3282,7 @@ void wined3d_context_gl_apply_blit_state(struct wined3d_context_gl *context_gl, } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) - wined3d_context_gl_check_fbo_status(context_gl, GL_FRAMEBUFFER); + wined3d_context_gl_check_fbo_status(context_gl, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); wined3d_context_gl_get_rt_size(context_gl, &rt_size);

1 0

Matteo Bruni : wined3d: Prepare/load the destination resource location in ffp_blitter_blit().
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 35634c42a99753fef33feb027954c2c0d3169f1c URL: https://gitlab.winehq.org/wine/wine/-/commit/35634c42a99753fef33feb027954c2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jul 12 22:18:48 2023 +0200 wined3d: Prepare/load the destination resource location in ffp_blitter_blit(). Port of c0ab55700f681ace7ac13f9fdaa6075185fef35c to the FFP blitter. --- dlls/wined3d/texture.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index bc7b1b63b9a..51139251188 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -6281,6 +6281,11 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit wined3d_texture_load(src_texture, context, FALSE); } + if (wined3d_texture_is_full_rect(dst_texture, dst_sub_resource_idx % dst_texture->level_count, dst_rect)) + wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, dst_location); + else + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location); + wined3d_context_gl_apply_ffp_blit_state(context_gl, device); if (dst_location == WINED3D_LOCATION_DRAWABLE)

1 0

Matteo Bruni : wined3d: Don't call wined3d_context_gl_apply_blit_state() from texture2d_read_from_framebuffer().
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 1e3ee36a7187eb56507947674629dc7917cfc00c URL: https://gitlab.winehq.org/wine/wine/-/commit/1e3ee36a7187eb56507947674629dc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Jul 6 14:06:11 2023 +0200 wined3d: Don't call wined3d_context_gl_apply_blit_state() from texture2d_read_from_framebuffer(). None of the GL states set by wined3d_context_gl_apply_blit_state() should matter for glReadPixels(), aside from the FBO read binding. So just do that instead. Some wined3d git archaeology suggests that the wined3d_context_gl_apply_blit_state() call was added right before Wine 1.2 to workaround various driver issues with glReadPixels() that in practice was erroneously affected by some GL states. If those kind of issues are still a thing, it might be necessary to reintroduce some limited state reset, possibly tied to a quirk. --- dlls/wined3d/surface.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11b1da829d7..6850e984efb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -372,16 +372,10 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i context_gl = wined3d_context_gl(context); gl_info = context_gl->gl_info; - if (src_location != resource->draw_binding) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { wined3d_context_gl_apply_fbo_state_blit(context_gl, GL_READ_FRAMEBUFFER, resource, sub_resource_idx, NULL, 0, src_location); - wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); - context_invalidate_state(context, STATE_FRAMEBUFFER); - } - else - { - wined3d_context_gl_apply_blit_state(context_gl, device); } /* Select the correct read buffer, and give some debug output. @@ -405,6 +399,8 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i src_is_upside_down = FALSE; } checkGLcall("glReadBuffer"); + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + wined3d_context_gl_check_fbo_status(context_gl, GL_READ_FRAMEBUFFER); if (data.buffer_object) {

1 0

Hans Leidekker : iphlpapi/tests: Call GetExtendedTcp/UdpTable() in a loop.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 46e3f259c145419e93cf3daecd992e053e6cdf6f URL: https://gitlab.winehq.org/wine/wine/-/commit/46e3f259c145419e93cf3daecd992e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 13 14:27:07 2023 +0200 iphlpapi/tests: Call GetExtendedTcp/UdpTable() in a loop. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54588 --- dlls/iphlpapi/tests/iphlpapi.c | 103 +++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 56 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index bd566980500..cd192003345 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1866,9 +1866,27 @@ static void test_GetAdaptersAddresses(void) free(ptr); } +static DWORD get_extended_tcp_table( ULONG family, TCP_TABLE_CLASS class, void **table ) +{ + DWORD ret, size = 0; + + *table = NULL; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, family, class, 0 ); + if (ret != ERROR_INSUFFICIENT_BUFFER) return ret; + + *table = malloc( size ); + ret = pGetExtendedTcpTable( *table, &size, TRUE, family, class, 0 ); + while (ret == ERROR_INSUFFICIENT_BUFFER) + { + *table = realloc( *table, size ); + ret = pGetExtendedTcpTable( *table, &size, TRUE, family, class, 0 ); + } + return ret; +} + static void test_GetExtendedTcpTable(void) { - DWORD ret, size; + DWORD ret; MIB_TCPTABLE *table; MIB_TCPTABLE_OWNER_PID *table_pid; MIB_TCPTABLE_OWNER_MODULE *table_module; @@ -1881,57 +1899,27 @@ static void test_GetExtendedTcpTable(void) ret = pGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); - size = 0; - ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table = malloc( size ); - ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 ); + ret = get_extended_tcp_table( AF_INET, TCP_TABLE_BASIC_ALL, (void **)&table ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table ); - size = 0; - ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table = malloc( size ); - ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 ); + ret = get_extended_tcp_table( AF_INET, TCP_TABLE_BASIC_LISTENER, (void **)&table ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table ); - size = 0; - ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table_pid = malloc( size ); - ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); + ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_PID_ALL, (void **)&table_pid ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table_pid ); - size = 0; - ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table_pid = malloc( size ); - ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); + ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_PID_LISTENER, (void **)&table_pid ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table_pid ); - size = 0; - ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table_module = malloc( size ); - ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 ); + ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_MODULE_ALL, (void **)&table_module ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table_module ); - size = 0; - ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table_module = malloc( size ); - ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 ); + ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, (void **)&table_module ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table_module ); } @@ -1985,9 +1973,27 @@ static void test_AllocateAndGetTcpExTableFromStack(void) ok( ret == ERROR_NOT_SUPPORTED, "got %lu\n", ret ); } +static DWORD get_extended_udp_table( ULONG family, UDP_TABLE_CLASS class, void **table ) +{ + DWORD ret, size = 0; + + *table = NULL; + ret = pGetExtendedUdpTable( NULL, &size, TRUE, family, class, 0 ); + if (ret != ERROR_INSUFFICIENT_BUFFER) return ret; + + *table = malloc( size ); + ret = pGetExtendedUdpTable( *table, &size, TRUE, family, class, 0 ); + while (ret == ERROR_INSUFFICIENT_BUFFER) + { + *table = realloc( *table, size ); + ret = pGetExtendedUdpTable( *table, &size, TRUE, family, class, 0 ); + } + return ret; +} + static void test_GetExtendedUdpTable(void) { - DWORD ret, size; + DWORD ret; MIB_UDPTABLE *table; MIB_UDPTABLE_OWNER_PID *table_pid; MIB_UDPTABLE_OWNER_MODULE *table_module; @@ -2000,30 +2006,15 @@ static void test_GetExtendedUdpTable(void) ret = pGetExtendedUdpTable( NULL, NULL, TRUE, AF_INET, UDP_TABLE_BASIC, 0 ); ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret ); - size = 0; - ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_BASIC, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table = malloc( size ); - ret = pGetExtendedUdpTable( table, &size, TRUE, AF_INET, UDP_TABLE_BASIC, 0 ); + ret = get_extended_udp_table( AF_INET, UDP_TABLE_BASIC, (void **)&table ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table ); - size = 0; - ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table_pid = malloc( size ); - ret = pGetExtendedUdpTable( table_pid, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 ); + ret = get_extended_udp_table( AF_INET, UDP_TABLE_OWNER_PID, (void **)&table_pid ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table_pid ); - size = 0; - ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 ); - ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret ); - - table_module = malloc( size ); - ret = pGetExtendedUdpTable( table_module, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 ); + ret = get_extended_udp_table( AF_INET, UDP_TABLE_OWNER_MODULE, (void **)&table_module ); ok( ret == ERROR_SUCCESS, "got %lu\n", ret ); free( table_module ); }

1 0

Hans Leidekker : iphlpapi/tests: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: c2c0fefb99ade454c2c8c5ad4e8e9dbf542b2050 URL: https://gitlab.winehq.org/wine/wine/-/commit/c2c0fefb99ade454c2c8c5ad4e8e9d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 13 13:59:47 2023 +0200 iphlpapi/tests: Call GetAdaptersAddresses() in a loop. As shown by the testbot, doubling is not always sufficient. --- dlls/iphlpapi/tests/iphlpapi.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 090cd2c9ff9..bd566980500 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1769,6 +1769,13 @@ static void test_GetAdaptersAddresses(void) osize = size; ptr = malloc(osize); ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ptr, &osize); + while (ret == ERROR_BUFFER_OVERFLOW) + { + size = osize * 2; + osize = size; + ptr = realloc(ptr, osize); + ret = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX | GAA_FLAG_SKIP_FRIENDLY_NAME, NULL, ptr, &osize); + } ok(!ret, "expected ERROR_SUCCESS got %lu\n", ret); ok(osize == size, "expected %ld, got %ld\n", size, osize);

1 0

Paul Gofman : d3dx9/tests: Add a basic test for d3dx9_mesh_OptimizeInplace().
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

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

Alexandre Julliard : ntdll: Fix the SystemProcessorFeaturesInformation value on ARM platforms.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 6cde96fb38772b06fbc6b61de594b7e30cae0546 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cde96fb38772b06fbc6b61de594b7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 15:58:40 2023 +0200 ntdll: Fix the SystemProcessorFeaturesInformation value on ARM platforms. --- dlls/ntdll/unix/system.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4805e765af0..4fbe45b2dd9 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -459,6 +459,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { + ULONGLONG features = 0; #ifdef linux char line[512]; char *s, *value; @@ -489,8 +490,8 @@ static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (!strcmp( line, "Features" )) { - if (strstr(value, "crc32")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; + if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; continue; } } @@ -506,18 +507,19 @@ static inline void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) info->ProcessorLevel = value; valsize = sizeof(value); - if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) - info->ProcessorFeatureBits |= CPU_FEATURE_ARM_VFP_32; + if (!sysctlbyname("hw.floatingpoint", &value, &valsize, NULL, 0)) features |= CPU_FEATURE_ARM_VFP_32; #else FIXME("CPU Feature detection not implemented.\n"); #endif info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM; + info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; } #elif defined(__aarch64__) static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) { + ULONGLONG features = 0; #ifdef linux char line[512]; char *s, *value; @@ -548,8 +550,8 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) } if (!strcmp( line, "Features" )) { - if (strstr(value, "crc32")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRC32; - if (strstr(value, "aes")) info->ProcessorFeatureBits |= CPU_FEATURE_ARM_V8_CRYPTO; + if (strstr(value, "crc32")) features |= CPU_FEATURE_ARM_V8_CRC32; + if (strstr(value, "aes")) features |= CPU_FEATURE_ARM_V8_CRYPTO; continue; } } @@ -560,6 +562,7 @@ static void get_cpuinfo( SYSTEM_CPU_INFORMATION *info ) #endif info->ProcessorLevel = max(info->ProcessorLevel, 8); info->ProcessorArchitecture = PROCESSOR_ARCHITECTURE_ARM64; + info->ProcessorFeatureBits = cpu_features.ProcessorFeatureBits = features; } #endif /* End architecture specific feature detection for CPUs */

1 0

Alexandre Julliard : ntdll/tests: Mark some tests as todo for ARM64.
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: e0f98c0ce96f5575d3e167de4e7647ba2529bc0d URL: https://gitlab.winehq.org/wine/wine/-/commit/e0f98c0ce96f5575d3e167de4e7647… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 15 16:31:26 2023 +0200 ntdll/tests: Mark some tests as todo for ARM64. --- dlls/ntdll/tests/wow64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 07375f16082..99f6a6dec65 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -540,6 +540,7 @@ static void test_cross_process_notifications( HANDLE process, void *ptr ) FlushInstructionCache( process, addr, 0x1234 ); entry = pop_from_work_list( &list->work_list ); + todo_wine_if (current_machine == IMAGE_FILE_MACHINE_ARM64) entry = expect_cross_work_entry( list, entry, CrossProcessFlushCache, addr, 0x1234, 0xcccccccc, 0xcccccccc, 0xcccccccc, 0xcccccccc ); ok( !entry, "not at end of list\n" ); @@ -1084,6 +1085,7 @@ static void test_image_mappings(void) } else if (current_machine == IMAGE_FILE_MACHINE_ARM64) { + todo_wine ok( status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH, "NtMapViewOfSection returned %08lx\n", status ); NtUnmapViewOfSection( process, ptr ); }

1 0

Paul Gofman : d3dx9: Handle special adjacency index value in d3dx9_mesh_OptimizeInplace().
by Alexandre Julliard Sept. 15, 2023

Sept. 15, 2023

Module: wine Branch: master Commit: 629c2f90d69a354aacc3a9c04fbde0321664d0b3 URL: https://gitlab.winehq.org/wine/wine/-/commit/629c2f90d69a354aacc3a9c04fbde0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Sep 14 16:20:08 2023 -0600 d3dx9: Handle special adjacency index value in d3dx9_mesh_OptimizeInplace(). --- dlls/d3dx9_36/mesh.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f033ac14cb7..47a0cadde67 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -1624,6 +1624,13 @@ static HRESULT remap_faces_for_attrsort(struct d3dx9_mesh *This, const DWORD *in return D3D_OK; } +static DWORD adjacency_remap(DWORD *face_remap, DWORD index) +{ + if (index == 0xffffffff) + return index; + return face_remap[index]; +} + static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, const DWORD *adjacency_in, DWORD *adjacency_out, DWORD *face_remap_out, ID3DXBuffer **vertex_remap_out) { @@ -1778,9 +1785,10 @@ static HRESULT WINAPI d3dx9_mesh_OptimizeInplace(ID3DXMesh *iface, DWORD flags, for (i = 0; i < This->numfaces; i++) { DWORD old_pos = i * 3; DWORD new_pos = face_remap[i] * 3; - adjacency_out[new_pos++] = face_remap[adjacency_in[old_pos++]]; - adjacency_out[new_pos++] = face_remap[adjacency_in[old_pos++]]; - adjacency_out[new_pos++] = face_remap[adjacency_in[old_pos++]]; + + adjacency_out[new_pos++] = adjacency_remap(face_remap, adjacency_in[old_pos++]); + adjacency_out[new_pos++] = adjacency_remap(face_remap, adjacency_in[old_pos++]); + adjacency_out[new_pos] = adjacency_remap(face_remap, adjacency_in[old_pos]); } } else { memcpy(adjacency_out, adjacency_in, This->numfaces * 3 * sizeof(*adjacency_out));

1 0