March 2022 - Wine-commits - list.winehq.org

Zebediah Figura : tests: Use only one heap for textures in the d3d12 shader runner.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: vkd3d Branch: master Commit: 0ca2444e9b43caeee6fc14f349b1b2d397b3b229 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0ca2444e9b43caeee6fc14f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sat Mar 12 15:02:15 2022 -0600 tests: Use only one heap for textures in the d3d12 shader runner. The d3d12 specification forbids simultaneously binding more than one heap of a given type. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/shader_runner.c | 2 +- tests/shader_runner.h | 3 +++ tests/shader_runner_d3d12.c | 24 ++++++++++++++++++------ 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 1808a581..8cfdf052 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -61,7 +61,7 @@ typedef int HRESULT; #include "vkd3d_test.h" #include "shader_runner.h" -static void VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2) fatal_error(const char *format, ...) +void fatal_error(const char *format, ...) { va_list args; diff --git a/tests/shader_runner.h b/tests/shader_runner.h index 822a863f..6958191d 100644 --- a/tests/shader_runner.h +++ b/tests/shader_runner.h @@ -21,6 +21,7 @@ #include "vkd3d_d3dcommon.h" #include "vkd3d_d3d12.h" #include "vkd3d_dxgiformat.h" +#include "vkd3d_common.h" #include "utils.h" enum shader_model @@ -89,6 +90,8 @@ struct shader_runner_ops void (*probe_vec4)(struct shader_context *context, const RECT *rect, const struct vec4 *v, unsigned int ulps); }; +void fatal_error(const char *format, ...) VKD3D_NORETURN VKD3D_PRINTF_FUNC(1, 2); + void run_shader_tests(struct shader_context *context, int argc, char **argv, const struct shader_runner_ops *ops); #ifdef _WIN32 diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 00bb9e41..571efeac 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -29,7 +29,6 @@ struct d3d12_texture struct texture t; D3D12_DESCRIPTOR_RANGE descriptor_range; - ID3D12DescriptorHeap *heap; ID3D12Resource *resource; unsigned int root_index; }; @@ -44,6 +43,8 @@ struct d3d12_shader_context struct shader_context c; struct test_context test_context; + + ID3D12DescriptorHeap *heap; }; static struct d3d12_shader_context *d3d12_shader_context(struct shader_context *c) @@ -77,6 +78,8 @@ static ID3D10Blob *compile_shader(const char *source, enum shader_model shader_m return blob; } +#define MAX_RESOURCE_DESCRIPTORS 256 + static struct texture *d3d12_runner_create_texture(struct shader_context *c, const struct texture_params *params) { struct d3d12_shader_context *context = d3d12_shader_context(c); @@ -85,11 +88,17 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con D3D12_SUBRESOURCE_DATA resource_data; struct d3d12_texture *texture; + if (!context->heap) + context->heap = create_gpu_descriptor_heap(device, + D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, MAX_RESOURCE_DESCRIPTORS); + + if (params->slot >= MAX_RESOURCE_DESCRIPTORS) + fatal_error("Resource slot %u is too high; please increase MAX_RESOURCE_DESCRIPTORS.\n", params->slot); + texture = calloc(1, sizeof(*texture)); texture->t.slot = params->slot; - texture->heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); texture->resource = create_default_texture(device, params->width, params->height, params->format, 0, D3D12_RESOURCE_STATE_COPY_DEST); resource_data.pData = params->data; @@ -99,7 +108,7 @@ static struct texture *d3d12_runner_create_texture(struct shader_context *c, con transition_resource_state(test_context->list, texture->resource, D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_NON_PIXEL_SHADER_RESOURCE | D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); ID3D12Device_CreateShaderResourceView(device, texture->resource, - NULL, get_cpu_descriptor_handle(test_context, texture->heap, 0)); + NULL, get_cpu_descriptor_handle(test_context, context->heap, params->slot)); return &texture->t; } @@ -108,7 +117,6 @@ static void d3d12_runner_destroy_texture(struct shader_context *c, struct textur { struct d3d12_texture *texture = d3d12_texture(t); - ID3D12DescriptorHeap_Release(texture->heap); ID3D12Resource_Release(texture->resource); free(texture); } @@ -214,7 +222,7 @@ static void d3d12_runner_draw_quad(struct shader_context *c) struct d3d12_texture *texture = d3d12_texture(context->c.textures[i]); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, texture->root_index, - get_gpu_descriptor_handle(test_context, texture->heap, 0)); + get_gpu_descriptor_handle(test_context, context->heap, texture->t.slot)); } ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &test_context->rtv, false, NULL); @@ -266,12 +274,16 @@ void run_shader_tests_d3d12(int argc, char **argv) .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, }; - struct d3d12_shader_context context; + struct d3d12_shader_context context = {0}; parse_args(argc, argv); enable_d3d12_debug_layer(argc, argv); init_adapter_info(); init_test_context(&context.test_context, &desc); + run_shader_tests(&context.c, argc, argv, &d3d12_runner_ops); + + if (context.heap) + ID3D12DescriptorHeap_Release(context.heap); destroy_test_context(&context.test_context); }

