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

Francois Gouget : msdaps: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: e7979679b17d0e98bd428c2cd6d14d08e2c76dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7979679b17d0e98bd428c2cd… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:06:27 2015 +0100 msdaps: Remove unneeded NONAMELESSXXX directives. --- dlls/msdaps/main.c | 2 -- dlls/msdaps/row_server.c | 2 -- dlls/msdaps/usrmarshal.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/msdaps/main.c b/dlls/msdaps/main.c index 14c6c01..403df3a 100644 --- a/dlls/msdaps/main.c +++ b/dlls/msdaps/main.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/msdaps/row_server.c b/dlls/msdaps/row_server.c index 9afe881..784ade8 100644 --- a/dlls/msdaps/row_server.c +++ b/dlls/msdaps/row_server.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b70d3f4..1243e48 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -21,8 +21,6 @@ #include <string.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : msi: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 232d1b6e3ff0350c2a239ba65618232dce0f43ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=232d1b6e3ff0350c2a239ba65… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:06:53 2015 +0100 msi: Remove unneeded NONAMELESSXXX directives. --- dlls/msi/database.c | 1 - dlls/msi/dialog.c | 1 - dlls/msi/msi_main.c | 1 - dlls/msi/registry.c | 1 - dlls/msi/source.c | 1 - dlls/msi/table.c | 2 -- 6 files changed, 7 deletions(-) diff --git a/dlls/msi/database.c b/dlls/msi/database.c index dd2c004..e970ef6 100644 --- a/dlls/msi/database.c +++ b/dlls/msi/database.c @@ -22,7 +22,6 @@ #include <stdio.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4380879..6baf08d 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -21,7 +21,6 @@ #define COBJMACROS #define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <stdarg.h> diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index 148e678..0955856 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/registry.c b/dlls/msi/registry.c index 3dc989f..2106ab2 100644 --- a/dlls/msi/registry.c +++ b/dlls/msi/registry.c @@ -22,7 +22,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/source.c b/dlls/msi/source.c index 2b88ce3..f4c139f 100644 --- a/dlls/msi/source.c +++ b/dlls/msi/source.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h" diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e1f7d9b..256034b 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -22,8 +22,6 @@ #include <assert.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : msxml3: Remove unneeded NONAMELESSUNION directives.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: ce40bcf054aad6c8fcf07c5d7528d35aa1189df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce40bcf054aad6c8fcf07c5d7… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:07:07 2015 +0100 msxml3: Remove unneeded NONAMELESSUNION directives. --- dlls/msxml3/domdoc.c | 1 - dlls/msxml3/mxnamespace.c | 1 - 2 files changed, 2 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 71cf077..e081f1a 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -20,7 +20,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include "config.h" diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index f114d97..dc6ff9c 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSUNION #include "config.h"

1 0

Francois Gouget : ntdll: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: ca1545cf1734a9a2de7222bf8c1585e0ade4fc5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca1545cf1734a9a2de7222bf8… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 14 03:38:17 2015 +0100 ntdll: Remove unneeded NONAMELESSXXX directives. --- dlls/ntdll/actctx.c | 3 +-- dlls/ntdll/cdrom.c | 3 +-- dlls/ntdll/directory.c | 3 +-- dlls/ntdll/file.c | 3 +-- dlls/ntdll/heap.c | 3 +-- dlls/ntdll/loader.c | 4 +--- dlls/ntdll/serial.c | 3 +-- dlls/ntdll/sync.c | 4 +--- dlls/ntdll/tape.c | 3 +-- dlls/ntdll/time.c | 2 -- dlls/ntdll/virtual.c | 3 +-- 11 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 20a98ec..6ea7b54 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -28,10 +28,9 @@ #include <stdarg.h> #include <stdio.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "winternl.h" #include "ddk/wdm.h" #include "ntdll_misc.h" diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 62c3d16..34910e7 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -116,10 +116,9 @@ typedef struct #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 283fe49..cbfc022 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -70,10 +70,9 @@ # include <unistd.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winnt.h" #include "winternl.h" diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 3bd2c31..92e83dd 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -76,10 +76,9 @@ # include <valgrind/memcheck.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "wine/unicode.h" #include "wine/debug.h" #include "wine/server.h" diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4ef44cf..a908f19 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -33,10 +33,9 @@ #define RUNNING_ON_VALGRIND 0 #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winnt.h" #include "winternl.h" diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index e1444d2..9810f07 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -28,11 +28,9 @@ # include <sys/mman.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winnt.h" #include "winternl.h" diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 9f73ce6..91d9be9 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -57,10 +57,9 @@ # include <sys/strtio.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 08fab44..7d44e60 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -48,11 +48,9 @@ #include <stdlib.h> #include <time.h> -#define NONAMELESSUNION -#define NONAMELESSSTRUCT - #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "wine/server.h" diff --git a/dlls/ntdll/tape.c b/dlls/ntdll/tape.c index df46015..fef31cb 100644 --- a/dlls/ntdll/tape.c +++ b/dlls/ntdll/tape.c @@ -48,10 +48,9 @@ #define MTSETBLK MTSETBSIZ #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "winioctl.h" diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 0f14a3e..69bd736 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -42,8 +42,6 @@ # include <mach/mach_time.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h" diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index dc5db00..ab6bf9b 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -42,10 +42,9 @@ # include <valgrind/valgrind.h> #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winternl.h" #include "wine/library.h"

