April 2002 - Wine-Devel - list.winehq.org

Review - Winnt.h warning patch for mingw32
by Steven Edwards April 4, 2002

April 4, 2002

This shuts up some compiler warnings on mingw but I don't know if my syntax is right. I know the rules about ifdef and ifndef but you guys said there was exceptions for the compilers so I figured I would check. Like I said I am still learning here so if this isnt right please flame away. Mingw32 currently lacks a good ./configure system as Msys wont see dlltool/wrap so I don't really have another option other then using my own makefiles for now. There is only about 4 or 5 other places I have found where mingw differs from normal GCC. Changelog: Fixes mingw32 warning about stdcall and fastcall being redefined. cvs diff winnt.h Index: winnt.h =================================================================== RCS file: /home/wine/wine/include/winnt.h,v retrieving revision 1.104 diff -u -r1.104 winnt.h --- winnt.h 2 Apr 2002 19:37:15 -0000 1.104 +++ winnt.h 4 Apr 2002 08:15:55 -0000 @@ -80,9 +80,11 @@ #ifndef __WINE__ #define pascal __stdcall #define _pascal __stdcall +#if ! defined(__WINE__) && !defined(__MINGW__) #define _stdcall __stdcall #define _fastcall __stdcall #define __fastcall __stdcall +#endif #define __export __stdcall #define cdecl __cdecl #define _cdecl __cdecl _________________________________________________________ Do You Yahoo!? Get your free @yahoo.com address at http://mail.yahoo.com

3 3

SetCooperativeLevel
by Tels April 4, 2002

April 4, 2002

-----BEGIN PGP SIGNED MESSAGE----- Moin, [crosspost to both wine lists] I am preparing a patch for DirectDraw::SetCooperativeLevel and friends: Some questions from a newbie, so please bear with me: ddraw/user.c has comments like these: /* GetDisplayMode: generic */ /* GetFourCCCodes: generic */ /* GetGDISurface: ??? */ /* GetMonitorFrequency: generic */ /* GetScanLine: generic */ /* GetSurfaceFromDC: generic */ /* GetVerticalBlankStatus: generic */ /* Initialize: generic */ /* RestoreAllSurfaces: generic */ /* RestoreDisplayMode: generic */ /* SetCooperativeLevel: ??? */ * What does the "generic" stand for? Return value? Function class? * It seems that SetCooperativeLevel associates a "value" (or more than one) with the givenwindow handle and TestCooperativeLevel let's you later check this status. Where would I store such a "global" value? * If I understand it correctly, the directx stuff is done by transgaming. Their licence differs from the "normal" wine. (I am really unsure how all these things play together even after readin codeweavers.com, winehq.com and transgaming.com) So, if I send in a patch for that, should I send it to wine-devel-patches? wine-devel? winex-devel? Under what license would it fall? Or does that not matter? I have no idea what hidden snatches are in the transmeta licence, so I would like to use the LGPL. ;) Is there a problem with that for the transmeta guys or for you wine guys? Or would it fall automatically under the transmeta licence, since I am patching their source anyway? (You can tell I am confused ;) * Also, since I am a bit CVS challanged (newbie, I told you ;), is it okay to add my files directly in the CVS source tree with vi(m) and then send you a diff -u patch? Or do I need some CVS magic to do locally? Or just keep the file outside the CVS and then send a patch? Thanx in advance, Te"Wine, I am coooominng!"ls - -- "Why do you go so slowly? Do you think this is some kind of game?" PGP key available on http://bloodgate.com/tels.asc or via email. perl -MDev::Bollocks -e'print Dev::Bollocks->rand(),"\n"' conveniently consolidate out-of-the-box ROI -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPKyTS3cLPEOTuEwVAQElUgf/Sjq2aXSUmuXz7W1FDBaAZQvNjEHovAB0 uZty72+LFRToxiGGvwU85X02Ug7Yc3zdT4R1cqtpGjjuGsXnBoE2h33Nz9rtDPhq wvZEIdxqv+MU3yVXWo5yRjSZZKpsDP78hiHoIZ+pCwtapqsZWdAOMIPwgVwNFwNv gJaG2OEtk9arlDNcN0uibzbq0lONh08BbqT+i1DvYYDRHJw6pNnUNKslV6b4sZdG bGjH0td8coj2vSM0RdRHaTYdjlY9BpJclqJI/7YGtS9cn3HCrWgAhCHwXLoLOL76 GcSfx/35eFrvmZM8LuJlXpK+abo2J4/+24CpuDEwwaI6Tqyuu+PS6A== =8o1v -----END PGP SIGNATURE-----