1 0

Zebediah Figura : vkd3d-shader/sm4: Recognise the msad opcode.
by Alexandre Julliard 14 Mar '22

14 Mar '22

Module: vkd3d Branch: master Commit: fa17a170b10f6e1ccee062b785128a70836d08f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fa17a170b10f6e1ccee062b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 14 11:55:02 2022 +0100 vkd3d-shader/sm4: Recognise the msad opcode. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 1 + libs/vkd3d-shader/sm4.h | 1 + libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + 4 files changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1ab71ca4..17be2306 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -837,6 +837,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DDIV, VKD3DSIH_DDIV, "d", "dd"}, {VKD3D_SM5_OP_DFMA, VKD3DSIH_DFMA, "d", "ddd"}, {VKD3D_SM5_OP_DRCP, VKD3DSIH_DRCP, "d", "d"}, + {VKD3D_SM5_OP_MSAD, VKD3DSIH_MSAD, "u", "uuu"}, {VKD3D_SM5_OP_DTOI, VKD3DSIH_DTOI, "i", "d"}, {VKD3D_SM5_OP_DTOU, VKD3DSIH_DTOU, "u", "d"}, {VKD3D_SM5_OP_ITOD, VKD3DSIH_ITOD, "d", "i"}, diff --git a/libs/vkd3d-shader/sm4.h b/libs/vkd3d-shader/sm4.h index 62bb4d12..fd388c81 100644 --- a/libs/vkd3d-shader/sm4.h +++ b/libs/vkd3d-shader/sm4.h @@ -350,6 +350,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DDIV = 0xd2, VKD3D_SM5_OP_DFMA = 0xd3, VKD3D_SM5_OP_DRCP = 0xd4, + VKD3D_SM5_OP_MSAD = 0xd5, VKD3D_SM5_OP_DTOI = 0xd6, VKD3D_SM5_OP_DTOU = 0xd7, VKD3D_SM5_OP_ITOD = 0xd8, diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index c292c847..6c30edc9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -225,6 +225,7 @@ static const char * const shader_opcode_names[] = [VKD3DSIH_MOV ] = "mov", [VKD3DSIH_MOVA ] = "mova", [VKD3DSIH_MOVC ] = "movc", + [VKD3DSIH_MSAD ] = "msad", [VKD3DSIH_MUL ] = "mul", [VKD3DSIH_NE ] = "ne", [VKD3DSIH_NOP ] = "nop", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 01e090cc..21f23709 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -328,6 +328,7 @@ enum vkd3d_shader_opcode VKD3DSIH_MOV, VKD3DSIH_MOVA, VKD3DSIH_MOVC, + VKD3DSIH_MSAD, VKD3DSIH_MUL, VKD3DSIH_NE, VKD3DSIH_NOP,

1 0

Alexandre Julliard : Wine release 7.4
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: website Branch: master Commit: 4157222205959695dd23081354ba22a314ed73a7 URL: https://source.winehq.org/git/website.git/?a=commit;h=4157222205959695dd230… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 11 21:49:45 2022 +0100 Wine release 7.4 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2022031101.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2022031101.xml b/news/en/2022031101.xml new file mode 100644 index 00000000..ca067583 --- /dev/null +++ b/news/en/2022031101.xml @@ -0,0 +1,17 @@ +<news> +<date>March 11, 2022</date> +<title>Wine 7.4 Released</title> +<body> + The Wine development release 7.4 is now available. + <a href="{$root}/announce/7.4">What's new</a> in this release: +<ul> + <li>'Light' theme enabled by default.</li> + <li>Bundled vkd3d library.</li> + <li>WineD3D, D3D12 and DXGI modules converted to PE.</li> + <li>More large scale cleanups to support 'long' type.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/7.x/wine-7.4.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Rémi Bernon : windows.gaming.input: Return correct error from DllGetActivationFactory.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 6ebdf1bab9eafb039078916bbc244b674423d6f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebdf1bab9eafb039078916b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 11 09:43:47 2022 +0100 windows.gaming.input: Return correct error from DllGetActivationFactory. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index c5b7f19c987..1ddd3a8fd23 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -169,7 +169,6 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); - HRESULT hr = REGDB_E_CLASSNOTREG; TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); @@ -178,13 +177,14 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** *factory = NULL; if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_RawGameController )) - hr = ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( controller_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) - hr = ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); + ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) - hr = IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); + IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); - return hr; + if (*factory) return S_OK; + return CLASS_E_CLASSNOTAVAILABLE; } BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved )

1 0

Rémi Bernon : windows.gaming.input: Always return S_OK from TryGetFactoryControllerFromGameController.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 0fc5a07770aaec7538538b29ad63fef41aebee3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc5a07770aaec7538538b29… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Mar 11 09:43:48 2022 +0100 windows.gaming.input: Always return S_OK from TryGetFactoryControllerFromGameController. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/hotplug.c | 7 ++----- dlls/windows.gaming.input/controller.c | 3 ++- dlls/windows.gaming.input/gamepad.c | 3 ++- dlls/windows.gaming.input/manager.c | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/tests/hotplug.c b/dlls/dinput/tests/hotplug.c index 24f913dc140..a2072ca16de 100644 --- a/dlls/dinput/tests/hotplug.c +++ b/dlls/dinput/tests/hotplug.c @@ -1059,7 +1059,6 @@ static void test_windows_gaming_input(void) hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_statics2, &custom_factory.ICustomGameControllerFactory_iface, game_controller, &tmp_game_controller ); - todo_wine ok( hr == S_OK, "TryGetFactoryControllerFromGameController returned %#lx\n", hr ); ok( !tmp_game_controller, "got controller %p\n", tmp_game_controller ); @@ -1126,10 +1125,9 @@ static void test_windows_gaming_input(void) hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_statics2, &custom_factory.ICustomGameControllerFactory_iface, game_controller, &tmp_game_controller ); - todo_wine ok( hr == S_OK, "TryGetFactoryControllerFromGameController returned %#lx\n", hr ); ok( tmp_game_controller == custom_controller.IGameController_outer, "got controller %p\n", tmp_game_controller ); - if (hr != S_OK) goto next; + if (!tmp_game_controller) goto next; hr = IGameController_QueryInterface( tmp_game_controller, &IID_IInspectable, (void **)&tmp_inspectable ); ok( hr == S_OK, "QueryInterface returned %#lx\n", hr ); ok( tmp_inspectable == (void *)tmp_game_controller, "got inspectable %p\n", tmp_inspectable ); @@ -1153,11 +1151,10 @@ static void test_windows_gaming_input(void) next: hr = IRawGameControllerStatics_FromGameController( statics, custom_controller.IGameController_outer, &tmp_raw_controller ); - todo_wine ok( hr == S_OK, "FromGameController returned %#lx\n", hr ); todo_wine ok( tmp_raw_controller == raw_controller, "got controller %p\n", tmp_raw_controller ); - if (hr == S_OK) IRawGameController_Release( tmp_raw_controller ); + if (tmp_raw_controller) IRawGameController_Release( tmp_raw_controller ); IGameController_Release( game_controller ); IRawGameController_Release( raw_controller ); diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 3e00da917e7..03a3ae398cf 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -459,9 +459,10 @@ static HRESULT WINAPI statics_FromGameController( IRawGameControllerStatics *ifa TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + *value = NULL; hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, game_controller, &controller ); - if (FAILED(hr)) return hr; + if (FAILED(hr) || !controller) return hr; hr = IGameController_QueryInterface( controller, &IID_IRawGameController, (void **)value ); IGameController_Release( controller ); diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index b815d5c0a13..7e72609a277 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -484,9 +484,10 @@ static HRESULT WINAPI statics2_FromGameController( IGamepadStatics2 *iface, IGam TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + *value = NULL; hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, game_controller, &controller ); - if (FAILED(hr)) return hr; + if (FAILED(hr) || !controller) return hr; hr = IGameController_QueryInterface( controller, &IID_IGamepad, (void **)value ); IGameController_Release( controller ); diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 393b5a850c8..af15849c521 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -392,7 +392,7 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage LeaveCriticalSection( &manager_cs ); - if (!found) return E_FAIL; + if (!found) *value = NULL; return S_OK; }

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_MULTICAST_HOPS.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 67ebbbf3368780c59f3109d89ee25d08efb8e39e URL: https://source.winehq.org/git/wine.git/?a=commit;h=67ebbbf3368780c59f3109d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:48 2022 +0300 ws2_32: Manage shorter length for IPV6_MULTICAST_HOPS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a9e0898e2d7..f4e2f8f172c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1828,6 +1828,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVHOPLIMIT, optval, optlen ); case IPV6_MULTICAST_HOPS: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_HOPS, optval, optlen ); case IPV6_MULTICAST_IF: @@ -3193,7 +3199,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVHOPLIMIT, optval, optlen ); case IPV6_MULTICAST_HOPS: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_HOPS, (char *)&value, sizeof(value) ); case IPV6_MULTICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 66bd5452046..001cfc0e98e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1191,6 +1191,7 @@ static void test_set_getsockopt(void) {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_STREAM, IPPROTO_IPV6, IPV6_DONTFRAG, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_MULTICAST_LOOP.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 9890677b49e09456d9dd68c5faedd512d8aa6f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9890677b49e09456d9dd68c5… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:49 2022 +0300 ws2_32: Manage shorter length for IPV6_MULTICAST_LOOP. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 15 ++++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f4e2f8f172c..07f9d5b3d3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1840,6 +1840,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_IF, optval, optlen ); case IPV6_MULTICAST_LOOP: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_MULTICAST_LOOP, optval, optlen ); case IPV6_PROTECTION_LEVEL: @@ -3211,7 +3217,14 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_IF, optval, optlen ); case IPV6_MULTICAST_LOOP: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + value = !!value; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, (char *)&value, sizeof(value) ); case IPV6_PKTINFO: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 001cfc0e98e..3f01c54c307 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1192,6 +1192,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_STREAM, IPPROTO_IPV6, IPV6_DONTFRAG, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_PKTINFO.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: adcff74cd2b00f45888b4f48bc26bf92590c9ca6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=adcff74cd2b00f45888b4f48… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:50 2022 +0300 ws2_32: Manage shorter length for IPV6_PKTINFO. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 07f9d5b3d3d..06b489ffd52 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1860,6 +1860,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return 0; case IPV6_PKTINFO: + if (*optlen < sizeof(DWORD) || !optval) + { + *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_RECVTCLASS: @@ -3227,6 +3233,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_MULTICAST_LOOP, (char *)&value, sizeof(value) ); case IPV6_PKTINFO: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_PROTECTION_LEVEL: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 3f01c54c307..f58e86869f0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1193,6 +1193,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_HOPLIMIT, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_RECVTCLASS.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: 91aa6b2828665e18dadcb632c1c0d2a8988c2290 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91aa6b2828665e18dadcb632… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:51 2022 +0300 ws2_32: Manage shorter length for IPV6_RECVTCLASS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +++++++++++ dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 12 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 06b489ffd52..4bb852cc103 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1869,6 +1869,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVPKTINFO, optval, optlen ); case IPV6_RECVTCLASS: + if (*optlen < sizeof(DWORD) || !optval) + { + if (optlen) *optlen = 0; + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: @@ -3245,6 +3251,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return 0; case IPV6_RECVTCLASS: + if (optlen < sizeof(DWORD) || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f58e86869f0..87ae422f9f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1194,6 +1194,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_RECVTCLASS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0

