wine-devel

wine-devel@winehq.org

2 participants
84469 discussions

Re: Using win dll with wine
by psuchomel＠volny.cz 01 Jul '02

01 Jul '02

I can not simply transfer this code from Windows (under them it is compilable and working) to Wine, because this code is bridge beetwen my Java app and this dll. Because it depends on Windows natives of Sun JVM, it can not be directly run under Linux. My problem: How to brand (?) part of Wine, to be able use this dll f.e. with Qt Canvas or X11 rendering?. The example shows only some of the simpliest parts of this one, primary it is used as native rendering engine (and this engine exist only as dll for Windows, I do not expect there will be version for Linux in suitable time for me). Petr

1 0

Usind win dll with wine
by psuchomel＠volny.cz 01 Jul '02

01 Jul '02

Hi wine gurus I have some dll, I want to run under Linux. I try to study Wine docs, but, if I say the truth, I did not make me clever so much. Please, could you help me port this part of win code (extracted from my java <--> cpp bridge) under Linux? Petr //define dll handler HINSTANCE hInst = NULL; //define entry in dll typedef char* (_pascal * GLL_version)(); //here is some call //load library if( hInst == NULL ) hInst = LoadLibrary("mylib"); if( hInst == NULL ) return; //get proc address FARPROC proc = GetProcAddress(hInst, "GLL_VERSION"); //and call it if (proc != NULL) printf("%s", (char*)(GLL_version)proc()); //free handler FreeLibrary(hInst); hInst = NULL;

2 1

Bug #829 triggers lock-up in Baldur's Gate
by Ian D. Stewart 01 Jul '02

01 Jul '02

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 After further research, it looks as if the lock-up in Baldur's Gate is being triggered by an unsupported API Call. Here is the pertinent error message from Wine: fixme:ddraw:DIB_DirectDrawSurface_Blt dwFlags DDBLT_WAIT and/or DDBLT_ASYNC: can't handle right now. This fixme is only encountered during game 'movies' (including resting and death scenes). I have a full logfile if anyone is interested. Ian -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.7 (GNU/Linux) iD8DBQE9H4FfAjpHQQmBAUMRAqG0AJ4iMs7zB5i2jQn0Axbtkqwsf1HShQCdHtPz zU0QnKIKUtr2vYNS+al5t7o= =pp9a -----END PGP SIGNATURE-----

3 6

RFC PATCH: Fix unixism in shelllink.c
by Steven Edwards 01 Jul '02

01 Jul '02

I dont know if this will work or not and its untested under *nix as wine and my slack 8.1 install are still not getting along. WINE already implements _cwait so we should use it although I think this is wrong. Can someone check and fix it? http://www.opengroup.org/onlinepubs/007908799/xsh/wait.html http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore98/h… The next one may be a bigger PITA because shelllink.c calls fork =( Changelog: Replace Unixism in shell32 cvs diff -u Makefile.in Index: Makefile.in =================================================================== RCS file: /home/wine/wine/dlls/shell32/Makefile.in,v retrieving revision 1.50 diff -u -r1.50 Makefile.in --- Makefile.in 14 Jun 2002 23:48:27 -0000 1.50 +++ Makefile.in 1 Jul 2002 08:29:24 -0000 @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = shell32.dll # fixme: avoid ole32.dll import -IMPORTS = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 +IMPORTS = ole32 shlwapi comctl32 user32 gdi32 advapi32 kernel32 msvcrt ALTNAMES = shell.dll EXTRALIBS = $(LIBUUID) $(LIBUNICODE) cvs diff -u shelllink.c Index: shelllink.c =================================================================== RCS file: /home/wine/wine/dlls/shell32/shelllink.c,v retrieving revision 1.40 diff -u -r1.40 shelllink.c --- shelllink.c 31 May 2002 23:25:52 -0000 1.40 +++ shelllink.c 1 Jul 2002 08:29:52 -0000 @@ -720,7 +720,7 @@ _exit(1); } - while (waitpid( pid, &status, 0 ) == -1) + while (_cwait( &status, pid, 0 ) == -1) { if (errno != EINTR) {

1 0

Re: Modal vs Nonmodal window [Bug 825]
by Ann and Jason Edmeades 30 Jun '02

30 Jun '02