3 3

cool font viewer... might make good test case
by Dan Kegel April 4, 2002

April 4, 2002

FYI... My wife is a Windows user who loves fonts. She never found good free font viewing utilities until today; now she's raving about 'font xplorer lite'. Since it's a free download, it might make a good testcase for Wine's font support. It's at http://www.moonsoftware.com/freeware.asp but I haven't tried it yet. - Dan

1 0

Re: ReadFile and WriteFile in overlapped mode
by Mike McCormack April 4, 2002

April 4, 2002

Hi, > I have been looking at those two functions and some specs. > My understanding is that those function do not work at all I haven't tested the current CVS lately, but i can assure you that ReadFile and WriteFile did work at some fairly recent time :-) You may be correct that they do not work in *exactly* the right way, but for most cases they do work. > ever be generated since step be is not performed. Application > doing the following sequence > ReadFile > .. > WaitOnSingleObject > > will wait forever. Some borland Builder classes do this No, it won't because asynchronous reads can be processed during on-alertable waits. The application must call WaitForSingleObject eventually to see f the overlapped operation has finished. > My understanding is that step a should never be done and only > step b. Is that correct ? We need to check if data is pending before returning RROR_IO_PENDING because some applications do this: WaitCommEvent(hComm,&ev,&ov); WaitForSingleObject(ov.hEvent); ClearCommError(hComm,NULL,&cs) len = cs.cbInQue; if(!ReadFile(hComm,buf,len,&count,&ov)) FATAL() You're right that the way wine currently handles this is not erfect, but it will only fail if multiple overlapped operations re done at the same time. Martin Wilck is currently fixing this. > Now, why step b is failing is another story. > > Comments ? It's not perfect, and you're welcome to fix it if you want. Mike ------------------------------------------ mailto:Mike_McCormack(a)start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

Re: [PATCH] async IO APCs call check_async_list() directly
by Mike McCormack April 4, 2002

April 4, 2002

Hi Martin, I think this is a better way to do things, but it might be better to submit this patch against the current CVS rather than against CVS+previous patch. Mike Original message from: Martin Wilck <Martin.Wilck(a)fujitsu-siemens.com> > > >PATCH: async-func.diff > >This is an improvement over my previous patch (async-struct.diff) >in that it does not need the static function check_async_lists >in several source files anymore and still achieves DLL separation. > >The idea is that all async I/O requests use check_async_list as callback function >anyway, so that there is no need to pass a function pointer. >I discussed the idea with Mike, and he seemed to like it. > >Patch against: Wine CVS 2002/04/04, with my async-struct patch applied. >Test status: Compiles warnings. > Tested regular file async IO (ok). > Serial port async IO: a test would be desirable. > ------------------------------------------ mailto:Mike_McCormack(a)start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

1 0

Re: Startup fix for scanbin 6.0
by Dimitrie O. Paun April 4, 2002

April 4, 2002

On April 4, 2002 01:48 pm, Stefan Leichter wrote: > i thought the NULL - pointer is the result of a missing feature or a bug in > wine. For me i does not make sense to call the functions DrawText* without > a text. Nevertheless here is the patch without the ERR. While it is true that some Wine code call DrawText, so does a lot of user programs... -- Dimi.

1 0

[PATCH] async IO APCs call check_async_list() directly
by Martin Wilck April 4, 2002

April 4, 2002

PATCH: async-func.diff This is an improvement over my previous patch (async-struct.diff) in that it does not need the static function check_async_lists in several source files anymore and still achieves DLL separation. The idea is that all async I/O requests use check_async_list as callback function anyway, so that there is no need to pass a function pointer. I discussed the idea with Mike, and he seemed to like it. Patch against: Wine CVS 2002/04/04, with my async-struct patch applied. Test status: Compiles warnings. Tested regular file async IO (ok). Serial port async IO: a test would be desirable. Modified files: include : async.h (remove check_async_list) server : protocol.def (add APC_ASYNC_IO APC type, remove func field for create_async) async.h (remove func field in async struct) async.c (remove references to func field) thread.c (allow NULL function pointer for APC_ASYNC_IO) scheduler : synchro.c (add check_async_list; call from call_apcs for APC_ASYNC_IO) -- Martin diff -ruNX ignore MW/wine/include/async.h TMP/wine/include/async.h --- MW/wine/include/async.h Thu Apr 4 18:07:36 2002 +++ TMP/wine/include/async.h Thu Apr 4 18:08:56 2002 @@ -56,8 +56,6 @@ /* All functions declared static for Dll separation purposes */ -static void WINAPI check_async_list(async_private *asp, DWORD status); - inline static void finish_async( async_private *ovp ) { if(ovp->prev) @@ -87,7 +85,6 @@ req->overlapped = ovp; req->type = ovp->type; req->count = ovp->ops->get_count( ovp ); - req->func = check_async_list; req->status = status; ret = wine_server_call( req ); } @@ -115,29 +112,6 @@ NtCurrentTeb()->pending_list = ovp; return __register_async( ovp, status ); -} - -static void WINAPI check_async_list(async_private *asp, DWORD status) -{ - async_private *ovp; - DWORD ovp_status; - - for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); - - if(!ovp) - return; - - if( status != STATUS_ALERTED ) - { - ovp_status = status; - ovp->ops->set_status (ovp, status); - } - else ovp_status = ovp->ops->get_status (ovp); - - if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); /* ovp->func may change status */ - - /* This will destroy all but PENDING requests */ - register_old_async( ovp ); } #endif /* __WINE_ASYNC_H */ diff -ruNX ignore MW/wine/include/wine/server_protocol.h TMP/wine/include/wine/server_protocol.h --- MW/wine/include/wine/server_protocol.h Thu Apr 4 18:07:36 2002 +++ TMP/wine/include/wine/server_protocol.h Thu Apr 4 17:49:50 2002 @@ -502,7 +502,7 @@ int type; /* VARARG(args,ptrs); */ }; -enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC }; +enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC, APC_ASYNC_IO }; @@ -2278,7 +2278,6 @@ { struct request_header __header; handle_t handle; - void* func; int type; void* overlapped; int count; @@ -3200,6 +3199,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 78 +#define SERVER_PROTOCOL_VERSION 81 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore MW/wine/scheduler/synchro.c TMP/wine/scheduler/synchro.c --- MW/wine/scheduler/synchro.c Thu Apr 4 18:07:36 2002 +++ TMP/wine/scheduler/synchro.c Thu Apr 4 17:54:20 2002 @@ -30,7 +30,7 @@ #include "thread.h" #include "winerror.h" #include "wine/server.h" - +#include "async.h" /*********************************************************************** * get_timeout @@ -90,6 +90,34 @@ /*********************************************************************** + * check_async_list + * + * Handle async I/O requests. + */ +static void WINAPI check_async_list(async_private *asp, DWORD status) +{ + async_private *ovp; + DWORD ovp_status; + + for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); + + if(!ovp) + return; + + if( status != STATUS_ALERTED ) + { + ovp_status = status; + ovp->ops->set_status (ovp, status); + } + else ovp_status = ovp->ops->get_status (ovp); + + if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); + + /* This will destroy all but PENDING requests */ + register_old_async( ovp ); +} + +/*********************************************************************** * call_apcs * * Call outstanding APCs. @@ -129,6 +157,9 @@ /* convert sec/usec to NT time */ DOSFS_UnixTimeToFileTime( (time_t)args[0], &ft, (DWORD)args[1] * 10 ); proc( args[2], ft.dwLowDateTime, ft.dwHighDateTime ); + break; + case APC_ASYNC_IO: + check_async_list ( args[0], (DWORD) args[1]); break; default: server_protocol_error( "get_apc_request: bad type %d\n", type ); diff -ruNX ignore MW/wine/server/async.c TMP/wine/server/async.c --- MW/wine/server/async.c Thu Apr 4 18:07:36 2002 +++ TMP/wine/server/async.c Thu Apr 4 17:50:45 2002 @@ -64,7 +64,7 @@ { /* fprintf(stderr,"notifying %p!\n",async->overlapped); */ async->status = status; - thread_queue_apc(async->thread, NULL, async->func, APC_ASYNC, 1, 2, async->overlapped, status); + thread_queue_apc(async->thread, NULL, NULL, APC_ASYNC_IO, 1, 2, async->overlapped, status); } void destroy_async_queue( struct async_queue *q ) @@ -116,7 +116,7 @@ destroy_async(async); } -struct async *create_async(struct object *obj, struct thread *thread, void *func, +struct async *create_async(struct object *obj, struct thread *thread, void *overlapped) { struct async *async = (struct async *) malloc(sizeof(struct async)); @@ -128,7 +128,6 @@ async->obj = obj; async->thread = thread; - async->func = func; async->overlapped = overlapped; async->next = NULL; async->prev = NULL; @@ -165,7 +164,7 @@ if(req->status==STATUS_PENDING) { if(!async) - async = create_async(obj, current, req->func, req->overlapped); + async = create_async(obj, current, req->overlapped); if(async) { diff -ruNX ignore MW/wine/server/async.h TMP/wine/server/async.h --- MW/wine/server/async.h Tue Apr 2 16:51:50 2002 +++ TMP/wine/server/async.h Thu Apr 4 17:50:57 2002 @@ -30,7 +30,6 @@ { struct object *obj; struct thread *thread; - void *func; void *overlapped; unsigned int status; struct timeval when; @@ -51,7 +50,7 @@ struct async *find_async(struct async_queue *q, struct thread *thread, void *overlapped); void async_insert(struct async_queue *q, struct async *async); struct async *create_async(struct object *obj, struct thread *thread, - void *func, void *overlapped); + void *overlapped); void async_add_timeout(struct async *async, int timeout); static inline void init_async_queue(struct async_queue *q) { diff -ruNX ignore MW/wine/server/protocol.def TMP/wine/server/protocol.def --- MW/wine/server/protocol.def Thu Apr 4 18:07:36 2002 +++ TMP/wine/server/protocol.def Thu Apr 4 17:49:45 2002 @@ -412,7 +412,7 @@ int type; /* function type */ VARARG(args,ptrs); /* function arguments */ @END -enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC }; +enum apc_type { APC_NONE, APC_USER, APC_TIMER, APC_ASYNC, APC_ASYNC_IO }; /* Close a handle for the current process */ @@ -1618,7 +1618,6 @@ /* Create / reschedule an async I/O */ @REQ(register_async) handle_t handle; /* handle to comm port, socket or file */ - void* func; int type; void* overlapped; int count; diff -ruNX ignore MW/wine/server/thread.c TMP/wine/server/thread.c --- MW/wine/server/thread.c Tue Apr 2 16:51:51 2002 +++ TMP/wine/server/thread.c Thu Apr 4 17:37:22 2002 @@ -959,8 +959,9 @@ } /* Optimization: ignore APCs that have a NULL func; they are only used * to wake up a thread, but since we got here the thread woke up already. + * Exception: for APC_ASYNC_IO, func == NULL is legal. */ - if (apc->func) break; + if (apc->func || apc->type == APC_ASYNC_IO) break; free( apc ); } size = apc->nb_args * sizeof(apc->args[0]); diff -ruNX ignore MW/wine/server/trace.c TMP/wine/server/trace.c --- MW/wine/server/trace.c Thu Apr 4 18:07:36 2002 +++ TMP/wine/server/trace.c Thu Apr 4 17:49:50 2002 @@ -1846,7 +1846,6 @@ static void dump_register_async_request( const struct register_async_request *req ) { fprintf( stderr, " handle=%d,", req->handle ); - fprintf( stderr, " func=%p,", req->func ); fprintf( stderr, " type=%d,", req->type ); fprintf( stderr, " overlapped=%p,", req->overlapped ); fprintf( stderr, " count=%d,", req->count );

