wine-commits September 2022

wine-commits@winehq.org

1 participants
553 discussions

Zebediah Figura : win32u: Copy directly into the union pointer in unpack_message().
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: c73999f169d54aea56796c1ebd71667b5ebf3b8d URL: https://gitlab.winehq.org/wine/wine/-/commit/c73999f169d54aea56796c1ebd7166… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:19:15 2022 -0500 win32u: Copy directly into the union pointer in unpack_message(). This works around a spurious gcc warning: ../wine/dlls/win32u/message.c: In function ‘unpack_message.constprop’: ../wine/dlls/win32u/message.c:359:9: error: writing 28 bytes into a region of size 4 [-Werror=stringop-overflow=] 359 | memcpy( &ps->wp, &wp, sizeof(wp) ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from ../wine/dlls/win32u/win32u_private.h:29, from ../wine/dlls/win32u/message.c:30: ../wine/include/ntuser.h:549:15: note: destination object ‘hwnd’ of size 4 549 | UINT hwnd; | ^~~~ --- dlls/win32u/message.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index f4f134e213b..57e9b26b33d 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -356,7 +356,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa wp.cx = ps->wp.cx; wp.cy = ps->wp.cy; wp.flags = ps->wp.flags; - memcpy( &ps->wp, &wp, sizeof(wp) ); + memcpy( ps, &wp, sizeof(wp) ); break; } case WM_WINE_KEYBOARD_LL_HOOK:

1 0

Zebediah Figura : ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: f66b49a4968a383bccab03dc200d5448a3ab15f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/f66b49a4968a383bccab03dc200d54… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:21:48 2022 -0500 ntdll: Calculate the necessary length after calling snprintf() in SystemWineVersionInformation. This works around a spurious gcc warning: ../wine/dlls/ntdll/unix/system.c: In function ‘NtQuerySystemInformation’: ../wine/dlls/ntdll/unix/system.c:3176:36: error: ‘%s’ directive output between 0 and 2147483644 bytes may cause result to exceed ‘INT_MAX’ [-Werror=format-truncation=] 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~ ~~~~~~~~~~ ../wine/dlls/ntdll/unix/system.c:3176:9: note: ‘snprintf’ output between 8 and 2147483780 bytes into a destination of size 4294967295 3176 | snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- dlls/ntdll/unix/system.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 83e0521a3c9..136fc80adf1 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -3172,8 +3172,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, struct utsname buf; uname( &buf ); - len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; snprintf( info, size, "%s%c%s%c%s%c%s", version, 0, wine_build, 0, buf.sysname, 0, buf.release ); + len = strlen(version) + strlen(wine_build) + strlen(buf.sysname) + strlen(buf.release) + 4; if (size < len) ret = STATUS_INFO_LENGTH_MISMATCH; break; }

1 0

Zebediah Figura : libwine: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: d17fe0a7920c09a16e75b74213ae0e8bbbd1cba0 URL: https://gitlab.winehq.org/wine/wine/-/commit/d17fe0a7920c09a16e75b74213ae0e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:15:30 2022 -0500 libwine: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/libs/wine/mmap.c: In function ‘wine_mmap_add_reserved_area_obsolete’: ../wine/libs/wine/mmap.c:504:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 504 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ --- libs/wine/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index ad51153d039..1f8ae3c7720 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -501,7 +501,7 @@ void wine_mmap_add_reserved_area_obsolete( void *addr, size_t size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -560,7 +560,7 @@ void wine_mmap_remove_reserved_area_obsolete( void *addr, size_t size, int unmap struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0

Zebediah Figura : ntdll: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 539ef7c462852cf9b528e9d7b8fc6999ed8d5f2d URL: https://gitlab.winehq.org/wine/wine/-/commit/539ef7c462852cf9b528e9d7b8fc69… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Sep 11 17:58:45 2022 -0500 ntdll: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/dlls/ntdll/unix/virtual.c: In function ‘mmap_add_reserved_area’: ../wine/dlls/ntdll/unix/virtual.c:241:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 241 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 96a5e095d16..e0aa410373e 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -238,7 +238,7 @@ static void mmap_add_reserved_area( void *addr, SIZE_T size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -287,7 +287,7 @@ static void mmap_remove_reserved_area( void *addr, SIZE_T size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0

Alexandre Julliard : advapi32/tests: Mark some failing tests as todo.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 5965771a9c8213eb85079dc3efa02609dfe75855 URL: https://gitlab.winehq.org/wine/wine/-/commit/5965771a9c8213eb85079dc3efa026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 14:07:13 2022 +0200 advapi32/tests: Mark some failing tests as todo. --- dlls/advapi32/tests/lsa.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/lsa.c b/dlls/advapi32/tests/lsa.c index 5c00298d41e..c43f313d77e 100644 --- a/dlls/advapi32/tests/lsa.c +++ b/dlls/advapi32/tests/lsa.c @@ -402,9 +402,11 @@ static void test_LsaLookupSids(void) /* English and Japanese */ check_unicode_string(&names[0].Name, L"Everyone"); else if (wcscmp(langW, L"0407") == 0) /* German */ - check_unicode_string(&names[0].Name, L"Jeder"); + todo_wine ok(!wcsicmp(names[0].Name.Buffer, L"Jeder"), "missing translation %s\n", + debugstr_w(names[0].Name.Buffer)); else if (wcscmp(langW, L"040C") == 0) /* French */ - check_unicode_string(&names[0].Name, L"Tout le monde"); + todo_wine ok(!wcsicmp(names[0].Name.Buffer, L"Tout le monde"), "missing translation %s\n", + debugstr_w(names[0].Name.Buffer)); else trace("<Everyone-group>.Name=%s\n", debugstr_w(names[0].Name.Buffer));

1 0

Alexandre Julliard : user32/tests: Don't print debug traces by default.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: 46164f40ab50ba7d4135d8c2226b4488269262a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/46164f40ab50ba7d4135d8c2226b44… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 10:22:45 2022 +0200 user32/tests: Don't print debug traces by default. This reduces the test output to stay within the 32kB limit. --- dlls/user32/tests/msg.c | 310 ++++++++++++++++++++++++------------------------ 1 file changed, 156 insertions(+), 154 deletions(-)

1 0

Alexandre Julliard : user32/tests: Only report the first todo of a failed message sequence.
by Alexandre Julliard 16 Sep '22

16 Sep '22

Module: wine Branch: master Commit: a72bffe768c9fe462010d7e40e20226322fb82c7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72bffe768c9fe462010d7e40e2022… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Sep 16 10:18:29 2022 +0200 user32/tests: Only report the first todo of a failed message sequence. This reduces the test output to stay within the 32kB limit. --- dlls/user32/tests/msg.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8bed81b6faf..2c46d24a98f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2713,6 +2713,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex const struct recvd_message *actual; int failcount = 0, dump = 0; unsigned int count = 0; + BOOL is_wine = !strcmp(winetest_platform, "wine"); add_message(&end_of_sequence); @@ -2729,11 +2730,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: in msg 0x%04x expecting wParam 0x%Ix got 0x%Ix\n", context, count, expected->message, expected->wParam, actual->wParam); } + if (is_wine) goto done; } else { @@ -2750,11 +2752,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: in msg 0x%04x expecting lParam 0x%Ix got 0x%Ix\n", context, count, expected->message, expected->lParam, actual->lParam); } + if (is_wine) goto done; } else { @@ -2776,11 +2779,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex { todo_wine { failcount ++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x should %shave been sent by DefWindowProc\n", context, count, expected->message, (expected->flags & defwinproc) ? "" : "NOT "); } + if (is_wine) goto done; } else { @@ -2831,23 +2835,25 @@ static void ok_sequence_(const struct message *expected_list, const char *contex ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || ((expected->flags & kbd_hook) && !hKBD_hook) || - ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) + ((expected->flags & winevent_hook_todo) && is_wine)) { if ((expected->flags & winevent_hook_todo) && hEvent_hook) { - todo_wine { + static int reported; + if (!reported++) todo_wine { ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, count, expected->message, actual->message); } } expected++; + goto done; } else if (todo) { failcount++; todo_wine { - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg 0x%04x was expected, but got msg 0x%04x instead\n", context, count, expected->message, actual->message); } @@ -2868,7 +2874,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex while (expected->message && ((expected->flags & optional) || ((expected->flags & hook) && !hCBT_hook) || ((expected->flags & winevent_hook) && !hEvent_hook) || - ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine")))) + ((expected->flags & winevent_hook_todo) && is_wine))) { if ((expected->flags & winevent_hook_todo) && hEvent_hook) { @@ -2878,6 +2884,7 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } } expected++; + goto done; } if (todo) @@ -2885,11 +2892,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex todo_wine { if (expected->message || actual->message) { failcount++; - if (strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line) (FALSE, "%s: %u: the msg sequence is not complete: expected %04x - actual %04x\n", context, count, expected->message, actual->message); } } + if (is_wine) goto done; } else { @@ -2902,12 +2910,12 @@ static void ok_sequence_(const struct message *expected_list, const char *contex } if( todo && !failcount) /* succeeded yet marked todo */ todo_wine { - if (!strcmp(winetest_platform, "wine")) dump++; + dump++; ok_( file, line)( TRUE, "%s: marked \"todo_wine\" but succeeds\n", context); } done: - if (dump) dump_sequence(expected_list, context, file, line); + if (dump && (!is_wine || winetest_debug > 1)) dump_sequence(expected_list, context, file, line); flush_sequence(); }

1 0

Eric Pouech : d3d11/tests: Introduce a clear_rtv() helper.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 5fa25d00d7edca295e38030006b14f4059276116 URL: https://gitlab.winehq.org/wine/wine/-/commit/5fa25d00d7edca295e38030006b14f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 15 19:37:20 2022 +0200 d3d11/tests: Introduce a clear_rtv() helper. This fixes warnings with gcc 12.2. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d11/tests/d3d11.c | 69 ++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 31 deletions(-)

1 0

Eric Pouech : d3d10core/tests: Introduce a clear_backbuffer_rtv() helper.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 6ba6f54f56c4ac3e23eba998813ed9b8a4e51499 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ba6f54f56c4ac3e23eba998813ed9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 15 19:37:20 2022 +0200 d3d10core/tests: Introduce a clear_backbuffer_rtv() helper. This fixes warnings with gcc 12.2. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 45 +++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7d0e3601403..908b11b7435 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1406,6 +1406,13 @@ static void release_test_context_(unsigned int line, struct d3d10core_test_conte ok_(__FILE__, line)(!ref, "Device has %lu references left.\n", ref); } +static void clear_backbuffer_rtv(struct d3d10core_test_context *test_context, const struct vec4 *v) +{ + /* Cast to (const float *) instead of passing &v->x, since gcc warns about + * overreading a float[4] from a float otherwise. */ + ID3D10Device_ClearRenderTargetView(test_context->device, test_context->backbuffer_rtv, (const float *)v); +} + #define draw_quad(context) draw_quad_vs_(__LINE__, context, NULL, 0) #define draw_quad_vs(a, b, c) draw_quad_vs_(__LINE__, a, b, c) static void draw_quad_vs_(unsigned int line, struct d3d10core_test_context *context, @@ -13443,7 +13450,7 @@ static void test_face_culling(void) device = test_context.device; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); @@ -13451,7 +13458,7 @@ static void test_face_culling(void) ccw_vb = create_buffer(device, D3D10_BIND_VERTEX_BUFFER, sizeof(ccw_quad), ccw_quad); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff0000ff, 0); @@ -13476,12 +13483,12 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state); test_context.vb = cw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, tests[i].expected_cw ? 0xff00ff00 : 0xff0000ff, 0); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, tests[i].expected_ccw ? 0xff00ff00 : 0xff0000ff, 0); @@ -13502,11 +13509,11 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state); test_context.vb = cw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000, 0); @@ -13522,14 +13529,14 @@ static void test_face_culling(void) ID3D10Device_RSSetState(device, state); test_context.vb = cw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); if (!broken_warp) check_texture_color(test_context.backbuffer, 0xffff0000 , 0); else win_skip("Broken WARP.\n"); test_context.vb = ccw_vb; - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xff00ff00, 0); @@ -13573,22 +13580,22 @@ static void test_line_antialiasing_blending(void) ok(SUCCEEDED(hr), "Failed to create blend state, hr %#lx.\n", hr); ID3D10Device_OMSetBlendState(device, blend_state, NULL, D3D10_DEFAULT_SAMPLE_MASK); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + clear_backbuffer_rtv(&test_context, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xe2007fcc, 1); ID3D10Device_OMSetBlendState(device, NULL, NULL, D3D10_DEFAULT_SAMPLE_MASK); ID3D10BlendState_Release(blend_state); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + clear_backbuffer_rtv(&test_context, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); @@ -13607,11 +13614,11 @@ static void test_line_antialiasing_blending(void) ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#lx.\n", hr); ID3D10Device_RSSetState(device, rasterizer_state); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); draw_color_quad(&test_context, &green); check_texture_color(test_context.backbuffer, 0x7f00ff00, 1); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &green.x); + clear_backbuffer_rtv(&test_context, &green); draw_color_quad(&test_context, &red); check_texture_color(test_context.backbuffer, 0xcc0000ff, 1); @@ -15636,7 +15643,7 @@ static void test_stream_output_resume(void) ID3D10Device_GSSetShader(device, gs); ID3D10Device_GSSetConstantBuffers(device, 0, 1, &cb); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); check_texture_color(test_context.backbuffer, 0xffffffff, 0); /* Draw into a SO buffer and then immediately destroy it, to make sure that @@ -17384,7 +17391,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); srv_desc.Format = tests[j].texture_format == DXGI_FORMAT_R8G8B8A8_UINT ? DXGI_FORMAT_R8G8B8A8_UINT : DXGI_FORMAT_R8G8B8A8_UNORM; @@ -17466,7 +17473,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -17498,7 +17505,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); + clear_backbuffer_rtv(&test_context, &white); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -19183,7 +19190,7 @@ static void test_dynamic_map_synchronization(void) hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &test_context.vb); ok(hr == S_OK, "Failed to create vertex buffer, hr %#lx.\n", hr); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &red.x); + clear_backbuffer_rtv(&test_context, &red); for (y = 0; y < 200; ++y) {

1 0

Eric Pouech : d3d10core/tests: Fix erroneous color parameter.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: ae890d5442d74c16b2b7916734674e5fc1bdbbf8 URL: https://gitlab.winehq.org/wine/wine/-/commit/ae890d5442d74c16b2b7916734674e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 15 19:37:19 2022 +0200 d3d10core/tests: Fix erroneous color parameter. (Spotted by warnings emitted by GCC 12.2). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/d3d10core/tests/d3d10core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index acc85f03b23..7d0e3601403 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -17466,7 +17466,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.w); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D; @@ -17498,7 +17498,7 @@ static void test_generate_mips(void) ID3D10Device_GenerateMips(device, srv); - ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.w); + ID3D10Device_ClearRenderTargetView(device, test_context.backbuffer_rtv, &white.x); srv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; srv_desc.ViewDimension = D3D10_SRV_DIMENSION_TEXTURE2D;

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2022