[Bug 9787] Warcraft3 Battle.net Doesn't work (Needs AcceptEx)

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

Johannes Hofmann  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #133 from Johannes Hofmann   2008-01-10 06:56:36 ---
(In reply to comment #128)
> Created an attachment (id=10107)

--> (http://bugs.winehq.org/attachment.cgi?id=10107) [details]
> basic AcceptEx implementation try 2
>
> So first patch added a regression.
> Please try if this patch works better (both hosting and joining the game)

I got following output while patching git version from Wed Jan 9 13:02:01 2008
+0100 :

patching file dlls/mswsock/mswsock.spec
patching file dlls/ws2_32/socket.c
Hunk #2 succeeded at 1355 with fuzz 2.
patching file dlls/ws2_32/ws2_32.spec
patching file server/protocol.def
patching file server/sock.c
Hunk #1 FAILED at 514.
Hunk #2 FAILED at 621.
2 out of 4 hunks FAILED -- saving rejects to file server/sock.c.rej
joe@laeppi ~/build/wine $ cat server/sock.c.rej
*************** static void sock_queue_async( struct fd *fd, const async_data_t
*data, int type,
*** 514,520 ****
          return;
      }

-     if ( ( 
           ( !( sock->state & FD_WRITE ) && type == ASYNC_TYPE_WRITE ) )
      {
          set_error( STATUS_PIPE_DISCONNECTED );
--- 514,520 ----
          return;
      }

+     if ( ( !( sock->state & (F
           ( !( sock->state & FD_WRITE ) && type == ASYNC_TYPE_WRITE ) )
      {
          set_error( STATUS_PIPE_DISCONNECTED );
*************** static struct object *create_socket( int family, int type, int
*** 621,629 ****
  }

/* accept a socket
- static struct sock *accep
  {
-     struct sock *acceptsock;
      struct sock *sock;
      intacceptfd;
      struct sockaddrsaddr;
--- 621,629 ----
  }

/* accept a socket
+ static struct sock *accept_socket( obj_handle_t handle, obj_handle_t ahandle
)
  {
+     struct sock *acceptsock = NULL;
      struct sock *sock;
      intacceptfd;
      struct sockaddrsaddr;