1 0

Francois Gouget : ntdll/tests: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 872e96fc4e4a8937d34968de26fb054c8649a548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=872e96fc4e4a8937d34968de2… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Mar 14 03:38:49 2015 +0100 ntdll/tests: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/ntdll/tests/exception.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 5cbab71..a594e3f 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -25,10 +25,9 @@ #define _WIN32_WINNT 0x500 /* For NTSTATUS */ #endif -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "ntstatus.h" #define WIN32_NO_STATUS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" #include "winnt.h"

1 0

Francois Gouget : ntprint: Remove an uneeded NONAMELESSUNION directive.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 17f425290eb63b84df819abaee63d0dcff2e8c3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=17f425290eb63b84df819abae… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:09:20 2015 +0100 ntprint: Remove an uneeded NONAMELESSUNION directive. --- dlls/ntprint/ntprint.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntprint/ntprint.c b/dlls/ntprint/ntprint.c index a5431b6..b6d77b3 100644 --- a/dlls/ntprint/ntprint.c +++ b/dlls/ntprint/ntprint.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : krnl386.exe16: Fix the _lread16() documentation.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: a4e38fab7c0cfb2060adf6fc5fb32c37a9c8f418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e38fab7c0cfb2060adf6fc5… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:10:36 2015 +0100 krnl386.exe16: Fix the _lread16() documentation. --- dlls/krnl386.exe16/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/file.c b/dlls/krnl386.exe16/file.c index 1386fe1..1584340 100644 --- a/dlls/krnl386.exe16/file.c +++ b/dlls/krnl386.exe16/file.c @@ -394,7 +394,7 @@ HFILE16 WINAPI _lopen16( LPCSTR path, INT16 mode ) /*********************************************************************** - * _lread16 (KERNEL.82) + * _lread16 (internal) */ UINT16 WINAPI _lread16( HFILE16 hFile, LPVOID buffer, UINT16 count ) {

1 0

Francois Gouget : crypt32: Mark internal symbols with hidden visibility.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 838ff1b244c6e03d2f1ef1f0194e366009eda408 URL: http://source.winehq.org/git/wine.git/?a=commit;h=838ff1b244c6e03d2f1ef1f01… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:12:07 2015 +0100 crypt32: Mark internal symbols with hidden visibility. --- dlls/crypt32/crypt32_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/crypt32_private.h b/dlls/crypt32/crypt32_private.h index fb5c5c3..ad4a827 100644 --- a/dlls/crypt32/crypt32_private.h +++ b/dlls/crypt32/crypt32_private.h @@ -430,7 +430,7 @@ void ContextPropertyList_Copy(CONTEXT_PROPERTY_LIST *to, void ContextPropertyList_Free(CONTEXT_PROPERTY_LIST *list) DECLSPEC_HIDDEN; -extern WINECRYPT_CERTSTORE empty_store; +extern WINECRYPT_CERTSTORE empty_store DECLSPEC_HIDDEN; void init_empty_store(void) DECLSPEC_HIDDEN; /**

1 0

Francois Gouget : dbghelp: Mark internal symbols with hidden visibility.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: ed82981ae070c2c144c3c98e292126fae23c403c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed82981ae070c2c144c3c98e2… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Mar 13 20:12:48 2015 +0100 dbghelp: Mark internal symbols with hidden visibility. --- dlls/dbghelp/dbghelp_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0d300f3..56a5bb8 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -580,7 +580,7 @@ extern BOOL macho_read_wine_loader_dbg_info(struct process* pcs) DECLSPE extern BOOL macho_synchronize_module_list(struct process* pcs) DECLSPEC_HIDDEN; /* minidump.c */ -void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva); +void minidump_add_memory_block(struct dump_context* dc, ULONG64 base, ULONG size, ULONG rva) DECLSPEC_HIDDEN; /* module.c */ extern const WCHAR S_ElfW[] DECLSPEC_HIDDEN;

1 0

Bruno Jesus : ws2_32/tests: Improve some helper functions.
by Alexandre Julliard 16 Mar '15

16 Mar '15