I've just uploaded a new (smaller) testcase for this issue. It shows a window launched by VB in 'modal' mode (xxx.show vbModal, Me) ends up (a) being clipped by the launching window, and (b) fails to accept keyboard and mouse input. Anyone got any thoughts about how to diagnose this - I need to get this working so I can open up the rest of my test app (All the bits I can get to now work with builtin oleaut32 after my last patch :-) ). I really am not a GUI person, but dont mind doing some diagnosis if someone can point me the right way. I've tried some traces with win debugmsg, but cant spot anything obvious. Regards, Jason

1 0

idl compiler in winehq tree
by Steven Edwards 30 Jun '02

30 Jun '02

Is anyone working on this or planning on submitting it? If not I will send the diffs tommrow as some of the ReactOS developers are interested in it but only only under LGPL. Thanks Steven __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

2 1

Re: filedlg95 patch
by Dmitry Timoshkov 30 Jun '02

30 Jun '02

"Andreas Mohr" <andi(a)rhlx01.fht-esslingen.de> wrote: > - quote strings (better in case of LFNs) debugstr_a/w are specially designed for that task. -- Dmitry.

1 0

Re: int10 SetCursorShape
by Andreas Mohr 30 Jun '02

30 Jun '02

On Sun, Jun 30, 2002 at 12:41:07AM +0200, Andreas Mohr wrote: > BTW, "almost" meaning that the display is perfect > (see http://home.arcor.de/wineshots/ida.png), but it is still very SLOOOW. > I guess now there's some real incentive to improve something... Argh, argh, argh. That should have been http://home.arcor.de/andi.mohr/wineshots/ida.png -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://mohr.de.tt

1 0

Re: winedefault.reg: FirstInstallDateTime value
by Joerg Mayer 29 Jun '02

29 Jun '02

On Sat, Jun 29, 2002 at 08:37:53PM +0200, Andreas Mohr wrote: > this adds the FirstInstallDateTime key, which is required by a program > some guy tested in the newsgroup. > +"FirstInstallDateTime"=hex:21,81,7c,23 How about adding a comment which date that is? Thanks Jörg -- Joerg Mayer <jmayer(a)loplof.de> I found out that "pro" means "instead of" (as in proconsul). Now I know what proactive means.

2 1

AGAIN: Wine wrongly seeing gdi32 & user32 as native
by Steven Edwards 29 Jun '02

29 Jun '02

Just setup a clean wine on slack 8.1 and any time I try to run a GUI app I'm seeing this: Warning: loading builtin user32.dll, but native version already present. Expect trouble. wine: Unhandled exception, starting debugger... Warning: loading builtin gdi32.dll, but native version already present. Expect trouble. Warning: loading builtin user32.dll, but native version already present. Expect trouble. wine: Unhandled exception, starting debugger... Warning: loading builtin gdi32.dll, but native version already present. Expect trouble. Console apps work fine and I read the thread relating to this with the tests at http://www.winehq.com/hypermail/wine-devel/2002/03/0454.html but havent been able to fix it for these apps. What else should I be doing? Thanks Steven __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

2 2

Re: X11DRV_SetDIBitsToDevice patch
by Max 29 Jun '02

29 Jun '02

Tony Lambregts wrote: >> Please resubmit this patch in diff -u format (+-) >> >> Tony Lambregts Ok, just submitting again Regards Max

1 0

VGA PLANETS
by Oliver Ob 29 Jun '02

29 Jun '02

A decent question: Has anyone got Tim Wisseman's VGA PLANETS (Version 4.xxxxx) got to work under Wine? If you like, you can send me PM. Kind regards and what I wanted to say here is: KEEP UP THAT GOOD WORK!! -- *º¤., ¸¸,.¤º*¨¨¨*¤ =Oliver@home= *º¤., ¸¸,.¤º*¨¨*¤ I http://www.bmw-roadster.de/Friends/Olli/olli.html I I http://www.bmw-roadster.de/Friends/friends.html I I http://groups.yahoo.com/group/VGAP-93 I I mailto:VGAP-93-subscribe@yahoogroups.com I I http://home.t-online.de/home/spacecraft.portal I >>> Telek0ma iBBMS - now back online +49.4504.TRSi1/TRSi2 <<<

1 0

Wine ODBC compatibilty
by Robert Damen 28 Jun '02

28 Jun '02

Wine, I found this address on your website, if it is the wrong address for these types of questions - Sorry!. I was wondering weather you could answer a question I have about support for Microsoft Office applications. The question is about weather wine can emulate (or has its own version of) the "ODBC Data Sources (32bit)" application found in c:\windows\Control Panel\ODBC Data Sources This application is used to set up DSN drivers for ODBC access on Access and Excel. An example of one of the drivers that this application handles is the MyODBC 3.51 windows driver. Any information would be greatly appreciated. Thanks Robert Damen ------------------------------------------ Robert Damen IT Dept. Select Music & Video Dist. Ltd. tel: 01737 645600 x224 fax: 01737 644065 mailto:RDamen@selectmusic.co.uk www.selectmusic.co.uk

2 1

Patches
by Max 28 Jun '02

28 Jun '02

I updated wine from CVS, and P. Christeas patch that solves bug 720 (misplaced graphics on AutoCAD) isn't there yet... but the bug does :) I tried the patch and works well with AutoCAD, and doesn't seems to make troubles with other apps I tested, so the question : what happens to patches sent to wine-devel ? They must be sent somwhere else or must wait longer to be put in CVS ? Regards Max

3 4

Re: X11DRV_SetDIBitsToDevice patch
by Tony Lambregts 28 Jun '02

28 Jun '02

Max wrote: >Here the X11DRV_SetDIBitsToDevice patch from P.Christeas that solves bug 720 - >Misplaced graphics in AutoCAD R14, with some minor cleanup by me. > >Regards > >Max > >------------------------------------------------------------------------ > >Index: graphics/x11drv/dib.c >=================================================================== >RCS file: /home/wine/wine/graphics/x11drv/dib.c,v >retrieving revision 1.97 >diff -r1.97 dib.c >4736a4737,4741 > > >>/* >> Changelog : 28.06.2002 : CLEANUP : cy == oldcy everytimes, of no use !!! >> I guess must be something wrong also with 'lines' declared as UINT but used as signed >> near end of function ( -lines), but not sure..... >> >> >> >4737a4743,4744 > > >>*/ >> DWORD width ; >> >> >4739a4747 > > >4796a4805 > > >4801a4811,4814 > > >>/* >> Changelog : 20.06.2002 patch from P. Christeas with a minor cleanup by me : solves bug 720 >> >> >4803c4816,4819 >< : ySrc - startscan; >--- > > >> : ySrc - startscan; >>*/ >> descr.ySrc = lines-(ySrc-startscan)-cy ; >> >> >> >4804a4821,4823 > > >>/* >> Changelog : 28.06.2002 : CLEANUP : cy == oldcy everytimes, so it's useless to add (oldcy - cy) !!!! >> >> >4805a4825,4827 > > >>*/ >> descr.yDest = physDev->org.y + pt.y ; >> >> >> Please resubmit this patch in diff -u format (+-) Tony Lambregts

1 0

What needs to be done to fix Wine DGA Input.
by Adam Luchjenbroers 28 Jun '02

28 Jun '02

What needs to be fixed to make DGA input under Wine function correctly?

2 6

Autocad slow startup
by Max 27 Jun '02

27 Jun '02

I just updated wine from cvs (today 27 june); AutoCAD cad program, that ran well before now needs some 5 minutes to start.... There's no disk activity, nor some hidden process, as TOP reveals. It just hangs for some 5 minutes (on a P4 2 Ghz...), then starts in a shot. Does somebody have such a problem with some other app, or maybe already solved it ? If not I'll try a regression to see what happens. Regards Max

2 2

Regression Bug in Wine MM (Bug #817)
by Ian D. Stewart 27 Jun '02

27 Jun '02

Eric, List, I have reported what appears to be a regression bug in Wine's multimedia subsystem (Bug #817). When running Baldur's Gate with recent builds of Wine, the game plays but without any sound. Earlier build ran the game with wine. The last known good build from CVS appears to be 2002-05-21 21:45:00 EDT. This looks like it may be related to the patch mmsystem.c commited by Alexandre Tue May 21 2002 - 20:52:31 CDT? I have attached the output from 'wine --debugmsg trace+relay Baldur.exe' to the bug report. Please let me know if there is anything else I can do to assist in debugging this. Ian

3 7

Modal vs Nonmodal window
by Andriy Palamarchuk 27 Jun '02

27 Jun '02

Window, shown as modal does not receive any input and is clipped on the border of parent window. The same window is displayed and functions fine if shown as non-modal. Nice testcase is attached: http://bugs.winehq.com/show_bug.cgi?id=825 This bug can potentially affect VB applications which use modal dialogs. Does anyone want to research this bug? Andriy __________________________________________________ Do You Yahoo!? Yahoo! - Official partner of 2002 FIFA World Cup http://fifaworldcup.yahoo.com

1 0

Notes R4 redraw problem - message trace
by Ian Pilcher 27 Jun '02

27 Jun '02

I have attached a log of all the messages sent to the right and left "panes" when switching virtual desktops. Note that the window named "Ian Pilcher - I" is the right pane, which shows individual messages, and the window named "{NotesSubprog}" is the left pane which is being hidden (resized to zero width?) when switching virtual desktops. See my original note of 19 June for an explanation of the problem. If someone GDI-knowledgable could take a look at this log and tell me if they see anything obviously wrong, I'd be very appreciative. Thanks! -- ======================================================================== Ian Pilcher pilchman(a)attbi.com ======================================================================== ######################################################################################################################################################### # Notes is running, the Inbox is displayed, and the left pane is visible. Will now switch virtual desktops. ######################################################################################################################################################### trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474b74 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474b74 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=40474a9c trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=40474a9c trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=40474b74 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=40474b74 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE sent from self wp=00000000 lp=00000001 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474b74 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474b74 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=40474a9c trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=40474a9c trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=40474b74 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=40474b74 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0003] WM_MOVE sent from self wp=00000000 lp=0004001c trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_MOVE [0003] wp=00000000 lp=0004001c trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_MOVE [0003] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0003] WM_MOVE returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE sent from self wp=00000000 lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474bb4 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474bb4 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=40474adc trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=40474adc trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=40474bb4 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=40474bb4 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE sent from self wp=00000000 lp=00140001 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474bb4 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474bb4 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=40474adc trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=40474adc trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=40474bb4 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=40474bb4 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE sent from self wp=00000000 lp=00140000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED returned 00000000 ######################################################################################################################################################### # Will now switch back to the virtual desktop on which Notes is running. ######################################################################################################################################################## trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0007] WM_SETFOCUS sent from self wp=00000000 lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0007] WM_SETFOCUS returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474c68 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474c68 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=40474b90 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=40474b90 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=40474c68 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=40474c68 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE sent from self wp=00000000 lp=016e0001 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474c68 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474c68 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=40474b90 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=40474b90 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=40474c68 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=40474c68 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE sent from self wp=00000000 lp=016e02c8 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474ca8 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474ca8 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=40474ca8 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=40474ca8 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0007] WM_SETFOCUS sent from self wp=00010025 lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0007] WM_SETFOCUS returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [000f] WM_PAINT dispatched wp=00000000 lp=00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0085] WM_NCPAINT sent from self wp=00001fe2 lp=00000000 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_NCPAINT [0085] wp=00001fe2 lp=00000000 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_NCPAINT [0085] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0085] WM_NCPAINT returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0014] WM_ERASEBKGND sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0014] WM_ERASEBKGND returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0407] WM_USER+0007 sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0407] WM_USER+0007 returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [000f] WM_PAINT returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [000f] WM_PAINT dispatched wp=00000000 lp=00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0085] WM_NCPAINT sent from self wp=00001fe2 lp=00000000 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_NCPAINT [0085] wp=00001fe2 lp=00000000 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_NCPAINT [0085] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0085] WM_NCPAINT returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0014] WM_ERASEBKGND sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0014] WM_ERASEBKGND returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0407] WM_USER+0007 sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0407] WM_USER+0007 returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [000f] WM_PAINT returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b sent from self wp=00000000 lp=40476080 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] wp=00000000 lp=40476080 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b sent from self wp=00000000 lp=40476080 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] wp=00000000 lp=40476080 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0466] WM_USER+0066 sent from self wp=00000000 lp=40475f84 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_USER+0066 [0466] wp=00000000 lp=40475f84 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_USER+0066 [0466] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0466] WM_USER+0066 returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b sent from self wp=00000000 lp=40476080 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] wp=00000000 lp=40476080 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b sent from self wp=00000000 lp=40476080 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] wp=00000000 lp=40476080 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_USER+003b [043b] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [043b] WM_USER+003b returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0466] WM_USER+0066 sent from self wp=00000000 lp=40475f84 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_USER+0066 [0466] wp=00000000 lp=40475f84 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_USER+0066 [0466] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0466] WM_USER+0066 returned 00000000 ####################################################################################################################################################### # Left pane is not visible (width = 0?). Mouse pointer is positioned over "divider". Will now drag divider to make left pane visible. ####################################################################################################################################################### trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=404763cc trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=404763cc trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=404762f4 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=404762f4 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=404763cc trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=404763cc trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE sent from self wp=00000000 lp=016e009a trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING sent from self wp=00000000 lp=404763cc trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] wp=00000000 lp=404763cc trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGING [0046] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0046] WM_WINDOWPOSCHANGING returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE sent from self wp=00000001 lp=404762f4 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] wp=00000001 lp=404762f4 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_NCCALCSIZE [0083] returned 00000300 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0083] WM_NCCALCSIZE returned 00000300 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED sent from self wp=00000000 lp=404763cc trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] wp=00000000 lp=404763cc trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0003] WM_MOVE sent from self wp=00000000 lp=000400b5 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_MOVE [0003] wp=00000000 lp=000400b5 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_MOVE [0003] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0003] WM_MOVE returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE sent from self wp=00000000 lp=016e022f trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0005] WM_SIZE returned 00000000 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_WINDOWPOSCHANGED [0047] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0047] WM_WINDOWPOSCHANGED returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [000f] WM_PAINT dispatched wp=00000000 lp=00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0085] WM_NCPAINT sent from self wp=00001fd2 lp=00000000 trace:message:SPY_EnterMessage (00010039) DefWindowProc32: WM_NCPAINT [0085] wp=00001fd2 lp=00000000 trace:message:SPY_ExitMessage (00010039) DefWindowProc32: WM_NCPAINT [0085] returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0085] WM_NCPAINT returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0014] WM_ERASEBKGND sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0014] WM_ERASEBKGND returned 00000000 trace:message:SPY_EnterMessage (00010039) L"{NotesSubprog}" message [0407] WM_USER+0007 sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [0407] WM_USER+0007 returned 00000000 trace:message:SPY_ExitMessage (00010039) L"{NotesSubprog}" message [000f] WM_PAINT returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [000f] WM_PAINT dispatched wp=00000000 lp=00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0085] WM_NCPAINT sent from self wp=00001fd2 lp=00000000 trace:message:SPY_EnterMessage (0001003a) DefWindowProc32: WM_NCPAINT [0085] wp=00001fd2 lp=00000000 trace:message:SPY_ExitMessage (0001003a) DefWindowProc32: WM_NCPAINT [0085] returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0085] WM_NCPAINT returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0014] WM_ERASEBKGND sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0014] WM_ERASEBKGND returned 00000000 trace:message:SPY_EnterMessage (0001003a) L"Ian Pilcher - I" message [0407] WM_USER+0007 sent from self wp=0000007c lp=00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [0407] WM_USER+0007 returned 00000000 trace:message:SPY_ExitMessage (0001003a) L"Ian Pilcher - I" message [000f] WM_PAINT returned 00000000

1 0

will "dxglwrap" merge in to wine?
by chan george 27 Jun '02

27 Jun '02

Dear all, Will the project "dxglwrap" source code be merged into wine? :-) George source: http://sourceforge.net/projects/dxglwrap/ _________________________________________________________________ 在 http://explorer.msn.com.hk/intl.asp 免費下載 MSN Explorer

2 1

Re: Autocad slow startup
by Massimo 27 Jun '02

27 Jun '02

1 0

Running Agfa Photowise on Wine
by Timo Kujala 27 Jun '02

27 Jun '02

Hi, I did some inspection how to get Agfa Photowise and my old CL50 to work under Wine. By default Photowise runs perfectly, except that when you try to connect to the camera, serial connection will always fail. After some debugging there is a very simple reason why this happens: Photowise tries to flush the file handle using FlushFileBuffers(). Under wine, doing this on /dev/ttyS0 will return error and FlushFileBuffers() returns FALSE. Photowise will detect this as error and refuses to continue. By forcing FlushFileBuffers() to always return TRUE, Photowise starts to work perfectly and finally my Agfa CL50 works with full 115200 speed under linux :) Perhaps somebody could figure out a clever fix for this in the future versions?

