From 8479f399756d515f48e164636c6dff1a34dd44fe Mon Sep 17 00:00:00 2001 From: Thomas Faber Date: Tue, 19 Jun 2012 03:53:47 +0000 Subject: [PATCH] [FUSION_WINETEST] - Fix a warning. Already applied upstream. [WS2_32_WINETEST] - Fix an ok(). Already applied upstream. svn path=/trunk/; revision=56746 --- rostests/winetests/fusion/asmcache.c | 2 +- rostests/winetests/ws2_32/sock.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rostests/winetests/fusion/asmcache.c b/rostests/winetests/fusion/asmcache.c index 141e442b96e..1b7cb282213 100644 --- a/rostests/winetests/fusion/asmcache.c +++ b/rostests/winetests/fusion/asmcache.c @@ -412,7 +412,7 @@ static struct _tagASSEMBLY 5, /* MinorRuntimeVersion */ { 0x2188, 0x1B4 }, /* MetaData */ COMIMAGE_FLAGS_ILONLY | COMIMAGE_FLAGS_STRONGNAMESIGNED, /* Flags */ - 0, /* EntryPointToken */ + { 0 }, /* EntryPointToken */ { 0x20D0, 0xB8 }, /* Resources */ { 0x2050, 0x80 }, /* StrongNameSignature */ { 0 }, /* CodeManagerTable */ diff --git a/rostests/winetests/ws2_32/sock.c b/rostests/winetests/ws2_32/sock.c index 663589f56a1..0cc19d213fa 100644 --- a/rostests/winetests/ws2_32/sock.c +++ b/rostests/winetests/ws2_32/sock.c @@ -1030,14 +1030,14 @@ static void test_set_getsockopt(void) SetLastError(0xdeadbeef); err = setsockopt(s, 0xffffffff, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); timeout = SOCKTIMEOUT1; SetLastError(0xdeadbeef); err = setsockopt(s, 0x00008000, SO_RCVTIMEO, (char *) &timeout, size); ok( (err == SOCKET_ERROR) && (WSAGetLastError() == WSAEINVAL), - "got %d with %d (expected SOCKET_ERROR with WSAEINVAL\n", + "got %d with %d (expected SOCKET_ERROR with WSAEINVAL)\n", err, WSAGetLastError()); closesocket(s);