Module: wine Branch: master Commit: 8042dbac55ef56ac47c9977a9ebe8199f76c3787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8042dbac55ef56ac47c9977a9… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Sun Mar 15 16:13:12 2015 -0300 ws2_32/tests: Improve some helper functions. --- dlls/ws2_32/tests/sock.c | 49 ++++++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ca8e1a5..c596e85 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -301,32 +301,41 @@ static void read_zero_bytes ( SOCKET s ) ok ( n <= 0, "garbage data received: %d bytes\n", n ); } -static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int sendlen, int flags ) +static int do_synchronous_send ( SOCKET s, char *buf, int buflen, int flags, int sendlen ) { char* last = buf + buflen, *p; int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) + for ( p = buf; n > 0 && p < last; ) + { n = send ( s, p, min ( sendlen, last - p ), flags ); + if (n > 0) p += n; + } wsa_ok ( n, 0 <=, "do_synchronous_send (%x): error %d\n" ); return p - buf; } -static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int recvlen ) +static int do_synchronous_recv ( SOCKET s, char *buf, int buflen, int flags, int recvlen ) { char* last = buf + buflen, *p; int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) - n = recv ( s, p, min ( recvlen, last - p ), 0 ); + for ( p = buf; n > 0 && p < last; ) + { + n = recv ( s, p, min ( recvlen, last - p ), flags ); + if (n > 0) p += n; + } wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); return p - buf; } -static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen,int flags,struct sockaddr *from, int *fromlen, int recvlen ) +static int do_synchronous_recvfrom ( SOCKET s, char *buf, int buflen, int flags, struct sockaddr *from, int *fromlen, int recvlen ) { char* last = buf + buflen, *p; int n = 1; - for ( p = buf; n > 0 && p < last; p += n ) - n = recvfrom ( s, p, min ( recvlen, last - p ), 0, from, fromlen ); + for ( p = buf; n > 0 && p < last; ) + { + n = recvfrom ( s, p, min ( recvlen, last - p ), flags, from, fromlen ); + if (n > 0) p += n; + } wsa_ok ( n, 0 <=, "do_synchronous_recv (%x): error %d:\n" ); return p - buf; } @@ -538,14 +547,14 @@ static VOID WINAPI simple_server ( server_params *par ) "simple_server (%x): strange peer address\n", id ); /* Receive data & check it */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "simple_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "simple_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "simple_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -597,14 +606,14 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); /* Receive normal data */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->sock[0].buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "oob_server (%x): test pattern error: %d\n", id, pos); /* Echo data back */ - n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "oob_server (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -613,7 +622,7 @@ static VOID WINAPI oob_server ( server_params *par ) ok ( atmark == 1, "oob_server (%x): unexpectedly at the OOB mark: %i\n", id, atmark ); /* Receive a part of the out-of-band data and check atmark state */ - n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, par->buflen ); + n_recvd = do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, 8, 0, par->buflen ); ok ( n_recvd == 8, "oob_server (%x): received less data than expected: %d of %d\n", id, n_recvd, 8 ); n_expected -= 8; @@ -622,7 +631,7 @@ static VOID WINAPI oob_server ( server_params *par ) todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); /* Receive the rest of the out-of-band data and check atmark state */ - do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, par->buflen ); + do_synchronous_recv ( mem->sock[0].s, mem->sock[0].buf, n_expected, 0, par->buflen ); ioctlsocket ( mem->sock[0].s, SIOCATMARK, &atmark ); todo_wine ok ( atmark == 0, "oob_server (%x): not at the OOB mark: %i\n", id, atmark ); @@ -795,7 +804,7 @@ static VOID WINAPI simple_client ( client_params *par ) trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -803,7 +812,7 @@ static VOID WINAPI simple_client ( client_params *par ) wsa_ok ( shutdown ( mem->s, SD_SEND ), 0 ==, "simple_client (%x): shutdown failed: %d\n" ); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); @@ -845,19 +854,19 @@ static VOID WINAPI oob_client ( client_params *par ) trace ( "oob_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); /* Receive data echoed back & check it */ - n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, par->buflen ); + n_recvd = do_synchronous_recv ( mem->s, mem->recv_buf, n_expected, 0, par->buflen ); ok ( n_recvd == n_expected, "simple_client (%x): received less data than expected: %d of %d\n", id, n_recvd, n_expected ); pos = test_buffer ( mem->recv_buf, gen->chunk_size, gen->n_chunks ); ok ( pos == -1, "simple_client (%x): test pattern error: %d\n", id, pos); /* send out-of-band data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, MSG_OOB ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, MSG_OOB, par->buflen ); ok ( n_sent == n_expected, "oob_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected ); @@ -900,7 +909,7 @@ static VOID WINAPI simple_mixed_client ( client_params *par ) trace ( "simple_client (%x) connected\n", id ); /* send data to server */ - n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, par->buflen, 0 ); + n_sent = do_synchronous_send ( mem->s, mem->send_buf, n_expected, 0, par->buflen ); ok ( n_sent == n_expected, "simple_client (%x): sent less data than expected: %d of %d\n", id, n_sent, n_expected );

1 0