1 0

freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI'
by Andriy Palamarchuk April 4, 2002

April 4, 2002

After refreshing today morning from CVS I got the compilation error. The complete error text: freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI' ../../include/font.h:102: previous declaration of `WineEngGetTextExtentPointI' make[2]: *** [freetype.o] Error 1 make[2]: Leaving directory `/mnt/buf/prj/wine/dlls/gdi' make[1]: *** [gdi/gdi32.dll.so] Error 2 make[1]: Leaving directory `/mnt/buf/prj/wine/dlls' make: *** [dlls] Error 2 Huw, can it be because of your yesterday's patch? Other relevant patch is Alexandre's change to configure. Let me know if you need additional information. Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

3 2

[PATCH] Move send() functionality to WS2_32 code
by Martin Wilck April 4, 2002

April 4, 2002

PATCH: Move send() functionality to WS2_32 code In short, does the same to send() that the previous patch did to recv(). For the send() family of functions, WSASendTo() becomes the work horse. All other functions (WSASend(), send(), sendto(), ...) are only wrappers around WSASendTo(). To provide the scatter/gather functionality of WSASendTo(), the Unix system call used as backend is sendmsg() rather than sendto(). Patch against: Wine CVS 2002-04-03, with my previous patch (recv) applied. Test status: Compiles, no warnings. Tested with 16 bit apps: FreeAgent (newsreader), Solstice mail, nslookup, teraterm (telnet) (16 bit apps now call WS2_32 code!) Modified files: dlls/winsock : socket.c, ws2_32.spec diff -ruNX diffignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Thu Apr 4 10:58:53 2002 +++ MW/wine/dlls/winsock/socket.c Thu Apr 4 11:01:03 2002 @@ -1944,34 +1944,13 @@ */ int WINAPI WS_send(SOCKET s, const char *buf, int len, int flags) { - int fd = _get_sock_fd(s); + DWORD n; + WSABUF wsabuf = { len, (char*) buf }; - TRACE("socket %04x, ptr %p, length %d, flags %d\n", s, buf, len, flags); - if (fd != -1) - { - int length; - - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: exceptfds */ - do_block(fd, 2); - } - if ((length = send(fd, buf, len, flags)) < 0 ) - { - SetLastError(wsaErrno()); - if( GetLastError() == WSAEWOULDBLOCK ) - _enable_event(s, FD_WRITE, 0, 0); - } - else - { - close(fd); - return length; - } - close(fd); - } - else SetLastError(WSAENOTSOCK); - return SOCKET_ERROR; + if ( WSASendTo ( s, &wsabuf, 1, &n, flags, NULL, 0, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; + else + return n; } /*********************************************************************** @@ -1982,43 +1961,106 @@ LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - INT iFlags = 0; - INT rc = 0; - DWORD dwCount; - - /* Overlapped is not supported or checked for */ - FIXME( "(%u,%p,0x%lx,%p,0x%lx,%p,%p): semi stub\n", - s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, - dwFlags, lpOverlapped, lpCompletionRoutine ); - - /* Convert setup flags */ - if( dwFlags & MSG_DONTROUTE ) - { - iFlags |= MSG_DONTROUTE; - } - - if( dwFlags & MSG_OOB ) - { - iFlags |= MSG_OOB; - } - - /* Indicate nothing yet sent */ - *lpNumberOfBytesSent = 0; - - /* Send all buffers with the same flags */ - for(dwCount = 0; dwCount < dwBufferCount; dwCount++ ) - { - if( ( rc = WS_send( s, lpBuffers[ dwCount ].buf, - lpBuffers[ dwCount ].len, iFlags ) ) != 0 ) + return WSASendTo ( s, lpBuffers, dwBufferCount, lpNumberOfBytesSent, dwFlags, + NULL, 0, lpOverlapped, lpCompletionRoutine ); +} + +/*********************************************************************** + * WSASendTo (WS2_32.74) + */ +INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD lpNumberOfBytesSent, DWORD dwFlags, + const struct WS_sockaddr *to, int tolen, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) +{ + int i, n, fd, err = WSAENOTSOCK; + struct iovec* iovec; + struct msghdr msghdr; + + TRACE ("socket %04x, wsabuf %p, nbufs %ld, flags %ld, to %p, tolen %d, ovl %p, func %p\n", + s, lpBuffers, dwBufferCount, dwFlags, + to, tolen, lpOverlapped, lpCompletionRoutine); + + fd = _get_sock_fd(s); + + if ( fd == -1 ) + goto error; + + iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + + if ( !iovec ) + { + err = WSAENOBUFS; + goto err_close; + } + + for ( i = 0; i < dwBufferCount; i++ ) + { + iovec[i].iov_base = lpBuffers[i].buf; + iovec[i].iov_len = lpBuffers[i].len; + } + + msghdr.msg_name = NULL; + + if (to) + { +#if DEBUG_SOCKADDR + dump_sockaddr (to); +#endif + msghdr.msg_name = (void*) ws_sockaddr_ws2u (to, tolen, &msghdr.msg_namelen); + if ( !msghdr.msg_name ) + { + err = WSAEFAULT; + goto err_free; + } + } + else + msghdr.msg_namelen = 0; + + msghdr.msg_iov = iovec; + msghdr.msg_iovlen = dwBufferCount; + msghdr.msg_control = NULL; + msghdr.msg_controllen = 0; + msghdr.msg_flags = 0; + + /* FIXME: Treat overlapped IO here */ + + if (_is_blocking(s)) + { + /* FIXME: exceptfds? */ + do_block(fd, 2); + } + + /* FIXME: can we support MSG_PARTIAL ? How does it relate to sendmsg()'s msg_flags ? */ + + if ((n = sendmsg (fd, &msghdr, dwFlags)) == -1) { - break; + err = wsaErrno(); + if ( err == WSAEWOULDBLOCK ) + _enable_event (s, FD_WRITE, 0, 0); + goto err_free; } - /* Indicate that we've sent something */ - *lpNumberOfBytesSent += lpBuffers[ dwCount ].len; - } + *lpNumberOfBytesSent = n; - return rc; + ws_sockaddr_free ( msghdr.msg_name, to ); + WS_FREE ( iovec ); + close ( fd ); + + return 0; + +err_free: + ws_sockaddr_free ( msghdr.msg_name, to ); + WS_FREE ( iovec ); + +err_close: + close ( fd ); + +error: + WARN (" -> ERROR %d\n", err); + SetLastError (err); + return SOCKET_ERROR; } /*********************************************************************** @@ -2035,46 +2077,13 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, const struct WS_sockaddr *to, int tolen) { - int fd = _get_sock_fd(s); - int res; - - TRACE("socket %04x, ptr %p, length %d, flags %d\n", s, buf, len, flags); - - res=SOCKET_ERROR; - if (fd != -1) - { - const struct sockaddr* uaddr; - int uaddrlen; + DWORD n; + WSABUF wsabuf = { len, (char*) buf }; - uaddr=ws_sockaddr_ws2u(to,tolen,&uaddrlen); - if (uaddr == NULL) - { - SetLastError(WSAEFAULT); - } - else - { - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: exceptfds */ - do_block(fd, 2); - } - res=sendto(fd, buf, len, flags, uaddr, uaddrlen); - if (res < 0 ) - { - SetLastError(wsaErrno()); - if( GetLastError() == WSAEWOULDBLOCK ) - _enable_event(s, FD_WRITE, 0, 0); - } - ws_sockaddr_free(uaddr,to); - } - close(fd); - } + if ( WSASendTo (s, &wsabuf, 1, &n, flags, to, tolen, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; else - { - SetLastError(WSAENOTSOCK); - } - return res; + return n; } /*********************************************************************** diff -ruNX diffignore TMP/wine/dlls/winsock/ws2_32.spec MW/wine/dlls/winsock/ws2_32.spec --- TMP/wine/dlls/winsock/ws2_32.spec Thu Apr 4 10:58:53 2002 +++ MW/wine/dlls/winsock/ws2_32.spec Thu Apr 4 11:01:03 2002 @@ -86,7 +86,7 @@ 71 forward WSAResetEvent KERNEL32.ResetEvent 72 stdcall WSASend(long ptr long ptr long ptr ptr) WSASend 73 stub WSASendDisconnect -74 stub WSASendTo +74 stdcall WSASendTo(long ptr long ptr long ptr long ptr ptr) WSASendTo 75 stub WSASetEvent 76 stub WSASetServiceA 77 stub WSASetServiceW

1 0

[PATCH] Move recv() functionality to WS2_32 code
by Martin Wilck April 4, 2002

April 4, 2002

PATCH: Move recv() functionality to WS2_32 code For the recv() family of functions, WSARecvFrom() becomes the work horse. All other functions (WSARecv(), recv(), recvfrom(), ...) are only wrappers around WSARecvFrom(). To provide the scatter/gather functionality of WSARecvFrom(), the Unix system call used as backend is recvmsg() rather than recvfrom(). Patch against: Wine CVS 2002-04-04. Test status: Compiles, no warnings. Tested with 16 bit apps: FreeAgent (newsreader), Solstice mail, nslookup, teraterm (telnet) (16 bit apps now call WS2_32 code!) Modified files: dlls/winsock : socket.c, ws2_32.spec diff -ruNX diffignore MW/wine/dlls/winsock/socket.c TMP/wine/dlls/winsock/socket.c --- MW/wine/dlls/winsock/socket.c Thu Apr 4 09:37:38 2002 +++ TMP/wine/dlls/winsock/socket.c Thu Apr 4 10:58:53 2002 @@ -1797,34 +1797,13 @@ */ int WINAPI WS_recv(SOCKET s, char *buf, int len, int flags) { - int fd = _get_sock_fd(s); - - TRACE("socket %04x, buf %8x, len %d, flags %d\n", s, (unsigned)buf, len, flags); - - if (fd != -1) - { - INT length; - - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: OOB and exceptfds? */ - do_block(fd, 1); - } - if ((length = recv(fd, buf, len, flags)) >= 0) - { - TRACE(" -> %i bytes\n", length); + DWORD n, dwFlags = flags; + WSABUF wsabuf = { len, buf }; - close(fd); - _enable_event(s, FD_READ, 0, 0); - return length; - } - SetLastError(wsaErrno()); - close(fd); - } - else SetLastError(WSAENOTSOCK); - WARN(" -> ERROR\n"); - return SOCKET_ERROR; + if ( WSARecvFrom (s, &wsabuf, 1, &n, &dwFlags, NULL, NULL, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; + else + return n; } /*********************************************************************** @@ -1842,60 +1821,13 @@ int WINAPI WS_recvfrom(SOCKET s, char *buf, INT len, int flags, struct WS_sockaddr *from, int *fromlen) { - int fd = _get_sock_fd(s); - int res; + DWORD n, dwFlags = flags; + WSABUF wsabuf = { len, buf }; - TRACE("socket %04x, ptr %08x, len %d, flags %d\n", s, (unsigned)buf, len, flags); -#if DEBUG_SOCKADDR - if (from) - dump_sockaddr(from); + if ( WSARecvFrom (s, &wsabuf, 1, &n, &dwFlags, from, fromlen, NULL, NULL) == SOCKET_ERROR ) + return SOCKET_ERROR; else - DPRINTF("from = NULL\n"); -#endif - - res=SOCKET_ERROR; - if (fd != -1) - { - struct sockaddr* uaddr; - int uaddrlen; - int length; - - if (_is_blocking(s)) - { - /* block here */ - /* FIXME: OOB and exceptfds */ - do_block(fd, 1); - } - - uaddr=ws_sockaddr_alloc(from,fromlen,&uaddrlen); - length=recvfrom(fd, buf, len, flags, uaddr, &uaddrlen); - if (length < 0) - { - SetLastError(wsaErrno()); - WARN(" -> ERROR\n"); - } - else if (ws_sockaddr_u2ws(uaddr,uaddrlen,from,fromlen) != 0) - { - /* The from buffer was too small, but we read the data - * anyway. Is that really bad? - */ - SetLastError(WSAEFAULT); - WARN(" -> WSAEFAULT\n"); - } - else - { - TRACE(" -> %i bytes\n", length); - _enable_event(s, FD_READ, 0, 0); - res=length; - } - close(fd); - } - else - { - SetLastError(WSAENOTSOCK); - WARN(" -> WSAENOTSOCK\n"); - } - return res; + return n; } /*********************************************************************** @@ -3302,34 +3234,129 @@ /*********************************************************************** + * WSARecv (WS2_32.67) + */ +int WINAPI WSARecv (SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, + LPDWORD NumberOfBytesReceived, LPDWORD lpFlags, + LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + return WSARecvFrom (s, lpBuffers, dwBufferCount, NumberOfBytesReceived, lpFlags, + NULL, NULL, lpOverlapped, lpCompletionRoutine); +} + +/*********************************************************************** * WSARecvFrom (WS2_32.69) */ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, LPDWORD lpNumberOfBytesRecvd, LPDWORD lpFlags, struct WS_sockaddr *lpFrom, LPINT lpFromlen, LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) + { - DWORD dwCount; - INT rc; + /* Uses recvmsg() in order to provide scatter-gather I/O */ + + struct iovec* iovec; + struct msghdr msghdr; + int fd, i, length, err = WSAENOTSOCK; + + TRACE("socket %04x, wsabuf %p, nbufs %ld, flags %ld, from %p, fromlen %ld, ovl %p, func %p\n", + s, lpBuffers, dwBufferCount, *lpFlags, lpFrom, + (lpFromlen ? *lpFromlen : -1L), + lpOverlapped, lpCompletionRoutine); + + fd = _get_sock_fd(s); - FIXME( "(%i,%p,%lu,%p,%p,%p,%p,%p,%p: stub\n", - s, lpBuffers, dwBufferCount, lpNumberOfBytesRecvd, lpFlags, - lpFrom, lpFromlen, lpOverlapped, lpCompletionRoutine ); + if (fd == -1) + { + err = WSAENOTSOCK; + goto error; + } - for( dwCount = 0, rc = 0; dwCount < dwBufferCount; dwCount++ ) - { + /* FIXME: should this be HeapAlloc() or WS_ALLOC ? */ + iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + if ( !iovec ) + { + err = WSAENOBUFS; + goto err_close; + } - if( ( rc = WS_recvfrom(s, lpBuffers[ dwCount ].buf, (INT)lpBuffers[ dwCount ].len, - (INT)*lpFlags, lpFrom, lpFromlen ) ) != 0 ) + for (i = 0; i < dwBufferCount; i++) { - break; + iovec[i].iov_base = lpBuffers[i].buf; + iovec[i].iov_len = lpBuffers[i].len; } - } + msghdr.msg_name = NULL; - return rc; -} + if ( lpFrom ) + { +#if DEBUG_SOCKADDR + dump_sockaddr (lpFrom); +#endif + + msghdr.msg_namelen = *lpFromlen; + msghdr.msg_name = ws_sockaddr_alloc (lpFrom, lpFromlen, &msghdr.msg_namelen); + } + else + msghdr.msg_namelen = 0; + + msghdr.msg_iov = iovec; + msghdr.msg_iovlen = dwBufferCount; + msghdr.msg_control = NULL; + msghdr.msg_controllen = 0; + msghdr.msg_flags = 0; + + /* FIXME: Treat overlapped IO here */ + + if (_is_blocking(s)) + { + /* block here */ + /* FIXME: OOB and exceptfds? */ + do_block(fd, 1); + } + + /* FIXME: can we support MSG_PARTIAL ? + How does it relate to recvmsg()'s msg_flags ? */ + + if ((length = recvmsg (fd, &msghdr, *lpFlags)) == -1) + { + err = wsaErrno(); + goto err_free; + } + + TRACE(" -> %i bytes\n", length); + + if ( lpFrom && ws_sockaddr_u2ws (msghdr.msg_name, msghdr.msg_namelen, lpFrom, lpFromlen) != 0 ) + { + /* The from buffer was too small, but we read the data + * anyway. Is that really bad? + */ + SetLastError ( WSAEFAULT ); + WARN ( " -> Address buffer too small\n" ); + } + + *lpNumberOfBytesRecvd = length; + WS_FREE (iovec); + ws_sockaddr_free ( msghdr.msg_name, lpFrom ); + close(fd); + _enable_event(s, FD_READ, 0, 0); + + return 0; + +err_free: + WS_FREE (iovec); + ws_sockaddr_free ( msghdr.msg_name, lpFrom ); + +err_close: + close (fd); + +error: + WARN(" -> ERROR %d\n", err); + SetLastError ( err ); + return SOCKET_ERROR; +} /*********************************************************************** * WSCInstallProvider (WS2_32.88) diff -ruNX diffignore MW/wine/dlls/winsock/ws2_32.spec TMP/wine/dlls/winsock/ws2_32.spec --- MW/wine/dlls/winsock/ws2_32.spec Thu Apr 4 09:37:38 2002 +++ TMP/wine/dlls/winsock/ws2_32.spec Thu Apr 4 10:58:53 2002 @@ -79,7 +79,7 @@ 64 stub WSANtohl 65 stub WSANtohs 66 stub WSAProviderConfigChange -67 stub WSARecv +67 stdcall WSARecv(long ptr long ptr ptr ptr ptr) WSARecv 68 stub WSARecvDisconnect 69 stdcall WSARecvFrom(long ptr long ptr ptr ptr ptr ptr ptr ) WSARecvFrom 70 stub WSARemoveServiceClass

1 0