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

Paul Gofman : ws2_32: Treat optlen as unsigned in setsockopt() for SO_SNDTIMEO.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: b2d1d090838f8f3b3affccfc0ccb7cfe623abb18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2d1d090838f8f3b3affccfc… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:05 2022 +0300 ws2_32: Treat optlen as unsigned in setsockopt() for SO_SNDTIMEO. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2e99f415c72..efc0a5b488a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2837,6 +2837,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDBUF, optval, optlen ); case SO_SNDTIMEO: + if (optlen < 0) optlen = 4; return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDTIMEO, optval, optlen ); /* SO_DEBUG is a privileged operation, ignore it. */

1 0

Paul Gofman : ws2_32: Return WSAENOBUFS from setsockopt() for IPPROTO_IP with negative optlen.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 9744055cf4d1c53ea5ca611ccb3c3b8e471e5147 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9744055cf4d1c53ea5ca611c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:06 2022 +0300 ws2_32: Return WSAENOBUFS from setsockopt() for IPPROTO_IP with negative optlen. 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 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index efc0a5b488a..40d86becef9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2946,6 +2946,12 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int break; case IPPROTO_IP: + if (optlen < 0) + { + SetLastError(WSAENOBUFS); + return SOCKET_ERROR; + } + switch(optname) { case IP_ADD_MEMBERSHIP:

1 0

Paul Gofman : ws2_32/tests: Add tests for setting and getting socket options with shorter length.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 4d60b85f3ba12c2561ce117f9dffd45daf20797d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d60b85f3ba12c2561ce117f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Sat Mar 5 22:04:07 2022 +0300 ws2_32/tests: Add tests for setting and getting socket options with shorter length. 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/tests/sock.c | 138 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 136 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6b6267dc153..6e492ffbb61 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1155,15 +1155,38 @@ static const LINGER linger_testvals[] = { static void test_set_getsockopt(void) { + static struct + { + int af; + int type; + int level; + int optname; + BOOL accepts_short_len; + unsigned int sizes[3]; + DWORD values[3]; + } + test_optsize[] = + { + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_TTL, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TOS, TRUE, {1, 1, 4}}, + {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_TTL, TRUE, {1, 1, 4}}, + }; SOCKET s, s2; - int i, err, lasterr; + int i, j, err, lasterr; int timeout; LINGER lingval; int size; WSAPROTOCOL_INFOA infoA; WSAPROTOCOL_INFOW infoW; char providername[WSAPROTOCOL_LEN + 1]; - DWORD value; + DWORD expected_last_error, expected_value; + int expected_err, expected_size; + DWORD value, save_value; + UINT64 value64; + struct _prottest { int family, type, proto; @@ -1375,6 +1398,117 @@ static void test_set_getsockopt(void) err, WSAGetLastError()); closesocket(s); + + /* Test option length. */ + for (i = 0; i < ARRAY_SIZE(test_optsize); ++i) + { + winetest_push_context("i %u, level %d, optname %d", + i, test_optsize[i].level, test_optsize[i].optname); + + s2 = socket( test_optsize[i].af, test_optsize[i].type, 0 ); + ok(s2 != INVALID_SOCKET, "socket() failed error %d\n", WSAGetLastError()); + + size = sizeof(save_value); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&save_value, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + + value64 = 0xffffffff00000001; + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char *)&value64, sizeof(value64)); + ok(!err, "Unexpected setsockopt result %d.\n", err); + ok(!WSAGetLastError(), "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + size = sizeof(value64); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value64, &size); + ok(!err, "Unexpected getsockopt result %d.\n", err); + ok(size == test_optsize[i].sizes[2], "Got unexpected size %d.\n", size); + /* The behaviour regarding filling the high dword is different between options without the obvious + * pattern, it is either left untouched (more often) or zeroed. Wine doesn't touch the high dword. */ + + if (test_optsize[i].sizes[2] == 1 || test_optsize[i].level != SOL_SOCKET) + { + expected_err = -1; + expected_last_error = WSAENOBUFS; + } + else + { + expected_err = 0; + expected_last_error = 0; + } + + value = 1; + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char *)&value, -1); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + /* Broken between Win7 and Win10 21H1. */ + ok(WSAGetLastError() == expected_last_error || broken(expected_last_error && WSAGetLastError() == WSAEFAULT), + "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + size = -1; + value = 0xdeadbeef; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + if (test_optsize[i].optname == SO_OPENTYPE) + { + ok(!err, "Unexpected getsockopt result %d.\n", err); + ok(!WSAGetLastError(), "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + } + else + { + ok(err == -1, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == WSAEFAULT, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + } + ok(size == (test_optsize[i].optname == SO_OPENTYPE ? 4 : -1), "Got unexpected size %d.\n", size); + + winetest_pop_context(); + + for (j = 0; j < ARRAY_SIZE(test_optsize[i].sizes); ++j) + { + size = 1 << j; + winetest_push_context("i %u, level %d, optname %d, len %u", + i, test_optsize[i].level, test_optsize[i].optname, size); + + value = 1; + if (test_optsize[i].values[j]) + expected_value = test_optsize[i].values[j]; + else + expected_value = 0xdeadbeef; + + if (test_optsize[i].accepts_short_len || size == 4) + { + expected_err = 0; + expected_last_error = 0; + expected_size = test_optsize[i].sizes[j]; + + if (!test_optsize[i].values[j]) + memcpy(&expected_value, &value, expected_size); + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + expected_size = test_optsize[i].sizes[j]; + } + + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, size); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + value = 0xdeadbeef; + SetLastError(0xdeadbeef); + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == expected_err, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + ok(value == expected_value, "Got unexpected value %#x, expected %#x.\n", value, expected_value); + ok(size == expected_size, "Got unexpected size %d, expected %d.\n", size, expected_size); + + winetest_pop_context(); + } + + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, + (char*)&save_value, sizeof(save_value)); + ok(!err, "Unexpected getsockopt result %d.\n", err); + closesocket(s2); + } + /* Test with the closed socket */ SetLastError(0xdeadbeef); size = sizeof(i);

1 0

Eric Pouech : riched20/tests: Use correct integral type.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 8b66db027d4112bfd4287b03d5c7b6f33994adc3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b66db027d4112bfd4287b03… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:24:56 2022 +0100 riched20/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/richole.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index c06be02bd89..8d8ba5b1e9d 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -947,7 +947,8 @@ static void test_ITextRange_GetStart_GetEnd(void) ITextDocument *txtDoc = NULL; ITextRange *txtRge = NULL; HRESULT hres; - int first, lim, start, end; + int first, lim; + LONG start, end; static const CHAR test_text1[] = "TestSomeText"; create_interfaces(&w, &reOle, &txtDoc, NULL); @@ -1166,7 +1167,8 @@ static void test_ITextSelection_GetStart_GetEnd(void) ITextDocument *txtDoc = NULL; ITextSelection *txtSel = NULL; HRESULT hres; - int first, lim, start, end; + int first, lim; + LONG start, end; static const CHAR test_text1[] = "TestSomeText"; create_interfaces(&w, &reOle, &txtDoc, &txtSel);

1 0

Eric Pouech : riched20/tests: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 9e90cecdc603d79c6332a03884ed8d4851ef2e88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e90cecdc603d79c6332a038… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Mar 4 09:25:02 2022 +0100 riched20/tests: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/Makefile.in | 1 - dlls/riched20/tests/editor.c | 466 +++++------ dlls/riched20/tests/richole.c | 1622 +++++++++++++++++++-------------------- dlls/riched20/tests/txtsrv.c | 194 ++--- 4 files changed, 1141 insertions(+), 1142 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e90cecdc603d79c6332…

1 0

Eric Pouech : kernel32/tests/path: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 51005afca3d8887509e29f456305b5b2856a66e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=51005afca3d8887509e29f45… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:35 2022 +0100 kernel32/tests/path: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/path.c | 401 +++++++++++++++++++++++---------------------- 1 file changed, 201 insertions(+), 200 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=51005afca3d8887509e2…

1 0

Eric Pouech : kernel32/tests/pipe: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: c1cebdf19a544d0f23c4a10820be1204ad540d05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c1cebdf19a544d0f23c4a108… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:41 2022 +0100 kernel32/tests/pipe: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 949 +++++++++++++++++++++++---------------------- 1 file changed, 475 insertions(+), 474 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c1cebdf19a544d0f23c4…

1 0

Eric Pouech : kernel32/tests/process: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: a9ae4866a54c0c308228e94c73f3ac97978cbffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ae4866a54c0c308228e94c… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:47 2022 +0100 kernel32/tests/process: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 939 +++++++++++++++++++++--------------------- 1 file changed, 470 insertions(+), 469 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a9ae4866a54c0c308228…

1 0

Eric Pouech : kernel32/tests/profile: Enable compilation with long types.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: f588d96e95540295585fd072803ede03ebb0bc19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f588d96e95540295585fd072… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:06:54 2022 +0100 kernel32/tests/profile: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/profile.c | 347 +++++++++++++++++++++--------------------- 1 file changed, 174 insertions(+), 173 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f588d96e95540295585f…

1 0

Eric Pouech : shell32/tests: Use correct integral type.
by Alexandre Julliard 07 Mar '22

07 Mar '22

Module: wine Branch: master Commit: 87c9a0dd08356cce9b653486b09bc4235c823ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c9a0dd08356cce9b653486… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Mar 5 12:07:55 2022 +0100 shell32/tests: Use correct integral type. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/recyclebin.c | 2 +- dlls/shell32/tests/shlfileop.c | 9 +++++---- dlls/shell32/tests/shlfolder.c | 16 +++++++++------- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/shell32/tests/recyclebin.c b/dlls/shell32/tests/recyclebin.c index 50e262e918d..9207872d40f 100644 --- a/dlls/shell32/tests/recyclebin.c +++ b/dlls/shell32/tests/recyclebin.c @@ -39,7 +39,7 @@ static void test_query_recyclebin(void) { SHQUERYRBINFO info1={sizeof(info1),0xdeadbeef,0xdeadbeef}; SHQUERYRBINFO info2={sizeof(info2),0xdeadbeef,0xdeadbeef}; - UINT written; + DWORD written; HRESULT hr; HANDLE file; SHFILEOPSTRUCTA shfo; diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 1c7f25ccd52..180ff4b1108 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -290,7 +290,8 @@ static void check_icon_size( HICON icon, DWORD flags ) { ICONINFO info; BITMAP bm; - SIZE list_size, metrics_size; + SIZE metrics_size; + int list_cx, list_cy; IImageList *list; GetIconInfo( icon, &info ); @@ -298,7 +299,7 @@ static void check_icon_size( HICON icon, DWORD flags ) SHGetImageList( (flags & SHGFI_SMALLICON) ? SHIL_SMALL : SHIL_LARGE, &IID_IImageList, (void **)&list ); - IImageList_GetIconSize( list, &list_size.cx, &list_size.cy ); + IImageList_GetIconSize( list, &list_cx, &list_cy ); IImageList_Release( list ); metrics_size.cx = GetSystemMetrics( (flags & SHGFI_SMALLICON) ? SM_CXSMICON : SM_CXICON ); @@ -307,8 +308,8 @@ static void check_icon_size( HICON icon, DWORD flags ) if (flags & SHGFI_SHELLICONSIZE) { - ok( bm.bmWidth == list_size.cx, "got %d expected %d\n", bm.bmWidth, list_size.cx ); - ok( bm.bmHeight == list_size.cy, "got %d expected %d\n", bm.bmHeight, list_size.cy ); + ok( bm.bmWidth == list_cx, "got %d expected %d\n", bm.bmWidth, list_cx ); + ok( bm.bmHeight == list_cy, "got %d expected %d\n", bm.bmHeight, list_cy ); } else { diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 13108f92246..608d4defcb9 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -3311,7 +3311,8 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { LPITEMIDLIST apidl[5]; - UINT done, numitems, i; + UINT done; + DWORD numitems, i; for(done = 0; done < 5; done++) if(IEnumIDList_Next(peidl, 1, &apidl[done], NULL) != S_OK) @@ -3387,7 +3388,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi2; - UINT count; + DWORD count; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count == 1, "Got count %d\n", count); @@ -3464,7 +3465,7 @@ static void test_SHCreateShellItemArray(void) ok(hr == S_OK, "Got 0x%08x\n", hr); if(SUCCEEDED(hr)) { - UINT count_sia, i; + DWORD count_sia, i; hr = IShellItemArray_GetCount(psia, &count_sia); ok(hr == S_OK, "Got 0x%08x\n", hr); ok(count_sia == count, "Counts differ (%d, %d)\n", count, count_sia); @@ -3544,7 +3545,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi; - UINT count = 0; + DWORD count = 0; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3597,7 +3598,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi; - UINT count = 0; + DWORD count = 0; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3639,7 +3640,7 @@ static void test_SHCreateShellItemArray(void) if(SUCCEEDED(hr)) { IShellItem *psi; - UINT count = 0; + DWORD count = 0; hr = IShellItemArray_GetCount(psia, &count); ok(hr == S_OK, "Got 0x%08x\n", hr); @@ -3731,7 +3732,8 @@ static void test_ShellItemArrayEnumItems(void) { IShellItemArray *psia; LPITEMIDLIST apidl[5]; - UINT done, numitems, i; + UINT done; + DWORD numitems, i; for(done = 0; done < 5; done++) if(IEnumIDList_Next(peidl, 1, &apidl[done], NULL) != S_OK)

1 0