mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Removed patch to set last error on success in WSARecv (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
4d5f020d44
commit
2e7eef2694
@ -172,7 +172,7 @@ Included bug fixes and improvements
|
||||
* Use actual program name if available to describe PulseAudio streams
|
||||
* Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
|
||||
* Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
|
||||
* WSARecv should call SetLastError on success ([Wine Bug #31438](https://bugs.winehq.org/show_bug.cgi?id=31438))
|
||||
* ~~WSARecv should call SetLastError on success~~ ([Wine Bug #31438](https://bugs.winehq.org/show_bug.cgi?id=31438))
|
||||
* Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](https://bugs.winehq.org/show_bug.cgi?id=20465))
|
||||
* Workaround for shlwapi URLs with relative paths
|
||||
* XEMBED support for embedding Wine windows inside Linux applications
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -3,6 +3,7 @@ wine-staging (1.7.35) UNRELEASED; urgency=low
|
||||
* Add support for Gentoo epatch backend to patchinstall.sh.
|
||||
* Added patch to implement support for DDS file format in D3DXSaveTextureToFileInMemory.
|
||||
* Added patch to avoid appending duplicate NULL character when importing keys with regedit.
|
||||
* Removed patch to set last error on success in WSARecv (accepted upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Mon, 12 Jan 2015 13:06:22 +0100
|
||||
|
||||
wine-staging (1.7.34-1) unstable; urgency=low
|
||||
|
||||
@ -186,7 +186,6 @@ patch_enable_all ()
|
||||
enable_wpcap_Dynamic_Linking="$1"
|
||||
enable_ws2_32_Connect_Time="$1"
|
||||
enable_ws2_32_TransmitFile="$1"
|
||||
enable_ws2_32_WSARecv_Last_Error="$1"
|
||||
enable_ws2_32_WriteWatches="$1"
|
||||
enable_ws2_32_getaddrinfo="$1"
|
||||
enable_wtsapi32_EnumerateProcesses="$1"
|
||||
@ -586,9 +585,6 @@ patch_enable ()
|
||||
ws2_32-TransmitFile)
|
||||
enable_ws2_32_TransmitFile="$2"
|
||||
;;
|
||||
ws2_32-WSARecv_Last_Error)
|
||||
enable_ws2_32_WSARecv_Last_Error="$2"
|
||||
;;
|
||||
ws2_32-WriteWatches)
|
||||
enable_ws2_32_WriteWatches="$2"
|
||||
;;
|
||||
@ -3508,21 +3504,6 @@ if test "$enable_ws2_32_TransmitFile" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ws2_32-WSARecv_Last_Error
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#31438] WSARecv should call SetLastError on success
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ws2_32/socket.c, dlls/ws2_32/tests/sock.c
|
||||
# |
|
||||
if test "$enable_ws2_32_WSARecv_Last_Error" -eq 1; then
|
||||
patch_apply ws2_32-WSARecv_Last_Error/0001-ws2_32-Call-SetLastError-for-successful-WSARecv.patch
|
||||
(
|
||||
echo '+ { "Heiko Przybyl", "ws2_32: Call SetLastError for successful WSARecv.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ws2_32-getaddrinfo
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,92 +0,0 @@
|
||||
From b226c98c4f411fed903003c92fb8f8662f61333b Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Przybyl <lil_tux@web.de>
|
||||
Date: Tue, 6 Jan 2015 14:03:14 -0700
|
||||
Subject: ws2_32: Call SetLastError for successful WSARecv.
|
||||
|
||||
---
|
||||
dlls/ws2_32/socket.c | 2 +-
|
||||
dlls/ws2_32/tests/sock.c | 8 --------
|
||||
2 files changed, 1 insertion(+), 9 deletions(-)
|
||||
|
||||
diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
|
||||
index e1b2a05..af79562 100644
|
||||
--- a/dlls/ws2_32/socket.c
|
||||
+++ b/dlls/ws2_32/socket.c
|
||||
@@ -6776,7 +6776,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount,
|
||||
if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa );
|
||||
release_sock_fd( s, fd );
|
||||
_enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0);
|
||||
-
|
||||
+ WSASetLastError(0);
|
||||
return 0;
|
||||
|
||||
error:
|
||||
diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c
|
||||
index ce47712..78ae609 100644
|
||||
--- a/dlls/ws2_32/tests/sock.c
|
||||
+++ b/dlls/ws2_32/tests/sock.c
|
||||
@@ -5136,14 +5136,12 @@ static void test_events(int useMessages)
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = recv(src, buffer, 1, MSG_PEEK);
|
||||
ok(ret == 1, "Failed to peek at recv buffer %d err %d\n", ret, GetLastError());
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
ok_event_seq(src, hEvent, read_seq, NULL, 0);
|
||||
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = recv(src, buffer, 50, 0);
|
||||
ok(ret == 50, "Failed to recv buffer %d err %d\n", ret, GetLastError());
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
ok_event_seq(src, hEvent, read_seq, NULL, 0);
|
||||
|
||||
@@ -5171,7 +5169,6 @@ todo_wine
|
||||
SetLastError(0xdeadbeef);
|
||||
ret = recv(src, buffer, 1, 0);
|
||||
ok(ret == 1, "Failed to recv buffer %d err %d\n", ret, GetLastError());
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
ok_event_seq(src, hEvent, empty_seq, NULL, 0);
|
||||
|
||||
@@ -5603,7 +5600,6 @@ static void test_WSASendMsg(void)
|
||||
ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen);
|
||||
ok(ret == bytesSent, "got %d, expected %d\n",
|
||||
ret, bytesSent);
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
|
||||
/* A successful call to WSASendMsg must have bound the socket */
|
||||
@@ -5634,7 +5630,6 @@ todo_wine
|
||||
ret = recvfrom(dst, buffer, sizeof(buffer), 0, (struct sockaddr *) &sockaddr, &addrlen);
|
||||
ok(ret == bytesSent, "got %d, expected %d\n",
|
||||
ret, bytesSent);
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
|
||||
closesocket(sock);
|
||||
@@ -5770,14 +5765,12 @@ static void test_WSARecv(void)
|
||||
iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL);
|
||||
ok(!iret, "Expected 0, got %d\n", iret);
|
||||
ok(bytesReturned, "Expected 2, got %d\n", bytesReturned);
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
SetLastError(0xdeadbeef);
|
||||
bytesReturned = 0xdeadbeef;
|
||||
iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL);
|
||||
ok(!iret, "Expected 0, got %d\n", iret);
|
||||
ok(bytesReturned, "Expected 2, got %d\n", bytesReturned);
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
|
||||
bufs.len = 4;
|
||||
@@ -5790,7 +5783,6 @@ todo_wine
|
||||
iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL);
|
||||
ok(!iret, "Expected 0, got %d\n", iret);
|
||||
ok(bytesReturned, "Expected 4, got %d\n", bytesReturned);
|
||||
-todo_wine
|
||||
ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError());
|
||||
|
||||
bufs.len = sizeof(buf);
|
||||
--
|
||||
2.2.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [31438] WSARecv should call SetLastError on success
|
||||
Loading…
x
Reference in New Issue
Block a user