wine-devel

wine-devel@winehq.org

4 participants
84403 discussions

RFC: How should ReadFile() on sockets behave ??
by Martin Wilck 26 Apr '02

26 Apr '02

If there is a socket for which event notification has been requested by the application with WSAEventSelect(), the behaviour is as follows: - When data arrives, FD_READ is signalled _ONCE_. - FD_READ is only delivered again if the app explicitly reenables it with WSAEventSelect/WSAAsyncSelect or if the application issues a recv() call. - The latter is accomplished in wine by calling _enable_event ( FD_READ, ...) after every recv() operation in the winsock code. - If an app uses ReadFile() rather than a winsock call to retrieve data, the FD_READ event is of course not reenabled, because the current implementation in file.c has no concept of socket events. Question: should ReadFile() behave like recv(), i.e. reenable FD_READ, or not? If yes, we would have a certain dependency of the ReadFile() code on winsock, because FD_READ etc are winsock-specific macros. If no, an app that relies on ReadFile() reenabling FD_READ will obviously fail. The best thing would probably be to do this in the server, but we currently can't, because the server does not notice when a read operation is finished. Opinions? Martin -- Martin Wilck Phone: +49 5251 8 15113 Fujitsu Siemens Computers Fax: +49 5251 8 20409 Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com D-33106 Paderborn http://www.fujitsu-siemens.com/primergy

2 2

file.c:FILE_ReadFileEx - fd is not overlapped
by Marcelo Welter 26 Apr '02

26 Apr '02

