wine-commits February 2022

wine-commits@winehq.org

2 participants
1495 discussions

Paul Gofman : server: Always update cached socket name after connect.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 4c1a288f6347522600c9f3561be62c002c631b30 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c1a288f6347522600c9f356… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 7 19:14:45 2022 +0300 server: Always update cached socket name after connect. Fixes a regression introduced by 5c009c17b3a212c3f5b0034c465077c0c593daae. For IPV6 socket already bound with bind() with IPV6_V6ONLY set to 0 the address returned by getsockname() may change after it is connected to a IPV4 peer (e. g., from :: to ::ffff:192.0.2.128). The effect of blamed commit is that before that Unix getsockname() was called for each ws2_32 getsockname() and after the commit the socket name is cached at bind and connect. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/sock.c b/server/sock.c index 40fb0cac535..512b7c0f78e 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2340,7 +2340,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) allow_fd_caching( sock->fd ); unix_len = sizeof(unix_addr); - if (!sock->bound && !getsockname( unix_fd, &unix_addr.addr, &unix_len )) + if (!getsockname( unix_fd, &unix_addr.addr, &unix_len )) sock->addr_len = sockaddr_from_unix( &unix_addr, &sock->addr.addr, sizeof(sock->addr) ); sock->bound = 1;

1 0

Stefan Dösinger : ddraw/tests: Mark random WARP behavior broken in test_ck_default.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 9da1a5059dfcd8722bd0783a898042bb4735412e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da1a5059dfcd8722bd0783a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 20:07:48 2022 +0300 ddraw/tests: Mark random WARP behavior broken in test_ck_default. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 11168d4a74d..304671558af 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -2067,7 +2067,11 @@ static void test_ck_default(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + /* Color keying is supposed to be on by default in ddraw1, but used only if a ckey is set. + * WARP begs to differ. The default of D3DRENDERSTATE_COLORKEYENABLE is random, and it + * doesn't mind the absence of a color key (the latter part affects other tests, not this one). */ + ok(compare_color(color, 0x0000ff00, 1) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x000000ff, 1)), + "Got unexpected color 0x%08x.\n", color); hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr);

1 0

Stefan Dösinger : ddraw/tests: Disable color keying in ddraw1 test_texture_load.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: cbd14598d55d98a9e6f878b9ee74a72613641462 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbd14598d55d98a9e6f878b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Feb 6 20:07:47 2022 +0300 ddraw/tests: Disable color keying in ddraw1 test_texture_load. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index c5afeff2343..11168d4a74d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -11872,6 +11872,8 @@ static void test_texture_load(void) emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 4); emit_texture_load(&ptr, dst_texture_handle, src_texture_handle); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, dst_texture_handle); + /* WARP randomly applies color keying without having a key set. */ + emit_set_rs(&ptr, D3DRENDERSTATE_COLORKEYENABLE, FALSE); emit_tquad(&ptr, 0); emit_end(&ptr); inst_length = (BYTE *)ptr - (BYTE *)exec_desc.lpData - sizeof(tquad);

1 0

Stefan Dösinger : ddraw/tests: Skip a crashy test on WARP.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: d41ca1818cfd8ad223f4e9c06c704848b8b83a86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d41ca1818cfd8ad223f4e9c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 7 20:00:44 2022 +0300 ddraw/tests: Skip a crashy test on WARP. ddraw1 doesn't draw, so presumably not affected. Can't find any crashes in the testbot history http://test.winehq.org/data/4364ff8d5c0387edd6fae142affe8e844b291518/win81_… http://test.winehq.org/data/d03984709d87d6eaa0e2e7746f0db5d8fdf81b5a/win150… I haven't found any examples of ddraw7 crashing in this test. Doesn't mean there aren't any. Let's wait and see. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 20 ++++++++++++++------ dlls/ddraw/tests/ddraw4.c | 11 ++++++++++- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 625776c652c..1285fa1b682 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1076,6 +1076,17 @@ static void test_coop_level_d3d_state(void) window = create_window(); ddraw = create_ddraw(); ok(!!ddraw, "Failed to create a ddraw object.\n"); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw2 crashes in EndScene, and if it doesn't crash it fails with + * DDERR_SURFACELOST on WARP. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + IDirectDraw2_Release(ddraw); + DestroyWindow(window); + return; + } + if (!(device = create_device(ddraw, window, DDSCL_NORMAL))) { skip("Failed to create a 3D device, skipping test.\n"); @@ -1159,12 +1170,9 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice2_DrawPrimitive(device, D3DPT_TRIANGLESTRIP, D3DVT_LVERTEX, quad, ARRAY_SIZE(quad), 0); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirect3DDevice2_EndScene(device); - ok(hr == DD_OK || broken(ddraw_is_warp(ddraw) && hr == DDERR_SURFACELOST), "Got unexpected hr %#x.\n", hr); - if (hr == DD_OK) - { - color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); - } + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + color = get_surface_color(rt, 320, 240); + ok(compare_color(color, 0x0000ff80, 1), "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 9b8acb674e3..399ef157497 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1301,6 +1301,14 @@ static void test_coop_level_d3d_state(void) hr = IDirect3D3_QueryInterface(d3d, &IID_IDirectDraw4, (void **)&ddraw); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); IDirect3D3_Release(d3d); + + if (ddraw_is_warp(ddraw)) + { + /* ddraw4 occasionally crashes in GetRenderTarget. */ + win_skip("Skipping test that crashes WARP occasionally.\n"); + goto done; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(rt); @@ -1324,6 +1332,7 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DDevice3_GetRenderTarget(device, &surface); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(surface == rt, "Got unexpected surface %p.\n", surface); + IDirectDrawSurface4_Release(surface); hr = IDirect3DDevice3_GetRenderState(device, D3DRENDERSTATE_ZENABLE, &value); ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); ok(!!value, "Got unexpected z-enable state %#x.\n", value); @@ -1349,8 +1358,8 @@ static void test_coop_level_d3d_state(void) || broken(ddraw_is_warp(ddraw) && compare_color(color, 0x0000ff00, 0)), "Got unexpected color 0x%08x.\n", color); +done: destroy_viewport(device, viewport); - IDirectDrawSurface4_Release(surface); IDirectDrawSurface4_Release(rt); IDirect3DDevice3_Release(device); IDirectDraw4_Release(ddraw);

