wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e8b9bda53ac39c913ddc93de0308f0c8b69605fc.

Browse Source
This commit is contained in:
Sebastian Lackner
2015-10-12 20:14:46 +02:00
parent cc0556df4a
commit e3ea1eef0d
13 changed files with 30 additions and 3483 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/ws2_32-WSAPoll/0002-ws2_32-tests-Add-WSAPoll-tests.patch
View File

@@ -1,4 +1,4 @@
From c550660596dfe05e3b275dec643e5b4ebd2bdb7e Mon Sep 17 00:00:00 2001
From 47bf6e8f213c1a1d023d160a829e390705db95e0 Mon Sep 17 00:00:00 2001
From: Bruno Jesus <00cpxxx@gmail.com>
Date: Fri, 22 May 2015 22:43:00 -0300
Subject: ws2_32/tests: Add WSAPoll() tests
@@ -8,26 +8,26 @@ Subject: ws2_32/tests: Add WSAPoll() tests
1 file changed, 222 insertions(+)
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
index 6d328e6..3d584f2 100644
index 7fbd67d..7901bda 100644
--- a/dlls/ws2_32/tests/sock.c
+++ b/dlls/ws2_32/tests/sock.c
@@ -71,6 +71,7 @@ static int (WINAPI *pInetPton)(INT,LPSTR,LPVOID);
static int (WINAPI *pWSALookupServiceBeginW)(LPWSAQUERYSETW,DWORD,LPHANDLE);
static int (WINAPI *pWSALookupServiceEnd)(HANDLE);
@@ -74,6 +74,7 @@ static int (WINAPI *pWSALookupServiceEnd)(HANDLE);
static int (WINAPI *pWSALookupServiceNextW)(HANDLE,DWORD,LPDWORD,LPWSAQUERYSETW);
static int (WINAPI *pWSAEnumNameSpaceProvidersA)(LPDWORD,LPWSANAMESPACE_INFOA);
static int (WINAPI *pWSAEnumNameSpaceProvidersW)(LPDWORD,LPWSANAMESPACE_INFOW);
+static int (WINAPI *pWSAPoll)(WSAPOLLFD *,ULONG,INT);
/**************** Structs and typedefs ***************/
@@ -1163,6 +1164,7 @@ static void Init (void)
pWSALookupServiceBeginW = (void *)GetProcAddress(hws2_32, "WSALookupServiceBeginW");
pWSALookupServiceEnd = (void *)GetProcAddress(hws2_32, "WSALookupServiceEnd");
@@ -1169,6 +1170,7 @@ static void Init (void)
pWSALookupServiceNextW = (void *)GetProcAddress(hws2_32, "WSALookupServiceNextW");
pWSAEnumNameSpaceProvidersA = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersA");
pWSAEnumNameSpaceProvidersW = (void *)GetProcAddress(hws2_32, "WSAEnumNameSpaceProvidersW");
+ pWSAPoll = (void *)GetProcAddress(hws2_32, "WSAPoll");
ok ( WSAStartup ( ver, &data ) == 0, "WSAStartup failed\n" );
tls = TlsAlloc();
@@ -6275,6 +6277,225 @@ end:
@@ -6330,6 +6332,225 @@ end:
WSACloseEvent(ov.hEvent);
}
@@ -253,7 +253,7 @@ index 6d328e6..3d584f2 100644
static void test_GetAddrInfoW(void)
{
static const WCHAR port[] = {'8','0',0};
@@ -8682,6 +8903,7 @@ START_TEST( sock )
@@ -9048,6 +9269,7 @@ START_TEST( sock )
test_WSASendMsg();
test_WSASendTo();
test_WSARecv();
@@ -262,5 +262,5 @@ index 6d328e6..3d584f2 100644
test_events(0);
test_events(1);
--
2.4.1
2.6.1