Paul Gofman : ws2_32: Manage shorter length for IPV6_UNICAST_HOPS.
by Alexandre Julliard 11 Mar '22

11 Mar '22

Module: wine Branch: master Commit: ed09d9a4c0f80758e80f0c133bca491f4852edf9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed09d9a4c0f80758e80f0c13… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Mar 11 13:29:52 2022 +0300 ws2_32: Manage shorter length for IPV6_UNICAST_HOPS. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 14 +++++++++++++- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4bb852cc103..7a4a60df8d6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1878,6 +1878,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: + if (*optlen < 1 || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + if (*optlen < sizeof(DWORD)) *optlen = 1; return server_getsockopt( s, IOCTL_AFD_WINE_GET_IPV6_UNICAST_HOPS, optval, optlen ); case IPV6_UNICAST_IF: @@ -3259,7 +3265,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_RECVTCLASS, optval, optlen ); case IPV6_UNICAST_HOPS: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, optval, optlen ); + if (!optlen || !optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_HOPS, (char *)&value, sizeof(value) ); case IPV6_UNICAST_IF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IPV6_UNICAST_IF, optval, optlen ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 87ae422f9f1..0746b07f4f1 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1195,6 +1195,7 @@ static void test_set_getsockopt(void) {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_PKTINFO, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_RECVTCLASS, FALSE, {0, 0, 4}, {0}, TRUE, TRUE}, + {AF_INET6, SOCK_DGRAM, IPPROTO_IPV6, IPV6_UNICAST_HOPS, TRUE, {1, 1, 4}, {0}, FALSE}, }; SOCKET s, s2; int i, j, err, lasterr;

1 0