1 0

Hans Leidekker : winhttp: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 120244aefe4987d71d389fefe7121ed0db3e300e URL: https://source.winehq.org/git/wine.git/?a=commit;h=120244aefe4987d71d389fef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:20:54 2022 +0100 winhttp: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/Makefile.in | 1 - dlls/winhttp/handle.c | 10 ++--- dlls/winhttp/net.c | 39 +++++++++-------- dlls/winhttp/request.c | 106 +++++++++++++++++++++++------------------------ dlls/winhttp/session.c | 76 ++++++++++++++++----------------- dlls/winhttp/url.c | 8 ++-- 6 files changed, 119 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=120244aefe4987d71d38…

1 0

Hans Leidekker : winhttp/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 3c695e3ce9a8b7f19bc085adce5c66b299040d0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c695e3ce9a8b7f19bc085ad… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:20:53 2022 +0100 winhttp/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/Makefile.in | 1 - dlls/winhttp/tests/notification.c | 422 ++++---- dlls/winhttp/tests/url.c | 190 ++-- dlls/winhttp/tests/winhttp.c | 1902 ++++++++++++++++++------------------- 4 files changed, 1246 insertions(+), 1269 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3c695e3ce9a8b7f19bc0…

1 0

Hans Leidekker : winhttp/tests: Remove unused include.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: ce76fc6f68c192d60eedfbcd43960db7bca0191d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce76fc6f68c192d60eedfbcd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:20:52 2022 +0100 winhttp/tests: Remove unused include. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 053f8315fec..21af2761323 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -32,7 +32,6 @@ #include <httprequestid.h> #include "wine/test.h" -#include "wine/heap.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);

1 0

Hans Leidekker : msi/tests: Correctly free usersid.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 1bab386adffce4cd5589cec43b407d53230ef1cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bab386adffce4cd5589cec4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 8 11:18:07 2022 +0100 msi/tests: Correctly free usersid. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/action.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 7de4fb7c52c..224637eb286 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -3022,7 +3022,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_product(void) @@ -3259,7 +3259,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static void test_publish_features(void) @@ -3384,7 +3384,7 @@ error: DeleteFileA(msifile); DeleteFileA("msitest\\maximus"); RemoveDirectoryA("msitest"); - free(usersid); + LocalFree(usersid); } static LPSTR reg_get_val_str(HKEY hkey, LPCSTR name)

1 0

Rémi Bernon : dinput/tests: Fix printf warnings with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 19a5881b0b9b29b084a986bfc334513b4dad84cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=19a5881b0b9b29b084a986bf… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:40 2022 +0100 dinput/tests: Fix printf warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/Makefile.in | 1 - dlls/dinput/tests/device.c | 126 ++-- dlls/dinput/tests/device8.c | 604 +++++++++---------- dlls/dinput/tests/dinput.c | 210 +++---- dlls/dinput/tests/driver_hid.c | 122 ++-- dlls/dinput/tests/driver_hid.h | 6 +- dlls/dinput/tests/force_feedback.c | 1120 ++++++++++++++++++------------------ dlls/dinput/tests/hid.c | 886 ++++++++++++++-------------- dlls/dinput/tests/hotplug.c | 82 +-- dlls/dinput/tests/joystick.c | 272 ++++----- dlls/dinput/tests/joystick8.c | 1032 ++++++++++++++++----------------- dlls/dinput/tests/keyboard.c | 110 ++-- dlls/dinput/tests/mouse.c | 80 +-- 13 files changed, 2325 insertions(+), 2326 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=19a5881b0b9b29b084a9…

1 0

Rémi Bernon : dinput: Fix printf warnings with long types.
by Alexandre Julliard 08 Feb '22

08 Feb '22

Module: wine Branch: master Commit: 9f472f00d88a813adc13d7a8f5de091accafcb52 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f472f00d88a813adc13d7a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 8 09:55:39 2022 +0100 dinput: Fix printf warnings with long types. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/Makefile.in | 2 +- dlls/dinput/device.c | 53 +++++++++++------------ dlls/dinput/dinput_main.c | 54 +++++++++++------------ dlls/dinput/joystick_hid.c | 106 ++++++++++++++++++++++----------------------- dlls/dinput/keyboard.c | 12 ++--- dlls/dinput/mouse.c | 12 ++--- dlls/dinput8/Makefile.in | 2 +- 7 files changed, 120 insertions(+), 121 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9f472f00d88a813adc13…

1 0

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 February 2022