Module: wine Branch: master Commit: b655102ca38dd8120d5437d6aeae9289eb37cd4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b655102ca38dd8120d5437d6ae...
Author: Zebediah Figura z.figura12@gmail.com Date: Sun Jan 22 15:25:04 2017 -0600
ws2_32/tests: Fix memcmp size in test_TransmitFile().
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Bruno Jesus 00cpxxx@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ws2_32/tests/sock.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5856718..7208088 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8296,17 +8296,17 @@ static void test_TransmitFile(void)
/* Test TransmitFile with only buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); bret = pTransmitFile(client, NULL, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); iret = recv(dest, buf, sizeof(buf), 0); - ok(iret == sizeof(header_msg)+sizeof(footer_msg)+2, + ok(iret == sizeof(header_msg)+sizeof(footer_msg), "Returned an unexpected buffer from TransmitFile: %d\n", iret ); - ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)+1) == 0, + ok(memcmp(&buf[0], &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); - ok(memcmp(&buf[sizeof(header_msg)+1], &footer_msg[0], sizeof(footer_msg)+1) == 0, + ok(memcmp(&buf[sizeof(header_msg)], &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n");
/* Test TransmitFile with only file data */ @@ -8316,18 +8316,18 @@ static void test_TransmitFile(void)
/* Test TransmitFile with both file and buffer data */ buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); bret = pTransmitFile(client, file, 0, 0, NULL, &buffers, 0); ok(bret, "TransmitFile failed unexpectedly.\n"); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n");
/* Test overlapped TransmitFile */ @@ -8381,9 +8381,9 @@ static void test_TransmitFile(void) goto cleanup; } buffers.Head = &header_msg[0]; - buffers.HeadLength = sizeof(header_msg)+1; + buffers.HeadLength = sizeof(header_msg); buffers.Tail = &footer_msg[0]; - buffers.TailLength = sizeof(footer_msg)+1; + buffers.TailLength = sizeof(footer_msg); SetFilePointer(file, 0, NULL, FILE_BEGIN); ov.Offset = 0; bret = pTransmitFile(client, file, 0, 0, &ov, &buffers, 0); @@ -8396,12 +8396,12 @@ static void test_TransmitFile(void) ok(total_sent == (file_size + buffers.HeadLength + buffers.TailLength), "Overlapped TransmitFile sent an unexpected number of bytes (%d != %d).\n", total_sent, file_size + buffers.HeadLength + buffers.TailLength); - iret = recv(dest, buf, sizeof(header_msg)+1, 0); - ok(memcmp(buf, &header_msg[0], sizeof(header_msg)+1) == 0, + iret = recv(dest, buf, sizeof(header_msg), 0); + ok(memcmp(buf, &header_msg[0], sizeof(header_msg)) == 0, "TransmitFile header buffer did not match!\n"); compare_file(file, dest, 0); - iret = recv(dest, buf, sizeof(footer_msg)+1, 0); - ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)+1) == 0, + iret = recv(dest, buf, sizeof(footer_msg), 0); + ok(memcmp(buf, &footer_msg[0], sizeof(footer_msg)) == 0, "TransmitFile footer buffer did not match!\n");
/* Test TransmitFile with a UDP datagram socket */
-
Alexandre Julliard