2 1

Re: Small Fix
by Nix N. Nix 26 Jun '02

26 Jun '02

On Wed, 2002-06-26 at 16:04, Nix N. Nix wrote: > ChangeLog: > > dlls/shell32/dialogs.c:FillList: > Removed a MessageBox > This MessageBox would pop up if a RunMRU list was not found. Instead, > it should /silently/ start a new MRUList. > > dlls/shell32/dialogs.c:RunDlgProc: > Removed dumb comment > I must've put that comment there just before going to bed (=> brain was > liquefied at the time). > > Sorry I didn't spot these earlier. > >

1 0

[suggested PATCH] POLLHUP handling, non-STREAM sockets
by Martin Wilck 26 Jun '02

26 Jun '02

Summary: Check POLLHUP semantics at remote shutdown when wineserver is started. Fix socket state handling and event handling for non-STREAM sockets. Status: Compiles, not tested (I couldn't get the tests to run, see my previous email). Modified files: server: sock.c main.c Index: server/main.c =================================================================== RCS file: /home/wine/wine/server/main.c,v retrieving revision 1.25 diff -u -r1.25 main.c --- server/main.c 20 Jun 2002 23:21:28 -0000 1.25 +++ server/main.c 26 Jun 2002 11:22:13 -0000 @@ -35,6 +35,7 @@ int debug_level = 0; int master_socket_timeout = 3; /* master socket timeout in seconds, default is 3 s */ const char *server_argv0; +extern void server_sock_init (void); /* parse-line args */ /* FIXME: should probably use getopt, and add a (more complete?) help option */ @@ -111,6 +112,7 @@ { parse_args( argc, argv ); signal_init(); + server_sock_init(); open_master_socket(); setvbuf( stderr, NULL, _IOLBF, 0 ); Index: server/sock.c =================================================================== RCS file: /home/wine/wine/server/sock.c,v retrieving revision 1.36 diff -u -r1.36 sock.c --- server/sock.c 21 Jun 2002 19:06:28 -0000 1.36 +++ server/sock.c 26 Jun 2002 11:22:13 -0000 @@ -67,6 +67,8 @@ unsigned int hmask; /* held (blocked) events */ unsigned int pmask; /* pending events */ unsigned int flags; /* socket flags */ + unsigned short type; /* socket type */ + unsigned short family; /* socket family */ struct event *event; /* event object */ user_handle_t window; /* window to send the message to */ unsigned int message; /* message to send */ @@ -124,6 +126,62 @@ 6, 7, 8, 9 /* leftovers */ }; +/* Flags that make sense only for SOCK_STREAM sockets */ +#define STREAM_FLAG_MASK ((unsigned int) (FD_CONNECT | FD_ACCEPT | FD_WINE_LISTENING | FD_WINE_CONNECTED)) + +typedef enum { + SOCK_SHUTDOWN_ERROR = -1, + SOCK_SHUTDOWN_EOF = 0, + SOCK_SHUTDOWN_POLLHUP = 1 +} sock_shutdown_t; + +static sock_shutdown_t sock_shutdown_type = SOCK_SHUTDOWN_ERROR; + +static sock_shutdown_t sock_check_pollhup (void) +{ + sock_shutdown_t ret = SOCK_SHUTDOWN_ERROR; + int fd[2], n; + struct pollfd pfd; + char dummy; + + if ( socketpair ( AF_UNIX, SOCK_STREAM, 0, fd ) ) goto out; + if ( shutdown ( fd[0], 1 ) ) goto out; + + pfd.fd = fd[1]; + pfd.events = POLLIN; + pfd.revents = 0; + + n = poll ( &pfd, 1, 0 ); + if ( n != 1 ) goto out; /* error or timeout */ + if ( pfd.revents & POLLHUP ) + ret = SOCK_SHUTDOWN_POLLHUP; + else if ( pfd.revents & POLLIN && + read ( fd[1], &dummy, 1 ) == 0 ) + ret = SOCK_SHUTDOWN_EOF; + +out: + close ( fd[0] ); + close ( fd[1] ); + return ret; +} + +void server_sock_init (void) +{ + sock_shutdown_type = sock_check_pollhup (); + + switch ( sock_shutdown_type ) + { + case SOCK_SHUTDOWN_EOF: + if (debug_level) fprintf ( stderr, "server_sock_init: shutdown() causes EOF\n" ); + break; + case SOCK_SHUTDOWN_POLLHUP: + if (debug_level) fprintf ( stderr, "server_sock_init: shutdown() causes POLLHUP\n" ); + break; + default: + fprintf ( stderr, "server_sock_init: ERROR in sock_check_pollhup()\n" ); + sock_shutdown_type = SOCK_SHUTDOWN_EOF; + } +} static int sock_reselect( struct sock *sock ) { @@ -222,7 +280,7 @@ static void sock_poll_event( struct object *obj, int event ) { struct sock *sock = (struct sock *)obj; - int empty_recv = 0; + int hangup_seen = 0; assert( sock->obj.ops == &sock_ops ); if (debug_level) @@ -270,7 +328,7 @@ } else { /* normal data flow */ - if (event & POLLIN) + if ( sock->type == SOCK_STREAM && ( event & POLLIN ) ) { char dummy; int nr; @@ -288,7 +346,7 @@ fprintf(stderr, "socket %d is readable\n", sock->obj.fd ); } else if ( nr == 0 ) - empty_recv = 1; + hangup_seen = 1; else { /* EAGAIN can happen if an async recv() falls between the server's poll() @@ -304,7 +362,19 @@ } } - else if (event & POLLHUP) empty_recv = 1; + else if ( sock_shutdown_type == SOCK_SHUTDOWN_POLLHUP && (event & POLLHUP) ) + { + hangup_seen = 1; + } + else if ( event & POLLIN ) /* POLLIN for non-stream socket */ + { + sock->pmask |= FD_READ; + sock->hmask |= (FD_READ|FD_CLOSE); + sock->errors[FD_READ_BIT] = 0; + if (debug_level) + fprintf(stderr, "socket %d is readable\n", sock->obj.fd ); + + } if (event & POLLOUT) { @@ -323,12 +393,12 @@ fprintf(stderr, "socket %d got OOB data\n", sock->obj.fd); } /* According to WS2 specs, FD_CLOSE is only delivered when there is - no more data to be read (i.e. empty_recv = 1) */ - else if ( empty_recv && (sock->state & (FD_READ|FD_WRITE) )) + no more data to be read (i.e. hangup_seen = 1) */ + else if ( hangup_seen && (sock->state & (FD_READ|FD_WRITE) )) { sock->errors[FD_CLOSE_BIT] = sock_error( sock->obj.fd ); - if ( event & POLLERR) - sock->state &= ~(FD_WINE_CONNECTED|FD_WRITE); + if ( (event & POLLERR) || ( sock_shutdown_type == SOCK_SHUTDOWN_EOF && (event & POLLHUP) )) + sock->state &= ~(FD_WINE_CONNECTED|FD_WRITE); sock->pmask |= FD_CLOSE; sock->hmask |= FD_CLOSE; if (debug_level) @@ -390,8 +460,8 @@ ev |= POLLIN | POLLPRI; if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->write_q))) ev |= POLLOUT; - /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication. */ - if (sock->mask & ~sock->hmask & FD_CLOSE) + /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ + if ( sock->type == SOCK_STREAM && ( sock->mask & ~sock->hmask & FD_CLOSE) ) ev |= POLLIN; return ev; @@ -526,6 +596,8 @@ sock->hmask = 0; sock->pmask = 0; sock->flags = flags; + sock->type = type; + sock->family = family; sock->event = NULL; sock->window = 0; sock->message = 0; @@ -586,6 +658,8 @@ acceptsock->mask = sock->mask; acceptsock->hmask = 0; acceptsock->pmask = 0; + acceptsock->type = sock->type; + acceptsock->family = sock->family; acceptsock->event = NULL; acceptsock->window = sock->window; acceptsock->message = sock->message; @@ -794,6 +868,7 @@ sock->hmask &= ~FD_CLOSE; sock->state |= req->sstate; sock->state &= ~req->cstate; + if ( sock->type != SOCK_STREAM ) sock->state &= ~STREAM_FLAG_MASK; pollev = sock_reselect( sock ); if ( pollev ) sock_try_event ( sock, pollev ); -- 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

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