[Bug 29499] Age of Empires II freezes when disconnecting from a multiplayer room/game using native DirectPlay DLL

wine-bugs at winehq.org wine-bugs at winehq.org
Wed Jan 9 16:22:27 CST 2013


http://bugs.winehq.org/show_bug.cgi?id=29499

--- Comment #57 from Paul The Tall <paulthetall at gmail.com> 2013-01-09 16:22:27 CST ---
Darn i got this: when using the patch below. help?

iMac-van-Paul-Bertelink:wine-1.5.19 paulthetall$ patch -p1 < directplay.diff
missing header for unified diff at line 10 of patch
patching file dlls/ws2_32/socket.c
Hunk #1 FAILED at 5822.
Hunk #2 FAILED at 5832.
patch unexpectedly ends in middle of line
2 out of 2 hunks FAILED -- saving rejects to file dlls/ws2_32/socket.c.rej
patch unexpectedly ends in middle of line



--- a/dlls/ws2_32/socket.c    
+++ a/dlls/ws2_32/socket.c    
@@ -5822,6 +5822,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers,
DWORD dwBufferCount,

             pfd.fd = fd;
             pfd.events = POLLIN;
+            pfd.revents = 0;
             if (*lpFlags & WS_MSG_OOB) pfd.events |= POLLPRI;
            timeout = 15;
             if (!timeout || !poll( &pfd, 1, timeout ))
@@ -5831,6 +5832,12 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers,
DWORD dwBufferCount,
                 _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0);
                 goto error;
             }
+            if ((pfd.revents & POLLERR) || (pfd.revents & POLLHUP))
+            {
+                err = WSAECONNRESET;
+                _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0);
+                goto error;
+            }
         }
         else
         {

-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.



More information about the wine-bugs mailing list