Helle friends Still fighting with my serial printers.. :) I upgrade my wine sources today with CVS and more advantages are in this new code (i'm very happy) but with one printer i receive the messages: trace:file:fd is not overlapped i comment the lines //if ( ! (flags & FD_FLAG_OVERLAPPED) ) { // WARN ( "fd is not overlapped\n" ); // SetLastError ( ERROR_INVALID_PARAMETER ); // goto error; //} in files/file.c and my printer communicate good. What i can change in my application to work with serial in this case See in +comm,+file trace:comm:ClearCommError handle 48 cbInQue = 2 cbOutQue = 0 trace:file:ReadFile 48 0x10025308 2 0x40566828 (nil) trace:file:FILE_TimeoutRead 48 0x10025308 2 0x40566828 trace:file:FILE_ReadFileEx file 48 to buf 0x10025308 num 2 0x40566794 func (nil) warn:file:FILE_ReadFileEx fd is not overlapped trace:comm:ClearCommError handle 48 cbInQue = 2 cbOutQue = 0 trace:file:ReadFile 48 0x10025308 2 0x40566828 (nil) trace:file:FILE_TimeoutRead 48 0x10025308 2 0x40566828 trace:file:FILE_ReadFileEx file 48 to buf 0x10025308 num 2 0x40566794 func (nil) warn:file:FILE_ReadFileEx fd is not overlapped Marcelo

2 1

Byte Swapping in storage32.c for solaris
by Warren_Baird＠cimmetry.com 26 Apr '02

26 Apr '02

I've been running into some problems with byte swapping in ole related code - it looks like the relevant stuff is in storage32.c - I've modified StorageUtl_{Read,Write}Word and DWord to byteswap on bigendian platforms, and that seems to help, but I'm also running into problems with the wchar property names in StorageImpl_{Read,Write}Property - the individual characters are showing up in the wrong order, so "Data" is showing up as 0x44006100 0x74006100 instead of 0x00440061 0x00740061 as I would expect... Is it safe to use the same approach here? should ReadProperty byteswap each wchar and then WriteProperty byteswap it again? There seem to be a lot of places things like this happen: StorageImpl_ReadProperty(This, propertyIndex, &chainProperty); chainProperty.startingBlock = bbHeadOfChain; StorageImpl_WriteProperty(This, propertyIndex, &chainProperty); and I'm not sure how else to handle these cases... Also - at the moment the only byteswapping macros actually appear in tools/wrc/wrctypes.h - would it make sense to move them to one of the top-level include directories, and use them in both storage32.c and in wrc? If so, which include file should I drop them in? Thanks! Warren

1 0

Bug 572
by Andriy Palamarchuk 26 Apr '02

26 Apr '02

Alexandre, could you look at bug 572: http://bugs.codeweavers.com/show_bug.cgi?id=572 It is possible that this bug is caused by your patch. Thanks, Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/

2 2

existing cooperation with mono?
by Freddy BL 26 Apr '02

26 Apr '02

Hi Wine-Team! Existing cooperations between the Wine-project and the Mono-project (http://www.go-mono.org)? At the moment it seams, that in the future there exists under MS-Windows three types of programs: programs which are in native-code (that can be run on Wine and can be portet to Linux by re-compiling with Wine), programs which are in MS-IL-code (that can in the future be run on Mono I hope) and mixed programs (IL-Code-programs, which integrate Native-Code DLLs and Native-Code-programs, which integrate IL-Code DLLs). And I think, that for the last type of programs a cooperation between the Wine-Devels and the Mono-Devels is very advantageous. So, existing this cooperations? (One of the results of an coopration could be an installer like that by CodeWeavers, which can be install both (Wine and Mono) for example) Greatings Freddy BL _________________________________________________________________ Senden und empfangen Sie Hotmail über Ihr Mobilgerät: http://mobile.msn.com

3 2

[Germany] Linuxtag
by Uwe Bonnes 26 Apr '02

26 Apr '02

Hallo, is there anybody beside me willing to care for a booth at Linuxtag June 6-9 in Karlsruhe? Please give feedback so I can apply for a booth. Beside our normal program winex and crossover might be good objects to demonstrate. Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

1 0

More BUG fixes for winsock2 patch series
by Martin Wilck 26 Apr '02

26 Apr '02

Patch: BUGS in my recently submitted patch series This applies over my complete patch series - I will send clean patches tomorrow. The fixes in server/file.c and server/serial.c relate to Rein Klazes' problem. Rein: please tell me if they fix it!! Patch http://www.winehq.com/hypermail/wine-patches/2002/04/0163.html is also needed. Modfied files: dlls/winsock: socket.c (allocation error) server: sock.c (remove socket from select loop for blocking sockets, too) file.c (try to serve async requests immediately) serial.c (dito) diff -ruNX ignore CVS/wine/dlls/winsock/socket.c TMP/wine/dlls/winsock/socket.c --- CVS/wine/dlls/winsock/socket.c Thu Apr 25 20:20:37 2002 +++ TMP/wine/dlls/winsock/socket.c Thu Apr 25 19:46:05 2002 @@ -2479,7 +2479,7 @@ goto error; } - iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + iovec = HeapAlloc (GetProcessHeap(), 0, dwBufferCount * sizeof (struct iovec) ); if ( !iovec ) { diff -ruNX ignore CVS/wine/server/file.c TMP/wine/server/file.c --- CVS/wine/server/file.c Thu Apr 25 20:20:36 2002 +++ TMP/wine/server/file.c Thu Apr 25 20:18:57 2002 @@ -389,6 +389,8 @@ if ( status == STATUS_PENDING ) { + struct pollfd pfd; + if ( !async ) async = create_async ( obj, current, ptr ); if ( !async ) @@ -397,6 +399,15 @@ async->status = STATUS_PENDING; if ( !async->q ) async_insert( q, async ); + + /* Check if the new pending request can be served immediately */ + pfd.fd = obj->fd; + pfd.events = file_get_poll_events ( obj ); + pfd.revents = 0; + poll ( &pfd, 1, 0 ); + + if ( pfd.revents ) + file_poll_event ( obj, pfd.revents ); } else if ( async ) destroy_async ( async ); else set_error ( STATUS_INVALID_PARAMETER ); diff -ruNX ignore CVS/wine/server/serial.c TMP/wine/server/serial.c --- CVS/wine/server/serial.c Thu Apr 25 20:20:36 2002 +++ TMP/wine/server/serial.c Thu Apr 25 20:27:11 2002 @@ -282,6 +282,8 @@ if ( status == STATUS_PENDING ) { + struct pollfd pfd; + if ( !async ) async = create_async ( obj, current, ptr ); if ( !async ) @@ -293,6 +295,19 @@ async_add_timeout(async,timeout); async_insert(q, async); } + + /* Check if the new pending request can be served immediately */ + pfd.fd = obj->fd; + pfd.events = serial_get_poll_events ( obj ); + pfd.revents = 0; + poll ( &pfd, 1, 0 ); + + if ( pfd.revents ) + /* serial_poll_event() calls set_select_events() */ + serial_poll_event ( obj, pfd.revents ); + else + set_select_events ( obj, pfd.events ); + return; } else if ( async ) destroy_async ( async ); else set_error ( STATUS_INVALID_PARAMETER ); diff -ruNX ignore CVS/wine/server/sock.c TMP/wine/server/sock.c --- CVS/wine/server/sock.c Thu Apr 25 20:20:36 2002 +++ TMP/wine/server/sock.c Thu Apr 25 15:10:54 2002 @@ -250,7 +250,6 @@ sock->errors[FD_CONNECT_BIT] = sock_error( sock->obj.fd ); if (debug_level) fprintf(stderr, "socket %d connection failure\n", sock->obj.fd); - set_select_events( &sock->obj, -1 ); } } else if (sock->state & FD_WINE_LISTENING) @@ -269,7 +268,6 @@ sock->pmask |= FD_ACCEPT; sock->errors[FD_ACCEPT_BIT] = sock_error( sock->obj.fd ); sock->hmask |= FD_ACCEPT; - set_select_events( &sock->obj, -1 ); } } else { @@ -335,11 +333,17 @@ if (debug_level) fprintf(stderr, "socket %d aborted by error %d, event: %x - removing from select loop\n", sock->obj.fd, sock->errors[FD_CLOSE_BIT], event); - set_select_events( &sock->obj, -1 ); } } - sock_reselect( sock ); + if ( sock->pmask & FD_CLOSE || event & (POLLERR|POLLHUP) ) + { + if ( debug_level ) + fprintf ( stderr, "removing socket %d from select loop\n", sock->obj.fd ); + set_select_events( &sock->obj, -1 ); + } + else + sock_reselect( sock ); /* wake up anyone waiting for whatever just happened */ if ( sock->pmask & sock->mask || sock->flags & FD_FLAG_OVERLAPPED ) sock_wake_up( sock, event );

3 2

Last header patch for Mingw32 I think (wingdi.h)
by Steven Edwards 26 Apr '02

26 Apr '02

cvs diff -u wingdi.h Index: wingdi.h =================================================================== RCS file: /home/wine/wine/include/wingdi.h,v retrieving revision 1.69 diff -u -r1.69 wingdi.h --- wingdi.h 3 Apr 2002 22:08:27 -0000 1.69 +++ wingdi.h 25 Apr 2002 16:48:19 -0000 @@ -24,6 +24,14 @@ extern "C" { #endif +#ifdef __MINGW__ +#undef _MAX_PATH +#undef _MAX_DIR +#undef _MAX_EXT +#undef _MAX_DRIVE +#include "stdlib.h" +#endif + typedef struct _ABCFLOAT { FLOAT abcfA; FLOAT abcfB; "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 3

Re: Send the first two mingw32 patches to /dev/null and use these instead
by Alexandre Julliard 26 Apr '02

26 Apr '02

"Steven Edwards" <Steven_Ed4153(a)yahoo.com> writes: > Index: windef.h > =================================================================== > RCS file: /home/wine/wine/include/windef.h,v > retrieving revision 1.62 > diff -u -r1.62 windef.h > --- windef.h 10 Mar 2002 00:02:34 -0000 1.62 > +++ windef.h 25 Apr 2002 02:09:36 -0000 > @@ -157,8 +157,9 @@ > #define _MAX_EXT _MAX_FNAME > #define _MAX_PATH 260 > #endif > +#if ! defined (__MINGW__) > #define MAX_PATH _MAX_PATH > - > +#endif This seems to be a mingw32 bug, it is not supposed to define MAX_PATH, only _MAX_PATH. At least that's how it's done under Windows. -- Alexandre Julliard julliard(a)winehq.com

2 1

First attempt at unit testing. Victim of choice: _hread()
by Jakob Eriksson 25 Apr '02

25 Apr '02

Thanks to Vincent Béron and Francois Gouget I've managed to do my own little unit test. I post it here hoping for comments of any kind: possible improvements, additions, advice etc. (I guess I could add some more limit-tests, trying to read many small chunks in a row see that I still end up in the right place in the file. Things like that.) -------- #include "winbase.h" #include "winerror.h" #include "wine/test.h" static void test__hread( void ) { LPCSTR filename = "testfile.xxx"; LPCSTR sillytext = "en larvig liten text dx \033 gx hej 84 hej 4484 ! \001\033 bla bla..."; HFILE filehandle; char buffer[10000]; long bytes_read; UINT bytes_wanted; UINT i; filehandle = _lcreat( filename, 0 ); ok( HFILE_ERROR != filehandle, "_lcreat complains." ); ok( HFILE_ERROR != _hwrite( filehandle, sillytext, strlen( sillytext ) ), "_hwrite complains." ); ok( HFILE_ERROR != _lclose(filehandle), "_lclose complains." ); filehandle = _lopen( filename, OF_READ ); bytes_read = _hread( filehandle, buffer, 2 * strlen( sillytext )); ok( strlen( sillytext ) == bytes_read, "file has wrong size."); for (bytes_wanted = 0; bytes_wanted < strlen( sillytext ); bytes_wanted++) { ok( 0 == _llseek( filehandle, 0, FILE_BEGIN ), "_llseek complains." ); ok( _hread( filehandle, buffer, bytes_wanted ) == bytes_wanted, "erratic _hread return value." ); for (i = 0; i < bytes_wanted; i++) { ok( buffer[i] == sillytext[i], "that's not what's written." ); } } ok( HFILE_ERROR != _lclose( filehandle ), "_lclose complains." ); ok( DeleteFileA( filename ) != 0, "DeleteFile complains." ); } START_TEST(file) { test__hread( ); } -- regards, Jakob Eriksson The wages of sin is debugging. -- Ron Jeffries

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel