- wine-devel - winehq.org

Unexpected calls of MODULE_LoadLibraryExA
by Sylvain Petreolle 25 Apr '02

25 Apr '02

Hi, Running the installer of the latest beta version of Povray gives these error when copying a file : MODULE_LoadLibraryExA fails because it is called with plain text files (for example pov sources). Function returns as it should, 193 (ERROR_BAD_EXE_FORMAT) err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Program Files\POV-Ray for Windows v3.5\renderer\slow.ini failed (error 193), check this file. err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Program Files\POV-Ray for Windows v3.5\renderer\tgaflc.ini failed (error 193), check this file. err:module:MODULE_LoadLibraryExA Loading of native DLL C:\Program Files\POV-Ray for Windows v3.5\renderer\tgafli.ini failed (error 193), check this file. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Patch to quite another Mingw Build warning (mmsystem.h)
by Steven Edwards 25 Apr '02

25 Apr '02

=================================================================== RCS file: /home/wine/wine/include/mmsystem.h,v retrieving revision 1.49 diff -u -r1.49 mmsystem.h --- mmsystem.h 10 Mar 2002 00:02:34 -0000 1.49 +++ mmsystem.h 25 Apr 2002 16:42:43 -0000 @@ -1335,9 +1335,11 @@ #define MMIO_CREATERIFF 0x0020 /* mmioCreateChunk: make a LIST chunk */ #define MMIO_CREATELIST 0x0040 /* mmioCreateChunk: make a RIFF chunk */ +#ifndef __MINGW__ #define SEEK_SET 0 #define SEEK_CUR 1 #define SEEK_END 2 +#endif /* __MINGW__ */ #define MMIOM_READ MMIO_READ /* read */ #define MMIOM_WRITE MMIO_WRITE /* write */ "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

2 2

Re: Kernel32 segfaults on compile
by Paul A. Kerr 25 Apr '02

25 Apr '02

Hi, my name is Paul. I have had a similar problem compiling various software, after a long battle I discovered that I had too little RAM on my machine. 48 mb on a 233PR IBM machine. I have now increased that memory to 96 mb, the problem has disapeared. If you could furnish a short list of the hardware, and software tools it would help greatly. Best regards Paul A. Kerr stardust(a)starmail.co.za On Wed, 17 Apr 2002 13:22:25 -0300 Ben Woodhead (ben(a)echotech.ca) wrote: >Hello Everybody.. > >I just tried but the 20020411 release and cvs and I get the same results >running ./tools/wineinstall > >make[2]: Entering directory `/home/ben/homes/src/wine/dlls/kernel' >LD_LIBRARY_PATH="../../unicode:$LD_LIBRARY_PATH" >../../tools/winebuild/winebuild -fPIC -L../../dlls -o kernel32.spec.c -spec >./kernel32.spec >make[2]: *** [kernel32.spec.c] Segmentation fault >make[2]: *** Deleting file `kernel32.spec.c' >make[2]: Leaving directory `/home/ben/homes/src/wine/dlls/kernel' >make[1]: *** [kernel/kernel32.dll.so] Error 2 >make[1]: Leaving directory `/home/ben/homes/src/wine/dlls' >make: *** [dlls] Error 2 > >I am running Slackware8.. >GCC version - 2.95.3 >GLIB version - 2.2.5 >GNU make verison - 3.79.1 > >Thanks, Ben >ps Is anybody else having this problem.. > E-mail stardust(a)starmail.co.za Ph +27 21 593 9100 Fax +27 593 1410 _______________________________________________________________ http://www.webmail.co.za the South-African free email service

1 0

CDRW precomando mount
by Marcelo Welter 25 Apr '02

25 Apr '02

Greatings Recently i install the packet module and UDF support in my kernel to use a CDRom writer like a diskete, but to mount this driver a need a precomand, and affer umount that need another comand That are possible in wine...? Thanks Marcelo Welter

2 1

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Michael Cardenas 25 Apr '02

25 Apr '02

Now, on to the work at hand. Attached is the output of running aol7 with +winsock, +file, with your latest series of winsock patches. Aol is still unable to handshake properly with it's web proxy and so you can't see any web content in aol or the buddy list. If anyone wants to work on aol or just to see it working, I can provide a deb package or a tarball that lets you install aol, so you don't have to worry about the aol installer working. I submitted some patches a few weeks ago that allow aol7 to launch. -- michael cardenas lead windows compatibility engineer lindows.com "Be the change you want to see in the world" -Mahatma Gandhi

1 0

Visual Basic 6 Setup Kit
by degs 25 Apr '02

25 Apr '02

Hi, I'm trying to run an installer which I *think* is built with the VB6 Setup Kit using Wine recent CVS. I get past the initial phase where the installer updates some files required by the installer itself but then when the blue background and the initial dialog comes up it wil not accept mouse or keyboard input. Has anybody come across this problem with VB apps/VB setup kit before? I've tried running with the default settings and also with managed=y or desktop=640x480 in .wine/config I notice that the inital dialog window is still managed by wine even if I have managed=y in .wine/config (other applications run under wine are managed by my X window manager though) I notice that I get a second desktop with the blue screen + initial dialog in it when desktop=640x480. The initial desktop window is empty (black). Clicking in the empty desktop window gives messages on the console such as: "fixme:class:get_class_ptr reading from class of other process window 10025" Clicking in the desktop where the installer is displayed does nothing and produces no console output. Any pointers as to how to debug this would be useful. thanks -- degs

1 0

Re: C/L utility to translate unix and dos paths
by Michael Wetherell 25 Apr '02

25 Apr '02

The 'configure' band still had broken long lines, and perhaps I shouldn't have had it there anyway since it can be generated, so I've just removed it. ChangeLog: * configure, configure.ac, Makefile.in, schedule/process.c programs/Makefile.in, programs/winepath/.cvsignore programs/winepath/Makefile.in, programs/winepath/winepath.c Mike Wetherell <mike.wetherell(a)ntlworld.com> Utility to convert between Unix and Windows paths at the command line. Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.20 diff -u -r1.20 configure.ac --- configure.ac 20 Apr 2002 21:00:42 -0000 1.20 +++ configure.ac 22 Apr 2002 22:50:08 -0000 @@ -1406,6 +1406,7 @@ programs/wcmd/Makefile programs/wineconsole/Makefile programs/winemine/Makefile +programs/winepath/Makefile programs/winetest/Makefile programs/winhelp/Makefile programs/winver/Makefile Index: Makefile.in =================================================================== RCS file: /home/wine/wine/Makefile.in,v retrieving revision 1.115 diff -u -r1.115 Makefile.in --- Makefile.in 17 Apr 2002 16:51:47 -0000 1.115 +++ Makefile.in 22 Apr 2002 22:50:09 -0000 @@ -30,7 +30,8 @@ # Programs that link with libwine LIBPROGRAMS = \ debugger/winedbg \ - programs/wineconsole/wineconsole + programs/wineconsole/wineconsole \ + programs/winepath/winepath # Libraries (not dlls) to build LIBRARIES = \ @@ -66,6 +67,7 @@ library \ ole \ programs/wineconsole \ + programs/winepath \ server \ tools \ tsx11 \ Index: scheduler/process.c =================================================================== RCS file: /home/wine/wine/scheduler/process.c,v retrieving revision 1.177 diff -u -r1.177 process.c --- scheduler/process.c 15 Apr 2002 15:38:10 -0000 1.177 +++ scheduler/process.c 22 Apr 2002 22:50:18 -0000 @@ -241,7 +241,7 @@ * * Main process initialisation code */ -static BOOL process_init( char *argv[] ) +BOOL process_init( char *argv[] ) { BOOL ret; size_t info_size = 0; Index: programs/Makefile.in =================================================================== RCS file: /home/wine/wine/programs/Makefile.in,v retrieving revision 1.14 diff -u -r1.14 Makefile.in --- programs/Makefile.in 11 Apr 2002 23:58:40 -0000 1.14 +++ programs/Makefile.in 22 Apr 2002 22:50:19 -0000 @@ -20,6 +20,7 @@ wcmd \ wineconsole \ winemine \ + winepath \ winetest \ winhelp \ winver diff -Nu programs/winepath/.cvsignore programs/winepath/.cvsignore --- programs/winepath/.cvsignore Thu Jan 1 01:00:00 1970 +++ programs/winepath/.cvsignore Tue Apr 23 00:15:47 2002 @@ -0,0 +1,2 @@ +Makefile +winepath diff -Nu programs/winepath/Makefile.in programs/winepath/Makefile.in --- programs/winepath/Makefile.in Thu Jan 1 01:00:00 1970 +++ programs/winepath/Makefile.in Tue Apr 23 00:15:47 2002 @@ -0,0 +1,27 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ + +PROGRAMS = winepath +MODULE = none +IMPORTS = ntdll.dll + +C_SRCS = \ + winepath.c + +all: $(PROGRAMS) + +@MAKE_RULES@ + +winepath: $(OBJS) + $(CC) $(CFLAGS) -o winepath $(OBJS) -L$(DLLDIR) $(IMPORTS:%=-l%) $(LIBWINE) $(LIBUNICODE) $(LDFLAGS) + +install:: $(PROGRAMS) + [ -d $(bindir) ] || $(MKDIR) $(bindir) + $(INSTALL_PROGRAM) winepath $(bindir)/winepath + +uninstall:: + $(RM) $(bindir)/winepath + +### Dependencies: diff -Nu programs/winepath/winepath.c programs/winepath/winepath.c --- programs/winepath/winepath.c Thu Jan 1 01:00:00 1970 +++ programs/winepath/winepath.c Tue Apr 23 00:17:07 2002 @@ -0,0 +1,184 @@ +/* + * Translate between Wine and Unix paths + * + * Copyright 2002 Mike Wetherell + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "config.h" + +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> + +#if defined(_WIN32) || defined(_WIN64) || defined(WINELIB) +#define WINDOWS 1 +#endif + +#define VERSION "0.1 (" PACKAGE_STRING ")" + +enum { + SHORTFORMAT = 1, + LONGFORMAT = 2, + UNIXFORMAT = 4 +}; + +static char *progname; + +/* Wine specific functions */ +extern BOOL process_init(char *argv[]); +typedef BOOL WINAPI wine_get_unix_file_name_t ( LPCSTR dos, + LPSTR buffer, + DWORD len ); +/* + * handle an option + */ +int option(int shortopt, char *longopt) +{ + const char *helpmsg = + "Convert PATH(s) to Unix or Windows long or short paths.\n" + "\n" + " -u, --unix output Unix format\n" + " -l, --long output Windows long format\n" + " -s, --short output Windows short format \n" + " -h, --help output this help message and exit\n" + " -v, --version output version information and exit\n" + "\n" + "The input paths can be in any format. If more than one option is given\n" + "then the input paths are ouput in all formats specified, in the order\n" + "Unix, long, short. If no option is given the default is Unix format.\n"; + + switch (shortopt) { + case 'h': + printf("Usage: %s [OPTION] [PATH]...\n", progname); + printf(helpmsg); + exit(0); + case 'v': + printf("%s version " VERSION "\n", progname); + exit(0); + case 'l': + return LONGFORMAT; + case 's': + return SHORTFORMAT; + case 'u': + return UNIXFORMAT; + } + + fprintf(stderr, "%s: invalid option ", progname); + if (longopt) + fprintf(stderr, "'%s'\n", longopt); + else + fprintf(stderr, "'-%c'\n", shortopt); + fprintf(stderr, "Try '%s --help' for help\n", progname); + exit(2); +} + +/* + * Parse command line options + */ +int parse_options(char *argv[]) +{ + int outputformats = 0; + int done = 0; + char *longopts[] = { "long", "short", "unix", "help", "version", "" }; + int i, j; + + for (i = 1; argv[i] && !done; ) + { + if (argv[i][0] != '-') { + /* not an option */ + i++; + continue; + } + + if (argv[i][1] == '-') { + if (argv[i][2] == 0) { + /* '--' end of options */ + done = 1; + } else { + /* long option */ + for (j = 0; longopts[j][0]; j++) + if (strcmp(argv[i]+2, longopts[j]) == 0) + break; + outputformats |= option(longopts[j][0], argv[i]); + } + } else { + /* short options */ + for (j = 1; argv[i][j]; j++) + outputformats |= option(argv[i][j], NULL); + } + + /* remove option */ + for (j = i + 1; argv[j - 1]; j++) + argv[j - 1] = argv[j]; + } + + return outputformats; +} + +/* + * Main function + */ +int main(int argc, char *argv[]) +{ +#ifndef WINDOWS + char *noargs[2] = { argv[0], NULL }; +#endif + wine_get_unix_file_name_t *wine_get_unix_file_name_ptr; + static char path[MAX_PATH]; + int outputformats; + int i; + + progname = argv[0]; + outputformats = parse_options(argv); + if (outputformats == 0) + outputformats = UNIXFORMAT; + +#ifndef WINDOWS + if (!process_init(noargs)) + exit(1); + wine_get_unix_file_name_ptr = wine_get_unix_file_name; +#else + if (outputformats & UNIXFORMAT) { + wine_get_unix_file_name_ptr = (wine_get_unix_file_name_t*) + GetProcAddress(GetModuleHandle("KERNEL32"), + "wine_get_unix_file_name"); + if (wine_get_unix_file_name_ptr == NULL) { + fprintf(stderr, "%s: cannot get the address of " + "'wine_get_unix_file_name'\n", progname); + exit(3); + } + } +#endif + + for (i = 1; argv[i]; i++) + { + if (outputformats & LONGFORMAT) { + GetLongPathNameA(argv[i], path, sizeof(path)); + printf("%s\n", path); + } + if (outputformats & SHORTFORMAT) { + GetShortPathNameA(argv[i], path, sizeof(path)); + printf("%s\n", path); + } + if (outputformats & UNIXFORMAT) { + wine_get_unix_file_name_ptr(argv[i], path, sizeof(path)); + printf("%s\n", path); + } + } + + exit(0); +}

1 0

New Winsock2 patch series - now tested
by Martin Wilck 25 Apr '02

25 Apr '02

Hi, I will now start to submit a new series of patches for Winsock2-related issues. Most of it is for overlapped IO, but there are some other issues, too. I have done a fair bit of testing with 16 and 32 bit network-oriented Windows apps, and found no regressions (well some apps wouldn't install or run with either the CVS version or my patched version of wine). Among the tested apps are - Opera (v5.12, 32bit, and 3.62, 16bit) - FreeAgent (news reader, 16bit) - Solstice Internet Mail (16bit) - Hamster local news server (32bit, interesting because it's using ReadFile()/WriteFile() for overlapped socket IO) - My evil overlapped testing server/client app I spotted a number of bugs with the "big" patch I sent to wine-devel last Friday. These are fixed in the version I'll submit now. The patch is now split into parts again (one bug fix for an earlier patch of mine that is already in CVS, and 7 "real" parts). Most of the testing has of course been done with the full patch set applied. I have tried to separate logically independent units, but I cannot swear that all is fine if only part of them is applied, and the later patches do fix some important problems. The main reason for splitting the stuff up is to make it easier for people to review. I honestly think that these patches are now ready for being applied to CVS and tested in the field. Here is the overall patch summary (for detailed explanantions see the patches thenmselves): - Correct handling of deferred WSAAccept() operations, - Change register_async() and the queue_async() method to allow more flexibility, needed for sockets, - Server support for overlapped IO on sockets, - Fix problem with FD_CLOSE never being delivered in some situations, - Wait for POLLIN if FD_CLOSE event notification is requested to catch grateful close or shutdown by the peer (empty recv(), no POLLHUP), - Implement overlapped WSARecvFrom()/WSASendTo() and WSAGetOverlappedResult(), - Change shutdown() to account for pending overlapped requests, - Change ReadFile() semantics for overlapped reads on sockets (return even if buffer is not yet full), - Improve error reporting for asynchronous requests (files and sockets) - Account for the SO_OPENTYPE socket option on a per-thread basis. I plan to look into the regression-testing code and also supply a few tests for the new socket functionality. Cheers (and please test this stuff with your apps!), 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 4

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Martin Wilck 25 Apr '02

25 Apr '02

On Wed, 24 Apr 2002, Michael Cardenas wrote: > If anyone wants to work on aol or just to see it working, I can provide a deb > package or a tarball that lets you install aol, so you don't have to worry > about the aol installer working. I submitted some patches a few weeks ago > that allow aol7 to launch. I'd like to test it, but I can't connect to AOL proxies from here (firewall). And I am not really interested in becoming an AOL member just to get this straight... However I shall help as much as I can without having AOL running on my machines. 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

1 0

Re: wine and aol7 [was: Re: New Winsock2 patch series - now tested]
by Martin Wilck 25 Apr '02

25 Apr '02

Hi Michael, I wonder whether "flags" is an invalid pointer - but I cannot figure out why it should be, from the calls to FILE_GetUnixGandleType that exist. Please try to generate a trace with trace+winsock,trace+server,trace+file. 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

1 0

Last patch for Mingw32 Warnings
by Steven Edwards 25 Apr '02

25 Apr '02

Once again if someone wants to help I only have one warning left to fix. Changelog: More Mingw32 warning fixes cvs diff -u winnls.h Index: winnls.h =================================================================== RCS file: /home/wine/wine/include/winnls.h,v retrieving revision 1.32 diff -u -r1.32 winnls.h --- winnls.h 10 Mar 2002 00:02:34 -0000 1.32 +++ winnls.h 25 Apr 2002 07:07:43 -0000 @@ -26,6 +26,13 @@ extern "C" { #endif +#ifdef __MINGW__ +#undef _MAX_PATH +#undef _MAX_DIR +#undef _MAX_EXT +#undef _MAX_DRIVE +#include "stdlib.h" +#endif #define MB_PRECOMPOSED 0x00000001 #define MB_COMPOSITE 0x00000002 "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

1 0

Send the first two mingw32 patches to /dev/null and use these instead
by Steven Edwards 25 Apr '02

25 Apr '02

Sorry about that. If you decide to apply them use this instead. I messed up and used CFLAGS=-D_MINGW_ instead of __MINGW__ cvs diff -u windef.h 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 #define HFILE_ERROR ((HFILE)-1) cvs diff -u makedep.c Index: makedep.c =================================================================== RCS file: /home/wine/wine/tools/makedep.c,v retrieving revision 1.10 diff -u -r1.10 makedep.c --- makedep.c 10 Mar 2002 00:24:22 -0000 1.10 +++ makedep.c 25 Apr 2002 02:11:38 -0000 @@ -24,6 +24,10 @@ #include <string.h> #include <unistd.h> +#ifdef __MINGW__ /* Taken from GLib */ +#define ftruncate(fd, size) +#endif + /* Max first-level includes per file */ #define MAX_INCLUDES 200 "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

1 0

Re: Installing MS Office gives error in installer
by Speeddymon 25 Apr '02

25 Apr '02

actually i did manage to get it work work from the cd, you have to explicitly specify the -o unhide command when you run mount or put the unhide command in your /etc/fstab... as for the files not getting written, i had the same problem, it is the .lnk files (that i assume go in the start menu on windows)...i am thinking that they aren't being properly converted to .desktop files or something. I will try installing with crossover office tonight and post the results tomorrow -Dustin --- Rizsanyi Zsolt <rizsanyi(a)myrealbox.com> wrote: On Wednesday 17 April 2002 21:42, Speeddymon wrote: > > I just recently installed wine-20020411 (as you > > may > > have noticed from my patch) > > I haven't tried installing Office 2000 on previous > > versions, but heard that it worked, so I decided > to > > try it. First I tried it in Crossover Office > (since i > > just recently got that also) and the Office 2000 > > installer complained that it couldnt find a > package to > > install on the installation media. So I tried it > in > > wine and it did the same thing... There were no > debug > > messages or anything (in the console). > > > > If anyone knows of a way around this, please let > me > > know... If it has been mentioned before please > point > > me to the right wine-devel archive so I can find > it... > > I have also dared to try to install office2k, and > had the same problem. > But I have found a workaround... > When the installation fails, the MSI installer is > already copied to your > windows directory (I think its name is > installmsi.exe or something like that > - I dont have it at hand). So I have tried to invoke > it with the msi file in > the root of the CD (the data1.msi or something like > that - the other msi is > something else). > This way the installation started. The configuration > of what programs to > install worked perfectly, but when copying the files > the installer broke, and > said that it can't write a file. I dont know what > was the problem. I had > enough space, the persmissions were ok, and so on. > > I have tried again, and the installer broke again > but now with a different > file. So I give up, since I don't really need it to > install, just I wanted to > see what the people are talking about... But if you > find a solution (or > submit a patch :), then I will be interested... > > Best regards, > Zsolt Rizsanyi > __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/

3 9

Another warning fix for Mingw32
by Steven Edwards 25 Apr '02

25 Apr '02

Same as last, if someone wants to help write a conf check by all means. Changelog: If the platform isnt MingW32 then define MAX_PATH cvs diff -u windef.h 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:00:24 -0000 @@ -157,8 +157,9 @@ #define _MAX_EXT _MAX_FNAME #define _MAX_PATH 260 #endif +#if ! defined (_MINGW_) #define MAX_PATH _MAX_PATH - +#endif #define HFILE_ERROR ((HFILE)-1)

1 0

Another Minor Mingw32 Patch
by Steven Edwards 25 Apr '02

25 Apr '02

This one could have a configure check but I havent had the time to learn How to properly write one and mingw is the only platform I know of that doesn't have ftruncate support. If anyone has the time and wants to help I have about 4 or 5 things I need ./conf checks written for. Changlog: Added ftruncate support for makedep on MingW32 cvs diff -u makedep.c Index: makedep.c =================================================================== RCS file: /home/wine/wine/tools/makedep.c,v retrieving revision 1.10 diff -u -r1.10 makedep.c --- makedep.c 10 Mar 2002 00:24:22 -0000 1.10 +++ makedep.c 25 Apr 2002 01:42:50 -0000 @@ -24,6 +24,10 @@ #include <string.h> #include <unistd.h> +#ifdef _MINGW_ /* Taken from GLib */ +#define ftruncate(fd, size) +#endif + /* Max first-level includes per file */ #define MAX_INCLUDES 200

1 0

RE: minor regression testing patch
by Geoffrey Hausheer 25 Apr '02

25 Apr '02

> -----Original Message----- > From: Alexandre Julliard julliard(a)winehq.com {WineHQ-devel} > Version checks are a bad idea because this is not how Wine is > implemented. For instance GetLongPathName under Wine doesn't try to > fail if you are running with -winver win95, it just works. Adding > version checks in the tests just means that some functions won't get > tested if you run with the wrong version. > > The right way is to always call the function no matter the version, > and check that the call either succeeds as expected, or fails in the > way that it's supposed to fail on a platform that doesn't support it. The problem I forsee with this is that it makes writing tests a bit tricky for functions that behave differently on different platforms (i.e. defining the failure conditions correctly). Otherwise, it is a good thing to strive for. I'll try to modify the tests I've written to behave in this manner, and see how much work it is. Unfortunately, it is somewhat difficult, since I don't (in general) have access to the platforms which don't support the functions. So I can write tests that pass on Win2k, Win98, and wine, but as soon as someone runs it on win95 or nt4.0, it will likely fail (since I have no idea what the failure mechanism will be on these platforms, and thus can't gaurd against it) until someone can provide enough feedback to allow the test to be fixed. My assumption has always been: Make the function work correctly on Windows, and then add todo's to support wine. Thus I've put the effort in upfront to catch errors when the application runs on an MS OS. It sounds to me that you are proposing a more wine-centric testing base (make the tests work in Wine, and fix problems encountered in Windows as they pop up...or be a lot more knowledgeable than me at how Windows is supposed to behave). So far I have written all my tests based purely on the MSDN spec, and then tweaked them when an OS behaves differently than documented. If I don't use OS-specific checks, I just feel like I'm leaving a known whole in my test if I don't account for the the cases which are documented not to work (and which I don't know how they will behave). For instance the thread.c test that I wrote makes (some) checks for access control, which only work on win2k+. The way I wrote the test, it just worked in win98 when I finally got around to testing it. Had I just executed the checks, I would have had no idea how Win98 would behave (hopefully with a nice SetError, but god only knows), and the test would certainly have failed on win98 until I was able to try it and figure out how it dealt with this unsupported functionality. Lastly, what is the recomendation for dealing with cases like this: lstrcpyA(tmpstr,"aaaaaaaa"); len1=GetTempPathA(len,tmpstr); /*this should fail because len is too small */ ok(len1==len+1, "GetTempPathA should return string length %d instead of %d",len+1,len1); if(WIN2K_PLUS(version)) { /* in Win2k, the path won't be modified, but in win98, wine it is */ todo_wine { ok(lstrcmpiA(tmpstr,"aaaaaaaa")==0, "GetTempPathA should not have modified the buffer"); } } One answer is not to test this, since it is not documented what the result will be, but the OSes certainly behave differently, and it is possible that some program takes advantage of this. I'm sure there are other similar cases, and I'd like to know (in general) what the right solution will be. I'm probably making a mountain out of a molehill, and I'll just try modifying my tests to work the way Alexandre proposes. I'm just afraid this is setting additonal obstacles for (non Wine) developers to write regression tests. Thanks, .Geoff

3 2

Re: C/L utility to translate unix and dos paths
by Michael Wetherell 24 Apr '02

24 Apr '02

On Wednesday 24 Apr 2002 7:51 pm, you wrote: > --- Michael Wetherell <mike.wetherell(a)ntlworld.com> > > wrote: > > Yes I know cygpath, winepath is intended to be a > > kind of Wine version of the > > same thing. > > > > The programs aren't interchangeable though, cygpath > > knows about Cygwin's > > mount points while winepath knows about Wine's DOS > > drives. > > Agree. Thought you may not know about cygpath and this > information will be interesting for you. > > Andiry > Yes thanks, it was interesting, many options. Mike

1 0

err:ntdll:RtlpWaitForCriticalSection
by Insyde 24 Apr '02

24 Apr '02

Hi, Starting a program with: wine --winver win2k --debugmsg -relay,+x11drv,+snoop+dll iyp022.exe (the same error occurs with --winver win98/win95) gives me the folowing error: x11drv: Warning: $DISPLAY variable ignored, using ':0.0' specified in config file fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet. err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=021f wine: Unhandled exception, starting debugger... x11drv: Warning: $DISPLAY variable ignored, using ':0.0' specified in config file err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=021f err:win:WIN_FindWndPtr window 30021 belongs to other process err:win:WIN_FindWndPtr window 30021 belongs to other process In the debbuger windows I have some debug msgs that the debbuger is trying to load and at the end it shows this message: Unhandled exception: wait failed on critical section 0x400f164c (loader_section in libntdll.dll.so) First chance exception: wait failed on critical section 0x400f164c (loader_section in libntdll.dll.so) and this message keeps repeating. How can I solve this? Already tryed with native ntdll.dll and it doesn't work. The program runs OK under Windows. Another problem I'm having is that if I don't specify --winver it doesn't work at all. Is it right? Thanks, Ricardo.

1 0

minor regression testing patch
by Paul Millar 24 Apr '02

24 Apr '02

Hi, Found attached bug. Curiously, the test doesn't fail even if wine is pretending to be Windows 95 :) ChangeLog: Fixed typo "Major" -> "Minor" BTW, After the patch, the test for WIN98 or later is: #define WIN98_PLUS(version) (version.dwMajorVersion==4 && \ version.dwMinorVersion>0) but, MS's documentation: http://msdn.microsoft.com/library/en-us/sysinfo/sysinfo_49iw.asp suggests something more like: #define WIN98_PLUS(version) \ ( (version.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) && \ ( (version.dwMajorVersion > 4) || \ (version.dwMajorVersion==4 && version.dwMinorVersion>0))) Is this more correct? ---- Paul Millar

3 5

RE: minor regression testing patch
by Geoffrey Hausheer 24 Apr '02

24 Apr '02

> -----Original Message----- > From: Paul Millar paulm(a)astro.gla.ac.uk {WineHQ-devel} > ... > > Perhaps it would be best to make a test.h somewhere > > and put all of these kind of definitions someplace so we > don't need to > > redefine them for each test. > > Hmmm, was there an email about that a while ago? I thought Alexandre > wasn't happy with the idea, but I can't remember why... > I looked through the archives again, and couldn't find this topic having been discussed before. In any case, there is already wine/test.h, so I think adding some defines in there should be ok (I don't have a copy in front of me, so maybe it's not exactly the right place). If I don't see any further activity on this thread, I'll just stick the required defines in there next time I submit a test, and see if anyone complains. .Geoff

1 0

Re: [PATCH] ./tools/wineinstall *correct (.diff) format*
by Alexandre Julliard 24 Apr '02

24 Apr '02

Speeddymon <speeddymon(a)yahoo.com> writes: > ModifiedFiles: tools/wineinstall > =================================================================== > RCS file: /home/wine/wine/tools/wineinstall,v > retrieving revision 1.26 > diff -u -r1.26 wineinstall > --- wineinstall 1 Apr 2002 20:56:51 -0000 1.26 > +++ wineinstall 17 Apr 2002 23:06:39 -0000 > @@ -291,6 +310,14 @@ > sucommand="echo $libdir>>/etc/ld.so.conf;ldconfig;$sucommand" > } > fi > + if [ -f /etc/ld.so.conf ] && ! grep -qs "$libdir/wine" /etc.ld.so.conf > + then { > + echo > + echo "$libdir/wine doesn't exist in your /etc/ld.so.conf, it will be" > + echo " added when we perform the install..." > + sucommand="echo $libdir/wine>>/etc/ld.so.conf;$sucommand" > + } > + fi $libdir/wine must not be added to ld.so.conf. Users have to set the WINEDLLPATH variable if Wine is not installed in the directory that was specified with --prefix (which shouldn't happen with wineinstall). -- Alexandre Julliard julliard(a)winehq.com

4 5

comm.c: TransmitCommChar
by Marcelo Welter 24 Apr '02

24 Apr '02

Greatings I have some application qhen use the comm.c:TransmitCommChar function, but this function are not implemented. anybody have one ideia to me go around this problem...? thaks and sorry per my litle english Marcelo Welter

4 6

Porting WineLib on PPC, using Bochs for binaries
by KandY 24 Apr '02

24 Apr '02

Hi everybody, I'm currently very interested by porting some of the Wine tech.on PPC. I've been looking for people interested in this kind of painful duty but I didn't see anybody carrying this type of idea anywhere on the Web. I've already mailed some people on that subject and someone told me some people were trying to port WineLib on Sparc (Ulrich Weigand for instance...). Does anybody of you have more information on that ? Did somebody did that somewhere on the globe? Besides that, to achieve my binary compatibility, I was looking at the Bochs emulation. Of course, I'm currently affected by some messages on the web saying the performances are not that great. I have nothing against emulation of machines but I only want to know of it is possible to port the Bochs on my Linux PPC and what performances can I expect (aren't there any benches to help me make my decision ?). Someone said that with a PIII 933, one can reach 3.5MIPS. Who can tell me success stories on that before I start working ? Yann K.

3 2

Re: printing problem?
by Insyde 24 Apr '02

24 Apr '02

sorry, wine version 20020411 Ricardo.

1 0

printing problem?
by Insyde 24 Apr '02

24 Apr '02

I tried to run a program but When I log in and sends me to the other program I have this error: 0806ea98:Call kernel32.VirtualFree(40a50000,00000000,00008000) ret=6a91583f 0806ea98:Ret kernel32.VirtualFree() retval=00000001 ret=6a91583f 0806ea98:Call kernel32.VirtualFree(40b50000,00000000,00008000) ret=6a915818 0806ea98:Ret kernel32.VirtualFree() retval=00000001 ret=6a915818 0806ea98:Ret PE DLL (proc=0x6a9110d9,module=6a910000,type=0,res=0x1) retval=1 0806ea98:Call PE DLL (proc=0x405b0ea8,module=40593000,type=0,res=0x1) 0806ea98:Ret PE DLL (proc=0x405b0ea8,module=40593000,type=0,res=0x1) retval=1 0806ea98:Call PE DLL (proc=0x407a1268,module=40796000,type=0,res=0x1) 0806ea98:Ret PE DLL (proc=0x407a1268,module=40796000,type=0,res=0x1) retval=1 0806ea98:Call PE DLL (proc=0x406a61d0,module=4069c000,type=0,res=0x1) 0806ea98:Ret PE DLL (proc=0x406a61d0,module=4069c000,type=0,res=0x1) retval=1 0806ea98:Call PE DLL (proc=0x407271ec,module=40717000,type=0,res=0x1) 0806ea98:Ret PE DLL (proc=0x407271ec,module=40717000,type=0,res=0x1) retval=1 x11drv: Warning: $DISPLAY variable ignored, using ':0.0' specified in config file err:winspool:WINSPOOL_OpenDriverReg win32 style printing used with 16 bits app, try -winver win95 err:winspool:AddPrinterDriverA Can't create Drivers key err:winspool:WINSPOOL_LoadSystemPrinters Failed adding PS Driver (6) fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f wine: Unhandled exception, starting debugger... x11drv: Warning: $DISPLAY variable ignored, using ':0.0' specified in config file err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:ntdll:RtlpWaitForCriticalSection section 0x400f164c "module.c: loader_section" wait timed out, retrying (60 sec) fs=024f err:win:WIN_FindWndPtr window 30021 belongs to other process err:win:WIN_FindWndPtr window 30021 belongs to other process can anyone help me? Thanks Ricardo.

1 0

Re: C/L utility to translate unix and dos paths
by Andriy Palamarchuk 24 Apr '02

24 Apr '02

--- Michael Wetherell <mike.wetherell(a)ntlworld.com> wrote: > Here's a small utility to convert between Unix and > Windows style paths > at the command line. [... skip ...] Mike, you may be interested in cygwin utility cygpath of the same purpose. For description see: http://cygwin.com/cygwin-ug-net/using-utils.html#CYGPATH Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/

1 0

Re: Re: CoGetClassObject and SHQueryValueEx A/W/AW fixxes
by juergen.schmied＠debitel.net 24 Apr '02

24 Apr '02

> I chose SHGetRegPathW from shlwapi, because that seemed to be the best > matching function for getting the registry string. I did not call a *AW > function directly. I fixed the SHQueryValueExW to convert the incoming > strings to ascii, _because_ the SHQueryValueExAW function had a bug in > handling ExpandEnviromentStringsA (always failed) and was ascii-only (it > doesn't seem to handle unicode at all). That was also the part i was not > completely happy about. I must say i'm not to happy about including > shlwapi either, but i think it is better than reinventing the wheel. I'm looking into the SHReg* functions at the moment and do a little cleanup i allready found some more glitches. > What would you suggest i do? Move SHGetRegPath into a libwine and make a > dependency from shlwapi and compobj(ole32) to that library? reimplement > SHGetRegPathW and SHQueryValueExW in place in compobj.c ? Especially > with the lib seperation going on.. there will be more and more inter-dll > dependencys, must we avoid that at all cost? No, we must avoid such dependencys and reimplement this functionality where needed. I send a patch in a few days. juergen

1 0

Fail to run Dreamweaver 4 -iKernel error
by leanne 24 Apr '02

24 Apr '02

Dear all, I tried. to run Dreamweaver 4. After running "Preparing ...." I got iKernel error. Attached pls find the ikernel_error.png Could anybody help? Thanks. Leanne

1 0

IE5.x and Toolbars
by Guy L. Albertelli 24 Apr '02

24 Apr '02

This note is just to document what happens in IE5.5 when using the "Favorites" dropdown menu. With the native control, if the mouse hovers over a folder, IE will expand the folder. The expansion is accomplished by the following steps: 1. IE will set a timer on the Toolbar window with id=8001 2. WM_TIMER message for id=8001 on the Toolbar window occurs. 3. Since the Toolbar window is subclassed via comctl.410 (and friends), the subclass WndProc (in native comctl32) somehow calls a part of IE which issues a KillTimer and a PostMessage of message 0xc057 against the main window. 4. When message 0xc057 is dispatched, it issues a few TB_... messages and then eventually issues a CreateWindowExA for the next "BaseBar" window. This then drives the creation of the pop-out window. Since we don't support comctl32.410, .411, .412, and .413, this doesn't work (and will never work till we do support those undocumented routines). <rant> The reason MS can't make a modular Windows is because apparently no one there understands what modular means. Maybe they should work a summer building double wide trailers. </rant> Guy Albertelli <<galberte(a)neo.lrun.com>>

1 0

Re: comm.c:COMM_BuildOldCommDCB err...
by Joerg Mayer 24 Apr '02

24 Apr '02

On Tue, Apr 23, 2002 at 05:43:32PM -0700, Duane Clark wrote: > Forwarded for marcelo(a)sysmo.com.br > + if (!strncasecmp(device,"COM",3)) strcpy(temp,device+5); > + else strcpy(temp,device); What happens, if device is "COM\0" ? Ciao 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.

1 0

MoveFileExA bug and half-a-solution
by Jeremy Shaw 23 Apr '02

23 Apr '02

Hello, The Problem: There is a bug in MoveFileExA (files/file.c). MoveFileExA will (usually) call rename() in libc to move a file. Unfortunately, this causes problems because it does not update the sharing table. I will illustrate with an example. When the Office intaller tries to install Internet Explorer it sees that the file: C:\Windows\System\UrlMon.dll exists and moves it to: C:\Windows\System\IE4Setup\UrlMon.dll it then tries to create the file C:\Windows\System\UrlMon.dll but fails because of a "sharing violation". It believes that a file already exists at c:\window\systems\urlmon.dll, because, according to the shared table, one does. But on the disk, the file has been moved. The Half-a-fix: It seems odd to me that MoveFileExA is directly renaming the file. The other functions in the same file do their dirty work via wineserver. Does it seem reasonable that I should have to add a new wineserver request for "MoveFile" that will rename the file and update the share table? Or am I missing something obvious? Also of note: I do not think this has been a "problem" until some recent changes in MoveFileExA where these lines were removed: /* check, if we are allowed to delete the source */ hFile = CreateFileA(full_name1.long_name, 0, 0, NULL,OPEN_EXISTING,0,0); if(hFile == INVALID_HANDLE_VALUE) return FALSE; CloseHandle(hFile); If a file was being shared, this code would prevent it from being moved. So, perhaps that was the right fix? Maybe you can't move a file that is being "shared"? If that is the case, there does not seem to be code in place anymore to prevent you from moving a shared filed. Thanks for you help! I will send a patch in, as soon as I got one. Jeremy Shaw. Here is a trace of the bug in action: Its shows the file being moved, a log file being updated, and then the CreateFileA failing. ** 080baec8:Call kernel32.MoveFileA(403d1e94 "C:\\WINDOWS\\SYSTEM\\URLMON.DLL",40556734 "C:\\WINDOWS\\SYSTEM\\IE4Setup\\URLMON.DLL") ret=500f6a98 retval=00000001 ** trace:file:MoveFileA (C:\WINDOWS\SYSTEM\URLMON.DLL,C:\WINDOWS\SYSTEM\IE4Setup\URLMON.DLL) ** trace:file:MoveFileExA (C:\WINDOWS\SYSTEM\URLMON.DLL,C:\WINDOWS\SYSTEM\IE4Setup\URLMON.DLL,0002) ** 080baec8:Ret kernel32.MoveFileA() retval=00000001 ret=500f6a98 ** 080baec8:CALL mssetup.87: FLogOpen() ret=500f78ff retval=00000001 ** 080baec8:RET mssetup.87: FLogOpen() retval=00000001 ret=500f78ff ** 080baec8:Call kernel32.FormatMessageA(00000500,500f1be0,00000000,00000000,40556710,00000000,4055670c) ret=500f7927 retval=0000005a ** 080baec8:Ret kernel32.FormatMessageA() retval=0000005a ret=500f7927 ** 080baec8:CALL mssetup.100: FWriteToLogFile(403d20a8,00000000) ret=500f7938 retval=00000001 *** 080baec8:Call kernel32.SetErrorMode(00000001) ret=5009df3c retval=00000000 *** 080baec8:Ret kernel32.SetErrorMode() retval=00000000 ret=5009df3c *** 080baec8:Call kernel32.CreateFileA(4036a7e0 "C:\\WINDOWS\\IE Setup Log.Txt",c0000000,00000000,00000000,00000003,00000000,00000000) ret=5009df92 retval=0000008c *** trace:file:CreateFileA C:\WINDOWS\IE Setup Log.Txt GENERIC_READ GENERIC_WRITE OPEN_EXISTING *** 080baec8:Ret kernel32.CreateFileA() retval=0000008c ret=5009df92 *** 080baec8:Call kernel32.SetErrorMode(00000000) ret=5009dfdd retval=00000001 *** 080baec8:Ret kernel32.SetErrorMode() retval=00000001 ret=5009dfdd *** 080baec8:Call kernel32.SetFilePointer(0000008c,00000000,00000000,00000002) ret=5009e199 retval=0000356a *** trace:file:SetFilePointer handle 140 offset 0 high 0 origin 2 *** 080baec8:Ret kernel32.SetFilePointer() retval=0000356a ret=5009e199 *** 080baec8:Call kernel32.lstrlenA(403d20a8 "\tMoveFile succeeded: C:\\WINDOWS\\SYSTEM\\URLMON.DLL to C:\\WINDOWS\\SYSTEM\\IE4Setup\\"...) ret=5009e388 retval=0000005a *** 080baec8:Ret kernel32.lstrlenA() retval=0000005a ret=5009e388 *** 080baec8:Call kernel32.WriteFile(0000008c,403d20a8,0000005a,405566c8,00000000) ret=5009e161 retval=00000001 *** trace:file:WriteFile 140 0x403d20a8 90 0x405566c8 (nil) *** 080baec8:Ret kernel32.WriteFile() retval=00000001 ret=5009e161 *** 080baec8:Call kernel32.lstrlenA(500c68f4 "\r\n") ret=5009e388 retval=00000002 *** 080baec8:Ret kernel32.lstrlenA() retval=00000002 ret=5009e388 *** 080baec8:Call kernel32.WriteFile(0000008c,500c68f4,00000002,405566c8,00000000) ret=5009e161 retval=00000001 *** trace:file:WriteFile 140 0x500c68f4 2 0x405566c8 (nil) *** 080baec8:Ret kernel32.WriteFile() retval=00000001 ret=5009e161 *** 080baec8:Call kernel32.CloseHandle(0000008c) ret=5009e0ef retval=00000001 *** 080baec8:Ret kernel32.CloseHandle() retval=00000001 ret=5009e0ef ** 080baec8:RET mssetup.100: FWriteToLogFile() retval=00000001 ret=500f7938 ** 080baec8:Call kernel32.LocalFree(403d20a8) ret=500f7941 retval=00000000 ** 080baec8:Ret kernel32.LocalFree() retval=00000000 ret=500f7941 ** 080baec8:Call kernel32.CopyFileA(40556734 "C:\\WINDOWS\\SYSTEM\\IE4Setup\\URLMON.DLL",403d1e94 "C:\\WINDOWS\\SYSTEM\\URLMON.DLL",00000000) ret=500f6aca retval=00000000 ** trace:file:_lopen ('C:\WINDOWS\SYSTEM\IE4Setup\URLMON.DLL',0000) ** trace:file:CreateFileA C:\WINDOWS\SYSTEM\IE4Setup\URLMON.DLL GENERIC_READ FILE_SHARE_READ FILE_SHARE_WRITE OPEN_EXISTING ** trace:file:CreateFileA C:\WINDOWS\SYSTEM\URLMON.DLL GENERIC_WRITE FILE_SHARE_READ FILE_SHARE_WRITE CREATE_ALWAYS ** 080baec8:Ret kernel32.CopyFileA() retval=00000000 ret=500f6aca

1 0

RE: tools/wineinstall problems
by Medland, Bill 23 Apr '02

23 Apr '02

> -----Original Message----- > From: Stig Vig [mailto:lancer_irc@hotmail.com] > Sent: Tuesday, April 23, 2002 1:36 PM > To: wine-devel(a)winehq.com > Subject: tools/wineinstall problems > > > Hi > I love your wine except one thing. I cant install it proper. > When I run > tools/wineinstall and it asks for the root password, it says > it's wrong > password but I have entered the right. In the message it says > that I shoudl > email on this adress if its a problem of this sort. So now I > be gratefull if > you could help me solw my problem. > //greets lancer > > > _________________________________________________________________ > MSN Photos is the easiest way to share and print your photos: > http://photos.msn.com/support/worldwide.aspx > > In the wineinstall script correct the following two lines: 1. Where it mentions "ldconfig" explicitly state "/sbin/ldconfig" 2. Where it says su -c"$sucommand" put su -c "$sucommand" Then run it again and that should solve it. Bill

1 0

The Euro symbol
by Medland, Bill 23 Apr '02

23 Apr '02

I am looking into getting the Euro symbol (Cp1252 0x80 ie U20ac) to display (and print) from Wine programs. I am running RedHat 7.1. From my quick literature search it looks to me like it isn't going to be easy. Am I being too pessimistic? Are there people out there who have been using it for ages? TIA Bill

2 1

tools/wineinstall problems
by Stig Vig 23 Apr '02

23 Apr '02

Hi I love your wine except one thing. I cant install it proper. When I run tools/wineinstall and it asks for the root password, it says it's wrong password but I have entered the right. In the message it says that I shoudl email on this adress if its a problem of this sort. So now I be gratefull if you could help me solw my problem. //greets lancer _________________________________________________________________ MSN Photos is the easiest way to share and print your photos: http://photos.msn.com/support/worldwide.aspx

1 0

internet explorer regression
by Michael Cardenas 23 Apr '02

23 Apr '02

I just picked up the latest cvs and some time in the last 3 weeks someone put in a patch that causes IE5 to crash when typing in an address in the address bar. I used office 2k pro to test. Also, windows media player can't install downloaded codecs, and it can in crossover office, but I'm not sure if that's a regression or an old bug. It complains about security settings. -- michael cardenas lead windows compatibility engineer lindows.com "Be the change you want to see in the world" -Mahatma Gandhi

2 2

Re: small patch for ./tools/wineinstall
by Speeddymon 23 Apr '02

23 Apr '02

alright thanks, the reason i thought you needed internet/cvs was because of the way that the winehq patch-making page was worded...it says to use cvs diff (instead of regular diff). I thoguht that there may be a difference in the 2, so I didnt want to make the diffs with diff when they required cvs diff. But now that I know, i will submit in diff format... Maybe the winehq site maintainer (alexandre?) could make that a little more clear (for us patch-contributing newbies/relative newbies) --- Tony Lambregts <tony_lambregts(a)telusplanet.net> wrote: > Speeddymon wrote: > > >as I have said a couple times, i dont have any way > to > >make the proper diff's due to the fact that I have > no > >internet at home, thanks again for making them for > me, > >I will be submitting the 2 diff's tomorrow (can't > do > >it here due to the fact that this computer is at > >compusa and has downloading disabled) > > > >Would there be anyone willing to make diff's for me > >when I have a patch to post? if so, could you > please > >email me directly so I know who to talk to? > > > >Thanks in advance > > > Well I would be glad to make diffs for you but it > really is not required > that you have CVS or the Internet to make propper > diffs. > > diff -u wineinstall.old wineinstall > > wineinstall.dif > > Where wineinstall.old is the original file (that you > saved somewhere or > got from the tarball) and wineinstall is the file > with your changes. > "man diff" will give you more information but thats > about all that you > need to know. > > You can edit the wineinstall.dif to get rid of the > .old extention but > I'm not sure its required. I guess to be on the safe > side I would get > rid of it. > > Tony Lambregts > > > PS: dont feel too bad there are tons of stuff that I > don't know either. > > __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/

1 0

toolbar.c problem (ATTN: Duane)
by Dusan Vujosevic 23 Apr '02

23 Apr '02

Hi, I am having a problem with the way toolbar.c was modified between revisions 1.107 & 1.108. My application (Signlab) pops flyout toolbars that stay around until they lose focus. The parent toolbar receives a 'TBN_DROPDOWN' message when someone clicks on one of its flyout buttons (button style: TBSTYLE_DROPDOWN). It creates a flyout at that point. With revision 1.108 of toolbar.c in Wine the parent toolbar also receives an WN_COMMAND after TBN_DROPDOWN message which causes Wine (rightly so) to send an WM_SETFOCUS (and WM_ACTIVATE). That causes the parent to regain focus and kills the flyout. The line that sends the WN_COMMAND is in toolbar.c at line 4540 (TOOLBAR_LButtonUp() function): SendMessageA (infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(infoPtr->buttons[nHit].idCommand, 0), (LPARAM)hwnd); In revision 1.107 it used to be: if (bSendMessage) SendMessageA (infoPtr->hwndNotify, WM_COMMAND, MAKEWPARAM(btnPtr->idCommand, 0), (LPARAM)hwnd); And that worked fine because it would never send WM_COMMAND for a flyout button. Note that WinXP (that's where I tested) doesn't send WM_COMMAND after TBN_DROPDOWN has been handled. I would like to suggest revert that line back to 1.106 because it is the correct way. If other apps are were having problems with 1.106 (Duane was mentioning Acrobat Reader - I will test that..) I suggest that the problem might be elsewhere. Should I supply a patch? Cheers, Dusan

4 12

Re:unit test (C) with WINAPIV function
by Eric Pouech 23 Apr '02

23 Apr '02

> ok ((wsprintfW (buf, fmt -1) == 10), "wsPrintfW length failure"); shouldn't it be wsprintfW (buf, fmt, -1) == 10 instead ? ^ | A+ --------------- Eric Pouech (http://perso.wanadoo.fr/eric.pouech/) The future will be better tomorrow, Vice President Dan Quayle ____________________________________________________________ Faites un voeu et puis Voila ! www.voila.fr Avec Voila Mail, consultez vos e-mails sur votre mobile Wap.

1 0

unit test (C) with WINAPIV function
by Medland, Bill 23 Apr '02

23 Apr '02

Any chance of some help with this? Yesterday i submitted a unit test for wsprintfA. I didn't include wsprintfW because I couldn't get it to work right. I still can't. I think it's something to do with the calling convention (since wsprintf uses cdecl, not stdcall). Here's the test code itself; static BOOL wsprintfWTest (void) { WCHAR buf[25]; static const WCHAR fmt[] = {'%','0','1','0','l','d','\0'}; WCHAR target[] = {'-','0','0','0','0','0','0','0','0','1'}; printf ("%p %p\n", buf, fmt); ok ((wsprintfW (buf, fmt -1) == 10), "wsPrintfW length failure"); ok ((lstrcmpW (buf, target) == 0), "wsprintfW zero padded negative value failure\n"); return TRUE; } but if I print the addresses of buf and fmt from within wsprintfW I get the same values for buf but for fmt I get a smaller pointer (0x401ecac instead of 0x401ecae) (and I can't figure out how to get at it in gdb to see exactly what is going on). Am I missing something obvious? Bill

3 2

RE: unit test (C) with WINAPIV function - sorry
by Medland, Bill 23 Apr '02

23 Apr '02

> -----Original Message----- > From: Medland, Bill [mailto:Bill.Medland@accpac.com] SNIP > ok ((wsprintfW (buf, fmt -1) == 10), "wsPrintfW length failure"); DUH! > Am I missing something obvious? Yes Bill

1 0

Re: fixme:dialog:MSGBOX_OnInit task modal msgbox ! Not modal yet.
by David Yerger 23 Apr '02

23 Apr '02

Just wanted to say the winpos.c.diff patch of 12/25/2001 works like a charm for me. [Was my first experience actually building wine from source - took me about two days to figure out how to patch an SRPM and build the patched version. Apparently what you're supposed to do is put the patch in the SOURCES folder, modify the spec file, run rpm -bb <specfile> and let it rip. Had no success doing rpm -bp wine.spec, patching manually and then running configure manually, or using tools/wineconfig, and then running rpm -bi --short-circuit or make install - I could build the program but it complained when I tried to run it. Sorry, I thought I wrote down the complaint. . . Oh well, I'm pretty sure it's because of something I did wrong anyway.] Thanks Laurent! David Yerger

2 1

Please educate me
by Medland, Bill 23 Apr '02

23 Apr '02

Can anyone explain what is going on here please; this is obviously an area of bash etc I don't understand. This morning I was doing a fresh install on a totally clean machine from the Wine-20020411 tarball under Redhat 7.1. All went reasonable well until I saw a "..<something not write> .." go flashing past as I ran wineinstall and later on the regapi failed because it couldn't find libntdll.dll.so. OK so I guess it was the ldconfig that failed!! So I thought "lets fix it". Yes; in the last fix to wineinstall where we went with using "su root" instead the ldconfig was hard-coded (and wasn't on the path for simply "su root"). So I followed up on the machine I normally use and started messing about with $ac_cv_path_LDCONFIG. I got that working, consistant on hand-editing the config.cache to change "true" to "/sbin/ldconfig". So the remaining thing was to get the cache entry generated correctly. This is where the problem is. (I still don't understand why it should get set either to the name of an executable or to the value "true"; I dislike variables holding dissimilar types). Anyway I was watching the loop so see why it wasn't finding the /sbin/ldconfig and I noticed that for ac_dir in /sbin:/usr/sbin:$PATH was splitting as 1. /sbin:/usr/sbin:/usr/local/bin 2. /bin 3. /usr/bin etc. Now, I know I can force it to work by changing the for loop to for ac_dir in /sbin /usr/sbin $PATH However the original form used to work (I guess, since the cache is correct on my other machine) so I'd rather know why it isn't working currently and fix that Can anyone explain why it isn't splitting the for the way we want it to TIA Bill

4 3

Re: Enhancements and fixes for the rich text edit control
by Alexandre Julliard 22 Apr '02

22 Apr '02

ccrayne(a)crayne.org writes: > Because of this concept, it was necessay to make two small changes to > edit.c -- to move the definition of the EDITSTATE structure into (new > file) edit.h, and to add support in function EDIT_BuildLineDefs_ML to > recognize "\n" as an alternative soft line break. I don't think richedit should know about edit.c internal structures (and it seems your patch didn't require that anyway) so I haven't applied that part of the patch. If we really need to access the internal edit structure it will have to be made Windows-compatible so that we can still mix builtin and native dlls. But it's better to avoid it if possible. -- Alexandre Julliard julliard(a)winehq.com

1 0

dlls/kernel/comm.c build failure
by Gerald Pfeifer 22 Apr '02

22 Apr '02

The following patch revision 1.56 date: 2002/04/21 22:06:09; author: julliard; state: Exp; lines: +24 -0 <wine(a)gc2.kloepfer.org> Faster serial speed cases for non Linux systems. broke dlls/kernel/comm.c on FreeBSD 4.5 (and probably all non-Linux systems) /usr/bin/gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_REENTRANT -I/usr/X11R6/include -o comm.o comm.c comm.c: In function `SetCommState': comm.c:1063: `CBR_230400' undeclared (first use in this function) comm.c:1063: (Each undeclared identifier is reported only once comm.c:1063: for each function it appears in.) gmake[2]: *** [comm.o] Error 1 gmake[2]: Leaving directory `/.amd_mnt/vexpert/files8/test/wine/dlls/kernel' gmake[1]: *** [kernel/kernel32.dll.so] Error 2 apparently because CBR_230400 is not #defined in include/winbase.h. The patch below fixes this, but I suppose it's not what will go in finally... Gerald ChangeLog: Only use CBR_230400 and CBR_460800 if they have been defined. Index: dlls/kernel/comm.c =================================================================== RCS file: /home/wine/wine/dlls/kernel/comm.c,v retrieving revision 1.56 diff -u -3 -p -r1.56 comm.c --- dlls/kernel/comm.c 21 Apr 2002 22:06:09 -0000 1.56 +++ dlls/kernel/comm.c 22 Apr 2002 06:44:43 -0000 @@ -1060,13 +1060,17 @@ BOOL WINAPI SetCommState( #endif #ifdef B230400 case 230400: +#ifdef CBR_230400 case CBR_230400: +#endif port.c_cflag |= B230400; break; #endif #ifdef B460800 case 460800: +#ifdef CBR_460800 case CBR_460800: +#endif port.c_cflag |= B460800; break; #endif

3 2

RE: bug?
by Medland, Bill 22 Apr '02

22 Apr '02

> -----Original Message----- > From: Rikard Björklind [mailto:olof@linux.nu] > Sent: Saturday, April 20, 2002 5:38 AM > To: wine-devel(a)winehq.com > Subject: bug? > > > Hi, I tried to use ./tools/wineinstall: > > Performing 'make install' as root to install binaries, enter > root password > Password: [here I wrote the password] > /bin/bash: - : unrecognized option > > What's wrong? > > Probably failed to run the ldconfig. Check the /etc/ld.so.conf to see that the location of the wine lib directory is included (probably /usr/local/lib) and su root and run /sbin/ldconfig. Bill

2 1

Re: Installing MS Office gives error in installer
by Speeddymon 22 Apr '02

22 Apr '02

I use mandrake 8.2, so the cdrom is mounted with supermount, but i will try that tonight and see what happens -Dustin > --- Gustavo Junior Alves <alves(a)coslinux.com.br> > wrote: > > The install is from a cdrom? You tried "mount > > /dev/cdrom /mnt/cdrom -o > > unhide" ???? > > > > Gustavo > > > > Speeddymon wrote: > > > > >I just recently installed wine-20020411 (as you > may > > >have noticed from my patch) > > >I haven't tried installing Office 2000 on > previous > > >versions, but heard that it worked, so I decided > to > > >try it. First I tried it in Crossover Office > > (since i > > >just recently got that also) and the Office 2000 > > >installer complained that it couldnt find a > package > > to > > >install on the installation media. So I tried it > > in > > >wine and it did the same thing... There were no > > debug > > >messages or anything (in the console). > > > > > >If anyone knows of a way around this, please let > me > > >know... If it has been mentioned before please > > point > > >me to the right wine-devel archive so I can find > > it... > > > > > >Thanks, > > > > > >Dustin > > > > > > >__________________________________________________ > > >Do You Yahoo!? > > >Yahoo! Tax Center - online filing with TurboTax > > >http://taxes.yahoo.com/ > > > > > > > > > > __________________________________________________ > Do You Yahoo!? > Yahoo! Tax Center - online filing with TurboTax > http://taxes.yahoo.com/ > __________________________________________________ Do You Yahoo!? Yahoo! Games - play chess, backgammon, pool and more http://games.yahoo.com/

1 0

Wine not releasing CDROM
by Oliver Sampson 22 Apr '02

22 Apr '02

Howdy, I'm seeing a strange behavior and I thought I'd let the Devel community know about it: While using Agent v1.8, and while having a CD in my CD tray (although unmounted!), if I start agent under wine, I'm able to open and close my CD tray. However, if I try to use the attachment window to attach something, the CD-ROM drive spins up, and I'm unable to open it. Even if I attach nothing, the CD-ROM drive is claimed by wine so that I can't eject the Drive. Once I exit agent, the drive is released so that I can open the drive. Note that the CD-ROM was never mounted. Even a check during the blocked period shows no mounted device, even though the "eject' command says "device busy." Interestingly, when I just tried this again for this email, I noticed the following output messages (It seems that there are some floppy drive assumptions, also.) Oliver ---output---- err:dosfs:DRIVE_ReadSuperblock Couldn't open device '/dev/fd0' for drive A: ! (no permission) err:dosfs:DRIVE_ReadSuperblock Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible ! Perhaps you have not properly edited or created your Wine configuration file. This is (supposed to be) '/home/olsam/.wine/config' err:dosfs:DRIVE_GetLabel Invalid or unreadable superblock on /dev/fd0 (A:). err:dosfs:DRIVE_ReadSuperblock Couldn't open device '/dev/fd0' for drive A: ! (no permission) err:dosfs:DRIVE_ReadSuperblock Can't read drive volume info ! Either pre-set it or make sure the device to read it from is accessible ! Perhaps you have not properly edited or created your Wine configuration file. This is (supposed to be) '/home/olsam/.wine/config' Invalid or unreadable superblock on /dev/fd0 (A:). Maybe not FAT? err:dosfs:DRIVE_ReadSuperblock The filesystem is not FAT !! (device=/dev/cdrom) err:dosfs:DRIVE_GetLabel Invalid or unreadable superblock on /dev/cdrom (D:). err:dosfs:DRIVE_ReadSuperblock The filesystem is not FAT !! (device=/dev/cdrom) Invalid or unreadable superblock on /dev/cdrom (D:). Maybe not FAT? fixme:listview:LISTVIEW_UnsupportedStyles LVS_EDITLABELS fixme:listview:LISTVIEW_UnsupportedStyles LVS_SHAREIMAGELISTS ==================================================== Oliver Sampson olsam(a)quickaudio.com http://www.oliversampson.com

5 6

regapi with global registry
by Raul Dias 22 Apr '02

22 Apr '02

Hi, I have a global windows fake tree, which every user in the group "wine" can access. However I got a problem dealing with new applications installed. When a user (any user, even root) installs an application, the registry entries goes to $HOME/.wine/*.reg . This also means that other users will not be able to use it because of the missing registry entries. I use the regSet.sh, regFixer.pl and regRestorer.pl to generete a diff .reg file with the changed registries. When a user (even root) uses regapi to add this values: regapi setValue < file.reg The data goes to the user's registry and not to the global registry (even if the user has access to it). Is there a way to tell wine/regapi (or regedit) to add the new values to the global registry? If not, the only solutions I can think of is: 1 - make every user run the regapi command. 2 - * create a new user (or to use a WINEPREFIX var), * change its config to save the whole registry (which would make the global config save under the user's dir). * copy the resulting registry to the global configuration (/etc/wine.*reg) If it isn't really possible to write to the global wine registry using standard wine tools this is really a drawback in wine which would be needed for a wine 0.9 or 1.0 release. That would allow multi-user wine environments to be easier stablished. Regards, Raul Dias

1 0

RE: wine/objects dc.c
by Medland, Bill 22 Apr '02

22 Apr '02

This broke our app. Any ideas why? It was the change on line 348; the other three were ok. (The result is it then goes through an attempt to close down windows which aren't even fully open yet so that X11DRV_GetDC is passed a window for which the pDriverData hasn't been set yet.) Bill > -----Original Message----- > From: Alexandre Julliard [mailto:julliard@wine.codeweavers.com] > Sent: Sunday, April 21, 2002 3:11 PM > To: wine-cvs(a)winehq.com > Subject: wine/objects dc.c > > > ChangeSet ID: 1019427035919545120866136 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 02/04/21 17:10:35 > > Modified files: > objects : dc.c > > Log message: > Fixed handling of visible region in Save/RestoreDC. > > Patch: http://cvs.winehq.com/patch.py?id=1019427035919545120866136 > > Revision Changes Path > 1.73 +4 -4 wine/objects/dc.c > >

1 0

RE: su to root failure in wineinstall
by Medland, Bill 22 Apr '02

22 Apr '02

> -----Original Message----- > From: Enrico Horn [mailto:farmboy1@subdimension.com] > Sent: Monday, April 22, 2002 2:58 AM > To: wine-devel(a)winehq.com > Subject: Re: su to root failure in wineinstall > > > Hi, > On Saturday 20 April 2002 21:23, Thomas Hardman wrote: > > Wine build complete. > > > > Performing 'make install' as root to install binaries, > enter root password > > Password: > > /bin/bash: - : unrecognized option > > > > Either you entered an incorrect password or we failed to run > > 'make install' correctly. > > If you didn't enter an incorrect password then please report this > > error to wine-devel(a)winehq.com. > > > > Installation failed, aborting. > > earthops:/usr/src/wine-20020411$ > > That is an error(typo?) in wineinstall > Find this line in wineinstall: > if ! su root -c"$sucommand" > > and put a space between -c and "$sucommand" > > That should do it. And if that doesn't work then find the line where it adds ldconfig to sucommand and explicitly specify /sbin/ldconfig (or wherever yours is) Bill > > Enrico > farmboy1(a)subdimension.com >

1 0

su to root failure in wineinstall
by Thomas Hardman 22 Apr '02

22 Apr '02

Wine build complete. Performing 'make install' as root to install binaries, enter root password Password: /bin/bash: - : unrecognized option Either you entered an incorrect password or we failed to run 'make install' correctly. If you didn't enter an incorrect password then please report this error to wine-devel(a)winehq.com. Installation failed, aborting. earthops:/usr/src/wine-20020411$ -- T. Jr. Hardman thardman(a)earthops.org

2 1

[PATCH] Big winsock2 / overlapped patch
by Martin Wilck 22 Apr '02

22 Apr '02

Hi, This stuff really approaches a usable state! I know the patch is much too big but I have no time now to split it into pieces before next week. However, I am so excited to see the close events coming at the right time that I must post it here and encourage people to try it. Patch summary: - Implement overlapped IO on sockets and the necessary changes in overlapped request handling. - Fix socket behaviour after FD_CLOSE received, when socket has been taken out of the server's main select loop. - Fix some more aspects of FD_CLOSE. - Fix WSAAccept() deferred accept. - Implement WSAGetOverlappedResult and WSAConnect(). - Some improvements for error code handling in Winsock2. Tested: so far with my test programs only, but they really tries to make things hard for wine. Patch against yesterday's (2002/04/18) CVS version of wine. Have fun, 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 diff -ruNX ignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Thu Apr 18 16:26:02 2002 +++ MW/wine/dlls/winsock/socket.c Fri Apr 19 15:51:52 2002 @@ -104,6 +104,7 @@ #include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" +#include "winerror.h" #include "winsock2.h" #include "ws2tcpip.h" #include "wsipx.h" @@ -125,6 +126,53 @@ inet_ntoa(((struct sockaddr_in *)a)->sin_addr), \ ntohs(((struct sockaddr_in *)a)->sin_port)) +/**************************************************************** + * Async IO declarations + ****************************************************************/ +#include "async.h" + +static DWORD ws2_async_get_status (const struct async_private *ovp); +static DWORD ws2_async_get_count (const struct async_private *ovp); +static void ws2_async_set_status (struct async_private *ovp, const DWORD status); +static void CALLBACK ws2_async_call_completion (ULONG_PTR data); +static void ws2_async_cleanup ( struct async_private *ovp ); + +static struct async_ops ws2_async_ops = +{ + ws2_async_get_status, + ws2_async_set_status, + ws2_async_get_count, + ws2_async_call_completion, + ws2_async_cleanup +}; + +static struct async_ops ws2_nocomp_async_ops = +{ + ws2_async_get_status, + ws2_async_set_status, + ws2_async_get_count, + NULL, /* call_completion */ + ws2_async_cleanup +}; + +typedef struct ws2_async +{ + async_private async; + LPWSAOVERLAPPED overlapped; + LPWSAOVERLAPPED user_overlapped; + LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; + struct iovec *iovec; + int n_iovecs; + struct WS_sockaddr *addr; + union { + int val; /* for send operations */ + int *ptr; /* for recv operations */ + } addrlen; + DWORD flags; +} ws2_async; + +/****************************************************************/ + /* ----------------------------------- internal data */ /* ws_... struct conversion flags */ @@ -223,13 +271,39 @@ */ static int opentype = 0; +inline static DWORD NtStatusToWSAError ( const DWORD status ) +{ + /* We only need to cover the status codes set by server async request handling */ + DWORD wserr; + switch ( status ) + { + case STATUS_SUCCESS: wserr = 0; break; + case STATUS_PENDING: wserr = WSA_IO_PENDING; break; + case STATUS_INVALID_HANDLE: wserr = WSAENOTSOCK; break; /* WSAEBADF ? */ + case STATUS_INVALID_PARAMETER: wserr = WSAEINVAL; break; + case STATUS_PIPE_DISCONNECTED: wserr = WSAESHUTDOWN; break; + case STATUS_CANCELLED: wserr = WSA_OPERATION_ABORTED; break; + case STATUS_TIMEOUT: wserr = WSAETIMEDOUT; break; + case STATUS_NO_MEMORY: wserr = WSAEFAULT; break; + default: + if ( status >= WSABASEERR && status <= WSABASEERR+1004 ) + /* It is not a NT status code but a winsock error */ + wserr = status; + else + { + wserr = RtlNtStatusToDosError( status ); + FIXME ( "Status code %08lx converted to DOS error code %lx\n", status, wserr ); + } + } + return wserr; +} + /* set last error code from NT status without mapping WSA errors */ inline static unsigned int set_error( unsigned int err ) { if (err) { - /* do not map WSA errors */ - if ((err < WSABASEERR) || (err >= 0x10000000)) err = RtlNtStatusToDosError(err); + err = NtStatusToWSAError ( err ); SetLastError( err ); } return err; @@ -245,10 +319,17 @@ return fd; } -inline static int _get_sock_fd_type( SOCKET s, enum fd_type *type, int *flags ) +inline static int _get_sock_fd_type( SOCKET s, DWORD access, enum fd_type *type, int *flags ) { int fd; - if (set_error( wine_server_handle_to_fd( s, GENERIC_READ, &fd, type, flags ) )) return -1; + if (set_error( wine_server_handle_to_fd( s, access, &fd, type, flags ) )) return -1; + if ( ( (access & GENERIC_READ) && (*flags & FD_FLAG_RECV_SHUTDOWN ) ) || + ( (access & GENERIC_WRITE) && (*flags & FD_FLAG_SEND_SHUTDOWN ) ) ) + { + close (fd); + WSASetLastError ( WSAESHUTDOWN ); + return -1; + } return fd; } @@ -904,6 +985,399 @@ free((void*)uaddr); } +/************************************************************************** + * Functions for handling overlapped I/O + **************************************************************************/ + +static DWORD ws2_async_get_status (const struct async_private *ovp) +{ + return ((ws2_async*) ovp)->overlapped->Internal; +} + +static VOID ws2_async_set_status (struct async_private *ovp, const DWORD status) +{ + ((ws2_async*) ovp)->overlapped->Internal = status; +} + +static DWORD ws2_async_get_count (const struct async_private *ovp) +{ + return ((ws2_async*) ovp)->overlapped->InternalHigh; +} + +static void ws2_async_cleanup ( struct async_private *ap ) +{ + struct ws2_async *as = (struct ws2_async*) ap; + + TRACE ( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, as->overlapped ); + if ( !as->user_overlapped ) + { + if ( as->overlapped->hEvent != INVALID_HANDLE_VALUE ) + WSACloseEvent ( as->overlapped->hEvent ); + HeapFree ( GetProcessHeap(), 0, as->overlapped ); + } + + if ( as->iovec ) + HeapFree ( GetProcessHeap(), 0, as->iovec ); + + HeapFree ( GetProcessHeap(), 0, as ); +} + +static void CALLBACK ws2_async_call_completion (ULONG_PTR data) +{ + ws2_async* as = (ws2_async*) data; + + TRACE ("data: %p\n", as); + + as->completion_func ( NtStatusToWSAError (as->overlapped->Internal), + as->overlapped->InternalHigh, + as->user_overlapped, + as->flags ); + ws2_async_cleanup ( &as->async ); +} + +/*********************************************************************** + * WS2_make_async (INTERNAL) + */ + +static void WS2_async_recv (async_private *as); +static void WS2_async_send (async_private *as); + +inline static struct ws2_async* +WS2_make_async (SOCKET s, int fd, int type, struct iovec *iovec, DWORD dwBufferCount, + LPDWORD lpFlags, struct WS_sockaddr *addr, + LPINT addrlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + struct ws2_async *wsa = HeapAlloc ( GetProcessHeap(), 0, sizeof ( ws2_async ) ); + + TRACE ( "wsa %p\n", wsa ); + + if (!wsa) + return NULL; + + wsa->async.ops = ( lpCompletionRoutine ? &ws2_async_ops : &ws2_nocomp_async_ops ); + wsa->async.handle = (HANDLE) s; + wsa->async.fd = fd; + wsa->async.type = type; + switch (type) + { + case ASYNC_TYPE_READ: + wsa->flags = *lpFlags; + wsa->async.func = WS2_async_recv; + wsa->addrlen.ptr = addrlen; + break; + case ASYNC_TYPE_WRITE: + wsa->flags = 0; + wsa->async.func = WS2_async_send; + wsa->addrlen.val = *addrlen; + break; + default: + ERR ("Invalid async type: %d\n", type); + } + wsa->user_overlapped = lpOverlapped; + wsa->completion_func = lpCompletionRoutine; + wsa->iovec = iovec; + wsa->n_iovecs = dwBufferCount; + wsa->addr = addr; + + if ( lpOverlapped ) + { + wsa->overlapped = lpOverlapped; + wsa->async.event = ( lpCompletionRoutine ? INVALID_HANDLE_VALUE : lpOverlapped->hEvent ); + } + else + { + wsa->overlapped = HeapAlloc ( GetProcessHeap(), 0, + sizeof (WSAOVERLAPPED) ); + if ( !wsa->overlapped ) + goto error; + wsa->async.event = wsa->overlapped->hEvent = INVALID_HANDLE_VALUE; + } + + wsa->overlapped->InternalHigh = 0; + TRACE ( "wsa %p, ops %p, h %d, ev %d, fd %d, func %p, ov %p, uov %p, cfunc %p\n", + wsa, wsa->async.ops, wsa->async.handle, wsa->async.event, wsa->async.fd, wsa->async.func, + wsa->overlapped, wsa->user_overlapped, wsa->completion_func ); + + return wsa; + +error: + TRACE ("Error\n"); + HeapFree ( GetProcessHeap(), 0, wsa ); + return NULL; +} + +/*********************************************************************** + * WS2_recv (INTERNAL) + * + * Work horse for both synchronous and asynchronous recv() operations. + */ +static int WS2_recv ( int fd, struct iovec* iov, int count, + struct WS_sockaddr *lpFrom, LPINT lpFromlen, + LPDWORD lpFlags ) +{ + struct msghdr hdr; + int n; + TRACE ( "fd %d, iovec %p, count %d addr %p, len %p, flags %lx\n", + fd, iov, count, lpFrom, lpFromlen, *lpFlags); + + hdr.msg_name = NULL; + + if ( lpFrom ) + { +#if DEBUG_SOCKADDR + dump_sockaddr (lpFrom); +#endif + + hdr.msg_namelen = *lpFromlen; + hdr.msg_name = ws_sockaddr_alloc ( lpFrom, lpFromlen, &hdr.msg_namelen ); + if ( !hdr.msg_name ) + { + WSASetLastError ( WSAEFAULT ); + n = -1; + goto out; + } + } + else + hdr.msg_namelen = 0; + + hdr.msg_iov = iov; + hdr.msg_iovlen = count; + hdr.msg_control = NULL; + hdr.msg_controllen = 0; + hdr.msg_flags = 0; + + if ( (n = recvmsg (fd, &hdr, *lpFlags)) == -1 ) + { + TRACE ( "recvmsg error %d\n", errno); + goto out; + } + + if ( lpFrom && + ws_sockaddr_u2ws ( hdr.msg_name, hdr.msg_namelen, + lpFrom, lpFromlen ) != 0 ) + { + /* The from buffer was too small, but we read the data + * anyway. Is that really bad? + */ + WSASetLastError ( WSAEFAULT ); + WARN ( "Address buffer too small\n" ); + } + +out: + + ws_sockaddr_free ( hdr.msg_name, lpFrom ); + TRACE ("-> %d\n", n); + return n; +} + +/*********************************************************************** + * WS2_async_recv (INTERNAL) + * + * Handler for overlapped recv() operations. + */ +static void WS2_async_recv ( async_private *as ) +{ + ws2_async* wsa = (ws2_async*) as; + int result, err; + + TRACE ( "async %p\n", wsa ); + + if ( wsa->overlapped->Internal != STATUS_PENDING ) + { + TRACE ( "status: %ld\n", wsa->overlapped->Internal ); + return; + } + + result = WS2_recv ( wsa->async.fd, wsa->iovec, wsa->n_iovecs, + wsa->addr, wsa->addrlen.ptr, &wsa->flags ); + + if (result >= 0) + { + wsa->overlapped->Internal = STATUS_SUCCESS; + wsa->overlapped->InternalHigh = result; + TRACE ( "received %d bytes\n", result ); + _enable_event ( (SOCKET) wsa->async.handle, FD_READ, 0, 0 ); + return; + } + + err = wsaErrno (); + if ( err == WSAEINTR || err == WSAEWOULDBLOCK ) /* errno: EINTR / EAGAIN */ + { + wsa->overlapped->Internal = STATUS_PENDING; + _enable_event ( (SOCKET) wsa->async.handle, FD_READ, 0, 0 ); + TRACE ( "still pending\n" ); + } + else + { + wsa->overlapped->Internal = err; + TRACE ( "Error: %x\n", err ); + } +} + +/*********************************************************************** + * WS2_send (INTERNAL) + * + * Work horse for both synchronous and asynchronous send() operations. + */ +static int WS2_send ( int fd, struct iovec* iov, int count, + const struct WS_sockaddr *to, INT tolen, DWORD dwFlags ) +{ + struct msghdr hdr; + int n = -1; + TRACE ( "fd %d, iovec %p, count %d addr %p, len %d, flags %lx\n", + fd, iov, count, to, tolen, dwFlags); + + hdr.msg_name = NULL; + + if ( to ) + { +#if DEBUG_SOCKADDR + dump_sockaddr (to); +#endif + hdr.msg_name = (struct sockaddr*) ws_sockaddr_ws2u ( to, tolen, &hdr.msg_namelen ); + if ( !hdr.msg_name ) + { + WSASetLastError ( WSAEFAULT ); + goto out; + } + } + else + hdr.msg_namelen = 0; + + hdr.msg_iov = iov; + hdr.msg_iovlen = count; + hdr.msg_control = NULL; + hdr.msg_controllen = 0; + hdr.msg_flags = 0; + + n = sendmsg (fd, &hdr, dwFlags); + +out: + ws_sockaddr_free ( hdr.msg_name, to ); + return n; +} + +/*********************************************************************** + * WS2_async_send (INTERNAL) + * + * Handler for overlapped send() operations. + */ +static void WS2_async_send ( async_private *as ) +{ + ws2_async* wsa = (ws2_async*) as; + int result, err; + + TRACE ( "async %p\n", wsa ); + + if ( wsa->overlapped->Internal != STATUS_PENDING ) + { + TRACE ( "status: %ld\n", wsa->overlapped->Internal ); + return; + } + + result = WS2_send ( wsa->async.fd, wsa->iovec, wsa->n_iovecs, + wsa->addr, wsa->addrlen.val, wsa->flags ); + + if (result >= 0) + { + wsa->overlapped->Internal = STATUS_SUCCESS; + wsa->overlapped->InternalHigh = result; + TRACE ( "sent %d bytes\n", result ); + _enable_event ( (SOCKET) wsa->async.handle, FD_WRITE, 0, 0 ); + return; + } + + err = wsaErrno (); + if ( err == WSAEINTR ) + { + wsa->overlapped->Internal = STATUS_PENDING; + _enable_event ( (SOCKET) wsa->async.handle, FD_WRITE, 0, 0 ); + TRACE ( "still pending\n" ); + } + else + { + /* We set the status to a winsock error code and check for that + later in NtStatusToWSAError () */ + wsa->overlapped->Internal = err; + TRACE ( "Error: %x\n", err ); + } +} + +/*********************************************************************** + * WS2_async_shutdown (INTERNAL) + * + * Handler for shutdown() operations on overlapped sockets. + */ +static void WS2_async_shutdown ( async_private *as ) +{ + ws2_async* wsa = (ws2_async*) as; + int err = 1; + + TRACE ( "async %p %d\n", wsa, wsa->async.type ); + switch ( wsa->async.type ) + { + case ASYNC_TYPE_READ: + err = shutdown ( wsa->async.fd, 0 ); + break; + case ASYNC_TYPE_WRITE: + err = shutdown ( wsa->async.fd, 1 ); + break; + default: + ERR ("invalid type: %d\n", wsa->async.type ); + } + + if ( err ) + wsa->overlapped->Internal = wsaErrno (); + else + wsa->overlapped->Internal = STATUS_SUCCESS; +} + +/*********************************************************************** + * WS2_register_async_shutdown (INTERNAL) + * + * Helper function for WS_shutdown() on overlapped sockets. + */ +static int WS2_register_async_shutdown ( SOCKET s, int fd, int type ) +{ + struct ws2_async *wsa; + int ret, err = WSAEFAULT; + DWORD dwflags = 0; + int len = 0; + LPWSAOVERLAPPED ovl = HeapAlloc (GetProcessHeap(), 0, sizeof ( WSAOVERLAPPED )); + + TRACE ("s %d fd %d type %d\n", s, fd, type); + if (!ovl) + goto out; + + ovl->hEvent = WSACreateEvent (); + if ( ovl->hEvent == WSA_INVALID_EVENT ) + goto out_free; + + wsa = WS2_make_async ( s, fd, type, NULL, 0, + &dwflags, NULL, &len, ovl, NULL ); + if ( !wsa ) + goto out_close; + + /* Hack: this will cause ws2_async_cleanup() to free the overlapped structure */ + wsa->user_overlapped = NULL; + wsa->async.func = WS2_async_shutdown; + if ( (ret = register_new_async ( &wsa->async )) ) + { + err = NtStatusToWSAError ( ret ); + ws2_async_cleanup ( &wsa->async ); + goto out; + } + return 0; + +out_close: + WSACloseEvent ( ovl->hEvent ); +out_free: + HeapFree ( GetProcessHeap(), 0, ovl ); +out: + return err; +} + /*********************************************************************** * accept (WS2_32.1) */ @@ -1139,6 +1613,19 @@ } /*********************************************************************** + * WSAConnect (WS2_32.30) + */ +int WINAPI WSAConnect ( SOCKET s, const struct WS_sockaddr* name, int namelen, + LPWSABUF lpCallerData, LPWSABUF lpCalleeData, + LPQOS lpSQOS, LPQOS lpGQOS ) +{ + if ( lpCallerData || lpCalleeData || lpSQOS || lpGQOS ) + FIXME ("unsupported parameters!\n"); + return WS_connect ( s, name, namelen ); +} + + +/*********************************************************************** * getpeername (WS2_32.5) */ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) @@ -1982,25 +2469,29 @@ LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - int i, n, fd, err = WSAENOTSOCK, flags; + int i, n, fd, err = WSAENOTSOCK, flags, ret; struct iovec* iovec; - struct msghdr msghdr; + struct ws2_async *wsa; enum fd_type type; 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_type( s, &type, &flags ); + fd = _get_sock_fd_type( s, GENERIC_WRITE, &type, &flags ); + TRACE ( "fd=%d, type=%d, flags=%x\n", fd, type, flags ); if ( fd == -1 ) + { + err = WSAGetLastError (); goto error; + } iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); if ( !iovec ) { - err = WSAENOBUFS; + err = WSAEFAULT; goto err_close; } @@ -2010,30 +2501,42 @@ iovec[i].iov_len = lpBuffers[i].len; } - msghdr.msg_name = NULL; - - if (to) + if ( (lpOverlapped || lpCompletionRoutine) && flags & FD_FLAG_OVERLAPPED ) { -#if DEBUG_SOCKADDR - dump_sockaddr (to); -#endif - msghdr.msg_name = (void*) ws_sockaddr_ws2u (to, tolen, &msghdr.msg_namelen); - if ( !msghdr.msg_name ) + wsa = WS2_make_async ( s, fd, ASYNC_TYPE_WRITE, iovec, dwBufferCount, + &dwFlags, (struct WS_sockaddr*) to, &tolen, + lpOverlapped, lpCompletionRoutine ); + if ( !wsa ) { err = WSAEFAULT; goto err_free; } - } - else - msghdr.msg_namelen = 0; + + if ( ( ret = register_new_async ( &wsa->async )) ) + { + err = NtStatusToWSAError ( ret ); + + if ( !lpOverlapped ) + HeapFree ( GetProcessHeap(), 0, wsa->overlapped ); + HeapFree ( GetProcessHeap(), 0, wsa ); + goto err_free; + } - msghdr.msg_iov = iovec; - msghdr.msg_iovlen = dwBufferCount; - msghdr.msg_control = NULL; - msghdr.msg_controllen = 0; - msghdr.msg_flags = 0; + /* Try immediate completion */ + if ( lpOverlapped ) + { + if ( WSAGetOverlappedResult ( (HANDLE) s, lpOverlapped, + lpNumberOfBytesSent, FALSE, &dwFlags) ) + return 0; + + if ( (err = WSAGetLastError ()) != WSA_IO_INCOMPLETE ) + goto error; - /* FIXME: Treat overlapped IO here */ + } + + WSASetLastError (WSA_IO_PENDING); + return SOCKET_ERROR; + } if (_is_blocking(s)) { @@ -2041,9 +2544,8 @@ 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) + n = WS2_send ( fd, iovec, dwBufferCount, to, tolen, dwFlags ); + if ( n == -1 ) { err = wsaErrno(); if ( err == WSAEWOULDBLOCK ) @@ -2051,24 +2553,22 @@ goto err_free; } + TRACE(" -> %i bytes\n", n); *lpNumberOfBytesSent = n; - ws_sockaddr_free ( msghdr.msg_name, to ); - WS_FREE ( iovec ); + HeapFree ( GetProcessHeap(), 0, iovec ); close ( fd ); - return 0; err_free: - ws_sockaddr_free ( msghdr.msg_name, to ); - WS_FREE ( iovec ); + HeapFree ( GetProcessHeap(), 0, iovec ); err_close: close ( fd ); error: WARN (" -> ERROR %d\n", err); - SetLastError (err); + WSASetLastError (err); return SOCKET_ERROR; } @@ -2195,55 +2695,88 @@ return (INT16)WS_setsockopt( s, (UINT16)level, optname, optval, optlen ); } - /*********************************************************************** * shutdown (WS2_32.22) */ int WINAPI WS_shutdown(SOCKET s, int how) { - int fd = _get_sock_fd(s); + int fd, fd0 = -1, fd1 = -1, flags, err = WSAENOTSOCK; + enum fd_type type; + unsigned int clear_flags = 0; - TRACE("socket %04x, how %i\n", s, how ); - if (fd != -1) + fd = _get_sock_fd_type ( s, 0, &type, &flags ); + TRACE("socket %04x, how %i %d %d \n", s, how, type, flags ); + + if (fd == -1) + return SOCKET_ERROR; + + switch( how ) { - switch( how ) - { - case 0: /* drop receives */ - _enable_event(s, 0, 0, FD_READ); -#ifdef SHUT_RD - how = SHUT_RD; -#endif - break; - - case 1: /* drop sends */ - _enable_event(s, 0, 0, FD_WRITE); -#ifdef SHUT_WR - how = SHUT_WR; -#endif - break; - - case 2: /* drop all */ -#ifdef SHUT_RDWR - how = SHUT_RDWR; -#endif - default: - WSAAsyncSelect( s, 0, 0, 0 ); - break; - } + case 0: /* drop receives */ + clear_flags |= FD_READ; + break; + case 1: /* drop sends */ + clear_flags |= FD_WRITE; + break; + case 2: /* drop all */ + clear_flags |= FD_READ|FD_WRITE; + default: + clear_flags |= FD_WINE_CONNECTED|FD_WINE_LISTENING; + } + + if ( flags & FD_FLAG_OVERLAPPED ) { + + switch ( how ) + { + case SD_RECEIVE: + fd0 = fd; + break; + case SD_SEND: + fd1 = fd; + break; + case SD_BOTH: + default: + fd0 = fd; + fd1 = _get_sock_fd ( s ); + } - if (shutdown(fd, how) == 0) - { - if( how > 1 ) - { - _enable_event(s, 0, 0, FD_WINE_CONNECTED|FD_WINE_LISTENING); - } - close(fd); - return 0; - } - SetLastError(wsaErrno()); - close(fd); - } - else SetLastError(WSAENOTSOCK); + if ( fd0 != -1 ) + { + err = WS2_register_async_shutdown ( s, fd0, ASYNC_TYPE_READ ); + if ( err ) + { + close ( fd0 ); + goto error; + } + } + if ( fd1 != -1 ) + { + err = WS2_register_async_shutdown ( s, fd1, ASYNC_TYPE_WRITE ); + if ( err ) + { + close ( fd1 ); + goto error; + } + } + } + else /* non-overlapped mode */ + { + if ( shutdown( fd, how ) ) + { + err = wsaErrno (); + close ( fd ); + goto error; + } + close(fd); + } + + _enable_event( s, 0, 0, clear_flags ); + if ( how > 1) WSAAsyncSelect( s, 0, 0, 0 ); + return 0; + +error: + _enable_event( s, 0, 0, clear_flags ); + WSASetLastError ( err ); return SOCKET_ERROR; } @@ -2672,6 +3205,44 @@ return SOCKET_ERROR; } +/********************************************************************** + * WSAGetOverlappedResult (WS2_32.40) + */ +BOOL WINAPI WSAGetOverlappedResult ( SOCKET s, LPWSAOVERLAPPED lpOverlapped, + LPDWORD lpcbTransfer, BOOL fWait, + LPDWORD lpdwFlags ) +{ + DWORD r; + + TRACE ( "socket %d ovl %p trans %p, wait %d flags %p\n", + s, lpOverlapped, lpcbTransfer, fWait, lpdwFlags ); + + if ( !(lpOverlapped && lpOverlapped->hEvent) ) + { + ERR ( "Invalid pointer\n" ); + WSASetLastError (WSA_INVALID_PARAMETER); + return FALSE; + } + + do { + r = WaitForSingleObjectEx (lpOverlapped->hEvent, fWait ? INFINITE : 0, TRUE); + } while (r == STATUS_USER_APC); + + if ( lpcbTransfer ) + *lpcbTransfer = lpOverlapped->InternalHigh; + + if ( lpdwFlags ) + *lpdwFlags = lpOverlapped->Offset; + + if ( r == WAIT_OBJECT_0 ) + return TRUE; + + WSASetLastError ( lpOverlapped->Internal == STATUS_PENDING ? + WSA_IO_INCOMPLETE : NtStatusToWSAError ( lpOverlapped->Internal ) ); + return FALSE; +} + + /*********************************************************************** * WSAAsyncSelect (WS2_32.101) */ @@ -3250,7 +3821,6 @@ } } - /*********************************************************************** * WSARecv (WS2_32.67) */ @@ -3272,11 +3842,9 @@ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - /* Uses recvmsg() in order to provide scatter-gather I/O */ - + int i, n, fd, err = WSAENOTSOCK, flags, ret; struct iovec* iovec; - struct msghdr msghdr; - int fd, i, length, err = WSAENOTSOCK, flags; + struct ws2_async *wsa; enum fd_type type; TRACE("socket %04x, wsabuf %p, nbufs %ld, flags %ld, from %p, fromlen %ld, ovl %p, func %p\n", @@ -3284,19 +3852,19 @@ (lpFromlen ? *lpFromlen : -1L), lpOverlapped, lpCompletionRoutine); - fd = _get_sock_fd_type( s, &type, &flags ); + fd = _get_sock_fd_type( s, GENERIC_READ, &type, &flags ); + TRACE ( "fd=%d, type=%d, flags=%x\n", fd, type, flags ); if (fd == -1) { - err = WSAENOTSOCK; + err = WSAGetLastError (); goto error; } - /* FIXME: should this be HeapAlloc() or WS_ALLOC ? */ - iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + iovec = HeapAlloc ( GetProcessHeap(), 0, dwBufferCount * sizeof (struct iovec) ); if ( !iovec ) { - err = WSAENOBUFS; + err = WSAEFAULT; goto err_close; } @@ -3306,74 +3874,77 @@ iovec[i].iov_len = lpBuffers[i].len; } - msghdr.msg_name = NULL; - - if ( lpFrom ) + if ( (lpOverlapped || lpCompletionRoutine) && flags & FD_FLAG_OVERLAPPED ) { -#if DEBUG_SOCKADDR - dump_sockaddr (lpFrom); -#endif + wsa = WS2_make_async ( s, fd, ASYNC_TYPE_READ, iovec, dwBufferCount, + lpFlags, lpFrom, lpFromlen, + lpOverlapped, lpCompletionRoutine ); - msghdr.msg_namelen = *lpFromlen; - msghdr.msg_name = ws_sockaddr_alloc (lpFrom, lpFromlen, &msghdr.msg_namelen); - } - else - msghdr.msg_namelen = 0; + if ( !wsa ) + { + err = WSAEFAULT; + goto err_free; + } + + if ( ( ret = register_new_async ( &wsa->async )) ) + { + err = NtStatusToWSAError ( ret ); + + if ( !lpOverlapped ) + HeapFree ( GetProcessHeap(), 0, wsa->overlapped ); + HeapFree ( GetProcessHeap(), 0, wsa ); + goto err_free; + } - msghdr.msg_iov = iovec; - msghdr.msg_iovlen = dwBufferCount; - msghdr.msg_control = NULL; - msghdr.msg_controllen = 0; - msghdr.msg_flags = 0; + /* Try immediate completion */ + if ( lpOverlapped ) + { + if ( WSAGetOverlappedResult ( (HANDLE) s, lpOverlapped, + lpNumberOfBytesRecvd, FALSE, lpFlags) ) + return 0; + + if ( (err = WSAGetLastError ()) != WSA_IO_INCOMPLETE ) + { + TRACE ("err: %d\n", err); + goto err_free; + } + } - /* FIXME: Treat overlapped IO here */ + WSASetLastError ( WSA_IO_PENDING ); + return SOCKET_ERROR; + } - if (_is_blocking(s)) + 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) + + n = WS2_recv ( fd, iovec, dwBufferCount, lpFrom, lpFromlen, lpFlags ); + if ( n == -1 ) { err = wsaErrno(); goto err_free; } - TRACE(" -> %i bytes\n", length); + TRACE(" -> %i bytes\n", n); + *lpNumberOfBytesRecvd = n; - 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 ); + HeapFree (GetProcessHeap(), 0, iovec); close(fd); _enable_event(s, FD_READ, 0, 0); - return 0; err_free: - WS_FREE (iovec); - ws_sockaddr_free ( msghdr.msg_name, lpFrom ); + HeapFree (GetProcessHeap(), 0, iovec); err_close: close (fd); error: WARN(" -> ERROR %d\n", err); - SetLastError ( err ); + WSASetLastError ( err ); return SOCKET_ERROR; } @@ -3419,7 +3990,7 @@ SOCKET cs; SOCKADDR src_addr, dst_addr; - TRACE("Socket %ui, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackD ata %ld\n", + TRACE("Socket %u, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackData %ld\n", s, addr, addrlen, lpfnCondition, dwCallbackData); @@ -3450,7 +4021,17 @@ addr = memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); return cs; case CF_DEFER: - SetLastError(WSATRY_AGAIN); + SERVER_START_REQ ( set_socket_deferred ) + { + req->handle = s; + req->deferred = cs; + if ( !wine_server_call_err ( req ) ) + { + SetLastError ( WSATRY_AGAIN ); + CloseHandle ( cs ); + } + } + SERVER_END_REQ; return SOCKET_ERROR; case CF_REJECT: WS_closesocket(cs); diff -ruNX ignore TMP/wine/dlls/winsock/ws2_32.spec MW/wine/dlls/winsock/ws2_32.spec --- TMP/wine/dlls/winsock/ws2_32.spec Thu Apr 18 16:26:02 2002 +++ MW/wine/dlls/winsock/ws2_32.spec Thu Apr 18 16:26:48 2002 @@ -42,7 +42,7 @@ 27 stub WSAAddressToStringA 28 stub WSAAddressToStringW 29 stdcall WSACloseEvent(long) WSACloseEvent -30 stub WSAConnect +30 stdcall WSAConnect(long ptr long ptr ptr ptr ptr) WSAConnect 31 stdcall WSACreateEvent () WSACreateEvent 32 stub WSADuplicateSocketA 33 stub WSADuplicateSocketW @@ -52,7 +52,7 @@ 37 stdcall WSAEnumProtocolsA(ptr ptr ptr) WSAEnumProtocolsA 38 stdcall WSAEnumProtocolsW(ptr ptr ptr) WSAEnumProtocolsW 39 stdcall WSAEventSelect(long long long) WSAEventSelect -40 stub WSAGetOverlappedResult +40 stdcall WSAGetOverlappedResult(long ptr ptr long ptr) WSAGetOverlappedResult 41 stub WSAGetQOSByName 42 stub WSAGetServiceClassInfoA 43 stub WSAGetServiceClassInfoW diff -ruNX ignore TMP/wine/files/file.c MW/wine/files/file.c --- TMP/wine/files/file.c Thu Apr 18 15:41:00 2002 +++ MW/wine/files/file.c Fri Apr 19 13:52:52 2002 @@ -306,6 +306,13 @@ ret = wine_server_handle_to_fd( handle, access, &fd, type, flags ); if (ret) SetLastError( RtlNtStatusToDosError(ret) ); + if ( ( (access & GENERIC_READ) && (*flags & FD_FLAG_RECV_SHUTDOWN ) ) || + ( (access & GENERIC_WRITE) && (*flags & FD_FLAG_SEND_SHUTDOWN ) ) ) + { + close (fd); + SetLastError ( ERROR_PIPE_NOT_CONNECTED ); + return -1; + } return fd; } @@ -1411,7 +1418,7 @@ *lpTransferred = lpOverlapped->InternalHigh; SetLastError ( lpOverlapped->Internal == STATUS_PENDING ? - ERROR_IO_INCOMPLETE : lpOverlapped->Internal ); + ERROR_IO_INCOMPLETE : RtlNtStatusToDosError ( lpOverlapped->Internal ) ); return (r==WAIT_OBJECT_0); } @@ -1511,9 +1518,13 @@ if ( fd < 0 ) { WARN ( "Couldn't get FD\n" ); - SetLastError ( ERROR_INVALID_PARAMETER ); return FALSE; } + if ( ! (flags & FD_FLAG_OVERLAPPED) ) { + WARN ( "fd is not overlapped\n" ); + SetLastError ( ERROR_INVALID_PARAMETER ); + goto error; + } ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) @@ -1730,6 +1741,11 @@ { TRACE( "Couldn't get FD\n" ); return FALSE; + } + if ( ! (flags & FD_FLAG_OVERLAPPED) ) { + WARN ( "fd is not overlapped\n" ); + SetLastError ( ERROR_INVALID_PARAMETER ); + goto error; } ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); diff -ruNX ignore TMP/wine/include/wine/server_protocol.h MW/wine/include/wine/server_protocol.h --- TMP/wine/include/wine/server_protocol.h Thu Apr 18 16:26:02 2002 +++ MW/wine/include/wine/server_protocol.h Fri Apr 19 13:51:02 2002 @@ -796,6 +796,8 @@ #define FD_FLAG_OVERLAPPED 0x01 #define FD_FLAG_TIMEOUT 0x02 +#define FD_FLAG_RECV_SHUTDOWN 0x04 +#define FD_FLAG_SEND_SHUTDOWN 0x08 struct set_file_pointer_request @@ -1001,6 +1003,16 @@ struct reply_header __header; }; +struct set_socket_deferred_request +{ + struct request_header __header; + handle_t handle; + handle_t deferred; +}; +struct set_socket_deferred_reply +{ + struct reply_header __header; +}; struct alloc_console_request @@ -2758,6 +2770,7 @@ REQ_set_socket_event, REQ_get_socket_event, REQ_enable_socket_event, + REQ_set_socket_deferred, REQ_alloc_console, REQ_free_console, REQ_get_console_renderer_events, @@ -2919,6 +2932,7 @@ struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; struct enable_socket_event_request enable_socket_event_request; + struct set_socket_deferred_request set_socket_deferred_request; struct alloc_console_request alloc_console_request; struct free_console_request free_console_request; struct get_console_renderer_events_request get_console_renderer_events_request; @@ -3078,6 +3092,7 @@ struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; struct enable_socket_event_reply enable_socket_event_reply; + struct set_socket_deferred_reply set_socket_deferred_reply; struct alloc_console_reply alloc_console_reply; struct free_console_reply free_console_reply; struct get_console_renderer_events_reply get_console_renderer_events_reply; @@ -3183,6 +3198,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 78 +#define SERVER_PROTOCOL_VERSION 80 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore TMP/wine/include/winsock.h MW/wine/include/winsock.h --- TMP/wine/include/winsock.h Thu Apr 18 15:41:05 2002 +++ MW/wine/include/winsock.h Thu Apr 18 16:26:48 2002 @@ -728,6 +728,7 @@ #define FD_CLOSE 0x00000020 /* internal per-socket flags */ +/* CAUTION: FD_FLAG_RECV_SHUTDOWN / FD_FLAG_SEND_SHUTDOWN (server/protocol.def) must fit into this mask */ #ifdef __WINE__ #define FD_WINE_LISTENING 0x10000000 #define FD_WINE_NONBLOCKING 0x20000000 diff -ruNX ignore TMP/wine/include/winsock2.h MW/wine/include/winsock2.h --- TMP/wine/include/winsock2.h Thu Apr 18 15:41:09 2002 +++ MW/wine/include/winsock2.h Thu Apr 18 16:26:48 2002 @@ -221,8 +221,7 @@ #define WSAEVENT HANDLE #define LPWSAEVENT LPHANDLE -#define WSAOVERLAPPED OVERLAPPED -typedef struct _OVERLAPPED* LPWSAOVERLAPPED; +typedef OVERLAPPED WSAOVERLAPPED, *LPWSAOVERLAPPED; #define WSA_IO_PENDING (ERROR_IO_PENDING) #define WSA_IO_INCOMPLETE (ERROR_IO_INCOMPLETE) diff -ruNX ignore TMP/wine/server/async.c MW/wine/server/async.c --- TMP/wine/server/async.c Tue Apr 16 11:18:11 2002 +++ MW/wine/server/async.c Fri Apr 19 13:50:30 2002 @@ -150,42 +150,32 @@ DECL_HANDLER(register_async) { - struct object *obj; + struct object *obj = get_handle_obj( current->process, req->handle, 0, NULL); - if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL)) ) - return; - - if(obj->ops->queue_async) + if ( !(obj) || !obj->ops->queue_async ) { - struct async_queue *q = obj->ops->queue_async(obj, NULL, req->type, 0); - struct async *async; - - async = find_async(q, current, req->overlapped); - if(req->status==STATUS_PENDING) - { - if(!async) - async = create_async(obj, current, req->overlapped); - - if(async) - { - async->status = req->status; - if(!obj->ops->queue_async(obj, async, req->type, req->count)) - destroy_async(async); - } - } - else - { - if(async) - destroy_async(async); - else - set_error(STATUS_INVALID_PARAMETER); - } - - set_select_events(obj,obj->ops->get_poll_events(obj)); - } - else set_error(STATUS_INVALID_HANDLE); + return; + } + +/* + * The queue_async method must do the following: + * + * 1. Get the async_queue for the request of given type. + * 2. Call find_async() to look for the specific client request in the queue (=> NULL if not found). + * 3. If status is STATUS_PENDING: + * a) If no async request found in step 2 (new request): call create_async() to initialize one. + * b) Set request's status to STATUS_PENDING. + * c) If the "queue" field of the async request is NULL: call async_insert() to put it into the queue. + * Otherwise: + * If the async request was found in step 2, destroy it by calling destroy_async(). + * 4. Carry out any operations necessary to adjust the object's poll events + * Usually: set_elect_events (obj, obj->ops->get_poll_events()). + * + * See also the implementations in file.c, serial.c, and sock.c. +*/ + obj->ops->queue_async (obj, req->overlapped, req->status, req->type, req->count); release_object(obj); } diff -ruNX ignore TMP/wine/server/file.c MW/wine/server/file.c --- TMP/wine/server/file.c Tue Apr 2 16:51:50 2002 +++ MW/wine/server/file.c Thu Apr 18 19:11:13 2002 @@ -69,7 +69,7 @@ static int file_flush( struct object *obj ); static int file_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags ); static void file_destroy( struct object *obj ); -static struct async_queue * file_queue_async(struct object *obj, struct async* async, int type, int count); +static void file_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count); static const struct object_ops file_ops = { @@ -358,9 +358,10 @@ return FD_TYPE_DEFAULT; } -static struct async_queue *file_queue_async(struct object *obj, struct async *async, int type, int count) +static void file_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count) { struct file *file = (struct file *)obj; + struct async *async; struct async_queue *q; assert( obj->ops == &file_ops ); @@ -368,7 +369,7 @@ if ( !(file->flags & FILE_FLAG_OVERLAPPED) ) { set_error ( STATUS_INVALID_HANDLE ); - return NULL; + return; } switch(type) @@ -381,13 +382,26 @@ break; default: set_error( STATUS_INVALID_PARAMETER ); - return NULL; + return; } - if(async && !async->q) - async_insert(q, async); + async = find_async ( q, current, ptr ); + + if ( status == STATUS_PENDING ) + { + if ( !async ) + async = create_async ( obj, current, ptr ); + if ( !async ) + return; + + async->status = STATUS_PENDING; + if ( !async->q ) + async_insert( q, async ); + } + else if ( async ) destroy_async ( async ); + else set_error ( STATUS_INVALID_PARAMETER ); - return q; + set_select_events ( obj, file_get_poll_events ( obj )); } static void file_destroy( struct object *obj ) diff -ruNX ignore TMP/wine/server/object.h MW/wine/server/object.h --- TMP/wine/server/object.h Thu Apr 4 09:37:39 2002 +++ MW/wine/server/object.h Fri Apr 19 13:29:37 2002 @@ -63,8 +63,8 @@ int (*flush)(struct object *); /* get file information */ int (*get_file_info)(struct object *,struct get_file_info_reply *, int *flags); - /* queue an async operation */ - struct async_queue* (*queue_async)(struct object *, struct async *async, int type, int count); + /* queue an async operation - see register_async handler in async.c*/ + void (*queue_async)(struct object *, void* ptr, unsigned int status, int type, int count); /* destroy on refcount == 0 */ void (*destroy)(struct object *); }; diff -ruNX ignore TMP/wine/server/protocol.def MW/wine/server/protocol.def --- TMP/wine/server/protocol.def Thu Apr 18 16:26:02 2002 +++ MW/wine/server/protocol.def Fri Apr 19 10:49:29 2002 @@ -612,7 +612,9 @@ }; #define FD_FLAG_OVERLAPPED 0x01 #define FD_FLAG_TIMEOUT 0x02 - +/* Socket flags: see server/sock.c */ +#define FD_FLAG_RECV_SHUTDOWN 0x04 +#define FD_FLAG_SEND_SHUTDOWN 0x08 /* Set a file current position */ @REQ(set_file_pointer) @@ -746,6 +748,10 @@ unsigned int cstate; /* status bits to clear */ @END +@REQ(set_socket_deferred) + handle_t handle; /* handle to the socket */ + handle_t deferred; /* handle to the socket for which accept() is deferred */ +@END /* Allocate a console (only used by a console renderer) */ @REQ(alloc_console) diff -ruNX ignore TMP/wine/server/request.h MW/wine/server/request.h --- TMP/wine/server/request.h Thu Apr 18 16:26:02 2002 +++ MW/wine/server/request.h Fri Apr 19 13:51:02 2002 @@ -152,6 +152,7 @@ DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(enable_socket_event); +DECL_HANDLER(set_socket_deferred); DECL_HANDLER(alloc_console); DECL_HANDLER(free_console); DECL_HANDLER(get_console_renderer_events); @@ -312,6 +313,7 @@ (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_enable_socket_event, + (req_handler)req_set_socket_deferred, (req_handler)req_alloc_console, (req_handler)req_free_console, (req_handler)req_get_console_renderer_events, diff -ruNX ignore TMP/wine/server/serial.c MW/wine/server/serial.c --- TMP/wine/server/serial.c Tue Apr 2 16:51:51 2002 +++ MW/wine/server/serial.c Fri Apr 19 13:36:47 2002 @@ -51,7 +51,7 @@ static int serial_get_fd( struct object *obj ); static int serial_get_info( struct object *obj, struct get_file_info_reply *reply, int *flags ); static int serial_get_poll_events( struct object *obj ); -static struct async_queue * serial_queue_async(struct object *obj, struct async* async, int type, int count); +static void serial_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count); static void destroy_serial(struct object *obj); static void serial_poll_event( struct object *obj, int event ); @@ -250,24 +250,11 @@ set_select_events(obj,obj->ops->get_poll_events(obj)); } -/* - * This function is an abuse of overloading that deserves some explanation. - * - * It has three purposes: - * - * 1. get the queue for a type of async operation - * 2. requeue an async operation - * 3. queue a new async operation - * - * It is overloaded so that these three functions only take one function pointer - * in the object operations list. - * - * In all cases, it returns the async queue. - */ -static struct async_queue *serial_queue_async(struct object *obj, struct async *async, int type, int count) +static void serial_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count) { struct serial *serial = (struct serial *)obj; struct async_queue *q; + struct async *async; int timeout; assert(obj->ops == &serial_ops); @@ -288,19 +275,29 @@ break; default: set_error(STATUS_INVALID_PARAMETER); - return NULL; + return; } - if(async) + async = find_async ( q, current, ptr ); + + if ( status == STATUS_PENDING ) { + if ( !async ) + async = create_async ( obj, current, ptr ); + if ( !async ) + return; + + async->status = STATUS_PENDING; if(!async->q) { - async_add_timeout(async,timeout); - async_insert(q, async); + async_add_timeout ( async, timeout ); + async_insert ( q, async ); + } } -} + else if ( async ) destroy_async ( async ); + else set_error ( STATUS_INVALID_PARAMETER ); - return q; + set_select_events ( obj, serial_get_poll_events ( obj )); } /* create a serial */ diff -ruNX ignore TMP/wine/server/sock.c MW/wine/server/sock.c --- TMP/wine/server/sock.c Thu Apr 18 16:26:02 2002 +++ MW/wine/server/sock.c Fri Apr 19 16:25:54 2002 @@ -72,6 +72,7 @@ unsigned int message; /* message to send */ unsigned int wparam; /* message wparam (socket handle) */ int errors[FD_MAX_EVENTS]; /* event errors */ + struct sock* deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* Queue for asynchronous reads */ struct async_queue write_q; /* Queue for asynchronous writes */ }; @@ -85,6 +86,7 @@ static void sock_destroy( struct object *obj ); static int sock_get_error( int err ); static void sock_set_error(void); +static void sock_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count); static const struct object_ops sock_ops = { @@ -99,7 +101,7 @@ sock_get_fd, /* get_fd */ no_flush, /* flush */ sock_get_info, /* get_file_info */ - NULL, /* queue_async */ + sock_queue_async, /* queue_async */ sock_destroy /* destroy */ }; @@ -123,7 +125,25 @@ }; -static void sock_reselect( struct sock *sock ) +/* After POLLHUP is received, the socket will no longer be in the main select loop. + This function is used to signal pending events nevertheless */ +static void sock_try_event ( struct sock *sock, int event ) +{ + struct pollfd pfd; + + pfd.fd = sock->obj.fd; + pfd.events = event; + pfd.revents = 0; + poll (&pfd, 1, 0); + + if ( pfd.revents ) + { + if ( debug_level ) fprintf ( stderr, "sock_try_event: %x\n", pfd.revents ); + sock_poll_event ( &sock->obj, pfd.revents ); + } +} + +static int sock_reselect( struct sock *sock ) { int ev = sock_get_poll_events( &sock->obj ); @@ -132,21 +152,41 @@ if (sock->obj.select == -1) { /* previously unconnected socket, is this reselect supposed to connect it? */ - if (!(sock->state & ~FD_WINE_NONBLOCKING)) return; + if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0; /* ok, it is, attach it to the wineserver's main poll loop */ add_select_user( &sock->obj ); } /* update condition mask */ set_select_events( &sock->obj, ev ); + return ev; } /* wake anybody waiting on the socket event or send the associated message */ -static void sock_wake_up( struct sock *sock ) +static void sock_wake_up( struct sock *sock, int pollev ) { unsigned int events = sock->pmask & sock->mask; int i; + int async_active = 0; - if (!events) return; + if ( sock->flags & FD_FLAG_OVERLAPPED ) + { + if( pollev & (POLLIN|POLLPRI) && IS_READY( sock->read_q ) ) + { + if (debug_level) fprintf ( stderr, "activating read queue for socket %p\n", sock ); + async_notify( sock->read_q.head, STATUS_ALERTED ); + async_active = 1; + } + if( pollev & POLLOUT && IS_READY( sock->write_q ) ) + { + if (debug_level) fprintf ( stderr, "activating write queue for socket %p\n", sock ); + async_notify( sock->write_q.head, STATUS_ALERTED ); + async_active = 1; + } + } + + /* Do not signal events if there are still pending asynchronous IO requests */ + /* We need this to delay FD_CLOSE events until all pending overlapped requests are processed */ + if ( !events || async_active ) return; if (sock->event) { @@ -182,6 +222,7 @@ static void sock_poll_event( struct object *obj, int event ) { struct sock *sock = (struct sock *)obj; + int empty_recv = 0; assert( sock->obj.ops == &sock_ops ); if (debug_level) @@ -232,19 +273,37 @@ if (event & POLLIN) { char dummy; + int nr; /* Linux 2.4 doesn't report POLLHUP if only one side of the socket * has been closed, so we need to check for it explicitly here */ - if (!recv( sock->obj.fd, &dummy, 1, MSG_PEEK )) event = POLLHUP; - else + nr = recv( sock->obj.fd, &dummy, 1, MSG_PEEK ); + + if ( nr > 0 ) { /* incoming data */ sock->pmask |= FD_READ; sock->hmask |= FD_READ; sock->errors[FD_READ_BIT] = 0; if (debug_level) - fprintf(stderr, "socket %d is readable\n", sock->obj.fd ); + fprintf( stderr, "socket %d is readable\n", sock->obj.fd ); } + else if ( nr == 0 ) + empty_recv = 1; + else + { + /* EAGAIN can happen if an async recv() falls between the server's poll() + call and the invocation of this routine */ + if ( errno == EAGAIN ) + event &= ~POLLIN; + else + { + if ( debug_level ) + fprintf ( stderr, "recv error on socket %d: %d\n", sock->obj.fd, errno ); + event = POLLERR; + } + } + } if (event & POLLOUT) { @@ -262,25 +321,37 @@ if (debug_level) fprintf(stderr, "socket %d got OOB data\n", sock->obj.fd); } - if (((event & POLLERR) || ((event & (POLLIN|POLLHUP)) == POLLHUP)) - && (sock->state & (FD_READ|FD_WRITE))) { + if ( (sock->state & (FD_READ|FD_WRITE)) && (event & (POLLERR|POLLHUP)) ) + { /* socket closing */ sock->errors[FD_CLOSE_BIT] = sock_error( sock->obj.fd ); - sock->state &= ~(FD_WINE_CONNECTED|FD_READ|FD_WRITE); + sock->state &= ~(FD_WINE_CONNECTED|FD_WRITE); sock->pmask |= FD_CLOSE; if (debug_level) fprintf(stderr, "socket %d aborted by error %d\n", sock->obj.fd, sock->errors[FD_CLOSE_BIT]); } + else if ( empty_recv && (sock->state & FD_READ) ) + { + /* incoming stream closing - do not alter sock->state, reading is still allowed */ + sock->errors[FD_CLOSE_BIT] = 0; + sock->pmask |= FD_CLOSE; + if (debug_level) + fprintf(stderr, "socket %d incoming stream closed\n", sock->obj.fd); + } } if (event & (POLLERR|POLLHUP)) + { + if ( debug_level ) + fprintf ( stderr, "HUP/ERR - 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_wake_up( sock ); + if ( sock->pmask & sock->mask || sock->flags & FD_FLAG_OVERLAPPED ) sock_wake_up( sock, event ); /* if anyone is stupid enough to wait on the socket object itself, * maybe we should wake them up too, just in case? */ @@ -319,8 +390,11 @@ /* listening, wait for readable */ return (sock->hmask & FD_ACCEPT) ? 0 : POLLIN; - if (mask & FD_READ) ev |= POLLIN | POLLPRI; - if (mask & FD_WRITE) ev |= POLLOUT; + if (mask & FD_READ || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->read_q))) + ev |= POLLIN | POLLPRI; + if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->write_q))) + ev |= POLLOUT; + return ev; } @@ -350,10 +424,70 @@ reply->serial = 0; } *flags = 0; - if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED; + if ( !(sock->state & FD_READ ) ) *flags |= FD_FLAG_RECV_SHUTDOWN; + if ( !(sock->state & FD_WRITE ) ) *flags |= FD_FLAG_SEND_SHUTDOWN; + if ( sock->flags & WSA_FLAG_OVERLAPPED ) *flags |= FD_FLAG_OVERLAPPED; return FD_TYPE_DEFAULT; } +static void sock_queue_async(struct object *obj, void *ptr, unsigned int status, int type, int count) +{ + struct sock *sock = (struct sock *)obj; + struct async_queue *q; + struct async *async; + int pollev; + + assert( obj->ops == &sock_ops ); + + if ( !(sock->flags & WSA_FLAG_OVERLAPPED) ) + { + set_error ( STATUS_INVALID_HANDLE ); + return; + } + + switch( type ) + { + case ASYNC_TYPE_READ: + q = &sock->read_q; + break; + case ASYNC_TYPE_WRITE: + q = &sock->write_q; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return; + } + + async = find_async ( q, current, ptr ); + + if ( status == STATUS_PENDING ) + { + if ( ( !( sock->state & FD_READ ) && type == ASYNC_TYPE_READ ) || + ( !( sock->state & FD_WRITE ) && type == ASYNC_TYPE_WRITE ) ) + { + set_error ( STATUS_PIPE_DISCONNECTED ); + if ( async ) destroy_async ( async ); + } + else + { + if ( !async ) + async = create_async ( obj, current, ptr ); + if ( !async ) + return; + + async->status = STATUS_PENDING; + if ( !async->q ) + async_insert ( q, async ); + } + } + else if ( async ) destroy_async ( async ); + else set_error ( STATUS_INVALID_PARAMETER ); + + pollev = sock_reselect ( sock ); + if ( pollev ) sock_try_event ( sock, pollev ); + else if ( sock->pmask & sock->mask ) sock_wake_up ( sock, 0 ); +} + static void sock_destroy( struct object *obj ) { struct sock *sock = (struct sock *)obj; @@ -361,6 +495,9 @@ /* FIXME: special socket shutdown stuff? */ + if ( sock->deferred ) + release_object ( sock->deferred ); + if ( sock->flags & WSA_FLAG_OVERLAPPED ) { destroy_async_queue ( &sock->read_q ); @@ -394,13 +531,14 @@ sock->window = 0; sock->message = 0; sock->wparam = 0; - sock_reselect( sock ); - clear_error(); + sock->deferred = NULL; if (sock->flags & WSA_FLAG_OVERLAPPED) { init_async_queue (&sock->read_q); init_async_queue (&sock->write_q); } + sock_reselect( sock ); + clear_error(); return &sock->obj; } @@ -417,44 +555,51 @@ GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops); if (!sock) return NULL; - /* Try to accept(2). We can't be safe that this an already connected socket - * or that accept() is allowed on it. In those cases we will get -1/errno - * return. - */ - slen = sizeof(saddr); - acceptfd = accept(sock->obj.fd,&saddr,&slen); - if (acceptfd==-1) { - sock_set_error(); - release_object( sock ); - return NULL; - } - if (!(acceptsock = alloc_object( &sock_ops, -1 ))) - { - release_object( sock ); - return NULL; - } - /* newly created socket gets the same properties of the listening socket */ - fcntl(acceptfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ - acceptsock->obj.fd = acceptfd; - acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; - if (sock->state & FD_WINE_NONBLOCKING) - acceptsock->state |= FD_WINE_NONBLOCKING; - acceptsock->mask = sock->mask; - acceptsock->hmask = 0; - acceptsock->pmask = 0; - acceptsock->event = NULL; - acceptsock->window = sock->window; - acceptsock->message = sock->message; - acceptsock->wparam = 0; - if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); - acceptsock->flags = sock->flags; - if ( acceptsock->flags & WSA_FLAG_OVERLAPPED ) - { - init_async_queue ( &acceptsock->read_q ); - init_async_queue ( &acceptsock->write_q ); - } + if ( sock->deferred ) { + acceptsock = sock->deferred; + sock->deferred = NULL; + } else { + + /* Try to accept(2). We can't be safe that this an already connected socket + * or that accept() is allowed on it. In those cases we will get -1/errno + * return. + */ + slen = sizeof(saddr); + acceptfd = accept(sock->obj.fd,&saddr,&slen); + if (acceptfd==-1) { + sock_set_error(); + release_object( sock ); + return NULL; + } + if (!(acceptsock = alloc_object( &sock_ops, -1 ))) + { + release_object( sock ); + return NULL; + } + /* newly created socket gets the same properties of the listening socket */ + fcntl(acceptfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ + acceptsock->obj.fd = acceptfd; + acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; + if (sock->state & FD_WINE_NONBLOCKING) + acceptsock->state |= FD_WINE_NONBLOCKING; + acceptsock->mask = sock->mask; + acceptsock->hmask = 0; + acceptsock->pmask = 0; + acceptsock->event = NULL; + acceptsock->window = sock->window; + acceptsock->message = sock->message; + acceptsock->wparam = 0; + if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); + acceptsock->flags = sock->flags; + acceptsock->deferred = 0; + if ( acceptsock->flags & WSA_FLAG_OVERLAPPED ) + { + init_async_queue ( &acceptsock->read_q ); + init_async_queue ( &acceptsock->write_q ); + } + } clear_error(); sock->pmask &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; @@ -566,6 +711,7 @@ { struct sock *sock; struct event *old_event; + int pollev; if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle, GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, &sock_ops))) @@ -579,7 +725,11 @@ if (req->event) sock->event = get_event_obj( current->process, req->event, EVENT_MODIFY_STATE ); if (debug_level && sock->event) fprintf(stderr, "event ptr: %p\n", sock->event); - sock_reselect( sock ); + + pollev = sock_reselect( sock ); + if ( pollev ) sock_try_event ( sock, pollev ); + else if ( sock->pmask & sock->mask ) sock_wake_up ( sock, 0 ); + if (sock->mask) sock->state |= FD_WINE_NONBLOCKING; @@ -587,7 +737,7 @@ it is possible that FD_CONNECT or FD_ACCEPT network events has happened before a WSAEventSelect() was done on it. (when dealing with Asynchronous socket) */ - if (sock->pmask & sock->mask) sock_wake_up( sock ); + if (sock->pmask & sock->mask) sock_wake_up( sock, pollev ); if (old_event) release_object( old_event ); /* we're through with it */ release_object( &sock->obj ); @@ -634,6 +784,7 @@ DECL_HANDLER(enable_socket_event) { struct sock *sock; + int pollev; if (!(sock = (struct sock*)get_handle_obj( current->process, req->handle, GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, &sock_ops))) @@ -643,6 +794,33 @@ sock->hmask &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate; - sock_reselect( sock ); + + pollev = sock_reselect( sock ); + if ( pollev ) sock_try_event ( sock, pollev ); + else if ( sock->pmask & sock->mask ) sock_wake_up ( sock, 0 ); + release_object( &sock->obj ); +} + +DECL_HANDLER(set_socket_deferred) +{ + struct sock *sock, *acceptsock; + + sock=(struct sock*)get_handle_obj( current->process,req->handle, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops ); + if ( !sock ) + { + set_error ( WSAENOTSOCK ); + return; + } + acceptsock = (struct sock*)get_handle_obj( current->process,req->deferred, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops ); + if ( !acceptsock ) + { + release_object ( sock ); + set_error ( WSAENOTSOCK ); + return; + } + sock->deferred = acceptsock; + release_object ( sock ); } diff -ruNX ignore TMP/wine/server/trace.c MW/wine/server/trace.c --- TMP/wine/server/trace.c Thu Apr 18 16:26:02 2002 +++ MW/wine/server/trace.c Fri Apr 19 13:51:02 2002 @@ -943,6 +943,12 @@ fprintf( stderr, " cstate=%08x", req->cstate ); } +static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req ) +{ + fprintf( stderr, " handle=%d,", req->handle ); + fprintf( stderr, " deferred=%d", req->deferred ); +} + static void dump_alloc_console_request( const struct alloc_console_request *req ) { fprintf( stderr, " access=%08x,", req->access ); @@ -2215,6 +2221,7 @@ (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_enable_socket_event_request, + (dump_func)dump_set_socket_deferred_request, (dump_func)dump_alloc_console_request, (dump_func)dump_free_console_request, (dump_func)dump_get_console_renderer_events_request, @@ -2372,6 +2379,7 @@ (dump_func)0, (dump_func)dump_get_socket_event_reply, (dump_func)0, + (dump_func)0, (dump_func)dump_alloc_console_reply, (dump_func)0, (dump_func)dump_get_console_renderer_events_reply, @@ -2529,6 +2537,7 @@ "set_socket_event", "get_socket_event", "enable_socket_event", + "set_socket_deferred", "alloc_console", "free_console", "get_console_renderer_events",

2 2

Re: Enhancements and fixes for the rich text edit control
by Duane Clark 21 Apr '02

21 Apr '02

Just out of curiosity, since it has not shown up in CVS, is this patch from Chuck likely to be incorporated? It is working significantly better than the current code for me, at least. If there are problems with it, how about some words of guidance, so that he will be encouraged to keep working on it? The richedit stuff really needs it.

1 0

Q: using GDI printer from Linux using Wine?
by Heiko Nardmann 21 Apr '02

21 Apr '02

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Is it possible to configure Linux to use a GDI printer (with no native Linux support) using Wine? Does Wine support GDI printing already? - -- Heiko Nardmann (Dipl.-Ing.), h.nardmann(a)secunet.de, Software Development secunet Security Networks AG - Sicherheit in Netzwerken (www.secunet.de), Weidenauer Str. 223-225, D-57076 Siegen Tel. : +49 271 48950-13, Fax : +49 271 48950-50 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: For info see http://www.gnupg.org iEYEARECAAYFAjzCgU0ACgkQpm53PRScYyhbZACbBRK9ozAMv1HT6GL8+ND5NZtK G6oAoJqwzVvVd2IrERjMJAiRmCxCVLHo =bb79 -----END PGP SIGNATURE-----

1 0

ALSA driver
by Marco Pietrobono 21 Apr '02

21 Apr '02

Hi, I'm starting to work on a native ALSA driver for wine. Since I remember that Marcus was working (or was planning to work) an that one too, I would like to know if there is already something to work on or to contribute to, or if I need to start from scratch. If there is nothing already written, I would like to discuss what kind of approach we should use with ALSA programming, since FWIK there should be two way to use it: we can use the ALSA devices directly, just like it has been done with OSS, or we can use the alsalib to avoid all direct references to the kernel devices and ioctl, but this solution will add a dependency on the alsalib library itself to wine. Of course, we could add a configure option/check to allow its use at compilation time, but... BTW, Alsalib is LGPL, so the license shouldn't be a problem. bye, /pietrobo -- Stud. Marco Pietrobono | Murphy's Law: if something could v. del Calice, 39 - 00178 ROMA | go wrong, it does. Tel. +39.06.7186329 339.7410893 | Legge di Murphy: se qualcosa può http://www.pietrobo.com | andar male, lo farà. ------------------------------------------------------------------------ Strange game. The only winning move is not to play. What about a nice play of chess ?

10 17

bug?
by Rikard Björklind 20 Apr '02

20 Apr '02

Hi, I tried to use ./tools/wineinstall: Performing 'make install' as root to install binaries, enter root password Password: [here I wrote the password] /bin/bash: - : unrecognized option What's wrong?

1 0

Is Wine server request serialization broken ?
by Laurent Pinchart 20 Apr '02

20 Apr '02

Hi everybody, I ran into a pretty serious problem. I'm trying to run a program which creates a child process. I noticed that the call to the server request init_process_done returned erroneus information about the debugger state. After some investigation, here's what I found. I put a few fprintfs in the start_process(), wine_server_call() and send_request() functions. I also tweaked the init_process_done request to return an unsigned int equal to 0x12345678 in the reply structure just after the debugger member. Here's what a 'normal' call to start_process() looks like calling wine_server_call req=0x405a6ec4 wine_server_call req=0x405a6ec4 request_header.req=6 wine_server_call checkpoint 1 send_request checkpoint 1 send_request checkpoint 2 wine_server_call checkpoint 2 wine_server_call req=0x405a6ec4 wine_server_call 00 00 00 00 00 00 00 00 wine_server_call 00 00 00 00 78 56 34 12 wine_server_call returned req=0x405a6ec4 wine_server_call returned 00 00 00 00 00 00 00 00 wine_server_call returned 00 00 00 00 78 56 34 12 There is one 'checkpoint' in wine_server_call just before the call to send_request(), and one right after. There are 2 checkpoints in send_request, the first one right before the call to writev() and the second one right after. The hex dump in the above trace is the content of the 16 first bytes of reply. Please notice the '78 56 34 12' at the end, being the extra member I added to the init_process_done_reply structure. Here's now what the 'broken' call to start_process() looks like calling wine_server_call req=0x40556ec4 wine_server_call req=0x40556ec4 request_header.req=6 wine_server_call checkpoint 1 send_request checkpoint 1 wine_server_call req=0x40555254 request_header.req=90 wine_server_call checkpoint 1 send_request checkpoint 1 send_request checkpoint 2 wine_server_call checkpoint 2 wine_server_call req=0x40555254 wine_server_call 00 00 00 00 00 00 00 00 wine_server_call 00 00 00 00 78 56 34 12 wine_server_call req=0x4055601c request_header.req=90 wine_server_call checkpoint 1 send_request checkpoint 1 send_request checkpoint 2 wine_server_call checkpoint 2 wine_server_call req=0x4055601c wine_server_call 00 00 00 00 00 00 00 00 wine_server_call 20 00 00 00 00 00 00 00 wine_server_call req=0x40555f2c request_header.req=94 wine_server_call checkpoint 1 send_request checkpoint 1 send_request checkpoint 2 wine_server_call checkpoint 2 wine_server_call req=0x40555f2c wine_server_call 00 00 00 00 00 00 00 00 wine_server_call 28 00 00 00 00 00 00 00 wine_server_call req=0x4055607c request_header.req=20 wine_server_call checkpoint 1 send_request checkpoint 1 wine_server_call checkpoint 2 wine_server_call req=0x4055607c wine_server_call 34 00 00 c0 00 00 00 00 wine_server_call ff ff ff ff 00 00 00 00 send_request checkpoint 2 wine_server_call checkpoint 2 wine_server_call req=0x40556ec4 wine_server_call 00 00 00 00 00 00 00 00 wine_server_call ff ff ff ff 00 00 00 00 wine_server_call returned req=0x40556ec4 wine_server_call returned 00 00 00 00 00 00 00 00 wine_server_call returned ff ff ff ff 00 00 00 00 As you can see, the call to writev() seems to trigger something registry-related (90 is open_key, 94 is get_key_value and 20 is close_handle). I have absolutely no idea about where those calls come from (Wine internal registry calls or external calls). Remember that there are two processes running, start_process() being called for the second one. As you can see for the hex dump, the open_key request receives the answer of the init_process_done request ! I'm completely clueless about that problem. If someone has any idea, or needs more information, please send me a mail. Laurent Pinchart

1 1

(no subject)
by Ann and Jason Edmeades 19 Apr '02

19 Apr '02

I've noticed a small bug when using wcmd, in the changing to a directory, eg c:\windows and doing 'dir \' fails to show the root directory. Its annoyed me to the point of investigating and the problem seems to lie further down inside the DOSFS_DoGetFullPathName routine. A simple testpgm shows the problem: #include <windows.h> void main() { char A[] = "\\"; char B[1024]; int rc; rc = GetFullPathName (A, sizeof(B), B, NULL); printf("rc = %d, a=%s, b=%s\n", rc, A, B); } (Note: Testpgm run on w2k) Unfortunately I also noticed how often this routine is called and how many cases it appears to be trying to handle, so am slightly nervous about touching it! I am going to do some more investigation but does anyone have any thoughts in the meantime? Thanks Jason jason @ the-edmeades.demon.co.uk

1 0

Using WineLib directly
by Zavada, Ed 19 Apr '02

19 Apr '02

I've seen this question asked before, but there was never a response to the newsgroup. We'd like to use WineLib to provide implementations of the Windows calls in our application's Linux build while we work on a full blown port. So far, all the documentation requires that we use winebuild and generate a .so that is loaded by the wine server. Is this truely the only way to do this? Is there no way to just use the various libraries independent of wine server? For instance, I'd like to be able to make a call to MessageBox() from a native linux binary, then later eliminate the need for it (since this will ultimately be a console app). Thanks, Ed Zavada Lead Server Engineer The Sims Online Maxis East

2 1

Re: small patch for ./tools/wineinstall
by Speeddymon 19 Apr '02

19 Apr '02

my first patch fixes that problem and quite a few others --- Tony Lambregts <tony_lambregts(a)telusplanet.net> wrote: > I seems with all the changes to ./tools/wineinstall > the installation of > the default wine registries does not happen when we > have a no windows > install. This little patch seems to do the trick > > Tony Lambregts > > > > > ? wineinstall.dif > Index: wineinstall > =================================================================== > RCS file: /home/wine/wine/tools/wineinstall,v > retrieving revision 1.26 > diff -u -r1.26 wineinstall > --- wineinstall 1 Apr 2002 20:56:51 -0000 1.26 > +++ wineinstall 17 Apr 2002 20:56:27 -0000 > @@ -578,7 +578,7 @@ > # (not to be done if windows registry exists) > if [ "$DOREG" = 'auto' ] > then { > - CROOT=`sed -n '/^\[Drive C\]$/,/^\[.*\]$/ > s/^Path=$.*$/\1/p' $CONF` > + CROOT=`awk -F\" '/\[Drive C]/ {if (getline) print > $4}' $LCONF` > echo "Checking for real Windows registry..." > if [ -f "$CROOT/windows/system.dat" ] > then DOREG=no > __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

2 1

FW: Please educate me
by Medland, Bill 19 Apr '02

19 Apr '02

Thanks for the responses guys, but.. > -----Original Message----- > From: David Laight [mailto:david@l8s.co.uk] > Sent: Friday, April 19, 2002 3:33 AM > Cc: Wine devel (E-mail) > Subject: Re: Please educate me > > > On Fri, Apr 19, 2002 at 04:13:03AM +0200, Sylvain Petreolle wrote: > > > noticed that > > > > > > for ac_dir in /sbin:/usr/sbin:$PATH > > > > > > was splitting as > > > 1. /sbin:/usr/sbin:/usr/local/bin > > > 2. /bin > > > 3. /usr/bin > > > etc. > > > > it's a normal behaviour, because for uses space as a > > separator, not ':' ?? > > > > > > > > Now, I know I can force it to work by changing the > > > for loop to > > > for ac_dir in /sbin /usr/sbin $PATH > > If you have: > more_path="/sbin:/usr/sbin:$PATH" > you can do: > save_ifs="$IFS" > IFS=" :" > for ac_dir in $more_path > do > IFS="$save_ifs" > ... > done > > So that the shell treats ':' as a separator when > parsing the output of the substitution. > > > David > > -- > David Laight: david(a)l8s.co.uk > So why does "for" use spaces as the separator between the /sbin, the /usr/sbin and the $PATH but $IFS while expanding the $PATH (which is using :)? (And how come configure used to work OK but doesn't now?) (And, of course, it is configure.ac I will have to change so I don't get to change how AC_PATH_PROG gets expanded, and using spaces to separate will go against the documentation on autoconf) Bill

1 0

Re: CoGetClassObject and SHQueryValueEx A/W/AW fixxes
by juergen.schmied＠debitel.net 19 Apr '02

19 Apr '02

Hmm, I think ole32 must not import shlwapi.dll... Instead after the RegQueryValue call it should do a ExpandEnvironmentStrings when returned lpType is REG_EXPAND_SZ. ... and never ever call a *AW Function internally, it will behave differently (one time it takes ASCII one time UNICODE) depending on the OSVERSION ... Juergen On 12 Apr 2002 at 20:17, Leo van den berg wrote: > Cleaned up and fixxed Registry Path finding of Inprocess32 & LocalServer32, > registry entrys like '%SystemRoot%' don't break programs anymore now. > Found that SHQueryValueEx - family of functions were broken (and derived > functions as well ofcourse). Not 100% happy about the result, but it seems > to *work* now. > > any comments welcome ofcourse, > Leo van den Berg >

2 1

Re: [WINE with XIM] help - runtime error
by Ulrich Czekalla 19 Apr '02

19 Apr '02

Hi Leanne, This error is usually caused by unresolved symbols in the libx11drv.so. Look for compile warnings about implicitly defined symbols when building the x11drv. By the way, I'm also looking into XIM support. Unfortunately my code isn't complete yet. How far along are you? Could you post or send me your diff. Perhaps we could work together. /Ulrich >Dear all, > >I have patched the code I was given in wine-16042002. >When I ran it, I got the following error.. > >~~~~~~~~~~~~~~ >[leanne@leanne73 wine]$ wine /tmp/notepad.exe >err:module:BUILTIN32_dlopen failed to load .so lib for builtin >x11drv.dll: /usr/X11R6/lib/libX11.so: shared object not open >Could not load graphics driver 'x11drv' >err:win:GetDesktopWindow Wine init error: either you're trying to use an >invalid native USER.EXE config, or some graphics/GUI libraries or DLLs >didn't initialize properly. Aborting. >~~~~~~~~~~~~~~ > >I would like to ask which module/file relates to this error so that I >could fix it? >If you want to see my code, please welcome. or I can post the .diff >later on. > > >Many thanks. > >Yours sincerely, >Leanne

1 0

bug in wineinstall script
by Martin 19 Apr '02

19 Apr '02

make[1]: Leaving directory `/home/src/wine/programs/wineconsole' Wine build complete. Performing 'make install' as root to install binaries, enter root password Password: /bin/bash: - : unrecognized option Either you entered an incorrect password or we failed to run 'make install' correctly. If you didn't enter an incorrect password then please report this error to wine-devel(a)winehq.com. Installation failed, aborting. bash-2.05$ uname -a Linux hexa 2.4.17 #7 SMP Wed Jan 23 15:19:41 CET 2002 i686 unknown bash-2.05$ /bin/bash --version GNU bash, version 2.05.0(1)-release (i386-slackware-linux-gnu) Copyright 2000 Free Software Foundation, Inc. bash-2.05$

1 0

[WINE with XIM] help - runtime error
by leanne 19 Apr '02

19 Apr '02

Dear all, I have patched the code I was given in wine-16042002. When I ran it, I got the following error. ~~~~~~~~~~~~~~ [leanne@leanne73 wine]$ wine /tmp/notepad.exe err:module:BUILTIN32_dlopen failed to load .so lib for builtin x11drv.dll: /usr/X11R6/lib/libX11.so: shared object not open Could not load graphics driver 'x11drv' err:win:GetDesktopWindow Wine init error: either you're trying to use an invalid native USER.EXE config, or some graphics/GUI libraries or DLLs didn't initialize properly. Aborting. ~~~~~~~~~~~~~~ I would like to ask which module/file relates to this error so that I could fix it? If you want to see my code, please welcome. or I can post the .diff later on. Many thanks. Yours sincerely, Leanne

1 0

Re: CoGetClassObject and SHQueryValueEx A/W/AW fixxes
by Leo van den Berg 18 Apr '02

18 Apr '02

please hold this one off, i have to add some changes to Makefiles to enable a clean complete build.. (only tried incremental) will be fixxed, sorry bout this. regards, leo Leo van den berg wrote: >Cleaned up and fixxed Registry Path finding of Inprocess32 & LocalServer32, >registry entrys like '%SystemRoot%' don't break programs anymore now. >Found that SHQueryValueEx - family of functions were broken (and derived >functions as well ofcourse). Not 100% happy about the result, but it seems >to *work* now. > >any comments welcome ofcourse, > Leo van den Berg >

1 0

COMI
by Johan Gill 18 Apr '02

18 Apr '02

I test Curse of Monkey Island now and then, and with the latest CVS update, and some before, starting the game yields a black screen. However, moving the mouse around causes err:ntdll:RtlpWaitForCriticalSection section 0x40360be8 "?" wait timed out, retrying (60 sec) fs=027f and when the debugger starts later on the game starts. Any ideas? /Johan Gill, johane(a)lysator.liu.se

2 2

Duplication of definition of /.wine
by Vincent Béron 18 Apr '02

18 Apr '02

I was looking for the place in the source where the ~/.wine directory was defined, and it turns out it's defined twice: once in scheduler/client.c, the other one in server/request.c. There's also some duplicated code: the function get_config_dir is defined in both of these files, and none is static. And both implementation are identical. Is it normal? Do they go in the same executable or in different ones (which ones)? I thought we would rather try to avoid duplication of code, no? Vincent

2 2

Replacement of browser component (Internet Explorer/IE
by Andriy Palamarchuk 18 Apr '02

18 Apr '02

Hi everybody, I just created a bug in bugzilla for subj.: http://bugs.codeweavers.com/show_bug.cgi?id=587 I don't think everybody tracks the wine-bugz mailing list, so I decided to announce this project on wine-devel. You are welcome to add information to the bug, create subprojects, start to work on it ;-) I'm especially interested in status of work on jscript component. I did not attend Wineconf and could not find details online. Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

1 0

Installing MS Office gives error in installer
by Speeddymon 18 Apr '02

18 Apr '02

I just recently installed wine-20020411 (as you may have noticed from my patch) I haven't tried installing Office 2000 on previous versions, but heard that it worked, so I decided to try it. First I tried it in Crossover Office (since i just recently got that also) and the Office 2000 installer complained that it couldnt find a package to install on the installation media. So I tried it in wine and it did the same thing... There were no debug messages or anything (in the console). If anyone knows of a way around this, please let me know... If it has been mentioned before please point me to the right wine-devel archive so I can find it... Thanks, Dustin __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

6 5

Urgent need for advice: POLLHUP and sockets
by Martin Wilck 18 Apr '02

18 Apr '02

Hi all, please consider the following problem: On sockets, when POLLHUP is received, it is perfectly legitimate to continue reading data until a read() or recv() call returns 0 bytes. The current wine implementation calls set_select_events( &sock->obj, -1 ) when POLLHUP or POLLERR is received, disabling any future events from the socket. However, if an application uses asynchronous IO (or only asynchronous notification via WSAAsyncSelect() or WSAEventSelect()), this also inhibits reception of POLLIN events which can perfectly well occur if there are still unread data in the kernel buffers. Thus the app will never notice that there is still data to be read. My first reaction to this was to comment out the above call to set_select_events() and continue listening to events from the socket. However, due to the semantics of poll(), this will cause a POLLHUP event on this socket for each and every iteration of the wineserver's main select loop, putting the server basically into a busy-wait state. How can this be resolved? We seem to have the choice between a) busy loop in the server (bad) b) discarding data which could be legitimately read by the application (very bad). Any hints/comments/ideas? Please note that it is insufficient to queue all pending APCs on the socket when POLLHUP is received, because the app may very well queue some _after_ the close event arrives. A minor point is that sock_poll_event() also sets a FD_CLOSE event (if present) everytime it is called with POLLHUP set, effectively preventing any APC from being called, at least if the app waits for FD_CLOSE and asynchronous send/recv operations at the same time (likely). This can be worked around by setting FD_CLOSE only once and then blocking it, although I am not sure if that is correct behaviour (permanently signalling FD_CLOSE is obviously incorrect). I hope someone has a good idea how to resolve this, 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

3 13

IOCTL_SCSI_GET_ADDRESS implementation
by Rizsanyi Zsolt 18 Apr '02

18 Apr '02

Hi! I have implemented IOCTL_SCSI_GET_ADDRESS for non scsi cdroms. On NT this ioctl is called on non scsi cdroms, and it should return a valid value. NT treats the two ide controllers as scsi (at least for this ioctl). The program which uses this ioctl, when the ioctl returns with success it tries to read further data from the registry, from the Machine\\HARDWARE\\DEVICEMAP\\Scsi I have looked at the registry of my w2k and I'm trying to set up according to it the registry of wine. But I have some implementation questions: - I'm setting up the registry in the CDROM_Open (in dlls/ntdll/cdrom.c). This is right, because before that no ioctl could be called, but maybe I should setup it when the devices are initialized (then of course only for the cdroms where the Device is specified in configuration), to ensure initialization only once, and not at every CDROM_Open - I'm having problems with the refreshing of the registry. If I delete the previously entered registry entries from system.reg, and run the (windows) regedit, then at start I dont have the Scsi registry key. But if I select ImportRegistry then the FileOpenDialog opens the cdrom, and from the debug messages I know that the data were entered to the registry, but regedit does not show it even if I press F5 (or select the Refresh menu) Why is this? I know that there are VOLATILE registry keys, but dont know if they apply here, and to how to use them... - I'm using some includes like linux/hdreg.h linux/major.h and sys/stat.h (fstat function) - where and how to add checks for them? Is it enough if I add those headers to the list in configure.ac? - and of course I want comments about anything - This is my first serious patch to wine The cdrom.diff is my patch, and the ntddscsi.h is a header file created by Laurent Pinchart who is working on IOCTL_SCSI_PASS_THROUGH_DIRECT, but has not sent his patch to the list yet... Thanks in advance for your help Zsolt Rizsanyi

2 2

PATCH: accept-deferred.diff (5 in series)
by Martin Wilck 18 Apr '02

18 Apr '02

PATCH: accept-deferred.diff If a connection request is deferred in a call to WSAAccept(), a subsequent accept()/WSAAccept() call must return the previously deferred connection rather than a new one. The current CVS implementation of WSAAccept is wrong in this respect. This patch fixes this. Furthermore, it includes a trivial implementation of WSAConnect(). Patch against: CVS 2002-04-12. Modified files: dlls/winsock: socket.c, ws2_32.spec include/wine: server_protocol.h server: protocol.def, sock.c, request.h, trace.c diff -ruNX ignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Tue Apr 9 13:29:12 2002 +++ MW/wine/dlls/winsock/socket.c Fri Apr 12 14:50:50 2002 @@ -1140,6 +1140,19 @@ } /*********************************************************************** + * WSAConnect (WS2_32.30) + */ +int WINAPI WSAConnect ( SOCKET s, const struct WS_sockaddr* name, int namelen, + LPWSABUF lpCallerData, LPWSABUF lpCalleeData, + LPQOS lpSQOS, LPQOS lpGQOS ) +{ + if ( lpCallerData || lpCalleeData || lpSQOS || lpGQOS ) + WARN ("unsupported parameters!"); + return WS_connect ( s, name, namelen ); +} + + +/*********************************************************************** * getpeername (WS2_32.5) */ int WINAPI WS_getpeername(SOCKET s, struct WS_sockaddr *name, int *namelen) @@ -3420,7 +3433,7 @@ SOCKET cs; SOCKADDR src_addr, dst_addr; - TRACE("Socket %ui, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackD ata %ld\n", + TRACE("Socket %u, sockaddr %p, addrlen %p, fnCondition %p, dwCallbackD ata %ld\n", s, addr, addrlen, lpfnCondition, dwCallbackData); @@ -3451,7 +3464,14 @@ addr = memcpy(addr, &src_addr, (*addrlen > size) ? size : *addrlen ); return cs; case CF_DEFER: - SetLastError(WSATRY_AGAIN); + SERVER_START_REQ ( set_socket_deferred ) + { + req->handle = s; + req->deferred = cs; + if ( !wine_server_call_err ( req ) ) + SetLastError ( WSATRY_AGAIN ); + } + SERVER_END_REQ; return SOCKET_ERROR; case CF_REJECT: WS_closesocket(cs); diff -ruNX ignore TMP/wine/dlls/winsock/ws2_32.spec MW/wine/dlls/winsock/ws2_32.spec --- TMP/wine/dlls/winsock/ws2_32.spec Mon Apr 8 10:56:59 2002 +++ MW/wine/dlls/winsock/ws2_32.spec Fri Apr 12 14:52:57 2002 @@ -42,7 +42,7 @@ 27 stub WSAAddressToStringA 28 stub WSAAddressToStringW 29 stdcall WSACloseEvent(long) WSACloseEvent -30 stub WSAConnect +30 stdcall WSAConnect(long ptr long ptr ptr ptr ptr) WSAConnect 31 stdcall WSACreateEvent () WSACreateEvent 32 stub WSADuplicateSocketA 33 stub WSADuplicateSocketW diff -ruNX ignore TMP/wine/include/wine/server_protocol.h MW/wine/include/wine/server_protocol.h --- TMP/wine/include/wine/server_protocol.h Mon Apr 8 10:56:59 2002 +++ MW/wine/include/wine/server_protocol.h Fri Apr 12 14:25:47 2002 @@ -1001,6 +1001,16 @@ struct reply_header __header; }; +struct set_socket_deferred_request +{ + struct request_header __header; + handle_t handle; + handle_t deferred; +}; +struct set_socket_deferred_reply +{ + struct reply_header __header; +}; struct alloc_console_request @@ -2758,6 +2768,7 @@ REQ_set_socket_event, REQ_get_socket_event, REQ_enable_socket_event, + REQ_set_socket_deferred, REQ_alloc_console, REQ_free_console, REQ_get_console_renderer_events, @@ -2919,6 +2930,7 @@ struct set_socket_event_request set_socket_event_request; struct get_socket_event_request get_socket_event_request; struct enable_socket_event_request enable_socket_event_request; + struct set_socket_deferred_request set_socket_deferred_request; struct alloc_console_request alloc_console_request; struct free_console_request free_console_request; struct get_console_renderer_events_request get_console_renderer_events_request; @@ -3078,6 +3090,7 @@ struct set_socket_event_reply set_socket_event_reply; struct get_socket_event_reply get_socket_event_reply; struct enable_socket_event_reply enable_socket_event_reply; + struct set_socket_deferred_reply set_socket_deferred_reply; struct alloc_console_reply alloc_console_reply; struct free_console_reply free_console_reply; struct get_console_renderer_events_reply get_console_renderer_events_reply; @@ -3183,6 +3196,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 78 +#define SERVER_PROTOCOL_VERSION 79 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore TMP/wine/server/protocol.def MW/wine/server/protocol.def --- TMP/wine/server/protocol.def Mon Apr 8 10:56:59 2002 +++ MW/wine/server/protocol.def Fri Apr 12 14:18:38 2002 @@ -746,6 +746,10 @@ unsigned int cstate; /* status bits to clear */ @END +@REQ(set_socket_deferred) + handle_t handle; /* handle to the socket */ + handle_t deferred; /* handle to the socket for which accept() is deferred */ +@END /* Allocate a console (only used by a console renderer) */ @REQ(alloc_console) diff -ruNX ignore TMP/wine/server/request.h MW/wine/server/request.h --- TMP/wine/server/request.h Fri Apr 5 12:21:25 2002 +++ MW/wine/server/request.h Fri Apr 12 14:16:35 2002 @@ -152,6 +152,7 @@ DECL_HANDLER(set_socket_event); DECL_HANDLER(get_socket_event); DECL_HANDLER(enable_socket_event); +DECL_HANDLER(set_socket_deferred); DECL_HANDLER(alloc_console); DECL_HANDLER(free_console); DECL_HANDLER(get_console_renderer_events); @@ -312,6 +313,7 @@ (req_handler)req_set_socket_event, (req_handler)req_get_socket_event, (req_handler)req_enable_socket_event, + (req_handler)req_set_socket_deferred, (req_handler)req_alloc_console, (req_handler)req_free_console, (req_handler)req_get_console_renderer_events, diff -ruNX ignore TMP/wine/server/sock.c MW/wine/server/sock.c --- TMP/wine/server/sock.c Tue Apr 2 16:51:51 2002 +++ MW/wine/server/sock.c Fri Apr 12 14:24:35 2002 @@ -72,6 +72,7 @@ unsigned int message; /* message to send */ unsigned int wparam; /* message wparam (socket handle) */ int errors[FD_MAX_EVENTS]; /* event errors */ + handle_t deferred; /* socket that waits for a deferred accept */ struct async_queue read_q; /* Queue for asynchronous reads */ struct async_queue write_q; /* Queue for asynchronous writes */ }; @@ -361,6 +362,9 @@ /* FIXME: special socket shutdown stuff? */ + if ( sock->deferred ) + close_handle ( current->process, sock->deferred, NULL ); + if ( sock->flags & WSA_FLAG_OVERLAPPED ) { destroy_async_queue ( &sock->read_q ); @@ -394,18 +398,19 @@ sock->window = 0; sock->message = 0; sock->wparam = 0; - sock_reselect( sock ); - clear_error(); + sock->deferred = 0; if (sock->flags & WSA_FLAG_OVERLAPPED) { init_async_queue (&sock->read_q); init_async_queue (&sock->write_q); } + sock_reselect( sock ); + clear_error(); return &sock->obj; } /* accept a socket (creates a new fd) */ -static struct sock *accept_socket( handle_t handle ) +static struct sock *accept_socket( handle_t handle, handle_t *accept_handle, unsigned int access, int inherit ) { struct sock *acceptsock; struct sock *sock; @@ -417,42 +422,52 @@ GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops); if (!sock) return NULL; - /* Try to accept(2). We can't be safe that this an already connected socket - * or that accept() is allowed on it. In those cases we will get -1/errno - * return. - */ - slen = sizeof(saddr); - acceptfd = accept(sock->obj.fd,&saddr,&slen); - if (acceptfd==-1) { - sock_set_error(); - release_object( sock ); - return NULL; - } - if (!(acceptsock = alloc_object( &sock_ops, -1 ))) - { - release_object( sock ); - return NULL; - } + if ( sock->deferred ) { + acceptsock = (struct sock*)get_handle_obj( current->process, sock->deferred, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops ); + *accept_handle = sock->deferred; + sock->deferred = 0; + } else { + + /* Try to accept(2). We can't be safe that this an already connected socket + * or that accept() is allowed on it. In those cases we will get -1/errno + * return. + */ + slen = sizeof(saddr); + acceptfd = accept(sock->obj.fd,&saddr,&slen); + if (acceptfd==-1) { + sock_set_error(); + release_object( sock ); + return NULL; + } + if (!(acceptsock = alloc_object( &sock_ops, -1 ))) + { + release_object( sock ); + return NULL; + } - /* newly created socket gets the same properties of the listening socket */ - fcntl(acceptfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ - acceptsock->obj.fd = acceptfd; - acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; - if (sock->state & FD_WINE_NONBLOCKING) - acceptsock->state |= FD_WINE_NONBLOCKING; - acceptsock->mask = sock->mask; - acceptsock->hmask = 0; - acceptsock->pmask = 0; - acceptsock->event = NULL; - acceptsock->window = sock->window; - acceptsock->message = sock->message; - acceptsock->wparam = 0; - if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); - acceptsock->flags = sock->flags; - if ( acceptsock->flags & WSA_FLAG_OVERLAPPED ) - { - init_async_queue ( &acceptsock->read_q ); - init_async_queue ( &acceptsock->write_q ); + /* newly created socket gets the same properties of the listening socket */ + fcntl(acceptfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ + acceptsock->obj.fd = acceptfd; + acceptsock->state = FD_WINE_CONNECTED|FD_READ|FD_WRITE; + if (sock->state & FD_WINE_NONBLOCKING) + acceptsock->state |= FD_WINE_NONBLOCKING; + acceptsock->mask = sock->mask; + acceptsock->hmask = 0; + acceptsock->pmask = 0; + acceptsock->event = NULL; + acceptsock->window = sock->window; + acceptsock->message = sock->message; + acceptsock->wparam = 0; + if (sock->event) acceptsock->event = (struct event *)grab_object( sock->event ); + acceptsock->flags = sock->flags; + acceptsock->deferred = 0; + if ( acceptsock->flags & WSA_FLAG_OVERLAPPED ) + { + init_async_queue ( &acceptsock->read_q ); + init_async_queue ( &acceptsock->write_q ); + } + *accept_handle = alloc_handle( current->process, &acceptsock->obj, access, inherit ); } clear_error(); @@ -552,9 +567,8 @@ struct sock *sock; reply->handle = 0; - if ((sock = accept_socket( req->lhandle )) != NULL) + if ( (sock = accept_socket( req->lhandle, &reply->handle, req->access, req->inherit )) != NULL ) { - reply->handle = alloc_handle( current->process, &sock->obj, req->access, req->inherit ); sock->wparam = reply->handle; /* wparam for message is the socket handle */ sock_reselect( sock ); release_object( &sock->obj ); @@ -645,4 +659,27 @@ sock->state &= ~req->cstate; sock_reselect( sock ); release_object( &sock->obj ); +} + +DECL_HANDLER(set_socket_deferred) +{ + struct sock *sock; + + sock=(struct sock*)get_handle_obj( current->process,req->handle, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE,&sock_ops ); + if (!sock) + { + set_error ( WSAENOTSOCK ); + return; + } + sock->deferred = req->deferred; + /* duplicate_handle ( current->process, req->deferred, current->process, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, TRUE, 0 ); */ + if ( !sock->deferred ) + { + release_object ( sock ); + set_error ( WSAENOTSOCK ); + return; + } + release_object ( sock ); } diff -ruNX ignore TMP/wine/server/trace.c MW/wine/server/trace.c --- TMP/wine/server/trace.c Mon Apr 8 10:56:59 2002 +++ MW/wine/server/trace.c Fri Apr 12 14:16:35 2002 @@ -943,6 +943,12 @@ fprintf( stderr, " cstate=%08x", req->cstate ); } +static void dump_set_socket_deferred_request( const struct set_socket_deferred_request *req ) +{ + fprintf( stderr, " handle=%d,", req->handle ); + fprintf( stderr, " deferred=%d", req->deferred ); +} + static void dump_alloc_console_request( const struct alloc_console_request *req ) { fprintf( stderr, " access=%08x,", req->access ); @@ -2215,6 +2221,7 @@ (dump_func)dump_set_socket_event_request, (dump_func)dump_get_socket_event_request, (dump_func)dump_enable_socket_event_request, + (dump_func)dump_set_socket_deferred_request, (dump_func)dump_alloc_console_request, (dump_func)dump_free_console_request, (dump_func)dump_get_console_renderer_events_request, @@ -2372,6 +2379,7 @@ (dump_func)0, (dump_func)dump_get_socket_event_reply, (dump_func)0, + (dump_func)0, (dump_func)dump_alloc_console_reply, (dump_func)0, (dump_func)dump_get_console_renderer_events_reply, @@ -2529,6 +2537,7 @@ "set_socket_event", "get_socket_event", "enable_socket_event", + "set_socket_deferred", "alloc_console", "free_console", "get_console_renderer_events",

3 5

building documentation failed
by Stefan Leichter 17 Apr '02

17 Apr '02

Hello, when i run make inside the ~wine/documentation directory i get an error when the pdf is created. The fix is easy for me, just an additional parameter (-s) for the command db2pdf. But before i send the attached patch to wine-patches i like to know if anyone can run make successful in the documentation directory. In this case we may have to add a check in the configure script. If someone is able to build the documentation successful please post the output of "db2pdf -v". Thanks Stefan

2 3

PATCH: TOOLTIPS_GetTipText
by Christian COSTA 17 Apr '02

17 Apr '02

Hi! The following patch fix at least one app but I don't know if it could break something. Assuming Loadstring accept handle equal to 0, I modified the function accordingly but is it right? Can somenone enlighten me? Bye. Changelog : dlls/comctl32/tooltips.c : TOOLTIPS_GetTipText allows module handle equal to 0 which refer to the current module Christian COSTA titan.costa(a)wanadoo.fr Index: tooltips.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/tooltips.c,v retrieving revision 1.42 diff -u -r1.42 tooltips.c --- tooltips.c 9 Mar 2002 23:29:34 -0000 1.42 +++ tooltips.c 17 Apr 2002 19:11:40 -0000 @@ -184,7 +184,7 @@ { TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool]; - if ((toolPtr->hinst) && (HIWORD((UINT)toolPtr->lpszText) == 0)) { + if (HIWORD((UINT)toolPtr->lpszText) == 0) { /* load a resource */ TRACE("load res string %x %x\n", toolPtr->hinst, (int)toolPtr->lpszText); @@ -208,7 +208,7 @@ SendMessageA (toolPtr->hwnd, WM_NOTIFY, (WPARAM)toolPtr->uId, (LPARAM)&ttnmdi); - if ((ttnmdi.hinst) && (HIWORD((UINT)ttnmdi.lpszText) == 0)) { + if (HIWORD((UINT)ttnmdi.lpszText) == 0) { LoadStringW (ttnmdi.hinst, (UINT)ttnmdi.lpszText, infoPtr->szTipText, INFOTIPSIZE); if (ttnmdi.uFlags & TTF_DI_SETITEM) {

1 0

Kernel32 segfaults on compile
by Ben Woodhead 17 Apr '02

17 Apr '02

Hello Everybody.. I just tried but the 20020411 release and cvs and I get the same results running ./tools/wineinstall make[2]: Entering directory `/home/ben/homes/src/wine/dlls/kernel' LD_LIBRARY_PATH="../../unicode:$LD_LIBRARY_PATH" ../../tools/winebuild/winebuild -fPIC -L../../dlls -o kernel32.spec.c -spec ./kernel32.spec make[2]: *** [kernel32.spec.c] Segmentation fault make[2]: *** Deleting file `kernel32.spec.c' make[2]: Leaving directory `/home/ben/homes/src/wine/dlls/kernel' make[1]: *** [kernel/kernel32.dll.so] Error 2 make[1]: Leaving directory `/home/ben/homes/src/wine/dlls' make: *** [dlls] Error 2 I am running Slackware8.. GCC version - 2.95.3 GLIB version - 2.2.5 GNU make verison - 3.79.1 Thanks, Ben ps Is anybody else having this problem..

1 0

Re: PATCH : VGA_ioport_in and vertical refresh
by Eric Pouech 17 Apr '02

17 Apr '02

Christian COSTA a écrit : > > Changelog : > dlls/winedos/vga.c : VGA_ioport_in > Fake the occurence of the vertical refresh when no graphic mode > has been set > > Christian COSTA titan.costa(a)wanadoo.fr avec le patch ca serait mieux ;-) A+

2 1

Re: Why Wine is like playing the guitar
by Kari Hurtta 17 Apr '02

17 Apr '02

http://www.winehq.com/hypermail/wine-devel/2002/03/0226.html | From: Steven Edwards (steven_ed4153(a)yahoo.com) | Date: Wed Mar 20 2002 - 03:14:30 CST | On a Side Note: | One thing that Wine/Lindows and Reactos will need is | to be able to run alot of the newer programs with | tighter Mozzila/NS intigration. This was discussed a | little during James's presentation on the Jscript.dll | interface to Seamonkey. Some of the newer software | loads Internet Explorers MSHTML.DLL for rendering | and I belive that this software with a little help | from wine could run better with tigher Mozilla | Intergration. Perhaps following is related: http://www.iol.ie/~locka/mozilla/control.htm | ActiveX Control Implementation | Not just a similar API | An identical one! That's right, the Mozilla control will implement the | IWebBrowser and DWebBrowserEvents interfaces that Microsoft have | already defined for Internet Explorer. | | Since the Mozilla control implements exactly the same API, it will | mean that developers can take existing IE code and port it, sometimes | in a matter of minutes!

1 0

Re: PATCH : VGA_ioport_in and vertical refresh
by Dimitrie O. Paun 17 Apr '02

17 Apr '02

On April 16, 2002 03:18 pm, Christian COSTA wrote: > Changelog : > dlls/winedos/vga.c : VGA_ioport_in > Fake the occurence of the vertical refresh when no graphic mode > has been set A patch would be nice... ;) -- Dimi.

1 0

Debugger looping busy
by Sylvain Petreolle 17 Apr '02

17 Apr '02

Hi, Using some programs with wine (last CVS), the debugger enters a loop and cannot be stopped other way than a kill on it. If I let it go, i see pages of these : Wine-dbg>parse error Cannot pass on last chance exception. You must use cont Wine-dbg>parse error Cannot pass on last chance exception. You must use cont Wine-dbg>parse error Cannot pass on last chance exception. You must use cont Had someone the same behaviour ? RH 7.2, kernel 2.4.9-31, glibc-2.2.4-24 ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

2 3

Additional warnings (-W) revisited
by Joerg Mayer 16 Apr '02

16 Apr '02

Hello, a year or more ago I started an attempt to turn on additional warnings with gccs -W switch. The amount of additional warnings created made any warnings useless (the current count is >2700). I've just thought about the problem again and come up with a divide and conquer approach: Why not turn -W on and disable the additional warnings on a per directory basis? The idea is to turn on the additional warnings and then disable them on a per directory/type basis by putting a file into each directory turning off one or both of the additional warnings that occur very often (signed/unsigned comparisons and unused parameters/variables). If both warnings should be shown in a directory, the file may be removed. I've attached an example patch and the initial look of the .nowarn file. What do you think of the idea in general and this particular solution? Ciao 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.

1 0

Sorry for spamming wine bugs list
by Andriy Palamarchuk 16 Apr '02

16 Apr '02

I just changed a dependency of some task list bug and a message was sent to the wine bugs list for each entry in the task list. Probably we need better filter for notifications which sent to the bugs list. Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

2 1

Re: fixme:win32:PeekNamedPipe
by Michael Riedel 16 Apr '02

16 Apr '02

Thanks for the hint, and yes it is a kernel32 function. BOOL PeekNamedPipe( HANDLE hNamedPipe, // handle to pipe LPVOID lpBuffer, // data buffer DWORD nBufferSize, // size of data buffer LPDWORD lpBytesRead, // number of bytes read LPDWORD lpTotalBytesAvail, // number of bytes available LPDWORD lpBytesLeftThisMessage // unread bytes ); Since I get fixme:win32:PeekNamedPipe (00000080, (nil), 00000000, (nil), 0x406a2194, (nil)): stub this means that at least a valid handle was created so that there is already some code for CreateNamedPipe or CreatePipe? Is there anybody knowing more before I am going to try looking into the sources? Thanks, Michael --

3 2

fixme:win32:PeekNamedPipe
by Michael Riedel 16 Apr '02

16 Apr '02

First of all I want to thank the community for the efforts spent in developing wine. It's simple a cool "tool" (sorry, it's more, I know). Now my problem: I installed wine-20020411 without having a native windows installation. I installed successfully a simulator software which obviously uses a tcl/tk-GUI to invoke other program moduls (compiler, library manager, simulator core) re-directing their stdin/stdout to the console window via pipes. It does not work for me and I get the message (infinitivly repeated): fixme:win32:PeekNamedPipe (00000080, (nil), 00000000, (nil), 0x406a2194, (nil)): stub Searchin the web I got no hit. Questions: (1) Can I avoid this by using a native windows-dll? If yes, which dll I have to install (but I assume it is a kernel-dll function and so it is not possible)? (2) I have no Windows programming background, but what do you think: Should I dare to implement this function or was it left open because of a tricky windows-API-Linux mapping problem? (3) Any other ideas? Thanks, Michael --

2 1

a problem using /tools/wineinstall
by davide madrisan 16 Apr '02

16 Apr '02

I had a problem using the wine installer script from wine-20020411. This is the brute change I've made to be able to end successfully the installation procedure. echo "Installing default Wine registry entries..." echo ## DEBUG : TMPREG == "/tmp/wineinstall.reg" ## DEBUG : REGAPI == "programs/regapi/regapi" # if ! $REGAPI setValue < $TMPREG > /dev/null <-- here is the problem # then { # rm -f $TMPREG # echo "Registry install failed." # conf_reset_question regapi_error # conf_question high regapi_error # exit 1 # } # else { # if we are converting from a .winerc file, running regapi once # will ONLY convert .winerc -> ~/.wine/config, it will not import the # registry data. so if we are converting we need to run regapi twice if [ "$CONVCONF" = 'yes' ] then if ! $REGAPI setValue < $TMPREG > /dev/null then rm -f $TMPREG echo "Registry install failed." conf_reset_question regapi_error conf_question high regapi_error exit 1 else echo echo "Registry entries successfully installed." fi else echo echo "Registry entries successfully installed." fi # } # fi I've choosen a wine-only installation, so no windows partition. If you need more informations, please let me know. Thanks. Saluti. -- Davide Madrisan GPG/PGP keys: <http://pgp.mit.edu/>

1 0

Re: wine/ misc/options.c scheduler/process.c
by Uwe Bonnes 15 Apr '02

15 Apr '02

>>>>> "Alexandre" == Alexandre Julliard <julliard(a)wine.codeweavers.com> writes: Alexandre> Log message: Fixed inheriting command-line options from Alexandre> parent process. The wine executable now doesn't understand OPTIONS any more. It is nescessary to give options in the WINEOPTIONS environment variable. Is this intended? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

4 3

*update*: fixed tools/wineconf and tools/wineinstall
by Speeddymon 15 Apr '02

15 Apr '02

ok guys, I know some of you are going to flame me for my post to wine-patches, but I can explain...I did rtfm (the patch submitting archive) for the format of submitting a patch, but I have no internet at home my college's computers are all windows-only, so please, forgive me for sending the whole files and not just 2 patch files... __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

1 0

Patch series for async socket IO & winsock2
by Martin Wilck 15 Apr '02

15 Apr '02

Hi, I will soon start submitting this week's work on async sockets. As I said in yesterday's "good news/bad news" posting, this is work in progress and far from being complete. However, I strongly need feedback and perhaps some testing by adventurous people. Anybody out there with an app that uses overlapped socket IO ?? However, the more basic parts can hardly break things, and do represent an improvement against the current CVS version. Even the other parts probably don't break apps, but I have not carried out extensive regression testing so far. Since the full thing would be too big, I have splitted it into functional pieces that are easier to read. I will forward those parts that I consider sufficiently robust to wine-patches. Of course the back side of splitting the patches is that the later ones depend (at least some) of the others. I have indicated these dependencies in the headers. That's not beutiful but probably better than one big chunk. I will be extremely grateful for any feedback. Nice weekend, Martin PS: As I indicated in my last posting, there is a lot of work outstanding to make all of the winsock2 code consistent with this async IO implementation. I see strange things in socket.c anyway, e.g. the select() call that simply disregards all the wait mechanisms that are provided in other places in wine. If any of the original authors of this code read this message, I'd be really happy to get in contact with you!! -- 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

3 2

Patch: sock-shutdown-file.diff (11 in series)
by Martin Wilck 15 Apr '02

15 Apr '02

Patch: sock-shutdown-file.diff Enables error handling if ReadFile() WriteFile() are called on a socket after the respective channel of the socket was shut down. Patch against: CVS 2002-04-12, with my previously submitted patches applied. Modified files: files: file.c --- TMP/wine/files/file.c Fri Apr 12 11:54:50 2002 +++ MW/wine/files/file.c Fri Apr 12 11:54:28 2002 @@ -1514,6 +1514,16 @@ SetLastError ( ERROR_INVALID_PARAMETER ); return FALSE; } + if ( ! (flags & FD_FLAG_OVERLAPPED) ) { + WARN ( "fd is not overlapped\n" ); + SetLastError ( ERROR_INVALID_PARAMETER ); + goto error; + } + if ( flags & FD_FLAG_RECV_SHUTDOWN ) { + /* Fixme: WSAESHUTDOWN is unavailable */ + SetLastError ( ERROR_BROKEN_PIPE ); + goto error; + } ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) @@ -1730,6 +1740,16 @@ { TRACE( "Couldn't get FD\n" ); return FALSE; + } + if ( ! (flags & FD_FLAG_OVERLAPPED) ) { + WARN ( "fd is not overlapped\n" ); + SetLastError ( ERROR_INVALID_PARAMETER ); + goto error; + } + if ( flags & FD_FLAG_SEND_SHUTDOWN ) { + /* Fixme: WSAESHUTDOWN is unavailable */ + SetLastError ( ERROR_BROKEN_PIPE ); + goto error; } ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio));

2 2

Re: Regression tests, UNICODE vs ASCII
by Lina Kemmel 15 Apr '02

15 Apr '02

You can write something like the following: const WCHAR zeroWidthNonJoiner = 0x200C; const WCHAR zeroWidthJoiner = 0x200D; const WCHAR leftToRightMark = 0x200E; const WCHAR rightToLeftMark = 0x200F; const WCHAR leftToRightEmbedding = 0x202A; const WCHAR rightToLeftEmbedding = 0x202B; const WCHAR popDirectionalFormatting = 0x202C; const WCHAR leftToRightOverride = 0x202D; const WCHAR rightToLeftOverride = 0x202E; ( or enum { zeroWidthNonJoiner = 0x200C, zeroWidthJoiner, leftToRightMark, rightToLeftMark, leftToRightEmbedding = 0x202A, rightToLeftEmbedding, popDirectionalFormatting, leftToRightOverride, rightToLeftOverride }; ) const WCHAR test_string[] = {zeroWidthNonJoiner, zeroWidthJoiner, leftToRightMark, ... , rightToLeftOverride}; Lina Francois Gouget <fgouget(a)free.fr> Sent by: wine-devel-admin(a)winehq.com 14/04/02 10:02 م Please respond to Francois Gouget To: Shachar Shemesh <wine-devel(a)sun.consumer.org.il> cc: Andriy Palamarchuk <apa3a(a)yahoo.com>, Geoffrey Hausheer <i8e7fkwmsl1(a)phracturedblue.com>, <wine-devel(a)winehq.com> Subject: Re: Regression tests, UNICODE vs ASCII On Sun, 14 Apr 2002, Shachar Shemesh wrote: > One thing you may try are the explicit BiDi specifiers (Right to left, > left to right etc.). These are Unicode characters designed to explicitly > specify the direction of otherwise amigious characters. > > Ansii does not have, to the best of my knowledge, an equivalent encoded > characters. But what would these Unicode characters look like? I.e. what would I write in my code: const WCHAR test_string[]={'???','???','???'}; -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Broadcast message : fin du monde dans cinq minutes, repentez vous !

1 0

re: 16-bit apps starting and stopping notification
by Joshua Thielen 15 Apr '02

15 Apr '02

> Can somebody give me a hint how is better to approach > implementation of > NFY_EXITTASK, NFY_STARTTASK events generation? Does anyone know what ToolHelpHook does (KERNEL.341)? Could this be used by windows to hook a toolhelp notification function into kernel.dll? > How important do you think is to implement this > functionality, since it is for 16-bit apps only? I still use a 16-bit app for school that uses these functions and that doesn't work in wine. I'm not sure if the app does't work because it needs these notifications or if there is another reason. I attempted to implement this a couple of months ago, but it was an ugly hack since I was calling a toolhelp helper function from kernel.dll (or maybe it was ntdll) in order to send the notification. Regards, Josh Thielen

2 2

Directory reorganization
by Joshua Thielen 14 Apr '02

14 Apr '02

Hello everybody, I have an idea for reorganizing some of the directories in wine. I hope I'm not stating an obvious idea here, but I would like to group everything into the following first level directories: dlls documentation include programs server tools I'm not sure, but maybe the following directories should also be included: libtest miscemu ole The point is to keep all related source files together with their dll directory. This way, if a new hacker is hunting for a bug, it is clear where they should begin to look. Also, it is easier to focus on the code for one dll this way. Here is where I would move things: controls --> dlls/user/controls files --> dlls/ntdll/files graphics --> dlls/gdi/graphics if1632 --> dlls/ntdll/if1632 library --> dlls (and possibly rename to wine?) loader --> dlls/ntdll/loader memory --> dlls/ntdll/memory msdos --> dlls/ntdll/msdos relay32 --> dlls/ntdll/relay32 scheduler --> dlls/ntdll/scheduler win32 --> dlls/ntdll/win32 windows --> dlls/user/windows These are the directories I'm not sure about: miscemu --> programs (possibly rename to wine?) ole --> dlls/ntdll/ole (ole is also used by library, maybe it should go to dlls/library?) tsx11 --> dlls/tsx11 (or maybe we should have a 'drivers' top-level directory?) graphics/tsx11 --> dlls/tsx11/graphics windows/tsx11 --> dlls/tsx11/windows unicode --> dlls/unicode Please let me know what you think. Thanks, Josh Thielen

2 1

Unknown Windows message number
by ccrayne＠crayne.org 14 Apr '02

14 Apr '02

While testing an application which I have (mostly) running under Wine, I consistently see the following message sent sometines to RICHEDIT32_WindowProc and sometimes to TOOLTIPS_WindowProc: msg: 0xc01e wp: 0 lp: 0x40596d60 Any clues as to what this message is would be welcome. -- Chuck Crayne ----------------------------------------------------------- ccrayne(a)crayne.org -----------------------------------------------------------

3 3

Regression tests, UNICODE vs ASCII
by Geoffrey Hausheer 14 Apr '02

14 Apr '02

So I've finally started writing tests for functions that have both Unicode and Ascii equivalents, and I'm wondering how to write the tests. I re-read the thread about this that occurred back in January, and there didn't seem to be a clear decision. With the current framework, it doesn't appear to be possible to just write one test, and have it build both unicode and ascii versions, and it seems like at least Alexandre was strongly against this anyway. But in my case, I know nothing at all about writing Unicode tests, or how to explicitly test unicode functionality, so I see that I have three options: 1) Don't write any 'W' tests, and use only 'A' functions in my tests 2) Duplicate my 'A' tests as 'W' tests, and acknowledge that there is likely Unicode specific stuff that is not tested 3) Learn something about Unicode, and figure out how to test the functions correctly. Now obvioulsy (3) is the best choice, but honestly, I am not motivated towards this at the moment. Which leaves (1) and (2), with (2) being the way I'm leaning. But the tests are getting really big, and pretty messy, and duplicating them and managing both versions looks like a nightmare (there are lots of TODOs, and I expect the tests to behave differently on different OS). So what is the recomendation that I do? In the simplest case, I can just copy the Ascii test to a new file and replace all 'A' with 'W', and just keep the tests seperated that way. Anyhow, any comments would be appreciated. Thanks, .Geoff

4 4

Re: Regression tests, UNICODE vs ASCII
by Lina Kemmel 14 Apr '02

14 Apr '02

P.S. By "2 code pages" I meant *ANSI* code pages, of course.. Lina Hi, At least 2 code pages contain a couple of BiDi control characters: * Left-to-Right Mark (LRM) and Right-to-Left Mark (RLM) present in both 1255 and 1256 code pages (0xFD and 0xFE); * Zero Width Non-Joiner (ZWNJ) and Zero Width Joiner (ZWJ) -- in cp1256 (0x9D and 0x9E). Lina Shachar Shemesh <wine-devel(a)sun.consumer.org.il> Sent by: wine-devel-admin(a)winehq.com 14/04/02 09:50 ص Please respond to Shachar Shemesh To: Francois Gouget <fgouget(a)free.fr> cc: Andriy Palamarchuk <apa3a(a)yahoo.com>, Geoffrey Hausheer <i8e7fkwmsl1(a)phracturedblue.com>, wine-devel(a)winehq.com Subject: Re: Regression tests, UNICODE vs ASCII One thing you may try are the explicit BiDi specifiers (Right to left, left to right etc.). These are Unicode characters designed to explicitly specify the direction of otherwise amigious characters. Ansii does not have, to the best of my knowledge, an equivalent encoded characters. Shachar Francois Gouget wrote: >On Mon, 8 Apr 2002, Andriy Palamarchuk wrote: > >>A couple comments: >>1) it is useful to check intermixed API calls, like >>A->W->A to be sure they do conversions correctly. >>2) while testing W functions use some Unicode symbols >>which do not have corresponding ASCII symbols. >> > > Could you give a couple examples of these Unicode symbols? I know >that I would be hard-pressed to make up a Unicode string with anything >significant. But if I had an example to base my code on, integrating it >into my own tests should be trivial. > >-- >Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ > 1 + e ^ ( i * pi ) = 0 >

1 0

Re: Regression tests, UNICODE vs ASCII
by Lina Kemmel 14 Apr '02

14 Apr '02

Hi, At least 2 code pages contain a couple of BiDi control characters: * Left-to-Right Mark (LRM) and Right-to-Left Mark (RLM) present in both 1255 and 1256 code pages (0xFD and 0xFE); * Zero Width Non-Joiner (ZWNJ) and Zero Width Joiner (ZWJ) -- in cp1256 (0x9D and 0x9E). Lina Shachar Shemesh <wine-devel(a)sun.consumer.org.il> Sent by: wine-devel-admin(a)winehq.com 14/04/02 09:50 ص Please respond to Shachar Shemesh To: Francois Gouget <fgouget(a)free.fr> cc: Andriy Palamarchuk <apa3a(a)yahoo.com>, Geoffrey Hausheer <i8e7fkwmsl1(a)phracturedblue.com>, wine-devel(a)winehq.com Subject: Re: Regression tests, UNICODE vs ASCII One thing you may try are the explicit BiDi specifiers (Right to left, left to right etc.). These are Unicode characters designed to explicitly specify the direction of otherwise amigious characters. Ansii does not have, to the best of my knowledge, an equivalent encoded characters. Shachar Francois Gouget wrote: >On Mon, 8 Apr 2002, Andriy Palamarchuk wrote: > >>A couple comments: >>1) it is useful to check intermixed API calls, like >>A->W->A to be sure they do conversions correctly. >>2) while testing W functions use some Unicode symbols >>which do not have corresponding ASCII symbols. >> > > Could you give a couple examples of these Unicode symbols? I know >that I would be hard-pressed to make up a Unicode string with anything >significant. But if I had an example to base my code on, integrating it >into my own tests should be trivial. > >-- >Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ > 1 + e ^ ( i * pi ) = 0 >

1 0

X11 fork available
by Ove Kaaven 13 Apr '02

13 Apr '02

Ever since the main Wine tree changed its license to the LGPL, a fork of the tree under the old license had seemed necessary, and been planned. This fork is now ready. If you're a Wine contributor that don't care all that much about forking, you do not need to leave the official LGPL-ed Wine tree to let the X11-licensed fork live. All you have to do is to agree to license your patches under the X11 license, so we are able to pick it up from wine-patches and apply it to the X11 tree whenever possible. This will make your contributions more widely used, so we encourage as many as possible to do so. And if it's out of the question for you, then we encourage you to tell us that, so that we know that we can never apply your patches. The fork's name was decided after a lot of brainstorming by Eric and me, when we found a name which we both liked... ReWind. It can stand for "Re-engineering Windows", or something like "Rewind to the old Windows days". The fork is currently hosted on SourceForge. The homepage is thus http://rewind.sourceforge.net/ for now. It's not a very fancy page, but all the necessary CVS and mailing list information is there. Go there if you're interested in contributing actively to ReWind. Patches known to come from X11-friendly contributors are already applied to the CVS, but many more patches are waiting for the authors to declare a stance. The CVS repository that ReWind is based on is the WineHQ repository, cleansed of all post-LGPL commits (except the Before-LGPL tag), so all the CVS history of the pre-LGPL Wine is present in the ReWind CVS repository. This ensures that no history is lost in the event that the X11 fork prevails over the LGPL fork. Your help to achieve this is welcome. Followups to this post should preferably go to wine-license. Thanks for your attention.

1 0

Looking for help to implement IOCTL_SCSI_PASS_THROUGH_DIRECT
by Laurent Pinchart 12 Apr '02

12 Apr '02

Hi, I need to implement IOCTL_SCSI_PASS_THROUGH_DIRECT for cdroms (and a few other IOCTLs, like IOCTL_SCSI_GET_ADDRESS). As I don't have enough SCSI & cdrom handling experience, I wonder if someone could help me getting started. Should I use the linux CDROM_SEND_PACKET ioctl ? If so, how should I handle the 16-byte command from the windows IOCTL_SCSI_PASS_THROUGH_DIRECT, as the command is 12-bytes long for CDROM_SEND_PACKET ? Any help will be appreciated. Laurent Pinchart

1 0

update to regression testing framework
by Paul Millar 12 Apr '02

12 Apr '02

Hi, The attached patch changes the way the regression testing works slightly. The default behaviour should be the same, but there's some optional "enhancements": o If you set WINETEST_REPORT_SUCCESS environment variable to 1, successful tests are reported as well as unsuccessful ones. o If you set WINETEST_CONTINUE_ON_FAIL environment variable to 1, "make test" will run all tests from all modules, rather than failing on the first failing module. o The commands "named_ok", "set_name" and "unset_name" now exist (in C and Perl). You can use these to specify a name for tests either individually (via named_ok) or for a region (via set_name and unset_name) The patch changes both the C and Perl frameworks. I'm pretty sure the Perl is right but someone who actually knows Perl ought to check it :) The second patch illustrates these by changing dlls/kernel/tests/atom.pl and dlls/kernel/tests/directory.c (apologies to Alexandre & Dmitry if I got the test semantics wrong). HTH ---- Paul Millar ChangeLog: Adding test names and some optional behaviour.

4 6

Patch: sock-shutdown.diff (9 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

Sorry I got the numbers wrong - there is no number 6 :-/ Patch: sock-shutdown.diff On overlapped sockets, shutdown() must be done asynchronously too to avoid premature closing of connections (necessary but unfortunately not sufficient). This patch queues the shutdown request in the async queue. Moreover it sets flags for the fd state to prevent calls to send() or recv() after the respective connection of the socket was shut down. Patch against: CVS 2002-04-12, with my sock-fd-type, sock-accept-deferred, async-winsock patches applied. Modified files: dlls/winsock: socket.c include/wine: server_protocol.h include: winsock.h server: protocol.def, sock.c diff -ruNX ignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Fri Apr 12 15:29:04 2002 +++ MW/wine/dlls/winsock/socket.c Fri Apr 12 15:29:13 2002 @@ -2258,6 +2258,12 @@ if ( fd == -1 ) goto error; + if ( flags & FD_FLAG_SEND_SHUTDOWN ) + { + err = WSAESHUTDOWN; + goto err_close; + } + iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); if ( !iovec ) @@ -2470,55 +2476,168 @@ return (INT16)WS_setsockopt( s, (UINT16)level, optname, optval, optlen ); } +/*********************************************************************** + * WS2_async_shutdown (INTERNAL) + * + * On overlapped sockets, shutdown() must be done asynchronously. + */ +static void WS2_async_shutdown ( async_private *as ) +{ + ws2_async* wsa = (ws2_async*) as; + int err = 1; + + TRACE ( "async %p %d\n", wsa, wsa->async.type ); + switch ( wsa->async.type ) + { + case ASYNC_TYPE_READ: + err = shutdown ( wsa->async.fd, 0 ); + break; + case ASYNC_TYPE_WRITE: + err = shutdown ( wsa->async.fd, 1 ); + break; + default: + WARN ("invalid type: %d\n", wsa->async.type ); + } + + if ( err ) + wsa->overlapped->Internal = STATUS_UNSUCCESSFUL; + else + wsa->overlapped->Internal = STATUS_SUCCESS; +} + +/*********************************************************************** + * WS2_register_async_shutdown (INTERNAL) + */ +static int WS2_register_async_shutdown ( SOCKET s, int fd, int type ) +{ + struct ws2_async *wsa; + int ret, err = WSAEFAULT; + DWORD dwflags = 0; + int len = 0; + LPWSAOVERLAPPED ovl = HeapAlloc (GetProcessHeap(), 0, sizeof ( WSAOVERLAPPED )); + + TRACE ("s %d fd %d type %d\n", s, fd, type); + if (!ovl) + goto out; + + ovl->hEvent = WSACreateEvent (); + if ( ovl->hEvent == WSA_INVALID_EVENT ) + goto out_free; + + wsa = WS2_make_async ( s, fd, type, NULL, 0, + &dwflags, NULL, &len, ovl, NULL ); + if ( !wsa ) + goto out_close; + + /* Hack: this will cause ws2_async_cleanup() to free the overlapped structure */ + wsa->user_overlapped = NULL; + wsa->async.func = WS2_async_shutdown; + if ( (ret = register_new_async ( &wsa->async )) ) + { + err = RtlNtStatusToDosError ( ret ); + ws2_async_cleanup ( &wsa->async ); + goto out; + } + return 0; + +out_close: + WSACloseEvent ( ovl->hEvent ); +out_free: + HeapFree ( GetProcessHeap(), 0, ovl ); +out: + return err; +} /*********************************************************************** * shutdown (WS2_32.22) */ int WINAPI WS_shutdown(SOCKET s, int how) { - int fd = _get_sock_fd(s); + int fd, fd0 = -1, fd1 = -1, flags, err = WSAENOTSOCK; + enum fd_type type; + unsigned int set_flags = 0, clear_flags = 0; - TRACE("socket %04x, how %i\n", s, how ); - if (fd != -1) - { - switch( how ) - { - case 0: /* drop receives */ - _enable_event(s, 0, 0, FD_READ); -#ifdef SHUT_RD - how = SHUT_RD; -#endif - break; + fd = _get_sock_fd_type ( s, &type, &flags ); + TRACE("socket %04x, how %i %d %d \n", s, how, type, flags ); - case 1: /* drop sends */ - _enable_event(s, 0, 0, FD_WRITE); -#ifdef SHUT_WR - how = SHUT_WR; -#endif - break; + if (fd == -1) + goto error; - case 2: /* drop all */ -#ifdef SHUT_RDWR - how = SHUT_RDWR; -#endif - default: - WSAAsyncSelect( s, 0, 0, 0 ); - break; - } + if ( flags & FD_FLAG_OVERLAPPED ) { + + switch ( how ) + { + case SD_RECEIVE: + fd0 = fd; + set_flags |= FD_FLAG_RECV_SHUTDOWN; + clear_flags |= FD_READ; + break; + case SD_SEND: + fd1 = fd; + set_flags |= FD_FLAG_SEND_SHUTDOWN; + clear_flags |= FD_WRITE; + break; + case SD_BOTH: + fd0 = fd; + fd1 = _get_sock_fd ( s ); + set_flags |= FD_FLAG_RECV_SHUTDOWN|FD_FLAG_SEND_SHUTDOWN; + clear_flags |= FD_READ|FD_WRITE; + default: + clear_flags |= FD_WINE_CONNECTED|FD_WINE_LISTENING; + WSAAsyncSelect( s, 0, 0, 0 ); + } + _enable_event( s, 0, set_flags, clear_flags ); - if (shutdown(fd, how) == 0) - { - if( how > 1 ) - { - _enable_event(s, 0, 0, FD_WINE_CONNECTED|FD_WINE_LISTENING); - } - close(fd); - return 0; - } - SetLastError(wsaErrno()); - close(fd); - } - else SetLastError(WSAENOTSOCK); + if ( fd0 != -1 ) + { + err = WS2_register_async_shutdown ( s, fd0, ASYNC_TYPE_READ ); + if ( err ) + { + close ( fd0 ); + goto error; + } + } + if ( fd1 != -1 ) + { + err = WS2_register_async_shutdown ( s, fd1, ASYNC_TYPE_WRITE ); + if ( err ) + { + close ( fd1 ); + goto error; + } + } + return 0; + } + else /* non-overlapped mode */ + { + switch( how ) + { + case 0: /* drop receives */ + _enable_event(s, 0, 0, FD_READ); + break; + case 1: /* drop sends */ + _enable_event(s, 0, 0, FD_WRITE); + break; + case 2: /* drop all */ + default: + WSAAsyncSelect( s, 0, 0, 0 ); + break; + } + + if ( shutdown( fd, how ) ) + { + err = wsaErrno (); + close ( fd ); + goto error; + } + if( how > 1 ) + _enable_event(s, 0, 0, FD_WINE_CONNECTED|FD_WINE_LISTENING); + close(fd); + return 0; + } + +error: + WSASetLastError ( err ); return SOCKET_ERROR; } @@ -3707,9 +3826,12 @@ TRACE ( "fd=%d, type=%d, flags=%x\n", fd, type, flags ); if (fd == -1) - { - err = WSAENOTSOCK; goto error; + + if ( flags & FD_FLAG_RECV_SHUTDOWN ) + { + err = WSAESHUTDOWN; + goto err_close; } iovec = HeapAlloc ( GetProcessHeap(), 0, dwBufferCount * sizeof (struct iovec) ); @@ -3879,6 +4001,7 @@ SetLastError ( WSATRY_AGAIN ); } SERVER_END_REQ; + /* WS_closesocket ( cs ); */ return SOCKET_ERROR; case CF_REJECT: WS_closesocket(cs); diff -ruNX ignore TMP/wine/include/wine/server_protocol.h MW/wine/include/wine/server_protocol.h --- TMP/wine/include/wine/server_protocol.h Fri Apr 12 14:38:16 2002 +++ MW/wine/include/wine/server_protocol.h Fri Apr 12 15:29:13 2002 @@ -796,6 +796,9 @@ #define FD_FLAG_OVERLAPPED 0x01 #define FD_FLAG_TIMEOUT 0x02 +#define FD_FLAG_RECV_SHUTDOWN 0x08000000 +#define FD_FLAG_SEND_SHUTDOWN 0x04000000 +#define FD_FLAG_SHUTDOWN_MASK (FD_FLAG_RECV_SHUTDOWN|FD_FLAG_SEND_SHUTDOWN) struct set_file_pointer_request @@ -3196,6 +3199,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 79 +#define SERVER_PROTOCOL_VERSION 80 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore TMP/wine/include/winsock.h MW/wine/include/winsock.h --- TMP/wine/include/winsock.h Tue Apr 2 16:51:40 2002 +++ MW/wine/include/winsock.h Fri Apr 12 15:29:13 2002 @@ -728,6 +728,7 @@ #define FD_CLOSE 0x00000020 /* internal per-socket flags */ +/* CAUTION: FD_FLAG_RECV_SHUTDOWN / FD_FLAG_SEND_SHUTDOWN (server/protocol.def) must fit into this mask */ #ifdef __WINE__ #define FD_WINE_LISTENING 0x10000000 #define FD_WINE_NONBLOCKING 0x20000000 diff -ruNX ignore TMP/wine/server/protocol.def MW/wine/server/protocol.def --- TMP/wine/server/protocol.def Fri Apr 12 14:38:16 2002 +++ MW/wine/server/protocol.def Fri Apr 12 15:29:13 2002 @@ -612,7 +612,10 @@ }; #define FD_FLAG_OVERLAPPED 0x01 #define FD_FLAG_TIMEOUT 0x02 - +/* These are only for sockets, but must work with ReadFile() etc., too */ +#define FD_FLAG_RECV_SHUTDOWN 0x08000000 +#define FD_FLAG_SEND_SHUTDOWN 0x04000000 +#define FD_FLAG_SHUTDOWN_MASK (FD_FLAG_RECV_SHUTDOWN|FD_FLAG_SEND_SHUTDOWN) /* Set a file current position */ @REQ(set_file_pointer) diff -ruNX ignore TMP/wine/server/sock.c MW/wine/server/sock.c --- TMP/wine/server/sock.c Fri Apr 12 15:29:04 2002 +++ MW/wine/server/sock.c Fri Apr 12 15:29:13 2002 @@ -230,7 +230,6 @@ } } else { - if ( sock->flags & WSA_FLAG_OVERLAPPED ) { if( IS_READY(sock->read_q) && (POLLIN & event) ) @@ -243,25 +242,26 @@ if (debug_level) fprintf ( stderr, "activating write queue for socket %p\n", sock ); async_notify(sock->write_q.head, STATUS_ALERTED); } - } - /* normal data flow */ - if (event & POLLIN) - { - char dummy; + } else { /* Linux 2.4 doesn't report POLLHUP if only one side of the socket * has been closed, so we need to check for it explicitly here */ - if (!recv( sock->obj.fd, &dummy, 1, MSG_PEEK )) event = POLLHUP; - else - { - /* incoming data */ - sock->pmask |= FD_READ; - sock->hmask |= FD_READ; - sock->errors[FD_READ_BIT] = 0; - if (debug_level) - fprintf(stderr, "socket %d is readable\n", sock->obj.fd ); - } + /* !!!! MW: do that only for non-overlapped sockets ??? */ + char dummy; + if (!recv( sock->obj.fd, &dummy, 1, MSG_PEEK )) + event = POLLHUP; + } + /* normal data flow */ + if (event & POLLIN) + { + + /* incoming data */ + sock->pmask |= FD_READ; + sock->hmask |= FD_READ; + sock->errors[FD_READ_BIT] = 0; + if (debug_level) + fprintf(stderr, "socket %d is readable\n", sock->obj.fd ); } if (event & POLLOUT) { @@ -371,8 +371,8 @@ reply->index_low = 0; reply->serial = 0; } - *flags = 0; - if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED; + *flags = ( sock->state & FD_FLAG_SHUTDOWN_MASK ); + if ( sock->flags & WSA_FLAG_OVERLAPPED ) *flags |= FD_FLAG_OVERLAPPED; return FD_TYPE_DEFAULT; }

2 1

Patch: wait-debug.diff (10 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

Patch: wait-debug.diff Introduce a debug channel for WaitForMultipleObjectsEx() in scheduler/synchro.c - I found this very useful to debug my asynchronous socket code. Moreover, include "async.h" _after_ declaring debug channels so that TRACEs can be used in the static functions in async.h. Patch against: CVS 2002-04-12, with my async-immediate, async-file patches applied. Modified files: dlls/kernel: comm.c dlls/ntdll: ntdll.spec files: file.c include: async.h scheduler: synchro.c diff -ruNX ignore TMP/wine/dlls/kernel/comm.c MW/wine/dlls/kernel/comm.c --- TMP/wine/dlls/kernel/comm.c Fri Apr 12 12:31:58 2002 +++ MW/wine/dlls/kernel/comm.c Fri Apr 12 12:32:19 2002 @@ -80,7 +80,6 @@ #include "winerror.h" #include "wine/server.h" -#include "async.h" #include "file.h" #include "heap.h" @@ -91,6 +90,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(comm); +#include "async.h" /*********************************************************************** * Asynchronous I/O for asynchronous wait requests * diff -ruNX ignore TMP/wine/dlls/ntdll/ntdll.spec MW/wine/dlls/ntdll/ntdll.spec --- TMP/wine/dlls/ntdll/ntdll.spec Tue Apr 2 16:51:27 2002 +++ MW/wine/dlls/ntdll/ntdll.spec Fri Apr 12 12:33:12 2002 @@ -5,7 +5,7 @@ global heap int int21 int31 io loaddll local module ntdll process profile reg relay resource segment seh selector server snoop string system tape task thread tid timer toolhelp ver virtual - vxd win32) + vxd wait win32) #note that the Zw... functions are alternate names for the #Nt... functions. (see www.sysinternals.com for details) diff -ruNX ignore TMP/wine/files/file.c MW/wine/files/file.c --- TMP/wine/files/file.c Fri Apr 12 12:31:58 2002 +++ MW/wine/files/file.c Fri Apr 12 12:32:19 2002 @@ -55,7 +55,6 @@ #include "drive.h" #include "file.h" -#include "async.h" #include "heap.h" #include "msdos.h" #include "wincon.h" @@ -64,6 +63,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(file); +#include "async.h" #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #define MAP_ANON MAP_ANONYMOUS diff -ruNX ignore TMP/wine/include/async.h MW/wine/include/async.h --- TMP/wine/include/async.h Fri Apr 12 12:31:58 2002 +++ MW/wine/include/async.h Fri Apr 12 12:32:19 2002 @@ -102,6 +102,7 @@ ovp->ops->set_status ( ovp, ret ); } + TRACE ("ovp %p, status %lx %lx, ret %x\n", ovp, status, ovp->ops->get_status (ovp), ret); if ( ovp->ops->get_status (ovp) != STATUS_PENDING ) finish_async (ovp); diff -ruNX ignore TMP/wine/scheduler/synchro.c MW/wine/scheduler/synchro.c --- TMP/wine/scheduler/synchro.c Mon Apr 8 10:56:59 2002 +++ MW/wine/scheduler/synchro.c Fri Apr 12 12:33:12 2002 @@ -23,6 +23,7 @@ #include <signal.h> #include <sys/time.h> #include <sys/poll.h> +#include <stdio.h> #include <unistd.h> #include <string.h> @@ -30,6 +31,9 @@ #include "thread.h" #include "winerror.h" #include "wine/server.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wait); #include "async.h" @@ -225,9 +229,22 @@ BOOL wait_all, DWORD timeout, BOOL alertable ) { - int ret, cookie; + int ret, cookie,i; struct timeval tv; + if ( TRACE_ON ( __default ) ) + { + const int len = 256; + char bf[len], *pp; + + for (i = 0, pp = bf; i < count && pp < bf+len; i++) + pp += snprintf (pp, bf + len - pp, " %d", handles[i]); + bf[len-1] = 0; + + TRACE ( "n=%ld wait=%c timeout=%ld alertable=%c handles%s\n", count, + ( wait_all ? 'y' : 'n' ), timeout, ( alertable ? 'y' : 'n' ), bf ); + } + if (count > MAXIMUM_WAIT_OBJECTS) { SetLastError( ERROR_INVALID_PARAMETER ); @@ -259,6 +276,7 @@ call_apcs( alertable ); if (alertable) break; } + TRACE ("status: %d\n", ret); if (HIWORD(ret)) /* is it an error code? */ { SetLastError( RtlNtStatusToDosError(ret) );

1 0

Patch: async-winsock.diff (8 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

Patch: async-winsock.diff Basic implementation of asynchronous WSARecvFrom()/WSASendTo()/WSAGetOverlappedResult(), client side. Patch against: CVS 2002-04-12, with my sock-fd-type and sock-accept-deferred patches applied. Also requires the server side patch (async-sock-server). Modified files: dlls/winsock: socket.c, ws2_32.spec include: winsock2.h diff -ruNX ignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Fri Apr 12 14:55:42 2002 +++ MW/wine/dlls/winsock/socket.c Fri Apr 12 15:13:28 2002 @@ -105,6 +105,7 @@ #include "wine/winbase16.h" #include "wingdi.h" #include "winuser.h" +#include "winerror.h" #include "winsock2.h" #include "ws2tcpip.h" #include "wsipx.h" @@ -126,6 +127,170 @@ inet_ntoa(((struct sockaddr_in *)a)->sin_addr), \ ntohs(((struct sockaddr_in *)a)->sin_port)) +/**************************************************************** + * Async IO declarations and operations + ****************************************************************/ +#include "async.h" + +static DWORD ws2_async_get_status (const struct async_private *ovp); +static DWORD ws2_async_get_count (const struct async_private *ovp); +static void ws2_async_set_status (struct async_private *ovp, const DWORD status); +static void CALLBACK ws2_async_call_completion (ULONG_PTR data); +static void ws2_async_cleanup ( struct async_private *ovp ); + +static struct async_ops ws2_async_ops = +{ + ws2_async_get_status, + ws2_async_set_status, + ws2_async_get_count, + ws2_async_call_completion, + ws2_async_cleanup +}; + +static struct async_ops ws2_nocomp_async_ops = +{ + ws2_async_get_status, + ws2_async_set_status, + ws2_async_get_count, + NULL, /* call_completion */ + ws2_async_cleanup +}; + +typedef struct ws2_async +{ + async_private async; + LPWSAOVERLAPPED overlapped; + LPWSAOVERLAPPED user_overlapped; + LPWSAOVERLAPPED_COMPLETION_ROUTINE completion_func; + struct iovec *iovec; + int n_iovecs; + struct WS_sockaddr *addr; + union { + int val; /* for send operations */ + int *ptr; /* for recv operations */ + } addrlen; + DWORD flags; +} ws2_async; + +static DWORD ws2_async_get_status (const struct async_private *ovp) +{ + return ((ws2_async*) ovp)->overlapped->Internal; +} + +static VOID ws2_async_set_status (struct async_private *ovp, const DWORD status) +{ + ((ws2_async*) ovp)->overlapped->Internal = status; +} + +static DWORD ws2_async_get_count (const struct async_private *ovp) +{ + return ((ws2_async*) ovp)->overlapped->InternalHigh; +} + +static void ws2_async_cleanup ( struct async_private *ap ) +{ + struct ws2_async *as = (struct ws2_async*) ap; + + TRACE ( "as: %p uovl %p ovl %p\n", as, as->user_overlapped, as->overlapped ); + if ( !as->user_overlapped ) + { + if ( as->overlapped->hEvent != INVALID_HANDLE_VALUE ) + WSACloseEvent ( as->overlapped->hEvent ); + HeapFree ( GetProcessHeap(), 0, as->overlapped ); + } + + if ( as->iovec ) + HeapFree ( GetProcessHeap(), 0, as->iovec ); + + HeapFree ( GetProcessHeap(), 0, as ); +} + +static void CALLBACK ws2_async_call_completion (ULONG_PTR data) +{ + ws2_async* as = (ws2_async*) data; + + TRACE ("data: %p\n", as); + + as->completion_func ( RtlNtStatusToDosError (as->overlapped->Internal), + as->overlapped->InternalHigh, + as->user_overlapped, + as->flags ); + ws2_async_cleanup ( &as->async ); +} + +static void WS2_async_recv (async_private *as); +static void WS2_async_send (async_private *as); + +/*********************************************************************** + * WS2_make_async (WS2_32.69) + */ +inline static struct ws2_async* +WS2_make_async (SOCKET s, int fd, int type, struct iovec *iovec, DWORD dwBufferCount, + LPDWORD lpFlags, struct WS_sockaddr *addr, + LPINT addrlen, LPWSAOVERLAPPED lpOverlapped, + LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) +{ + struct ws2_async *wsa = HeapAlloc ( GetProcessHeap(), 0, sizeof ( ws2_async ) ); + + TRACE ( "wsa %p\n", wsa ); + + if (!wsa) + return NULL; + + wsa->async.ops = ( lpCompletionRoutine ? &ws2_async_ops : &ws2_nocomp_async_ops ); + wsa->async.handle = (HANDLE) s; + wsa->async.fd = fd; + wsa->async.type = type; + switch (type) + { + case ASYNC_TYPE_READ: + wsa->flags = *lpFlags; + wsa->async.func = WS2_async_recv; + wsa->addrlen.ptr = addrlen; + break; + case ASYNC_TYPE_WRITE: + wsa->flags = 0; + wsa->async.func = WS2_async_send; + wsa->addrlen.val = *addrlen; + break; + default: + ERR ("Invalid async type: %d\n", type); + } + wsa->user_overlapped = lpOverlapped; + wsa->completion_func = lpCompletionRoutine; + wsa->iovec = iovec; + wsa->n_iovecs = dwBufferCount; + wsa->addr = addr; + + if ( lpOverlapped ) + { + wsa->overlapped = lpOverlapped; + wsa->async.event = ( lpCompletionRoutine ? INVALID_HANDLE_VALUE : lpOverlapped->hEvent ); + } + else + { + wsa->overlapped = HeapAlloc ( GetProcessHeap(), 0, + sizeof (WSAOVERLAPPED) ); + if ( !wsa->overlapped ) + goto error; + wsa->async.event = wsa->overlapped->hEvent = INVALID_HANDLE_VALUE; + } + + wsa->overlapped->InternalHigh = 0; + TRACE ( "wsa %p, ops %p, h %d, ev %d, fd %d, func %p, ov %p, uov %p, cfunc %p\n", + wsa, wsa->async.ops, wsa->async.handle, wsa->async.event, wsa->async.fd, wsa->async.func, + wsa->overlapped, wsa->user_overlapped, wsa->completion_func ); + + return wsa; + +error: + TRACE ("Error\n"); + HeapFree ( GetProcessHeap(), 0, wsa ); + return NULL; +} + +/****************************************************************/ + /* ----------------------------------- internal data */ /* ws_... struct conversion flags */ @@ -1988,6 +2153,88 @@ } /*********************************************************************** + * WS2_send (INTERNAL) + */ +static int WS2_send ( int fd, struct iovec* iov, int count, + const struct WS_sockaddr *to, INT tolen, DWORD dwFlags ) +{ + struct msghdr hdr; + int n = -1; + TRACE ( "fd %d, iovec %p, count %d addr %p, len %d, flags %lx\n", + fd, iov, count, to, tolen, dwFlags); + + hdr.msg_name = NULL; + + if ( to ) + { +#if DEBUG_SOCKADDR + dump_sockaddr (to); +#endif + hdr.msg_name = (struct sockaddr*) ws_sockaddr_ws2u ( to, tolen, &hdr.msg_namelen ); + if ( !hdr.msg_name ) + { + WSASetLastError ( WSAEFAULT ); + goto out; + } + } + else + hdr.msg_namelen = 0; + + hdr.msg_iov = iov; + hdr.msg_iovlen = count; + hdr.msg_control = NULL; + hdr.msg_controllen = 0; + hdr.msg_flags = 0; + + n = sendmsg (fd, &hdr, dwFlags); + +out: + ws_sockaddr_free ( hdr.msg_name, to ); + return n; +} + +/*********************************************************************** + * WS2_async_send (INTERNAL) + */ +static void WS2_async_send ( async_private *as ) +{ + ws2_async* wsa = (ws2_async*) as; + int result, err; + + TRACE ( "async %p\n", wsa ); + + if ( wsa->overlapped->Internal != STATUS_PENDING ) + { + TRACE ( "status: %ld\n", wsa->overlapped->Internal ); + return; + } + + result = WS2_send ( wsa->async.fd, wsa->iovec, wsa->n_iovecs, + wsa->addr, wsa->addrlen.val, wsa->flags ); + + if (result >= 0) + { + wsa->overlapped->Internal = STATUS_SUCCESS; + wsa->overlapped->InternalHigh = result; + TRACE ( "sent %d bytes\n", result ); + _enable_event ( (SOCKET) wsa->async.handle, FD_WRITE, 0, 0 ); + return; + } + + err = errno; + if ( err == EAGAIN || err == EINTR ) + { + wsa->overlapped->Internal = STATUS_PENDING; + TRACE ( "still pending\n" ); + } + else + { + wsa->overlapped->Internal = STATUS_UNSUCCESSFUL; + TRACE ( "Error: %d\n", errno ); + } +} + +/*********************************************************************** * WSASendTo (WS2_32.74) */ INT WINAPI WSASendTo( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, @@ -1996,9 +2243,9 @@ LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - int i, n, fd, err = WSAENOTSOCK, flags; + int i, n, fd, err = WSAENOTSOCK, flags, ret; struct iovec* iovec; - struct msghdr msghdr; + struct ws2_async *wsa; enum fd_type type; TRACE ("socket %04x, wsabuf %p, nbufs %ld, flags %ld, to %p, tolen %d, ovl %p, func %p\n", @@ -2006,6 +2253,7 @@ to, tolen, lpOverlapped, lpCompletionRoutine); fd = _get_sock_fd_type( s, &type, &flags ); + TRACE ( "fd=%d, type=%d, flags=%x\n", fd, type, flags ); if ( fd == -1 ) goto error; @@ -2014,7 +2262,7 @@ if ( !iovec ) { - err = WSAENOBUFS; + err = WSAEFAULT; goto err_close; } @@ -2024,30 +2272,46 @@ iovec[i].iov_len = lpBuffers[i].len; } - msghdr.msg_name = NULL; - - if (to) + if ( (lpOverlapped || lpCompletionRoutine) && flags & FD_FLAG_OVERLAPPED ) { -#if DEBUG_SOCKADDR - dump_sockaddr (to); -#endif - msghdr.msg_name = (void*) ws_sockaddr_ws2u (to, tolen, &msghdr.msg_namelen); - if ( !msghdr.msg_name ) + wsa = WS2_make_async ( s, fd, ASYNC_TYPE_WRITE, iovec, dwBufferCount, + &dwFlags, (struct WS_sockaddr*) to, &tolen, + lpOverlapped, lpCompletionRoutine ); + if ( !wsa ) { err = WSAEFAULT; goto err_free; } - } - else - msghdr.msg_namelen = 0; + + if ( ( ret = register_new_async ( &wsa->async )) ) + { + err = RtlNtStatusToDosError ( ret ); - msghdr.msg_iov = iovec; - msghdr.msg_iovlen = dwBufferCount; - msghdr.msg_control = NULL; - msghdr.msg_controllen = 0; - msghdr.msg_flags = 0; + if ( !lpOverlapped ) + HeapFree ( GetProcessHeap(), 0, wsa->overlapped ); + HeapFree ( GetProcessHeap(), 0, wsa ); + goto err_free; + } - /* FIXME: Treat overlapped IO here */ + _enable_event ( s, FD_WRITE, 0, 0 ); + + /* Try immediate completion */ + if ( lpOverlapped ) + { + if ( WSAGetOverlappedResult ( (HANDLE) s, lpOverlapped, + lpNumberOfBytesSent, FALSE, &dwFlags) ) + return 0; + + if ( (err = WSAGetLastError ()) != WSA_IO_INCOMPLETE ) + { + WARN ("err=%d\n", err); + goto err_free; + } + } + + WSASetLastError (WSA_IO_PENDING); + return SOCKET_ERROR; + } if (_is_blocking(s)) { @@ -2055,9 +2319,8 @@ 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) + n = WS2_send ( fd, iovec, dwBufferCount, to, tolen, dwFlags ); + if ( n == -1 ) { err = wsaErrno(); if ( err == WSAEWOULDBLOCK ) @@ -2065,24 +2328,22 @@ goto err_free; } + TRACE(" -> %i bytes\n", n); *lpNumberOfBytesSent = n; - ws_sockaddr_free ( msghdr.msg_name, to ); - WS_FREE ( iovec ); + HeapFree ( GetProcessHeap(), 0, iovec ); close ( fd ); - return 0; err_free: - ws_sockaddr_free ( msghdr.msg_name, to ); - WS_FREE ( iovec ); + HeapFree ( GetProcessHeap(), 0, iovec ); err_close: close ( fd ); error: WARN (" -> ERROR %d\n", err); - SetLastError (err); + WSASetLastError (err); return SOCKET_ERROR; } @@ -2686,6 +2947,53 @@ return SOCKET_ERROR; } +/********************************************************************** + * WSAGetOverlappedResult (WS2_32.40) + */ +BOOL WINAPI WSAGetOverlappedResult ( SOCKET s, LPWSAOVERLAPPED lpOverlapped, + LPDWORD lpcbTransfer, BOOL fWait, + LPDWORD lpdwFlags ) +{ + DWORD r; + + TRACE ( "socket %d ovl %p trans %p, wait %d flags %p\n", + s, lpOverlapped, lpcbTransfer, fWait, lpdwFlags ); + + if ( !(lpOverlapped && lpOverlapped->hEvent) ) + { + ERR ( "Invalid pointer\n" ); + WSASetLastError (WSA_INVALID_PARAMETER); + return FALSE; + } + + do { + r = WaitForSingleObjectEx (lpOverlapped->hEvent, fWait ? INFINITE : 0, TRUE); + } while (r == STATUS_USER_APC); + + if ( lpcbTransfer ) + *lpcbTransfer = lpOverlapped->InternalHigh; + + if ( lpdwFlags ) + *lpdwFlags = lpOverlapped->Offset; + + TRACE ("r=%lx, int=%lx inth%ld\n", r, lpOverlapped->Internal, lpOverlapped->InternalHigh); + + if ( r == WAIT_OBJECT_0 ) + return TRUE; + + if ( lpOverlapped->Internal == STATUS_PENDING ) + WSASetLastError ( WSA_IO_INCOMPLETE ); + else + { + DWORD err = RtlNtStatusToDosError ( lpOverlapped->Internal ); + WSASetLastError ( err ); + TRACE ( "Error: %lx\n", err ); + } + + return FALSE; +} + + /*********************************************************************** * WSAAsyncSelect (WS2_32.101) */ @@ -3278,6 +3586,105 @@ } /*********************************************************************** + * WS2_recv (INTERNAL) + */ +static int WS2_recv ( int fd, struct iovec* iov, int count, + struct WS_sockaddr *lpFrom, LPINT lpFromlen, + LPDWORD lpFlags ) +{ + struct msghdr hdr; + int n; + TRACE ( "fd %d, iovec %p, count %d addr %p, len %p, flags %lx\n", + fd, iov, count, lpFrom, lpFromlen, *lpFlags); + + hdr.msg_name = NULL; + + if ( lpFrom ) + { +#if DEBUG_SOCKADDR + dump_sockaddr (lpFrom); +#endif + + hdr.msg_namelen = *lpFromlen; + hdr.msg_name = ws_sockaddr_alloc ( lpFrom, lpFromlen, &hdr.msg_namelen ); + if ( !hdr.msg_name ) + { + WSASetLastError ( WSAEFAULT ); + n = -1; + goto out; + } + } + else + hdr.msg_namelen = 0; + + hdr.msg_iov = iov; + hdr.msg_iovlen = count; + hdr.msg_control = NULL; + hdr.msg_controllen = 0; + hdr.msg_flags = 0; + + if ( (n = recvmsg (fd, &hdr, *lpFlags)) == -1 ) + goto out; + + if ( lpFrom && + ws_sockaddr_u2ws ( hdr.msg_name, hdr.msg_namelen, + lpFrom, lpFromlen ) != 0 ) + { + /* The from buffer was too small, but we read the data + * anyway. Is that really bad? + */ + WSASetLastError ( WSAEFAULT ); + WARN ( "Address buffer too small\n" ); + } + +out: + + ws_sockaddr_free ( hdr.msg_name, lpFrom ); + return n; +} + +/*********************************************************************** + * WS2_async_recv (INTERNAL) + */ +static void WS2_async_recv ( async_private *as ) +{ + ws2_async* wsa = (ws2_async*) as; + int result, err; + + TRACE ( "async %p\n", wsa ); + + if ( wsa->overlapped->Internal != STATUS_PENDING ) + { + TRACE ( "status: %ld\n", wsa->overlapped->Internal ); + return; + } + + result = WS2_recv ( wsa->async.fd, wsa->iovec, wsa->n_iovecs, + wsa->addr, wsa->addrlen.ptr, &wsa->flags ); + + if (result >= 0) + { + wsa->overlapped->Internal = STATUS_SUCCESS; + wsa->overlapped->InternalHigh = result; + TRACE ( "received %d bytes\n", result ); + _enable_event ( (SOCKET) wsa->async.handle, FD_READ, 0, 0 ); + return; + } + + err = errno; + if ( err == EAGAIN || err == EINTR ) + { + wsa->overlapped->Internal = STATUS_PENDING; + TRACE ( "still pending\n" ); + } + else + { + wsa->overlapped->Internal = STATUS_UNSUCCESSFUL; + TRACE ( "Error: %d\n", errno ); + } +} + +/*********************************************************************** * WSARecvFrom (WS2_32.69) */ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, @@ -3286,11 +3693,9 @@ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - /* Uses recvmsg() in order to provide scatter-gather I/O */ - + int i, n, fd, err = WSAENOTSOCK, flags, ret; struct iovec* iovec; - struct msghdr msghdr; - int fd, i, length, err = WSAENOTSOCK, flags; + struct ws2_async *wsa; enum fd_type type; TRACE("socket %04x, wsabuf %p, nbufs %ld, flags %ld, from %p, fromlen %ld, ovl %p, func %p\n", @@ -3299,6 +3704,7 @@ lpOverlapped, lpCompletionRoutine); fd = _get_sock_fd_type( s, &type, &flags ); + TRACE ( "fd=%d, type=%d, flags=%x\n", fd, type, flags ); if (fd == -1) { @@ -3306,11 +3712,10 @@ goto error; } - /* FIXME: should this be HeapAlloc() or WS_ALLOC ? */ - iovec = WS_ALLOC ( dwBufferCount * sizeof (struct iovec) ); + iovec = HeapAlloc ( GetProcessHeap(), 0, dwBufferCount * sizeof (struct iovec) ); if ( !iovec ) { - err = WSAENOBUFS; + err = WSAEFAULT; goto err_close; } @@ -3320,67 +3725,69 @@ iovec[i].iov_len = lpBuffers[i].len; } - msghdr.msg_name = NULL; - - if ( lpFrom ) + if ( (lpOverlapped || lpCompletionRoutine) && flags & FD_FLAG_OVERLAPPED ) { -#if DEBUG_SOCKADDR - dump_sockaddr (lpFrom); -#endif + wsa = WS2_make_async ( s, fd, ASYNC_TYPE_READ, iovec, dwBufferCount, + lpFlags, lpFrom, lpFromlen, + lpOverlapped, lpCompletionRoutine ); - msghdr.msg_namelen = *lpFromlen; - msghdr.msg_name = ws_sockaddr_alloc (lpFrom, lpFromlen, &msghdr.msg_namelen); - } - else - msghdr.msg_namelen = 0; + if ( !wsa ) + { + err = WSAEFAULT; + goto err_free; + } + + if ( ( ret = register_new_async ( &wsa->async )) ) + { + err = RtlNtStatusToDosError ( ret ); - msghdr.msg_iov = iovec; - msghdr.msg_iovlen = dwBufferCount; - msghdr.msg_control = NULL; - msghdr.msg_controllen = 0; - msghdr.msg_flags = 0; + if ( !lpOverlapped ) + HeapFree ( GetProcessHeap(), 0, wsa->overlapped ); + HeapFree ( GetProcessHeap(), 0, wsa ); + goto err_free; + } - /* FIXME: Treat overlapped IO here */ + _enable_event ( s, FD_READ, 0, 0 ); - if (_is_blocking(s)) + /* Try immediate completion */ + if ( lpOverlapped ) + { + if ( WSAGetOverlappedResult ( (HANDLE) s, lpOverlapped, + lpNumberOfBytesRecvd, FALSE, lpFlags) ) + return 0; + + if ( (err = WSAGetLastError ()) != WSA_IO_INCOMPLETE ) + goto err_free; + } + + WSASetLastError ( WSA_IO_PENDING ); + return SOCKET_ERROR; + } + + 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) + + n = WS2_recv ( fd, iovec, dwBufferCount, lpFrom, lpFromlen, lpFlags ); + if ( n == -1 ) { err = wsaErrno(); goto err_free; } - TRACE(" -> %i bytes\n", length); + TRACE(" -> %i bytes\n", n); + *lpNumberOfBytesRecvd = n; - 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 ); + HeapFree (GetProcessHeap(), 0, iovec); close(fd); _enable_event(s, FD_READ, 0, 0); - return 0; err_free: - WS_FREE (iovec); - ws_sockaddr_free ( msghdr.msg_name, lpFrom ); + HeapFree (GetProcessHeap(), 0, iovec); err_close: close (fd); diff -ruNX ignore TMP/wine/dlls/winsock/ws2_32.spec MW/wine/dlls/winsock/ws2_32.spec --- TMP/wine/dlls/winsock/ws2_32.spec Fri Apr 12 14:55:42 2002 +++ MW/wine/dlls/winsock/ws2_32.spec Fri Apr 12 15:05:29 2002 @@ -52,7 +52,7 @@ 37 stdcall WSAEnumProtocolsA(ptr ptr ptr) WSAEnumProtocolsA 38 stdcall WSAEnumProtocolsW(ptr ptr ptr) WSAEnumProtocolsW 39 stdcall WSAEventSelect(long long long) WSAEventSelect -40 stub WSAGetOverlappedResult +40 stdcall WSAGetOverlappedResult(long ptr ptr long ptr) WSAGetOverlappedResult 41 stub WSAGetQOSByName 42 stub WSAGetServiceClassInfoA 43 stub WSAGetServiceClassInfoW diff -ruNX ignore TMP/wine/include/winsock2.h MW/wine/include/winsock2.h --- TMP/wine/include/winsock2.h Tue Apr 2 16:51:40 2002 +++ MW/wine/include/winsock2.h Fri Apr 12 15:05:29 2002 @@ -221,8 +221,7 @@ #define WSAEVENT HANDLE #define LPWSAEVENT LPHANDLE -#define WSAOVERLAPPED OVERLAPPED -typedef struct _OVERLAPPED* LPWSAOVERLAPPED; +typedef OVERLAPPED WSAOVERLAPPED, *LPWSAOVERLAPPED; #define WSA_IO_PENDING (ERROR_IO_PENDING) #define WSA_IO_INCOMPLETE (ERROR_IO_INCOMPLETE)

1 0

PATCH: async-sock-server.diff (7 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

PATCH: async-sock-server.diff Basic implementation of async IO queues in the server code for sockets. Patch against: CVS-2002-04-12, with my sock-fd-type patch applied. Modified files: server: sock.c diff -ruNX ignore TMP/wine/server/sock.c MW/wine/server/sock.c --- TMP/wine/server/sock.c Fri Apr 12 14:38:16 2002 +++ MW/wine/server/sock.c Fri Apr 12 15:26:36 2002 @@ -86,6 +86,7 @@ static void sock_destroy( struct object *obj ); static int sock_get_error( int err ); static void sock_set_error(void); +static struct async_queue * sock_queue_async(struct object *obj, struct async* async, int type, int count); static const struct object_ops sock_ops = { @@ -100,7 +101,7 @@ sock_get_fd, /* get_fd */ no_flush, /* flush */ sock_get_info, /* get_file_info */ - NULL, /* queue_async */ + sock_queue_async, /* queue_async */ sock_destroy /* destroy */ }; @@ -229,6 +230,21 @@ } } else { + + if ( sock->flags & WSA_FLAG_OVERLAPPED ) + { + if( IS_READY(sock->read_q) && (POLLIN & event) ) + { + if (debug_level) fprintf ( stderr, "activating read queue for socket %p\n", sock ); + async_notify(sock->read_q.head, STATUS_ALERTED); + } + if( IS_READY(sock->write_q) && (POLLOUT & event) ) + { + if (debug_level) fprintf ( stderr, "activating write queue for socket %p\n", sock ); + async_notify(sock->write_q.head, STATUS_ALERTED); + } + } + /* normal data flow */ if (event & POLLIN) { @@ -312,6 +328,8 @@ int ev = 0; assert( obj->ops == &sock_ops ); + if ( debug_level ) + fprintf (stderr, "mask: %x %x %x -> %x\n", sock->mask, sock->state, sock->hmask, mask); if (sock->state & FD_CONNECT) /* connecting, wait for writable */ @@ -320,8 +338,11 @@ /* listening, wait for readable */ return (sock->hmask & FD_ACCEPT) ? 0 : POLLIN; - if (mask & FD_READ) ev |= POLLIN | POLLPRI; - if (mask & FD_WRITE) ev |= POLLOUT; + if (mask & FD_READ || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->read_q))) + ev |= POLLIN | POLLPRI; + if (mask & FD_WRITE || (sock->flags & WSA_FLAG_OVERLAPPED && IS_READY (sock->write_q))) + ev |= POLLOUT; + return ev; } @@ -353,6 +374,38 @@ *flags = 0; if (sock->flags & WSA_FLAG_OVERLAPPED) *flags |= FD_FLAG_OVERLAPPED; return FD_TYPE_DEFAULT; +} + +static struct async_queue *sock_queue_async(struct object *obj, struct async *async, int type, int count) +{ + struct sock *sock = (struct sock *)obj; + struct async_queue *q; + + assert( obj->ops == &sock_ops ); + + if ( !(sock->flags & WSA_FLAG_OVERLAPPED) ) + { + set_error ( STATUS_INVALID_HANDLE ); + return NULL; + } + + switch(type) + { + case ASYNC_TYPE_READ: + q = &sock->read_q; + break; + case ASYNC_TYPE_WRITE: + q = &sock->write_q; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + return NULL; + } + + if(async && !async->q) + async_insert(q, async); + + return q; } static void sock_destroy( struct object *obj )

1 0

Patch: async-file.diff (4 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

Patch: async-file.diff Some improvements to the async IO API. - Need a "cleanup" method. - calling the "call_completion" method unconditionally in finish_async (introduced by me) was wrong, because the thread may never be in an alertable wait state -> call it only if user completion function is present. - We need two constant "ops" objects, one with and one without call_completion method (the event field may NOT be used to determine whether the completion must be called or not). - STATUS_CANCELLED is correct for cancelled requests ( corresponds to ERROR_OPERATION_ABORTED ). Modified files: dlls/kernel: comm.c files: file.c include: async.h server: async.c diff -ruNX ignore TMP/wine/dlls/kernel/comm.c MW/wine/dlls/kernel/comm.c --- TMP/wine/dlls/kernel/comm.c Fri Apr 12 11:47:48 2002 +++ MW/wine/dlls/kernel/comm.c Fri Apr 12 12:27:07 2002 @@ -99,14 +99,15 @@ static DWORD commio_get_async_status (const async_private *ovp); static DWORD commio_get_async_count (const async_private *ovp); static void commio_set_async_status (async_private *ovp, const DWORD status); -static void CALLBACK commio_call_completion_func (ULONG_PTR data); +static void commio_async_cleanup (async_private *ovp); static async_ops commio_async_ops = { commio_get_async_status, /* get_status */ commio_set_async_status, /* set_status */ commio_get_async_count, /* get_count */ - commio_call_completion_func /* call_completion */ + NULL, /* call_completion */ + commio_async_cleanup /* cleanup */ }; typedef struct async_commio @@ -131,9 +132,9 @@ return 0; } -static void CALLBACK commio_call_completion_func (ULONG_PTR data) +static void commio_async_cleanup (async_private *ovp) { - HeapFree(GetProcessHeap(), 0, (void*) data); + HeapFree(GetProcessHeap(), 0, ovp ); } /***********************************************************************/ diff -ruNX ignore TMP/wine/files/file.c MW/wine/files/file.c --- TMP/wine/files/file.c Fri Apr 12 11:59:51 2002 +++ MW/wine/files/file.c Fri Apr 12 12:28:22 2002 @@ -88,13 +88,24 @@ static DWORD fileio_get_async_count (const async_private *ovp); static void fileio_set_async_status (async_private *ovp, const DWORD status); static void CALLBACK fileio_call_completion_func (ULONG_PTR data); +static void fileio_async_cleanup (async_private *ovp); static async_ops fileio_async_ops = { fileio_get_async_status, /* get_status */ fileio_set_async_status, /* set_status */ fileio_get_async_count, /* get_count */ - fileio_call_completion_func /* call_completion */ + fileio_call_completion_func, /* call_completion */ + fileio_async_cleanup /* cleanup */ +}; + +static async_ops fileio_nocomp_async_ops = +{ + fileio_get_async_status, /* get_status */ + fileio_set_async_status, /* set_status */ + fileio_get_async_count, /* get_count */ + NULL, /* call_completion */ + fileio_async_cleanup /* cleanup */ }; typedef struct async_fileio @@ -128,12 +139,16 @@ async_fileio *ovp = (async_fileio*) data; TRACE ("data: %p\n", ovp); - if (ovp->completion_func) - ovp->completion_func(ovp->lpOverlapped->Internal, - ovp->lpOverlapped->InternalHigh, - ovp->lpOverlapped); + ovp->completion_func( ovp->lpOverlapped->Internal, + ovp->lpOverlapped->InternalHigh, + ovp->lpOverlapped ); + + fileio_async_cleanup ( &ovp->async ); +} - HeapFree(GetProcessHeap(), 0, ovp); +static void fileio_async_cleanup ( struct async_private *ovp ) +{ + HeapFree ( GetProcessHeap(), 0, ovp ); } /*********************************************************************** @@ -1479,6 +1494,8 @@ { async_fileio *ovp; int fd; + int flags; + enum fd_type type; TRACE("file %d to buf %p num %ld %p func %p\n", hFile, buffer, bytesToRead, overlapped, lpCompletionRoutine); @@ -1490,10 +1507,11 @@ return FALSE; } - fd = FILE_GetUnixHandle( hFile, GENERIC_READ ); - if(fd<0) + fd = FILE_GetUnixHandleType ( hFile, GENERIC_READ, &type, &flags); + if ( fd < 0 ) { - TRACE("Couldn't get FD\n"); + WARN ( "Couldn't get FD\n" ); + SetLastError ( ERROR_INVALID_PARAMETER ); return FALSE; } @@ -1502,11 +1520,10 @@ { TRACE("HeapAlloc Failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); - close(fd); - return FALSE; + goto error; } - ovp->async.ops = &fileio_async_ops; + ovp->async.ops = ( lpCompletionRoutine ? &fileio_async_ops : &fileio_nocomp_async_ops ); ovp->async.handle = hFile; ovp->async.fd = fd; ovp->async.type = ASYNC_TYPE_READ; @@ -1518,6 +1535,11 @@ ovp->buffer = buffer; return !register_new_async (&ovp->async); + +error: + close (fd); + return FALSE; + } /*********************************************************************** @@ -1691,6 +1713,8 @@ { async_fileio *ovp; int fd; + int flags; + enum fd_type type; TRACE("file %d to buf %p num %ld %p func %p stub\n", hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine); @@ -1701,7 +1725,7 @@ return FALSE; } - fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + fd = FILE_GetUnixHandleType ( hFile, GENERIC_WRITE, &type, &flags ); if ( fd < 0 ) { TRACE( "Couldn't get FD\n" ); @@ -1713,8 +1737,7 @@ { TRACE("HeapAlloc Failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); - close (fd); - return FALSE; + goto error; } ovp->async.ops = &fileio_async_ops; @@ -1729,6 +1752,10 @@ ovp->completion_func = lpCompletionRoutine; return !register_new_async (&ovp->async); + +error: + close (fd); + return FALSE; } /*********************************************************************** diff -ruNX ignore TMP/wine/include/async.h MW/wine/include/async.h --- TMP/wine/include/async.h Fri Apr 12 11:47:48 2002 +++ MW/wine/include/async.h Fri Apr 12 12:25:30 2002 @@ -35,6 +35,7 @@ typedef DWORD (*async_get_status)(const struct async_private *ovp); typedef DWORD (*async_get_count)(const struct async_private *ovp); typedef void (*async_set_status)(struct async_private *ovp, const DWORD status); +typedef void (*async_cleanup)(struct async_private *ovp); typedef struct async_ops { @@ -42,6 +43,7 @@ async_set_status set_status; async_get_count get_count; async_call_completion_func call_completion; + async_cleanup cleanup; } async_ops; typedef struct async_private @@ -74,7 +76,10 @@ if( ovp->event != INVALID_HANDLE_VALUE ) NtSetEvent( ovp->event, NULL ); - QueueUserAPC( ovp->ops->call_completion, GetCurrentThread(), (ULONG_PTR)ovp ); + if ( ovp->ops->call_completion ) + QueueUserAPC( ovp->ops->call_completion, GetCurrentThread(), (ULONG_PTR)ovp ); + else + ovp->ops->cleanup ( ovp ); } inline static BOOL __register_async( async_private *ovp, const DWORD status ) @@ -92,7 +97,11 @@ } SERVER_END_REQ; - if ( ret ) ovp->ops->set_status ( ovp, GetLastError() ); + if ( ret ) { + SetLastError( RtlNtStatusToDosError(ret) ); + ovp->ops->set_status ( ovp, ret ); + } + if ( ovp->ops->get_status (ovp) != STATUS_PENDING ) finish_async (ovp); diff -ruNX ignore TMP/wine/server/async.c MW/wine/server/async.c --- TMP/wine/server/async.c Fri Apr 12 11:47:48 2002 +++ MW/wine/server/async.c Fri Apr 12 12:23:56 2002 @@ -71,7 +71,7 @@ { while(q->head) { - async_notify(q->head, STATUS_HANDLES_CLOSED); + async_notify(q->head, STATUS_CANCELLED); destroy_async(q->head); } }

1 0

PATCH: winemaker.diff (3 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

PATCH: winemaker.diff (identical to: http://www.winehq.com/hypermail/wine-devel/2002/04/0187.html) Fix winemaker-generated references to dlls that have changed their names in configure.ac. Patch against: Wine CVS 2002-04-12 Modified Files: tools: winemaker diff -ruNX ignore TMP/wine/tools/winemaker MW/wine/tools/winemaker --- TMP/wine/tools/winemaker Tue Apr 9 13:19:57 2002 +++ MW/wine/tools/winemaker Tue Apr 9 13:29:27 2002 @@ -2732,14 +2732,14 @@ WINE_DLL_ROOT="/lib:/lib/dlls:/usr/lib:/usr/lib/dlls:/usr/local/lib:/usr/local/lib/dlls" fi fi -AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.so],[ - AC_MSG_ERROR([Could not find the Wine dlls (libntdll.so)]) +AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.dll.so],[ + AC_MSG_ERROR([Could not find the Wine dlls (libntdll.dll.so)]) ],[$WINE_DLL_ROOT]) -AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[ - AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.so)]) +AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll.dll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[ + AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.dll.so)]) ],[$WINE_DLL_ROOT]) -WINE_DLL_PATH="-L$WINE_DLL_ROOT" +WINE_DLL_PATH="-L$WINE_DLL_ROOT/wine" if test -n "$LD_PATH" then

1 0

PATCH: sock-fd-type.diff (2 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

PATCH: sock-fd-type.diff Patch against: Wine CVS 2002-04-12 Test status: Compiles (no errors/warnings). Modified Files: dlls/winsock : socket.c Log message: Martin Wilck <Martin.Wilck(a)Fujitsu-Siemens.com> _get_sock_fd_type : New function, retrieve fd type and flags like FILE_GetUnixHandleType(). WSASendTo() /WSARecvFrom(): Use _get_sock_fd_type(). diff -ruNX ignore TMP/wine/dlls/winsock/socket.c MW/wine/dlls/winsock/socket.c --- TMP/wine/dlls/winsock/socket.c Tue Apr 9 13:27:56 2002 +++ MW/wine/dlls/winsock/socket.c Tue Apr 9 13:28:08 2002 @@ -246,6 +246,13 @@ return fd; } +inline static int _get_sock_fd_type( SOCKET s, enum fd_type *type, int *flags ) +{ + int fd; + if (set_error( wine_server_handle_to_fd( s, GENERIC_READ, &fd, type, flags ) )) return -1; + return fd; +} + static void _enable_event(SOCKET s, unsigned int event, unsigned int sstate, unsigned int cstate) { @@ -1976,15 +1983,16 @@ LPWSAOVERLAPPED lpOverlapped, LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine ) { - int i, n, fd, err = WSAENOTSOCK; + int i, n, fd, err = WSAENOTSOCK, flags; struct iovec* iovec; struct msghdr msghdr; - + enum fd_type type; + 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); + fd = _get_sock_fd_type( s, &type, &flags ); if ( fd == -1 ) goto error; @@ -3269,14 +3277,15 @@ struct iovec* iovec; struct msghdr msghdr; - int fd, i, length, err = WSAENOTSOCK; + int fd, i, length, err = WSAENOTSOCK, flags; + enum fd_type type; 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); + fd = _get_sock_fd_type( s, &type, &flags ); if (fd == -1) {

1 0

PATCH: async-immediate.diff (1 in series)
by Martin Wilck 12 Apr '02

12 Apr '02

PATCH: async-immediate.diff (Resubmission of http://www.winehq.com/hypermail/wine-patches/2002/04/0021.html) This patch uses a more elegant and (IMO) more wine-ish method to check for possible immediate completion of asynchronous IO requests in ReadFile() and WriteFile(). The implementation in current CVS is wrong for 2 reasons: 1. The overlapped event is not set, nor the completion routine called, if immediate completion succeeds. This breaks apps that do not check for immediate success. 2. If there are async requests currently in the queue, immediate completion will bypass the request ordering. This will lead to data corruption on FIFO-type files. The patch fixes this. Patch against: Wine CVS 2002-04-12 Test status: Compiles (no errors/warnings). Tested for regular file IO (ok). The 2002-01-15 patch has been tested for 16-bit serial IO by Lawson Whitney (ok). Modified Files: files : file.c Log message: Martin Wilck <Martin.Wilck(a)Fujitsu-Siemens.com> GetOverlappedResult(): Return ERROR_IO_INCOMPLETE if IO still pending (MSDN docs) ReadFile() / WriteFile(): Use GetOverlappedResult() to check for immediate completion. diff -ruNX ignore TMP/wine/files/file.c MW/wine/files/file.c --- TMP/wine/files/file.c Tue Apr 9 13:20:25 2002 +++ MW/wine/files/file.c Tue Apr 9 13:25:25 2002 @@ -1395,7 +1395,8 @@ if(lpTransferred) *lpTransferred = lpOverlapped->InternalHigh; - SetLastError(lpOverlapped->Internal); + SetLastError ( lpOverlapped->Internal == STATUS_PENDING ? + ERROR_IO_INCOMPLETE : lpOverlapped->Internal ); return (r==WAIT_OBJECT_0); } @@ -1576,41 +1577,21 @@ SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } - - /* see if we can read some data already (this shouldn't block) */ - result = pread( unix_handle, buffer, bytesToRead, OVERLAPPED_OFFSET(overlapped) ); - if ((result < 0) && (errno == ESPIPE)) - result = read( unix_handle, buffer, bytesToRead ); - close(unix_handle); - - if(result<0) - { - if( (errno!=EAGAIN) && (errno!=EINTR) && - ((errno != EFAULT) || IsBadWritePtr( buffer, bytesToRead )) ) - { - FILE_SetDosError(); - return FALSE; - } - else - result = 0; - } - /* if we read enough to keep the app happy, then return now */ - if(result>=bytesToRead) - { - *bytesRead = result; - return TRUE; - } - - /* at last resort, do an overlapped read */ - overlapped->InternalHigh = result; + close(unix_handle); + overlapped->InternalHigh = 0; if(!FILE_ReadFileEx(hFile, buffer, bytesToRead, overlapped, NULL, overlapped->hEvent)) return FALSE; - /* fail on return, with ERROR_IO_PENDING */ - SetLastError(ERROR_IO_PENDING); - return FALSE; + if ( !GetOverlappedResult (hFile, overlapped, bytesRead, FALSE) ) + { + if ( GetLastError() == ERROR_IO_INCOMPLETE ) + SetLastError ( ERROR_IO_PENDING ); + return FALSE; + } + + return TRUE; } if (flags & FD_FLAG_TIMEOUT) { @@ -1790,43 +1771,20 @@ return FALSE; } - /* see if we can write some data already (this shouldn't block) */ - - result = pwrite( unix_handle, buffer, bytesToWrite, OVERLAPPED_OFFSET (overlapped) ); - if ((result < 0) && (errno == ESPIPE)) - result = write( unix_handle, buffer, bytesToWrite ); - close(unix_handle); + overlapped->InternalHigh = 0; - if(result<0) - { - if( (errno!=EAGAIN) && (errno!=EINTR) && - ((errno != EFAULT) || IsBadReadPtr( buffer, bytesToWrite )) ) - { - FILE_SetDosError(); - return FALSE; - } - else - result = 0; - } + if(!FILE_WriteFileEx(hFile, buffer, bytesToWrite, overlapped, NULL, overlapped->hEvent)) + return FALSE; - /* if we wrote enough to keep the app happy, then return now */ - if(result>=bytesToWrite) + if ( !GetOverlappedResult (hFile, overlapped, bytesWritten, FALSE) ) { - *bytesWritten = result; - return TRUE; - } - - /* at last resort, do an overlapped read */ - overlapped->Internal = STATUS_PENDING; - overlapped->InternalHigh = result; - - if(!FILE_WriteFileEx(hFile, buffer, bytesToWrite, overlapped, NULL, overlapped->hEvent)) + if ( GetLastError() == ERROR_IO_INCOMPLETE ) + SetLastError ( ERROR_IO_PENDING ); return FALSE; + } - /* fail on return, with ERROR_IO_PENDING */ - SetLastError(ERROR_IO_PENDING); - return FALSE; + return TRUE; } switch(type)

1 0

Re: Make dumping more robust
by juergen.schmied＠debitel.net 12 Apr '02

12 Apr '02

I just rewrote the dumping of pidl's because the dumping itself produces lots of relay/snoop messages. So I made it not call any other functions. Will send it soon. juergen

2 1

Expect Trouble
by Shachar Shemesh 12 Apr '02

12 Apr '02

Hi list, I am sorry if this is a baisc question. I have not been able to find anything about it in the docs. I am trying to run a small program I wrote and compiled with VC6 on Windows. I am getting the following error: Invoking /usr/bin/wine.bin HebTest.exe ... Warning: loading builtin kernel32.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... err:seh:start_debugger Couldn't start debugger ("debugger/winedbg 134661992 32") (2) Read the Wine Developers Guide on how to set up winedbg or another debugger Wine failed with return code 5 I get the same error whether I am using my own CVS compiled version, or the nightly CVS for debian SID. I get this error regardless of whether I am using fake windows or real windows. I even tried removing the user32.dll file (0 bytes) completely from C:\Windows\System of the fake windows. Attached is the output when running wine with --debugmsg +all, and the binary I am using to run this program (it is a debug build). It's a tiny program of my writing, so unless I unwittedly stole it from somewhere, you hereby have my permission to use the binary as you see fit. Sources are available upon request. Thanks Shachar

1 0

Re: Handling of messages above WM_USER in pack_message
by Alexandre Julliard 12 Apr '02

12 Apr '02

Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> writes: > I don't know if this global approach is valid, but at least it helped me to > get winhlp32 working called with WinHelpA from an application. In what other > way can we cope with user defined messages and their related structures in > inter-process SendMessage? We can't. User messages cannot pass data around, WinHelpA will need to do that differently. The best way to find out how is probably to watch winhlp32 with a message spy under Windows. -- Alexandre Julliard julliard(a)winehq.com

2 1

NT Status vs. Dos Error code in async operations
by Martin Wilck 12 Apr '02

12 Apr '02

Hi, If my understanding of the MS docs is correct, the status of overlapped requests is stored as an NT status in lpOverlapped->Internal (As Mike implemented it). The error code returned by GetOverlappedResult() or passed to the completion routine, though, is a DOS error code. Thus in priciple we'd need to convert the status with RtlNtStatusToDosError(), right ? Moreover, if our async read()/write() operations fail, we simply set the status to STATUS_UNSUCCESSFUL which translates to ERROR_GEN_FAILURE - not very meaningful to our users. What we'd need would consequently be a errno->NT status converter to set the overlapped status correctly from the error reported by read or write. I can't seem to find one in the wine code (??). There only seem to be local errno -> DOS error converters, and no DOS error->Nt status converter. What should we do? 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 1

Async IO on sockets: good news and bad news
by Martin Wilck 11 Apr '02

11 Apr '02

Hi, The good news is: I have the basic mechanism for async IO on sockets running. Requests can be scheduled and waited for, just like for regular files. The bad news is: This is not enough for sockets. Problems occur especially when sockets are closed, because the signalling of socket events uses a completely independent mechanism. This leads to all sorts of strange behaviour, mostly to data loss because "FD_CLOSE" is signalled prematurely. Sadly, this means for me: - The whole event signalling mechanism needs to be reworked so that it is consistent with overlapped IO. - Probably the async IO mechanism, too. It seems that it would be good to have a single IO queue where all events are handled, rather than several ones. Unlike now, also things like "peer closed socket" would be scheduled in that queue. Well I need to think more. Currently, I am not even sure how exactly it _should_ work. 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

1 0

16-bit apps starting and stopping notification
by Andriy Palamarchuk 10 Apr '02

10 Apr '02

I found an issue for a hang of 16-bit application (www.formdocs.com) installer. The app registers with NotifyRegister16 callback function and looks like it hangs while waiting for completion of child process. The last part of relay trace is attached. NotifyRegister16 function of ToolHelp dll is used to register handler for following events: NFY_UNKNOWN NFY_LOADSEG NFY_FREESEG NFY_STARTDLL NFY_STARTTASK NFY_EXITTASK NFY_DELMODULE NFY_RIP NFY_TASKIN NFY_TASKOUT NFY_INCHAR NFY_OUTSTRING NFY_LOGERROR NFY_LOGPARAMERROR Note, this works for 16-bit applications only. These events also used by debuggers to debug 16-bit applications. Can somebody give me a hint how is better to approach implementation of NFY_EXITTASK, NFY_STARTTASK events generation? How important do you think is to implement this functionality, since it is for 16-bit apps only? Andriy Palamarchuk __________________________________________________ Do You Yahoo!? Yahoo! Tax Center - online filing with TurboTax http://taxes.yahoo.com/

1 0

Wine & ActiveX?
by Mark Lehrer 10 Apr '02

10 Apr '02

Hello! We are trying to make one of our applications work under Wine on Red Hat 7.2. We have a lot of talent here in both Linux and Windows, but no Wine experts (yet!). Unfortunately it only gets as far as showing the splash screen before it freezes. Is there a document that can help us with debugging procedures? Obviously running Visual Studio is not an option... but what is the best way to start looking at what may be going wrong? It uses ActiveX so perhaps that is the trouble. We took out all of the DCOM stuff already. Thanks! Mark

3 2

RE: update to regression testing framework
by Geoffrey Hausheer 10 Apr '02

10 Apr '02

> -----Original Message----- > From: Paul Millar paulm(a)astro.gla.ac.uk > Subject: update to regression testing framework > o The commands "named_ok", "set_name" and "unset_name" now > exist (in C > and Perl). You can use these to specify a name for tests either > individually (via named_ok) or for a region (via set_name and > unset_name) > What is the benefit of this? The current framework supports 'ok(test,printf-style string)' which seems to be fine for debugging in general, and 'trace' to just print out general purpose information about what the test is doing. Thanks, .Geoff

1 0

winebuild broken?
by Michael Cardenas 09 Apr '02

09 Apr '02

It seems that with the new dll separation changes, winebuild is broken. I've been trying to build an app with winebuild, and it tries to open kernel32.dll.so instead of libkernel32.dll.so when trying to resolve the "import kernel32.dll" line of the spec file. This works for compiling wine, but not for compiling external apps that use the installed lib directory. I'm not sure if I should fix winebuild to look for lib(name).dll.so or if I should change the dll makefiles to create the correct symlinks so that wine can compile or if we should make winebuild check for both lib(name).dll.so and (name).dll.so. For now, I'm doing the last case, which works fine, so I can submit that patch if you want it. There is also the problem of dlls in the wine directory which are not found either, which I'm still working on. -- michael cardenas lead windows compatibility engineer www.lindows.com "Be the change you want to see in the world." -Mahatma Gandhi

1 1

Failing MODULE_DllProcessAttach causes other module left uninitialized
by Uwe Bonnes 09 Apr '02

09 Apr '02

Hallo, in loader/module.c:MODULE_DllProcessAttach the recursion to attach ends as soon as _one_ initialization fails. This leaves other modules uninitialized. I had this problem with xnview and native shell (without native shfolder). The missing SHGetFolderPathA caused COMDLG32_DllEntryPoint to return FALSE and in cause WSVFW32_LibMain wasn't called. Later this caused MULTIMEDIA_GetIData to not find it's IData and cause a crash. The missing HGetFolderPathA wasn't the culprit. I think the original error was obscured to much here. Either we judge a failing InitDLL as error and abort there, or in MODULE_DllProcessAttach we should recurse without looking at the result. What about appended patch? -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ---------- Index: wine/loader/module.c =================================================================== RCS file: /home/wine/wine/loader/module.c,v retrieving revision 1.150 diff -u -r1.150 module.c --- wine/loader/module.c 2 Apr 2002 19:47:30 -0000 1.150 +++ wine/loader/module.c 9 Apr 2002 14:06:26 -0000 @@ -212,17 +212,14 @@ wm->flags |= WINE_MODREF_MARKER; /* Recursively attach all DLLs this one depends on */ - for ( i = 0; retv && i < wm->nDeps; i++ ) + for ( i = 0; i < wm->nDeps; i++ ) if ( wm->deps[i] ) - retv = MODULE_DllProcessAttach( wm->deps[i], lpReserved ); + MODULE_DllProcessAttach( wm->deps[i], lpReserved ); /* Call DLL entry point */ + retv = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); if ( retv ) - { - retv = MODULE_InitDLL( wm, DLL_PROCESS_ATTACH, lpReserved ); - if ( retv ) - wm->flags |= WINE_MODREF_PROCESS_ATTACHED; - } + wm->flags |= WINE_MODREF_PROCESS_ATTACHED; /* Re-insert MODREF at head of list */ if ( retv && wm->prev )

2 1

Starting application from a directory with some kernel32.dll
by Uwe Bonnes 09 Apr '02

09 Apr '02

Hallo, when an application is run in a directory, where there is also a kernel32.dll, and this is _not_ the system directory, MODULE_GetLoadOrder doesn't strip the path and therefore crashes when native kernel32.dll is loaded. While the header of MODULE_GetLoadOrder talks about "any path is stripped", the function only strips the path for "16 bit modules or if the module resides in the system directory " Is this intended behaviour? Bye -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt --------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------

3 4

Return To Castle Wolfenstein
by Michal Seliga 09 Apr '02

09 Apr '02

Greetings I use wine from 10.3.2002 I tried to run Return To castle Wolfenstain in it. Works almost great! I found few problems I would like to tell you, maybe they are solved already 1) installation: font is wider then expected (I think) so it looks like not all texts are fully visible or they collide with buttons (screenshot on request) 2) installation: in part where i should write an installation code, there are places for 4 characters in all textfields, but when I type in 2 characters it will jump to the next one. It looks like if editfield is xx chars long, then after writing xx/2 characters it thinks it is already all filled 3) game: works in window, but thinks it runs fullscreen. but except of this it runs great (only a bit slow sometimes) 4) game: when I chnged settings a bit it crashed after some minutes, but only once and I don't know hat exactly I changed. I think I switched trueform on, so maybe this is problem (yes I have ATI). but with defaults It worked great I have Mandrake 8.1, but changed to gcc-3.0.1 as default compiler, kernel upgraded to 2.4.19-pre1 and XFree upgraded to 4.2.0 processor Duron700, gfx card ATI Radeon 7500 64MB DDR, motherboard Abit KT7 If you will have some more questions feel free to ask, I don't have the game but it should be no problem to borow from friend (I hope), he already finished it good work people, I was really surprised...

2 1

CVS won't compile with wine/dlls/winsock socket.c ws2_32.spec patch applied
by Tony Lambregts 09 Apr '02

09 Apr '02

wine compiles fine with my system until this patch is applied http://www.winehq.com/hypermail/wine-cvs/2002/04/0087.html after it is applied it stops with the following errors > > socket.c: In function `WSASendTo': > socket.c:1990: sizeof applied to an incomplete type > socket.c:2000: arithmetic on pointer to an incomplete type > socket.c:2000: dereferencing pointer to incomplete type > socket.c:2001: arithmetic on pointer to an incomplete type > socket.c:2001: dereferencing pointer to incomplete type > socket.c: In function `WSARecvFrom': > socket.c:3286: sizeof applied to an incomplete type > socket.c:3295: arithmetic on pointer to an incomplete type > socket.c:3295: dereferencing pointer to incomplete type > socket.c:3296: arithmetic on pointer to an incomplete type > socket.c:3296: dereferencing pointer to incomplete type > make: *** [socket.o] Error 1 I changed directory to dlls/winsock and did make clean make depend make I have attached a log of the session if that will help it seems it doesn't like this code and I (moron user ) can't see anything wrong with it . > 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) ); I welcome your advice, fixes or flames Tony Lambregts Script started on Mon Apr 8 11:29:24 2002 [tony@tony winsock]$ make clean rm -f *.o *.a *.so *.ln \#*\# *~ *% .\#* *.bak *.orig *.rej *.flc *.spec.c *.spec.def *.glue.c y.tab.c y.tab.h lex.yy.c core tests/testlist.c [tony@tony winsock]$ make depend ../../tools/makedep -I. -I. -I../../include -I../../include -C. async.c socket.c -C. [tony@tony winsock]$ make LD_LIBRARY_PATH="../../unicode:$LD_LIBRARY_PATH" ../../tools/winebuild/winebuild -fPIC -L../../dlls -o winsock.spec.c -spec winsock.spec gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -DUSE_WS_PREFIX -D_REENTRANT -I/usr/X11R6/include -o winsock.spec.o winsock.spec.c gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -DUSE_WS_PREFIX -D_REENTRANT -I/usr/X11R6/include -o async.o async.c gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -fPIC -D__WINE__ -DUSE_WS_PREFIX -D_REENTRANT -I/usr/X11R6/include -o socket.o socket.c socket.c: In function `WSASendTo': socket.c:1990: sizeof applied to an incomplete type socket.c:2000: arithmetic on pointer to an incomplete type socket.c:2000: dereferencing pointer to incomplete type socket.c:2001: arithmetic on pointer to an incomplete type socket.c:2001: dereferencing pointer to incomplete type socket.c: In function `WSARecvFrom': socket.c:3286: sizeof applied to an incomplete type socket.c:3295: arithmetic on pointer to an incomplete type socket.c:3295: dereferencing pointer to incomplete type socket.c:3296: arithmetic on pointer to an incomplete type socket.c:3296: dereferencing pointer to incomplete type make: *** [socket.o] Error 1 [tony@tony winsock]$ exit exit Script done on Mon Apr 8 11:30:32 2002

2 2

Bitblt::Maskblt code ready for CVS
by Lonnie Cumberland 09 Apr '02

09 Apr '02

Hello All, I have worked out the modifications and implementation for the maskblt() functin in the graphics/bitble.c sources and have been able to run it in my version of wine 20020310 release. How can I get the source for the new bitble.c, or the new Maskblt() routine added to the CVS tree? cheers, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

2 1

Invalidation problems
by Dimitrie O. Paun 09 Apr '02

09 Apr '02

People, I think I can reproduce one of those ugly redraw problems. The problem manifests itself in the Microsoft Control Spy. This program looks like in figure http://www.dssd.ca/wine/mscs1.png. If I click on the Styles menu, I get a dialog like this: http://www.dssd.ca/wine/mscs2.png The two list boxes on the right display messages sent to the control on the left. As you can see, when the Styles dialog pops up, it hides part of the listboxes which keep scrolling in the background. Now, what happens is that sometimes, they scroll off with a bit of dialog caption in them as shown here: http://www.dssd.ca/wine/mscs3.png !!! Hope this is helpful to someone more knowledgeable in this area. -- Dimi.

1 1

Re: wine/controls edit.c
by Dimitrie O. Paun 09 Apr '02

09 Apr '02

On April 8, 2002 07:46 pm, Alexandre Julliard wrote: > ChangeSet ID: 1018309592593147649736242 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 02/04/08 18:46:32 > > Modified files: > controls : edit.c > > Log message: > Dmitry Timoshkov <dmitry(a)codeweavers.com> > Added CS_PARENTDC style. We can see that from the patch :-) Why did you do it though? -- Dimi.

2 1

[PATCH] async IO API, reworked
by Martin Wilck 09 Apr '02

09 Apr '02

Hi, Here is a reworked version of the async API patch which I hope is now ready for being applied. Details see below. Regards, Martin PATCH: async-struct.diff Purpose: Modified API for asynchronous IO requests. - separate cleanly between async scheduling and file IO related issues, - make the API compatible with other types of async requests (e.g. for sockets), - remove exports of async IO related functions for DLL separation. ** This patch OBSOLETES these two patches I submitted: ** http://www.winehq.com/hypermail/wine-patches/2002/04/0020.html http://www.winehq.com/hypermail/wine-patches/2002/04/0034.html Note: the cancel_async server request that was in the previous patch (0020.html) was removed (unnecessary). Patch against: Wine CVS 2002/04/05 Test status: Compiles (no errors/warnings). Tested regular file async IO with ReadFile and ReadFileEx (ok). Added files: include : async.h (structs and inline functions for async requests) Modified files: server : protocol.def (add APC type APC_ASYNC_IO, remove func element of register_async request) async.h (remove func element in async struct) async.c (remove references to func element in async struct) thread.c (allow NULL function pointer for APC_ASYNC_IO requests) dlls/kernel : comm.c (use modified API) files : file.c (use modified API) include : file.h (move async stuff to async.h) scheduler : synchro.c (remove functions now inlined through async.h, call_apcs() calls check_async_list() for APC_ASYNC_IO APCs) diff -ruNX ignore CVS/wine/dlls/kernel/comm.c TMP/wine/dlls/kernel/comm.c --- CVS/wine/dlls/kernel/comm.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/dlls/kernel/comm.c Fri Apr 5 11:19:40 2002 @@ -91,6 +91,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); +/*********************************************************************** + * Asynchronous I/O for asynchronous wait requests * + */ +#include "async.h" + +static DWORD commio_get_async_status (const async_private *ovp); +static DWORD commio_get_async_count (const async_private *ovp); +static void commio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK commio_call_completion_func (ULONG_PTR data); + +static async_ops commio_async_ops = +{ + commio_get_async_status, /* get_status */ + commio_set_async_status, /* set_status */ + commio_get_async_count, /* get_count */ + commio_call_completion_func /* call_completion */ +}; + +typedef struct async_commio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + char *buffer; +} async_commio; + +static DWORD commio_get_async_status (const struct async_private *ovp) +{ + return ((async_commio*) ovp)->lpOverlapped->Internal; +} + +static void commio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_commio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD commio_get_async_count (const struct async_private *ovp) +{ + return 0; +} + +static void CALLBACK commio_call_completion_func (ULONG_PTR data) +{ + HeapFree(GetProcessHeap(), 0, (void*) data); +} + +/***********************************************************************/ + #if !defined(TIOCINQ) && defined(FIONREAD) #define TIOCINQ FIONREAD #endif @@ -1558,12 +1605,13 @@ */ static void COMM_WaitCommEventService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_commio *commio = (async_commio*) ovp; + LPOVERLAPPED lpOverlapped = commio->lpOverlapped; TRACE("overlapped %p\n",lpOverlapped); /* FIXME: detect other events */ - *ovp->buffer = EV_RXCHAR; + *commio->buffer = EV_RXCHAR; lpOverlapped->Internal = STATUS_SUCCESS; } @@ -1579,8 +1627,8 @@ LPDWORD lpdwEvents, /* [out] event(s) that were detected */ LPOVERLAPPED lpOverlapped) /* [in/out] for Asynchronous waiting */ { - int fd,ret; - async_private *ovp; + int fd; + async_commio *ovp; if(!lpOverlapped) { @@ -1591,53 +1639,32 @@ if(NtResetEvent(lpOverlapped->hEvent,NULL)) return FALSE; - lpOverlapped->Internal = STATUS_PENDING; - lpOverlapped->InternalHigh = 0; - lpOverlapped->Offset = 0; - lpOverlapped->OffsetHigh = 0; - fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); if(fd<0) return FALSE; - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_commio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_commio)); if(!ovp) { close(fd); return FALSE; } - ovp->event = lpOverlapped->hEvent; + + ovp->async.ops = &commio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_WAIT; + ovp->async.func = COMM_WaitCommEventService; + ovp->async.event = lpOverlapped->hEvent; ovp->lpOverlapped = lpOverlapped; - ovp->func = COMM_WaitCommEventService; ovp->buffer = (char *)lpdwEvents; - ovp->fd = fd; - ovp->count = 0; /- ovp->completion_func = 0; - ovp->type = ASYNC_TYPE_WAIT; - ovp->handle = hFile; - - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev=ovp; - NtCurrentTeb()->pending_list = ovp; - - /* start an ASYNCHRONOUS WaitCommEvent */ - SERVER_START_REQ( register_async ) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = ASYNC_TYPE_WAIT; - req->count = 0; - req->func = check_async_list; - req->status = STATUS_PENDING; - ret=wine_server_call_err(req); - } - SERVER_END_REQ; + lpOverlapped->InternalHigh = 0; + lpOverlapped->Offset = 0; + lpOverlapped->OffsetHigh = 0; - if (!ret) - SetLastError(ERROR_IO_PENDING); + if ( !register_new_async (&ovp->async) ) + SetLastError( ERROR_IO_PENDING ); return FALSE; } diff -ruNX ignore CVS/wine/files/file.c TMP/wine/files/file.c --- CVS/wine/files/file.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/files/file.c Fri Apr 5 12:15:58 2002 @@ -64,6 +64,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); +/*********************************************************************** + * Asynchronous file I/O * + */ +#include "async.h" + +static DWORD fileio_get_async_status (const async_private *ovp); +static DWORD fileio_get_async_count (const async_private *ovp); +static void fileio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK fileio_call_completion_func (ULONG_PTR data); + +static async_ops fileio_async_ops = +{ + fileio_get_async_status, /* get_status */ + fileio_set_async_status, /* set_status */ + fileio_get_async_count, /* get_count */ + fileio_call_completion_func /* call_completion */ +}; + +typedef struct async_fileio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + LPOVERLAPPED_COMPLETION_ROUTINE completion_func; + char *buffer; + int count; +} async_fileio; + +static DWORD fileio_get_async_status (const struct async_private *ovp) +{ + return ((async_fileio*) ovp)->lpOverlapped->Internal; +} + +static void fileio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_fileio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD fileio_get_async_count (const struct async_private *ovp) +{ + async_fileio *fileio = (async_fileio*) ovp; + DWORD ret = fileio->count - fileio->lpOverlapped->InternalHigh; + return (ret < 0 ? 0 : ret); +} + +static void CALLBACK fileio_call_completion_func (ULONG_PTR data) +{ + async_fileio *ovp = (async_fileio*) data; + TRACE ("data: %p\n", ovp); + + if (ovp->completion_func) + ovp->completion_func(ovp->lpOverlapped->Internal, + ovp->lpOverlapped->InternalHigh, + ovp->lpOverlapped); + + HeapFree(GetProcessHeap(), 0, ovp); +} + +/***********************************************************************/ + #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #define MAP_ANON MAP_ANONYMOUS #endif @@ -1344,30 +1403,6 @@ return (r==WAIT_OBJECT_0); } - -/*********************************************************************** - * FILE_StartAsync (INTERNAL) - * - * type==ASYNC_TYPE_NONE means cancel the indicated overlapped operation - * lpOverlapped==NULL means all overlappeds match - */ -BOOL FILE_StartAsync(HANDLE hFile, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status) -{ - BOOL ret; w- SERVER_START_REQ(register_async) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = type; - req->count = count; - req->func = check_async_list; - req->status = status; - ret = wine_server_call( req ); - } - SERVER_END_REQ; - return !ret; -} - /*********************************************************************** * CancelIo (KERNEL32.@) */ @@ -1377,16 +1412,11 @@ TRACE("handle = %x\n",handle); - ovp = NtCurrentTeb()->pending_list; - while(ovp) + for (ovp = NtCurrentTeb()->pending_list; ovp; ovp = t) { t = ovp->next; - if(FILE_StartAsync(handle, ovp->lpOverlapped, ovp->type, 0, STATUS_CANCELLED)) - { - TRACE("overlapped = %p\n",ovp->lpOverlapped); - finish_async(ovp, STATUS_CANCELLED); - } - ovp = t; + if ( ovp->handle == handle ) + cancel_async ( ovp ); } WaitForMultipleObjectsEx(0,NULL,FALSE,1,TRUE); return TRUE; @@ -1400,18 +1430,19 @@ */ static void FILE_AsyncReadService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio*) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("%p %p\n", lpOverlapped, ovp->buffer ); + TRACE("%p %p\n", lpOverlapped, fileio->buffer ); /* check to see if the data is ready (non-blocking) */ - result = pread (ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pread (ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = read (ovp->fd, &ovp->buffer[already], ovp->count - already); + result = read (ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1429,9 +1460,9 @@ } lpOverlapped->InternalHigh += result; - TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1448,7 +1479,7 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; int fd; TRACE("file %d to buf %p num %ld %p func %p\n", @@ -1468,7 +1499,7 @@ return FALSE; } - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); @@ -1476,31 +1507,19 @@ close(fd); return FALSE; } - ovp->event = hEvent; + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_READ; + ovp->async.func = FILE_AsyncReadService; + ovp->async.event = hEvent; ovp->lpOverlapped = overlapped; ovp->count = bytesToRead; ovp->completion_func = lpCompletionRoutine; - ovp->func = FILE_AsyncReadService; ovp->buffer = buffer; - ovp->fd = fd; - ovp->type = ASYNC_TYPE_READ; - ovp->handle = hFile; - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - if ( !FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_READ, bytesToRead, STATUS_PENDING) ) - { - /* FIXME: remove async_private and release memory */ - ERR("FILE_StartAsync failed\n"); - return FALSE; - } - - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1510,7 +1529,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_ReadFileEx(hFile,buffer,bytesToRead,overlapped,lpCompletionRoutine, INVALID_HANDLE_VALUE); } @@ -1588,7 +1606,6 @@ } /* at last resort, do an overlapped read */ - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = result; if(!FILE_ReadFileEx(hFile, buffer, bytesToRead, overlapped, NULL, overlapped->hEvent)) @@ -1646,18 +1663,19 @@ */ static void FILE_AsyncWriteService(struct async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio *) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("(%p %p)\n",lpOverlapped,ovp->buffer); + TRACE("(%p %p)\n",lpOverlapped,fileio->buffer); /* write some data (non-blocking) */ - result = pwrite(ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pwrite(ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = write(ovp->fd, &ovp->buffer[already], ovp->count - already); + result = write(ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1674,9 +1692,9 @@ lpOverlapped->InternalHigh += result; - TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1693,7 +1711,8 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; + int fd; TRACE("file %d to buf %p num %ld %p func %p stub\n", hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine); @@ -1704,46 +1723,34 @@ return FALSE; } - overlapped->Internal = STATUS_PENDING; - overlapped->InternalHigh = 0; - - if (!FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_WRITE, bytesToWrite, STATUS_PENDING )) + fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + if ( fd < 0 ) { - TRACE("FILE_StartAsync failed\n"); + TRACE( "Couldn't get FD\n" ); return FALSE; } - ovp = (async_private*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); + close (fd); return FALSE; } + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + ovp->async.type = ASYNC_TYPE_WRITE; + ovp->async.func = FILE_AsyncWriteService; ovp->lpOverlapped = overlapped; - ovp->event = hEvent; - ovp->func = FILE_AsyncWriteService; + ovp->async.event = hEvent; ovp->buffer = (LPVOID) buffer; ovp->count = bytesToWrite; ovp->completion_func = lpCompletionRoutine; - ovp->fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); - ovp->type = ASYNC_TYPE_WRITE; - ovp->handle = hFile; - if(ovp->fd <0) - { - HeapFree(GetProcessHeap(), 0, ovp); - return FALSE; - } - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1753,7 +1760,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_WriteFileEx(hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine, INVALID_HANDLE_VALUE); diff -ruNX ignore CVS/wine/include/async.h TMP/wine/include/async.h --- CVS/wine/include/async.h Thu Jan 1 01:00:00 1970 +++ TMP/wine/include/async.h Fri Apr 5 12:24:13 2002 @@ -0,0 +1,124 @@ +/* + * Structures and static functions for handling asynchronous I/O. + * + * Copyright (C) 2002 Mike McCormack, Martin Wilck + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * This file declares static functions. + * It should only be included by those source files that implement async I/O requests. + */ + +#ifndef __WINE_ASYNC_H +#define __WINE_ASYNC_H + +struct async_private; + +typedef void (*async_handler)(struct async_private *ovp); +typedef void CALLBACK (*async_call_completion_func)(ULONG_PTR data); +typedef DWORD (*async_get_status)(const struct async_private *ovp); +typedef DWORD (*async_get_count)(const struct async_private *ovp); +typedef void (*async_set_status)(struct async_private *ovp, const DWORD status); + +typedef struct async_ops +{ + async_get_status get_status; + async_set_status set_status; + async_get_count get_count; + async_call_completion_func call_completion; +} async_ops; + +typedef struct async_private +{ + struct async_ops *ops; + HANDLE handle; + HANDLE event; + int fd; + async_handler func; + int type; + struct async_private *next; + struct async_private *prev; +} async_private; + +/* All functions declared static for Dll separation purposes */ + +inline static void finish_async( async_private *ovp ) +{ + if(ovp->prev) + ovp->prev->next = ovp->next; + else + NtCurrentTeb()->pending_list = ovp->next; + + if(ovp->next) + ovp->next->prev = ovp->prev; + + ovp->next = ovp->prev = NULL; + + close( ovp->fd ); + if( ovp->event != INVALID_HANDLE_VALUE ) + NtSetEvent( ovp->event, NULL ); + + QueueUserAPC( ovp->ops->call_completion, GetCurrentThread(), (ULONG_PTR)ovp ); +} + +inline static BOOL __register_async( async_private *ovp, const DWORD status ) +{ + BOOL ret; + + SERVER_START_REQ( register_async ) + { + req->handle = ovp->handle; + req->overlapped = ovp; + req->type = ovp->type; + req->count = ovp->ops->get_count( ovp ); + req->status = status; + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + if ( ret ) ovp->ops->set_status ( ovp, GetLastError() ); + if ( ovp->ops->get_status (ovp) != STATUS_PENDING ) + finish_async (ovp); + + return ret; +} + +#define register_old_async(ovp) \ + __register_async (ovp, ovp->ops->get_status( ovp )); + +inline static BOOL register_new_async( async_private *ovp ) +{ + ovp->ops->set_status ( ovp, STATUS_PENDING ); + + ovp->next = NtCurrentTeb()->pending_list; + ovp->prev = NULL; + if ( ovp->next ) ovp->next->prev = ovp; + NtCurrentTeb()->pending_list = ovp; + + return __register_async( ovp, STATUS_PENDING ); +} + +inline static BOOL cancel_async ( async_private *ovp ) +{ + /* avoid multiple cancellations */ + if ( ovp->ops->get_status( ovp ) != STATUS_PENDING ) + return 0; + ovp->ops->set_status ( ovp, STATUS_CANCELLED ); + return __register_async ( ovp, STATUS_CANCELLED ); +} + +#endif /* __WINE_ASYNC_H */ diff -ruNX ignore CVS/wine/include/file.h TMP/wine/include/file.h --- CVS/wine/include/file.h Wed Apr 3 19:32:56 2002 +++ TMP/wine/include/file.h Fri Apr 5 11:19:40 2002 @@ -46,27 +46,6 @@ int flags; } DOS_DEVICE; -/* overlapped private structure */ -struct async_private; -typedef void (*async_handler)(struct async_private *ovp); -typedef struct async_private -{ - LPOVERLAPPED lpOverlapped; - HANDLE handle; - HANDLE event; - int fd; - char *buffer; - async_handler func; - int count; - int type; - LPOVERLAPPED_COMPLETION_ROUTINE completion_func; - struct async_private *next; - struct async_private *prev; -} async_private; - -extern void WINAPI check_async_list(LPOVERLAPPED ov, DWORD status); -extern void finish_async(struct async_private *ovp, DWORD status); - /* locale-independent case conversion */ inline static char FILE_tolower( char c ) { @@ -99,7 +78,6 @@ DWORD attributes, HANDLE template, BOOL fail_read_only, UINT drive_type ); extern HANDLE FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa ); -extern BOOL FILE_StartAsync(HANDLE handle, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status); extern LONG WINAPI WIN16_hread(HFILE16,SEGPTR,LONG); diff -ruNX ignore CVS/wine/include/wine/server_protocol.h TMP/wine/include/wine/server_protocol.h --- CVS/wine/include/wine/server_protocol.h Tue Apr 2 15:39:35 2002 +++ TMP/wine/include/wine/server_protocol.h Fri Apr 5 12:21:25 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; @@ -3184,6 +3183,6 @@ struct get_window_properties_reply get_window_properties_reply; }; -#define SERVER_PROTOCOL_VERSION 77 +#define SERVER_PROTOCOL_VERSION 78 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff -ruNX ignore CVS/wine/scheduler/synchro.c TMP/wine/scheduler/synchro.c --- CVS/wine/scheduler/synchro.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/scheduler/synchro.c Fri Apr 5 12:35:35 2002 @@ -30,6 +30,7 @@ #include "thread.h" #include "winerror.h" #include "wine/server.h" +#include "async.h" /*********************************************************************** @@ -50,74 +51,32 @@ } } -static void CALLBACK call_completion_routine(ULONG_PTR data) -{ - async_private* ovp = (async_private*)data; - - ovp->completion_func(ovp->lpOverlapped->Internal, - ovp->lpOverlapped->InternalHigh, - ovp->lpOverlapped); - ovp->completion_func=NULL; - HeapFree(GetProcessHeap(), 0, ovp); -} - -void finish_async(async_private *ovp, DWORD status) -{ - ovp->lpOverlapped->Internal=status; - - /* call ReadFileEx/WriteFileEx's overlapped completion function */ - if(ovp->completion_func) - { - QueueUserAPC(call_completion_routine,GetCurrentThread(),(ULONG_PTR)ovp); - } - - /* remove it from the active list */ - if(ovp->prev) - ovp->prev->next = ovp->next; - else - NtCurrentTeb()->pending_list = ovp->next; - - if(ovp->next) - ovp->next->prev = ovp->prev; - - ovp->next=NULL; - ovp->prev=NULL; - - close(ovp->fd); - if(ovp->event!=INVALID_HANDLE_VALUE) - NtSetEvent(ovp->event,NULL); - if(!ovp->completion_func) HeapFree(GetProcessHeap(), 0, ovp); -} - /*********************************************************************** * check_async_list * * Process a status event from the server. */ -void WINAPI check_async_list(LPOVERLAPPED overlapped, DWORD status) +static void WINAPI check_async_list(async_private *asp, DWORD status) { async_private *ovp; + DWORD ovp_status; - /* fprintf(stderr,"overlapped %p status %x\n",overlapped,status); */ + for( ovp = NtCurrentTeb()->pending_list; ovp && ovp != asp; ovp = ovp->next ); - for(ovp = NtCurrentTeb()->pending_list; ovp; ovp = ovp->next) - if(ovp->lpOverlapped == overlapped) - break; - - if(!ovp) + if(!ovp) return; - if(status != STATUS_ALERTED) - ovp->lpOverlapped->Internal = status; + if( status != STATUS_ALERTED ) + { + ovp_status = status; + ovp->ops->set_status (ovp, status); + } + else ovp_status = ovp->ops->get_status (ovp); - if(ovp->lpOverlapped->Internal==STATUS_PENDING) - { - ovp->func(ovp); - FILE_StartAsync(ovp->handle, ovp->lpOverlapped, ovp->type, 0, ovp->lpOverlapped->Internal); - } + if( ovp_status == STATUS_PENDING ) ovp->func( ovp ); - if(ovp->lpOverlapped->Internal!=STATUS_PENDING) - finish_async(ovp,ovp->lpOverlapped->Internal); + /* This will destroy all but PENDING requests */ + register_old_async( ovp ); } @@ -200,6 +159,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 CVS/wine/server/async.c TMP/wine/server/async.c --- CVS/wine/server/async.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/server/async.c Fri Apr 5 12:22:32 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 CVS/wine/server/async.h TMP/wine/server/async.h --- CVS/wine/server/async.h Tue Apr 2 15:39:41 2002 +++ TMP/wine/server/async.h Fri Apr 5 11:19:45 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 CVS/wine/server/protocol.def TMP/wine/server/protocol.def --- CVS/wine/server/protocol.def Wed Apr 3 19:32:56 2002 +++ TMP/wine/server/protocol.def Fri Apr 5 12:17:37 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 */ @@ -1615,10 +1615,9 @@ #define SERIALINFO_SET_ERROR 0x04 -/* Create/Destroy an async I/O */ +/* 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 CVS/wine/server/thread.c TMP/wine/server/thread.c --- CVS/wine/server/thread.c Tue Apr 2 15:39:42 2002 +++ TMP/wine/server/thread.c Fri Apr 5 11:19:45 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 CVS/wine/server/trace.c TMP/wine/server/trace.c --- CVS/wine/server/trace.c Wed Apr 3 19:32:56 2002 +++ TMP/wine/server/trace.c Fri Apr 5 12:21:25 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 );

3 4

ChangeSet ID: 10178643640749867230924828 - oops.
by lawson_whitney＠juno.com 08 Apr '02

08 Apr '02

Log message: Huw D M Davies <hdavies(a)codeweavers.com> The horizontal dialog base unit is calculated as the straight average of a-z,A-Z (tmAveCharWidth is supposed to be a weighted average according to character usage, so we shouldn't use this). Good day! I don't pay much attention to GUI, or care much about it, but I noticed this patch causes my app to display a progress bar (?) with the title folded down into the progress bar, so it looks kind of lame. % xx transferred: Without the patch, it looks more like: % transferred: xx I have no idea what this app looks like in Windows. I have never run it with Windows, and I have no intention to buy Windows just to see, but I think we might not want this bit of code to stay exactly as it is. I will gladly make any kind of traces you would like to see, or I can live with it. The app is in fact obsolete win9x, but it is the most recent version that can work a modem without requiring DUN or RAS or some dam' thing. Hmmm, I wonder if a more recent version has the same problem? Let me check... Regards, Lawson ---oof---

2 2

[PATCH] winemaker + DLL paths
by Martin Wilck 08 Apr '02

08 Apr '02

I found that winemaker-generated configure scripts bail out with recent CVS versions of wine. The appended patch fixes this. It may be not exactly what the winemaker authors intended, but at least it generates working configure scripts for me. 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 --- tools/winemaker.OLD Tue Apr 2 16:51:51 2002 +++ tools/winemaker Mon Apr 8 16:45:17 2002 @@ -2732,14 +2732,14 @@ WINE_DLL_ROOT="/lib:/lib/dlls:/usr/lib:/usr/lib/dlls:/usr/local/lib:/usr/local/lib/dlls" fi fi -AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.so],[ - AC_MSG_ERROR([Could not find the Wine dlls (libntdll.so)]) +AC_PATH_FILE(WINE_DLL_ROOT,[libntdll.dll.so],[ + AC_MSG_ERROR([Could not find the Wine dlls (libntdll.dll.so)]) ],[$WINE_DLL_ROOT]) -AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[ - AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.so)]) +AC_PATH_LIBRARY(WINE_DLL_ROOT,[-lntdll.dll],[$WINE_LIBRARY_PATH -lwine -lwine_unicode],[ + AC_MSG_ERROR([Could not link with the Wine dlls (libntdll.dll.so)]) ],[$WINE_DLL_ROOT]) -WINE_DLL_PATH="-L$WINE_DLL_ROOT" +WINE_DLL_PATH="-L$WINE_DLL_ROOT/wine" if test -n "$LD_PATH" then

1 0

Running tests on windows
by Geoffrey Hausheer 08 Apr '02

08 Apr '02

Last week I submitted a perl script that makes a Makefile (and archive bundle) for building tests on Windows boxes under cygwin. Well, it works fine with mingw too (when using msys at least), but there is a snag. In order to compile tests under Windows, I seem to need to include windows.h before any other .h files. I did this using the '-include' directive in gcc, but it requires knowledge of the absolute path to the windows.h file. This means I need to specify the path in the Makefile, which is completely non-portable (especialy with mingw which doesn't really have a default setup like cygwin does). 1) So it seems I have three options. I can append '#include <windows.h>' to each .c file (either wrapped in #define, or through the perl script) 2) I can include the entire wine /include directory in the archive, and use that 'windows.h' to build against. 3) I can just force the user to edit the Makefile to point to the correct include directory. I don't really like any of these options (though 3 is the the easiest to implement, as this is how it works now) So is there a better solution than the three I've listed? And why won't wine let me include 'windows.h', but under windows it is required? Thanks, .Geoff

5 6

posting wineconf info to slashdot?
by Michael Cardenas 08 Apr '02

08 Apr '02

Now that we have the video feeds, some of the presentations, and some pictures, does anyone think we should post links to slashdot so everyone who couldn't attend can see what went on?

3 3

mIRC fails to start (Wine CVS 20020407)
by mdew 08 Apr '02

08 Apr '02

heres a debug report.... [01:40pm 08-Apr-02]$ /usr/bin/wine --winver=nt2k -debugmsg +relay ./mirc32.exe 0806fcf8:Call kernel32.__wine_register_dll_16(40615c7c) ret=406131b4 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40615c7c ret=406131b4 0806fcf8:Call kernel32.__wine_register_dll_16(4033c854) ret=40337460 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=4033c854 ret=40337460 Warning: loading builtin kernel32.dll, but native version already present. Expect trouble. 0806fcf8:Call kernel32.__wine_register_dll_16(4063a648) ret=4062e8a0 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=4063a648 ret=4062e8a0 0806fcf8:Call kernel32.__wine_register_dll_16(409edc20) ret=409b40ec 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409edc20 ret=409b40ec 0806fcf8:Call kernel32.__wine_register_dll_16(409edf28) ret=409b439c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409edf28 ret=409b439c 0806fcf8:Call kernel32.__wine_register_dll_16(409ee0e0) ret=409b4504 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409ee0e0 ret=409b4504 0806fcf8:Call kernel32.__wine_register_dll_16(409ee1f0) ret=409b45bc 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409ee1f0 ret=409b45bc 0806fcf8:Call kernel32.__wine_register_dll_16(409ee3d4) ret=409b4724 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409ee3d4 ret=409b4724 0806fcf8:Call kernel32.__wine_register_dll_16(409eebe4) ret=409b4ee8 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409eebe4 ret=409b4ee8 0806fcf8:Call kernel32.__wine_register_dll_16(409f1214) ret=409b6918 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409f1214 ret=409b6918 0806fcf8:Call kernel32.__wine_register_dll_16(409949d0) ret=4094e774 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=409949d0 ret=4094e774 0806fcf8:Call kernel32.__wine_register_dll_16(4092d46c) ret=408df1f8 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=4092d46c ret=408df1f8 0806fcf8:Call kernel32.__wine_register_dll_16(40ab6ec8) ret=40a72a6c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40ab6ec8 ret=40a72a6c 0806fcf8:Call kernel32.__wine_register_dll_16(40ab7290) ret=40a72c7c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40ab7290 ret=40a72c7c 0806fcf8:Call kernel32.__wine_register_dll_16(40b00ba0) ret=40ad409c 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40b00ba0 ret=40ad409c 0806fcf8:Call kernel32.__wine_register_dll_16(40b00e54) ret=40ad42ec 0806fcf8:Ret kernel32.__wine_register_dll_16() retval=40b00e54 ret=40ad42ec 0806fcf8:Call PE DLL (proc=0x405d01ec,module=405c0000,type=1,res=0x1) 0806fcf8:Call PE DLL (proc=0x4080f1ec,module=407ff000,type=1,res=(nil)) 0806fcf8:Ret PE DLL (proc=0x4080f1ec,module=407ff000,type=1,res=(nil)) retval=1 0806fcf8:Ret PE DLL (proc=0x405d01ec,module=405c0000,type=1,res=0x1) retval=1 0806fcf8:Call PE DLL (proc=0x4078dd30,module=40780000,type=1,res=0x1) 0806fcf8:Ret PE DLL (proc=0x4078dd30,module=40780000,type=1,res=0x1) retval=1 0806fcf8:Call PE DLL (proc=0x40684eb8,module=40667000,type=1,res=0x1) Warning: loading builtin user32.dll, but native version already present. Expect trouble. 0806fcf8:Call PE DLL (proc=0x40c0aea8,module=40bed000,type=1,res=(nil)) 0806fcf8:Call x11drv.CreateDC(40362fc0,40566930 "DISPLAY",00000000,00000000,00000000) ret=4079fa81 wine: Unhandled exception, starting debugger... err:seh:start_debugger Couldn't start debugger ((null)) (127) Read the Wine Developers Guide on how to set up winedbg or another debugger Wine failed with return code 5 aswell as my previous report on Usenet.. http://groups.google.co.nz/groups?q=mirc+group:comp.emulators.ms-windows.wi…

1 1

winver
by Rizsanyi Zsolt 08 Apr '02

08 Apr '02

Hi! I have tried to run my program with --winver nt40. And it was ok But when I started the program by the means of setup.exe (its the autorun program on a cd which detects if the program is already installed, and automatically starts it), then the program was not running like it had got the winver argument. It was looking for VxD only used in win9x mode (the output is same as if I run it without --winver). Interestingly I have also noticed that when I start the program through setup.exe it is not managed, although I have managed mode set in ~/.wine/config I think that the processes created by other executables get the hardcoded options, and not from the configuration. Also winver option in the config file would be useful. Best regards Zsolt Rizsanyi

1 0

How to debug an exception handler ?
by Laurent Pinchart 07 Apr '02

07 Apr '02

Hi everybody, I have a windows program which raises an exception as part of its normal execution (it tries to call int 0x01). The program setups an exception handler, catches the exception, and resumes it execution after the call to int 0x01. This works fine when run in wine. However, when I try to run the program in winedbg, the debugger catches the exeception, interrupts the program execution, prints a register dump, stack dump & backtrace, and waits. If I continue the execution using 'cont' (after incrementing $eip by 2 to skip int 0x01), the program continues but the exception handler installed bu the user program is not called. I was wondering if it was a bug or a normal behaviour, and if it is normal behaviour, is there a workaround ? Thanks in advance for your help. Laurent Pinchart

4 6

MAC WINE Project?
by Lonnie Cumberland 07 Apr '02

07 Apr '02

Hello All, Could someone please tell me if there is a MAC WINE type project that would use native libraries to run MAC applications on Linux without having to install the MAC OS? I was just courious if one existed, thanks, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

3 2

Re: ChangeSet ID: 10178643640749867230924828 - oops.
by lawson_whitney＠juno.com 07 Apr '02

07 Apr '02

On Sat, 6 Apr 2002 whit(a)giftie.alien.org wrote: > Hmmm, I wonder if a more recent version has the same > problem? Let me check... As it happens, Juno version 4 puts the title under the progress bar, Transferred xx% and the patch doesn't cause it to fold. Maybe it isn't important, but if you would like to debug Juno version 2 I will be glad to help. Regards, Lawson | We apologize if this message has reached you in error. | Save the Planet, Save the Trees! Advertise via E mail.

1 0

Windows NT, int 0x01 & EXCEPTION_ACCESS_VIOLATION
by Laurent Pinchart 06 Apr '02

06 Apr '02

Hi everybody, It seems that calling int 0x01 on windows NT should raise an EXCEPTION_ACCESS_VIOLATION instead of EXCEPTION_PRIV_INSTRUCTION. Could anyone confirm ? (I don't know how to test it. Calling the interruption is trivial, but how does a user program test the exception type ?) Laurent Pinchart

1 0

Re: wine/objects text.c
by Dimitrie O. Paun 06 Apr '02

06 Apr '02

On April 5, 2002 07:37 pm, Alexandre Julliard wrote: > Log message: > Huw D M Davies <hdavies(a)codeweavers.com> > Spout a FIXME if we try to call ExtTextOut on an open path. FIXME what? Is there some unimplemented functionality, or is it just illegal to call ExtTextOut on an open path? -- Dimi.

3 3

[PATCH] HOMAM III fix
by Martin Lexa 06 Apr '02

06 Apr '02

Hello! Function CreateFileA get this file path (just for example): C:\\Program Files\\3DO\\Heroes3\\DATAh3bitmap.lod As you can see the correct path should be: C:\\Program Files\\3DO\\Heroes3\\DATA\\h3bitmap.lod This lead to error message "Can't initialize resources.Possible disk problem." I see the problem in the function DOSFS_DoGetFullPathName(), which in the end removes the ending backslash from the path. The attached patch fixes it. Bye, Martin

7 11

Newbie developer looking for pointers (re printing)
by Carl Sopchak 05 Apr '02

05 Apr '02

I've decided to try to fix a problem myself that I'm having printing from QuickBooks (partial page checks need to be landscape). I've downloaded the source, updated it via CVS, and now I'm trying to figure out where the problem is. I know where the problem is at the moment: ME! :-) That is, I could use some pointers on where to look... I have no knowledge of the Win API, and I can't say that I'm a strong C programmer (although I've played with it for a while a few years ago). However, being a consultant for over 15 years, I've jumped into more difficult situations and got results in a reasonable period of time. With a few helpful pointers, I don't think this should be any different. :-) I've looked around MSDN for a while, searching for printing API info with no luck (perhaps it's a lack of patients, perhaps its a poor search enging on top of a huge mass of information). I've looked at the Wine source, have successfully watched my program trace through wineps.c (et al), and even made a slight mod to it to make sure that I would know that I was running modified code (which worked). I've also looked around winehq and codeweavers, in the wine developer's sections... Here's where my head's at: It seems to me that I'm "too low" looking at wineps.c, but I can't figure out where else to look. Using the cross reference on winehq, and looking at the "where used" for wineps.c, the trail "goes cold" after a level or two (still "too low"). I know the app is making the proper calls to the Win Printing API to set landscape mode when needed since the program works fine on an NT box. I just don't know WHAT gets called to do this! If I started there, I could trace down to whatever levels I need to to figure out what is currently going on, so I can figure out what needs to be changed... So here are my questions: - What APIs are called by programs to talk to the printing subsystem? Is there a MS URL that gives an overview of this API? - What --debugmsg options can I use to trace programs through these API calls? (+psdrv works for the routines in wineps/*.c; +gdi [am I on the right track?] seems to give a whole bunch of traces, none of which [well, maybe a few] seem relavent.) - What calls the PSDRV_ functions? What's the --debugmsg option for it? - Is anyone willing to Mentor me?? (VERY big grin; flash the long eyelashes; etc.) I'd love to get this to work, and I'd be more than happy to supply the patch once it is working. I'm also be willing to continue working on the printing in wine, and perhaps fix other bugs that I run across. But in order for this to become reality, I sure could use some help up the learning curve!! Humble thanks, Carl

1 0

Re: SetCooperativeLevel
by Tels 05 Apr '02

05 Apr '02

-----BEGIN PGP SIGNED MESSAGE----- Moin, On 05-Apr-02 Jason Phillips carved into stone: > > > Well first are you confusing Transmeta with Transgaming? Transmeta is the Yes. Sorry, s/transmeta/transgaming/g; And transgaming has their own mailing list, and their own CVS, which I already synced and build (I don't know if it contains all source code parts, though, but I suppose yes - AFAIU transgaming gives you anything, you just redistribute it commercially - or something along these lines) [snip the rest] Cheers, Tels - -- "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"' greatly extend B2B architectures -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPK2/IXcLPEOTuEwVAQGsgQf+I97ziYy4ZbYODW7dkSNjXPp0nAg/jKlj q4rCBhcvV1adFbNZ7JBGZJrkHVKZjiLLq99kK244iE+SQXKBG6kr9zIWbd9iCYSB gXwdqc4lf8mmVKiZz+EEtV5hCT1Dyst+hY9fxAYBYso1ZjXD/wz59Ds8YE9oLEOe y5sHzbzzXFsyLfRb7EWDwgXLB3TTRx0LPsHKLrzyn4k+7NMTimx8F2zFY5bhWqOW huvcDZ0vF3ldh1XuGl13t/fN8kqRpQfdHe/8RgXEXM1g/j9490zPVpFFZ67LY8ZE RkxVd6IWOFaVlGDmuCz04hPoeBQqg51hzTSga0aNw6R/GDFI9tdMnQ== =F3SZ -----END PGP SIGNATURE-----

1 0

Crossover/WINE Test In Large Rollout
by Dave Richards 05 Apr '02

05 Apr '02

All- I am not on this list, so if you would like to respond to me you will have to reply to me directly. This is a real world situation where WINE could be used for a massive sever rollout (hundreds of users) and is having some problems in our environment. The City of Largo, Florida is a large Linux and thin client shop that has deployed a PC-less network for running out software. We are currently doing some R&D into options for running Lotus Notes in our environment. Our first choice obviously would be a native client running on Linux---it doesn't exist. We haven't looked at WINE in about 2 years and today the kind folks at CodeWeavers allowed us to test their new release with the Lotus Client. Here are the problems--> 1) Endian Bug. WINE is not able to detect that the runtime Endian order might be different than the server. Our Xterminals are RISC based and obviously WINE is running on Intel. All of the colors display incorrectly because of this. 2) Performance. On remote displays WINE is *much* slower than it is on the console. The Lotus Notes client took over 5 minutes to run remotely whereas on the console it comes up in about 20 seconds. I am assuming that it is making use of some of the XFree extensions for performance and that perhaps they have to timeout and drop through code in order to run on our Xservers. Once it is running, performance is much better, but the initial startup make it undeployable. We are thankful for everyone that has gotten WINE this far and that it works as well as it does considering the complexity of this task. If these areas are ever addressed, we would be happy to explore the product again! Dave Richards City of Largo, FL Systems Administrator

2 1

Re: [PATCH] async IO APCs call check_async_list() directly
by Mike McCormack 05 Apr '02

05 Apr '02

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@start.com.au ph +82 16 430 0425 __________________________________________________________________ Get your free Australian email account at http://www.Looksmart.com.au

2 1

ReadFile and WriteFile in overlapped mode
by Jacques Gelinas 05 Apr '02

05 Apr '02

I have been looking at those two functions and some specs. My understanding is that those function do not work at all in overlapped (async mode). Currently (latest stuff in CVS), both function handle overlap mode like this a) Give it a try in synchronous mode using a combination of pread/read and pwrite/write. b) If not enough bytes were read or written, a request is sent to wineserver to perform and asynchronous operation. This request always fail. (don't know why yet). There is two problem here. If step a succeed, no event will 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 My understanding is that step a should never be done and only step b. Is that correct ? Now, why step b is failing is another story. Comments ? --------------------------------------------------------- Jacques Gelinas <jack(a)solucorp.qc.ca> vserver: run general purpose virtual servers on one box, full speed! http://www.solucorp.qc.ca/miscprj/s_context.hc

3 3

DeviceIoControl
by Laurent Pinchart 05 Apr '02

05 Apr '02

Hi everybody, I need to add support for a currently unsupported VxD, and I'm quite puzzled by the way that DeviceIoControl currently processes the device control requests. DeviceIoControl starts by checking the high word of dwIoControlCode, which is the device type. If the device type is 0, it gets a client ID by sending a get_file_info request to the server, and uses the client ID as the device type. It then looks in the VxD table for a handler for the device type, and calls it if it exists. No problem with that. If the high word of dwIoControlCode is not 0, it checks if the device is a CDROM (by calling GetDriveTypeA). If so, it calls CDROM_DeviceIoControl, and if not is just fails. I was wondering why the same VxD table as for (HIWORD(dwIoControlCode) == 0) wasn't used when the device type in dwIoControlCode is not 0. It seems to be a mistake to me. I was thinking about implementing the following algorithm: - check HIWORD(dwIoControlCode) - if 0, deviceType = GetCliendID( Device ) - if ! 0, deviceType = HIWORD(dwIoControlCode) - look for a VxD handler in the VxD table using the deviceType. - call the handler if it exists, fails otherwise This leaves out the special case for CDROM_DeviceIoControl. Could anyone explain to me why that special check is needed, if it is ? Thanks in advance. Laurent Pinchart

2 5

Review - Winnt.h warning patch for mingw32
by Steven Edwards 05 Apr '02

05 Apr '02

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 05 Apr '02

05 Apr '02

-----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 05 Apr '02

05 Apr '02

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 04 Apr '02

04 Apr '02

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@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 04 Apr '02

04 Apr '02

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@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 04 Apr '02

04 Apr '02

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 04 Apr '02

04 Apr '02

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 04 Apr '02

04 Apr '02

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 04 Apr '02

04 Apr '02

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 04 Apr '02

04 Apr '02

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

freetype : wine doesn't compile(Implement GetTextExtentPointI)
by Sylvain Petreolle 04 Apr '02

04 Apr '02

The following patch breaks compilation because there is a previous definition : Log message: Huw D M Davies <hdavies(a)codeweavers.com> Implement GetTextExtentPointI and add support for ETO_GLYPH_INDEX. Patch: http://cvs.winehq.com/patch.py?id=1017871707710937189943255 Compile errors : gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_GDI32_ -D_REENTRANT -I/usr/X11R6/include -o freetype.o freetype.c freetype.c:1852: conflicting types for `WineEngGetTextExtentPointI' ../../include/font.h:102: previous declaration of `WineEngGetTextExtentPointI' ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

Re: Removed sorting of registry key values
by Eric Pouech 04 Apr '02

04 Apr '02

Andriy Palamarchuk a écrit : > > Working on regedit replacement I noticed that Windows > regedit does not sort registry key values, while Wine > does. > I tested this on NT 4.0, SP2. You can check this by > importing a registry file with not alphabetic values > order and exporting it again. I fail to see the benefits of the patch: - key are sorted to allow O(log(n)) searching (registry is loaded only once, and then searched lots of time) so using enhanced searching techniques (<< O(n)) is really needed - saying that NT doesn't export the keys in an alphabetical order doesn't mean the keys are not sorted. So far, you can only tell that they are not sorted, in the export mechanism, by an alphabetical order. They could be sorted, for example, by a hash code value (look at misc/registry.c for some more details on registry internals) A+

5 5

VirtualAlloc bug ?
by Laurent Pinchart 04 Apr '02

04 Apr '02

Hi, I tried to use VirtualAlloc with MEM_COMMIT to map a page at address 0x7ffe0000. The call to VirtualAlloc failed with ERROR_INVALID_ADDRESS. I then tried to reserve the pages first, using VirtualAlloc with MEM_RESERVE, and the call to VirtualAlloc/MEM_COMMIT worked fined after that. The MSDN state that "(MEM_COMMIT) If a memory page is not yet reserved, setting this value causes the function to both reserve and commit the memory page.". Is that a wine bug ? I can try to fix it, but I'm scared to break something in VirtualAlloc, as I'm new to wine internals. Laurent Pinchart

2 1

FreeBSD/Solaris and -lc
by Francois Gouget 04 Apr '02

04 Apr '02

When I compile Wine on FreeBSD and Solaris I keep getting 'undefined sybol' errors for all the C library symbols. So I usually add the following to 'configure.ac'. Index: configure.ac =================================================================== RCS file: /home/wine/wine/configure.ac,v retrieving revision 1.14 diff -u -r1.14 configure.ac --- configure.ac 31 Mar 2002 19:23:41 -0000 1.14 +++ configure.ac 31 Mar 2002 20:45:37 -0000 @@ -77,6 +77,8 @@ dnl **** Check for some libraries **** +dnl Check for -lc for FreeBSD and Solaris +AC_CHECK_LIB(c,getpid) dnl Check for -lm AC_CHECK_LIB(m,sqrt) dnl Check for -li386 for NetBSD and OpenBSD But is it the right eay to do things? What worries me is that I found some messages related to libtool that claim that -lc should not be explicitly linked in on FreeBSD (and OpenBSD): http://mail.gnu.org/pipermail/libtool/2001-November/005782.html But maybe things are different if you use -symbolic. -- François Gouget fgouget(a)codeweavers.com

2 2

DirectX API information - where?
by Tels 03 Apr '02

03 Apr '02

-----BEGIN PGP SIGNED MESSAGE----- Moin, I want to learn more about the directx and general windows APIs. Now I looked at some books, but was very unsure as to buy what and where, if ever. First, it seems that good books about these topics come from Microsoft Press. Naturally I don't want to support them ;) Second, it seems that you need for the examples and SDK Visual C++ - again from MS. Eeek! And of course, you have to run and use it under Windows *sigh* I am also worried about the different EULAs, licence and all that other stuff "tainting" me - even though I do believe that all of this stuff isn't legal binding for me anyway. But you never know. So, my question: Where can I obtain *free* information about the API's, their working etc. What do you use? Books you can advise? Thank you in advance, Tels - -- "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"' appropriately cultivate error-free convergence -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPKs2zXcLPEOTuEwVAQGhjQf+KlvVhQQwEOpoReUTiukkohRolyyR8Z+f I/G4sx/ER8+RxtnwrWjBl/gadtnmUdjcf5x0Maca0cxRESjUwSvLgFXNA/VqGtiu SDsDpGVgXUr3iGDu2vXPMFCP0EqrwIUsFSoCpk9me6lWoPlWIOG/EZknA+JY+2zp axFcdrcu7QXq5KF2imPu+ACTA4dC9Af7HGhRflL0ERSe8a4+yhFqC8R2HV++TLPU +H5BQzLPiOANdrfj63bdaCoMWB+qj9bRW+PhPGkzq/QL4p/wsnz70AuW60pSRW5R dOokojLj9gjTY4QEQ/UEt8kyGIxFnSCF21oz9Ltjn1MXC6L8cwJ0Fg== =c8ZH -----END PGP SIGNATURE-----

5 4

Re: Startup fix for scanbin 6.0
by Dimitrie O. Paun 03 Apr '02

03 Apr '02

On April 3, 2002 03:58 pm, Stefan Leichter wrote: > + if (!str) { > + ERR("called without text\n"); ^^^ This is not an ERR (which signals an internal Wine error), maybe a WARN, but I would suggest instead just: + if (!str) return 0; -- Dimi.

1 0

Read of memory location 0x7ffe0000 in windows NT
by Laurent Pinchart 03 Apr '02

03 Apr '02

Hi everybody, I've stumbled accross some code which reads a dword at memory location 0x7ffe000, which causes the program to crash and the wine debugger to start. After some investigation, it seems that reading the memory location 0x7ffe0000 should return KeTickCount.LowPart to the user process. Has anyone ever heard about that ? I was wondering if it was a native windows NT behaviour, or if it was done by a special kernel-space exception handler installed by the program. The assembly code which does the trick is pusha mov $0x7ffe0000,%edx mov (%edx),%eax mov %eax,0xfffffffc(%ebp) popa mov 0xfffffffc(%ebp),%eax Any idea anyone ? Thanks for your help. Laurent Pinchart

3 6

dynamic .fon conversion
by David Chow 03 Apr '02

03 Apr '02

Hi, I am new to Wine develop, I wish to investigate and join, the following is the topic I am interested in. Does Wine develpers planning to implement .fon files support? I mean loading it dynamically? Since Xfree86 4 supports true type fonts, and most of the Linux distribution are now using XFree86-4 . We can actually load these fonts into the Xsever dynamically at run time providing we have some dynamic conversion between the font files. David

4 4

Regression: Wine won't compile with latest cvs shlwapi
by Tony Lambregts 03 Apr '02

03 Apr '02

I can't get recent cvs versions to compile. After running cvs update -PAd and ./tools/installwine I get these messages gcc: Internal compiler error: program cc1 got fatal signal 11 make[2]: *** [ordinal.o] Error 1 make[2]: Leaving directory `/usr/local/src/wine/dlls/shlwapi' make[1]: *** [shlwapi/shlwapi.dll.so] Error 2 make[1]: Leaving directory `/usr/local/src/wine/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. At first I thought it might be something wrong with my system so I backed out cvs to March 1st 2002 and everything worked. I talked to Lawson on wine-users and he says I should look at http://www.bitwizard.nl/sig11/ (This link is about mostly about compiling a kernal but it applies to compiling wine as well) I have looked at it and tried most of the things suggested in it. I still stop in exactly the same place. Things i have tried I ran dd if=/dev/hda7 of=/dev/null bs=1024k count=96 and re-ran make I lowered my clock speed from 200mhz to 133mhz I have 4 72 pin simms, 2-16's and 2-32's I have tried compiling with each set individualy I have increased my swap space None of this helped. In the mean time I have done some regression testing using CVS cvs update -D "2002-03-19 19:31:04 CST" ./configure make depend && make compiles with no errors cvs update -D "2002-03-19 19:33:40 CST" ./configure make depend && make results with this gcc: Internal compiler error: program cc1 got fatal signal 11 make[2]: *** [ordinal.o] Error 1 make[2]: Leaving directory `/usr/local/src/wine/dlls/shlwapi' make[1]: *** [shlwapi/shlwapi.dll.so] Error 2 make[1]: Leaving directory `/usr/local/src/wine/dlls' make: *** [dlls] Error 2 Compilation failed, aborting install. This is the patch that was commited at 19:33:39 CST http://www.winehq.com/hypermail/wine-cvs/2002/03/0072.html Now I'm not the shapest knife in the drawer in fact I can be quite dull but this is a very strong indication that this patch is the one that is causing the problem. What do I need to do now? Tony Lambregts

5 7

apologies to all
by Lonnie Cumberland 03 Apr '02

03 Apr '02

Hello All, I am VERY VERY sorry for sending the entire list such a large attachment. I hope that you all will forgive me and it will not happen again. I have no excuse except to say that I was getting too excited about the implementation and did not look at the size of the files. Sorry again, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

1 0

Re: warn:wave:OSS_OpenDevice Another thread ...
by Duane Clark 03 Apr '02

03 Apr '02

Eric wrote: > This patch would be the correct way of fixing the issue. Would you mind > trying it? This patch causes hangs for me. The audio and app ran for awhile, but then everything, including the app, suddenly froze up.

1 0

SharedUserData
by Laurent Pinchart 03 Apr '02

03 Apr '02

Hi everybody, I need to implement the SharedUserData, which is a page of memory located at (KERNEL_BASE - 0x10000) shared between user space (read-only access) and kernel space. Some information in that page are very accurate (system time in 100ns units for instance), so I don't think that it would be possible to create a shared page at (KERNEL_BASE - 0x10000) and refresh it fast enough. Please correct me if I'm wrong, but I think that the way to go would be to create a copy of that page in memory and initialize it when Wine starts (some information never change, like the system root or version number). When a user space program would try to access that page, the page fault exception handler would return the appropriate data. I'm not very familiar with Wine internals, so I might be wrong, or forget some important issues. Comments are more than welcome :-) I'd also appreciate if someone could give me some hints about the implementation (where I should look for the page fault exception handler, where I should initialize that shared data, where I can find the needed information to initialize those data, ...). Thanks in advance. Laurent Pinchart

2 2

process detach in user
by David Hammerton 03 Apr '02

03 Apr '02

Hi, If you take a look at the bottom of dlls/user/user_main.c you will notice that in UserClientDllInitialize we have a switch for 'reason': switch(reason) { case DLL_PROCESS_ATTACH: ret = process_attach(); break; case DLL_THREAD_DETACH: thread_detach(); break; } Should we not also be accounting for the DLL_PROCESS_DETACH case in this switch? The reason I noticed this is because some windows (on the user side) are not being cleaned up when a when a process detaches, although they are being clean up on the x11drv side. Is this just a silly bug or is there a reason DLL_PROCESS_DETACH is not worried about? Cheers David -- David Hammerton programmer and support TransGaming Technologies Inc. http://www.transgaming.com david(a)transgaming.com

1 0

Generalization of async IO structures - New attempt
by Martin Wilck 03 Apr '02

03 Apr '02

PATCH: async-struct.diff This patch introduces a new API for asynchronous requests, which 1) separates cleanly between async scheduling and file IO related issues, 2) thereby makes the API compatible with other types of async requests, 3) makes all async IO handling functions static for better DLL separation. This a a reworked version of my patch as of 2002/01/15, with modifications to achieve 3). Patch against: Wine CVS 2002/04/03 Test status: Compiles (no errors/warnings), tested regular file async IO (ok). Added files: include : async.h Modified files: server : protocol.def async.c dlls/kernel : comm.c files : file.c include : file.h scheduler : synchro.c Log message: Martin Wilck <Martin.Wilck(a)Fujitsu-Siemens.com> - new server call: cancel_async - move async IO API from include/file.h, scheduler/synchro.c to new header file include/async.h - differentiate generic async API from IO-type specific fields diff -ruNX diffignore CVS/wine/dlls/kernel/comm.c MW/wine/dlls/kernel/comm.c --- CVS/wine/dlls/kernel/comm.c Tue Apr 2 15:39:18 2002 +++ MW/wine/dlls/kernel/comm.c Wed Apr 3 14:48:39 2002 @@ -91,6 +91,53 @@ WINE_DEFAULT_DEBUG_CHANNEL(comm); +/*********************************************************************** + * Asynchronous I/O for asynchronous wait requests * + */ +#include "async.h" + +static DWORD commio_get_async_status (const async_private *ovp); +static DWORD commio_get_async_count (const async_private *ovp); +static void commio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK commio_call_completion_func (ULONG_PTR data); + +static async_ops commio_async_ops = +{ + commio_get_async_status, /* get_status */ + commio_set_async_status, /* set_status */ + commio_get_async_count, /* get_count */ + commio_call_completion_func /* call_completion */ +}; + +typedef struct async_commio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + char *buffer; +} async_commio; + +static DWORD commio_get_async_status (const struct async_private *ovp) +{ + return ((async_commio*) ovp)->lpOverlapped->Internal; +} + +static void commio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_commio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD commio_get_async_count (const struct async_private *ovp) +{ + return 0; +} + +static void CALLBACK commio_call_completion_func (ULONG_PTR data) +{ + HeapFree(GetProcessHeap(), 0, (void*) data); +} + +/***********************************************************************/ + #if !defined(TIOCINQ) && defined(FIONREAD) #define TIOCINQ FIONREAD #endif @@ -1558,12 +1605,13 @@ */ static void COMM_WaitCommEventService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_commio *commio = (async_commio*) ovp; + LPOVERLAPPED lpOverlapped = commio->lpOverlapped; TRACE("overlapped %p\n",lpOverlapped); /* FIXME: detect other events */ - *ovp->buffer = EV_RXCHAR; + *commio->buffer = EV_RXCHAR; lpOverlapped->Internal = STATUS_SUCCESS; } @@ -1579,8 +1627,8 @@ LPDWORD lpdwEvents, /* [out] event(s) that were detected */ LPOVERLAPPED lpOverlapped) /* [in/out] for Asynchronous waiting */ { - int fd,ret; - async_private *ovp; + int fd; + async_commio *ovp; if(!lpOverlapped) { @@ -1591,53 +1639,32 @@ if(NtResetEvent(lpOverlapped->hEvent,NULL)) return FALSE; - lpOverlapped->Internal = STATUS_PENDING; - lpOverlapped->InternalHigh = 0; - lpOverlapped->Offset = 0; - lpOverlapped->OffsetHigh = 0; - fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); if(fd<0) return FALSE; - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_commio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_commio)); if(!ovp) { close(fd); return FALSE; } - ovp->event = lpOverlapped->hEvent; + + ovp->async.ops = &commio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_WAIT; + ovp->async.func = COMM_WaitCommEventService; + ovp->async.event = lpOverlapped->hEvent; ovp->lpOverlapped = lpOverlapped; - ovp->func = COMM_WaitCommEventService; ovp->buffer = (char *)lpdwEvents; - ovp->fd = fd; - ovp->count = 0; - ovp->completion_func = 0; - ovp->type = ASYNC_TYPE_WAIT; - ovp->handle = hFile; - - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev=ovp; - NtCurrentTeb()->pending_list = ovp; - - /* start an ASYNCHRONOUS WaitCommEvent */ - SERVER_START_REQ( register_async ) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = ASYNC_TYPE_WAIT; - req->count = 0; - req->func = check_async_list; - req->status = STATUS_PENDING; - ret=wine_server_call_err(req); - } - SERVER_END_REQ; + lpOverlapped->InternalHigh = 0; + lpOverlapped->Offset = 0; + lpOverlapped->OffsetHigh = 0; - if (!ret) - SetLastError(ERROR_IO_PENDING); + if ( !register_new_async (&ovp->async) ) + SetLastError( ERROR_IO_PENDING ); return FALSE; } diff -ruNX diffignore CVS/wine/files/file.c MW/wine/files/file.c --- CVS/wine/files/file.c Tue Apr 2 15:39:31 2002 +++ MW/wine/files/file.c Wed Apr 3 16:00:38 2002 @@ -64,6 +64,65 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); +/*********************************************************************** + * Asynchronous file I/O * + */ +#include "async.h" + +static DWORD fileio_get_async_status (const async_private *ovp); +static DWORD fileio_get_async_count (const async_private *ovp); +static void fileio_set_async_status (async_private *ovp, const DWORD status); +static void CALLBACK fileio_call_completion_func (ULONG_PTR data); + +static async_ops fileio_async_ops = +{ + fileio_get_async_status, /* get_status */ + fileio_set_async_status, /* set_status */ + fileio_get_async_count, /* get_count */ + fileio_call_completion_func /* call_completion */ +}; + +typedef struct async_fileio +{ + struct async_private async; + LPOVERLAPPED lpOverlapped; + LPOVERLAPPED_COMPLETION_ROUTINE completion_func; + char *buffer; + int count; +} async_fileio; + +static DWORD fileio_get_async_status (const struct async_private *ovp) +{ + return ((async_fileio*) ovp)->lpOverlapped->Internal; +} + +static void fileio_set_async_status (async_private *ovp, const DWORD status) +{ + ((async_fileio*) ovp)->lpOverlapped->Internal = status; +} + +static DWORD fileio_get_async_count (const struct async_private *ovp) +{ + async_fileio *fileio = (async_fileio*) ovp; + DWORD ret = fileio->count - fileio->lpOverlapped->InternalHigh; + return (ret < 0 ? 0 : ret); +} + +static void CALLBACK fileio_call_completion_func (ULONG_PTR data) +{ + async_fileio *ovp = (async_fileio*) data; + TRACE ("data: %p\n", ovp); + + if (ovp->completion_func) + ovp->completion_func(ovp->lpOverlapped->Internal, + ovp->lpOverlapped->InternalHigh, + ovp->lpOverlapped); + + HeapFree(GetProcessHeap(), 0, ovp); +} + +/***********************************************************************/ + #if defined(MAP_ANONYMOUS) && !defined(MAP_ANON) #define MAP_ANON MAP_ANONYMOUS #endif @@ -1344,30 +1403,6 @@ return (r==WAIT_OBJECT_0); } - -/*********************************************************************** - * FILE_StartAsync (INTERNAL) - * - * type==ASYNC_TYPE_NONE means cancel the indicated overlapped operation - * lpOverlapped==NULL means all overlappeds match - */ -BOOL FILE_StartAsync(HANDLE hFile, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status) -{ - BOOL ret; - SERVER_START_REQ(register_async) - { - req->handle = hFile; - req->overlapped = lpOverlapped; - req->type = type; - req->count = count; - req->func = check_async_list; - req->status = status; - ret = wine_server_call( req ); - } - SERVER_END_REQ; - return !ret; -} - /*********************************************************************** * CancelIo (KERNEL32.@) */ @@ -1377,16 +1412,25 @@ TRACE("handle = %x\n",handle); - ovp = NtCurrentTeb()->pending_list; - while(ovp) + for (ovp = NtCurrentTeb()->pending_list; ovp; ovp = t) { t = ovp->next; - if(FILE_StartAsync(handle, ovp->lpOverlapped, ovp->type, 0, STATUS_CANCELLED)) + if (ovp->handle != handle) continue; + + SERVER_START_REQ ( cancel_async ) { - TRACE("overlapped = %p\n",ovp->lpOverlapped); - finish_async(ovp, STATUS_CANCELLED); + req->handle = handle; + req->type = ovp->type; + req->overlapped = ovp; + wine_server_call ( req ); + if (reply->cancelled) + { + TRACE ("cancelling request: %p\n", ovp); + ovp->ops->set_status ( ovp, STATUS_CANCELLED ); + finish_async (ovp); + } } - ovp = t; + SERVER_END_REQ; } WaitForMultipleObjectsEx(0,NULL,FALSE,1,TRUE); return TRUE; @@ -1400,18 +1444,19 @@ */ static void FILE_AsyncReadService(async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio*) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("%p %p\n", lpOverlapped, ovp->buffer ); + TRACE("%p %p\n", lpOverlapped, fileio->buffer ); /* check to see if the data is ready (non-blocking) */ - result = pread (ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pread (ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = read (ovp->fd, &ovp->buffer[already], ovp->count - already); + result = read (ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1429,9 +1474,9 @@ } lpOverlapped->InternalHigh += result; - TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("read %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1448,7 +1493,7 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; int fd; TRACE("file %d to buf %p num %ld %p func %p\n", @@ -1468,7 +1513,7 @@ return FALSE; } - ovp = (async_private *) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); @@ -1476,31 +1521,19 @@ close(fd); return FALSE; } - ovp->event = hEvent; + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = fd; + ovp->async.type = ASYNC_TYPE_READ; + ovp->async.func = FILE_AsyncReadService; + ovp->async.event = hEvent; ovp->lpOverlapped = overlapped; ovp->count = bytesToRead; ovp->completion_func = lpCompletionRoutine; - ovp->func = FILE_AsyncReadService; ovp->buffer = buffer; - ovp->fd = fd; - ovp->type = ASYNC_TYPE_READ; - ovp->handle = hFile; - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - - if ( !FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_READ, bytesToRead, STATUS_PENDING) ) - { - /* FIXME: remove async_private and release memory */ - ERR("FILE_StartAsync failed\n"); - return FALSE; - } - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1510,7 +1543,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_ReadFileEx(hFile,buffer,bytesToRead,overlapped,lpCompletionRoutine, INVALID_HANDLE_VALUE); } @@ -1588,7 +1620,6 @@ } /* at last resort, do an overlapped read */ - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = result; if(!FILE_ReadFileEx(hFile, buffer, bytesToRead, overlapped, NULL, overlapped->hEvent)) @@ -1646,18 +1677,19 @@ */ static void FILE_AsyncWriteService(struct async_private *ovp) { - LPOVERLAPPED lpOverlapped = ovp->lpOverlapped; + async_fileio *fileio = (async_fileio *) ovp; + LPOVERLAPPED lpOverlapped = fileio->lpOverlapped; int result, r; int already = lpOverlapped->InternalHigh; - TRACE("(%p %p)\n",lpOverlapped,ovp->buffer); + TRACE("(%p %p)\n",lpOverlapped,fileio->buffer); /* write some data (non-blocking) */ - result = pwrite(ovp->fd, &ovp->buffer[already], ovp->count - already, + result = pwrite(ovp->fd, &fileio->buffer[already], fileio->count - already, OVERLAPPED_OFFSET (lpOverlapped) + already); if ((result < 0) && (errno == ESPIPE)) - result = write(ovp->fd, &ovp->buffer[already], ovp->count - already); + result = write(ovp->fd, &fileio->buffer[already], fileio->count - already); if ( (result<0) && ((errno == EAGAIN) || (errno == EINTR))) { @@ -1674,9 +1706,9 @@ lpOverlapped->InternalHigh += result; - TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,ovp->count); + TRACE("wrote %d more bytes %ld/%d so far\n",result,lpOverlapped->InternalHigh,fileio->count); - if(lpOverlapped->InternalHigh < ovp->count) + if(lpOverlapped->InternalHigh < fileio->count) r = STATUS_PENDING; else r = STATUS_SUCCESS; @@ -1693,7 +1725,8 @@ LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, HANDLE hEvent) { - async_private *ovp; + async_fileio *ovp; + int fd; TRACE("file %d to buf %p num %ld %p func %p stub\n", hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine); @@ -1704,46 +1737,34 @@ return FALSE; } - overlapped->Internal = STATUS_PENDING; - overlapped->InternalHigh = 0; - - if (!FILE_StartAsync(hFile, overlapped, ASYNC_TYPE_WRITE, bytesToWrite, STATUS_PENDING )) + fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + if ( fd < 0 ) { - TRACE("FILE_StartAsync failed\n"); + TRACE( "Couldn't get FD\n" ); return FALSE; } - ovp = (async_private*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_private)); + ovp = (async_fileio*) HeapAlloc(GetProcessHeap(), 0, sizeof (async_fileio)); if(!ovp) { TRACE("HeapAlloc Failed\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); + close (fd); return FALSE; } + + ovp->async.ops = &fileio_async_ops; + ovp->async.handle = hFile; + ovp->async.fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); + ovp->async.type = ASYNC_TYPE_WRITE; + ovp->async.func = FILE_AsyncWriteService; ovp->lpOverlapped = overlapped; - ovp->event = hEvent; - ovp->func = FILE_AsyncWriteService; + ovp->async.event = hEvent; ovp->buffer = (LPVOID) buffer; ovp->count = bytesToWrite; ovp->completion_func = lpCompletionRoutine; - ovp->fd = FILE_GetUnixHandle( hFile, GENERIC_WRITE ); - ovp->type = ASYNC_TYPE_WRITE; - ovp->handle = hFile; - if(ovp->fd <0) - { - HeapFree(GetProcessHeap(), 0, ovp); - return FALSE; - } - - /* hook this overlap into the pending async operation list */ - ovp->next = NtCurrentTeb()->pending_list; - ovp->prev = NULL; - if(ovp->next) - ovp->next->prev = ovp; - NtCurrentTeb()->pending_list = ovp; - - return TRUE; + return !register_new_async (&ovp->async); } /*********************************************************************** @@ -1753,7 +1774,6 @@ LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { - overlapped->Internal = STATUS_PENDING; overlapped->InternalHigh = 0; return FILE_WriteFileEx(hFile, buffer, bytesToWrite, overlapped, lpCompletionRoutine, INVALID_HANDLE_VALUE); diff -ruNX diffignore CVS/wine/include/async.h MW/wine/include/async.h --- CVS/wine/include/async.h Thu Jan 1 01:00:00 1970 +++ MW/wine/include/async.h Wed Apr 3 15:41:18 2002 @@ -0,0 +1,143 @@ +/* + * Structures and static functions for handling asynchronous I/O. + * + * Copyright (C) 2002 Mike McCormack, Martin Wilck + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * This file declares static functions. + * It should only be included by those source files that implement async I/O requests. + */ + +#ifndef __WINE_ASYNC_H +#define __WINE_ASYNC_H + +struct async_private; + +typedef void (*async_handler)(struct async_private *ovp); +typedef void CALLBACK (*async_call_completion_func)(ULONG_PTR data); +typedef DWORD (*async_get_status)(const struct async_private *ovp); +typedef DWORD (*async_get_count)(const struct async_private *ovp); +typedef void (*async_set_status)(struct async_private *ovp, const DWORD status); + +typedef struct async_ops +{ + async_get_status get_status; + async_set_status set_status; + async_get_count get_count; + async_call_completion_func call_completion; +} async_ops; + +typedef struct async_private +{ + struct async_ops *ops; + HANDLE handle; + HANDLE event; + int fd; + async_handler func; + int type; + struct async_private *next; + struct async_private *prev; +} async_private; + +/* 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) + ovp->prev->next = ovp->next; + else + NtCurrentTeb()->pending_list = ovp->next; + + if(ovp->next) + ovp->next->prev = ovp->prev; + + ovp->next = ovp->prev = NULL; + + close( ovp->fd ); + if( ovp->event!=INVALID_HANDLE_VALUE ) + NtSetEvent( ovp->event, NULL ); + + QueueUserAPC( ovp->ops->call_completion, GetCurrentThread(), (ULONG_PTR)ovp ); +} + +inline static BOOL __register_async( async_private *ovp, const DWORD status ) +{ + BOOL ret; + + SERVER_START_REQ( register_async ) + { + req->handle = ovp->handle; + 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 ); + } + SERVER_END_REQ; + + if ( ret ) ovp->ops->set_status ( ovp, GetLastError() ); + if ( ovp->ops->get_status (ovp) != STATUS_PENDING ) + finish_async (ovp); + + return ret; +} + +#define register_old_async(ovp) \ + __register_async (ovp, ovp->ops->get_status( ovp )); + +inline static BOOL register_new_async( async_private *ovp ) +{ + const DWORD status = STATUS_PENDING; + + ovp->ops->set_status (ovp, status); + + ovp->next = NtCurrentTeb()->pending_list; + ovp->prev = NULL; + if (ovp->next) ovp->next->prev = ovp; + 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 diffignore CVS/wine/include/file.h MW/wine/include/file.h --- CVS/wine/include/file.h Tue Apr 2 15:39:33 2002 +++ MW/wine/include/file.h Wed Apr 3 13:07:35 2002 @@ -46,27 +46,6 @@ int flags; } DOS_DEVICE; -/* overlapped private structure */ -struct async_private; -typedef void (*async_handler)(struct async_private *ovp); -typedef struct async_private -{ - LPOVERLAPPED lpOverlapped; - HANDLE handle; - HANDLE event; - int fd; - char *buffer; - async_handler func; - int count; - int type; - LPOVERLAPPED_COMPLETION_ROUTINE completion_func; - struct async_private *next; - struct async_private *prev; -} async_private; - -extern void WINAPI check_async_list(LPOVERLAPPED ov, DWORD status); -extern void finish_async(struct async_private *ovp, DWORD status); - /* locale-independent case conversion */ inline static char FILE_tolower( char c ) { @@ -99,7 +78,6 @@ DWORD attributes, HANDLE template, BOOL fail_read_only, UINT drive_type ); extern HANDLE FILE_CreateDevice( int client_id, DWORD access, LPSECURITY_ATTRIBUTES sa ); -extern BOOL FILE_StartAsync(HANDLE handle, LPOVERLAPPED lpOverlapped, DWORD type, DWORD count, DWORD status); extern LONG WINAPI WIN16_hread(HFILE16,SEGPTR,LONG); diff -ruNX diffignore CVS/wine/scheduler/synchro.c MW/wine/scheduler/synchro.c --- CVS/wine/scheduler/synchro.c Tue Apr 2 15:39:41 2002 +++ MW/wine/scheduler/synchro.c Wed Apr 3 16:01:36 2002 @@ -50,77 +50,6 @@ } } -static void CALLBACK call_completion_routine(ULONG_PTR data) -{ - async_private* ovp = (async_private*)data; - - ovp->completion_func(ovp->lpOverlapped->Internal, - ovp->lpOverlapped->InternalHigh, - ovp->lpOverlapped); - ovp->completion_func=NULL; - HeapFree(GetProcessHeap(), 0, ovp); -} - -void finish_async(async_private *ovp, DWORD status) -{ - ovp->lpOverlapped->Internal=status; - - /* call ReadFileEx/WriteFileEx's overlapped completion function */ - if(ovp->completion_func) - { - QueueUserAPC(call_completion_routine,GetCurrentThread(),(ULONG_PTR)ovp); - } - - /* remove it from the active list */ - if(ovp->prev) - ovp->prev->next = ovp->next; - else - NtCurrentTeb()->pending_list = ovp->next; - - if(ovp->next) - ovp->next->prev = ovp->prev; - - ovp->next=NULL; - ovp->prev=NULL; - - close(ovp->fd); - if(ovp->event!=INVALID_HANDLE_VALUE) - NtSetEvent(ovp->event,NULL); - if(!ovp->completion_func) HeapFree(GetProcessHeap(), 0, ovp); -} - -/*********************************************************************** - * check_async_list - * - * Process a status event from the server. - */ -void WINAPI check_async_list(LPOVERLAPPED overlapped, DWORD status) -{ - async_private *ovp; - - /* fprintf(stderr,"overlapped %p status %x\n",overlapped,status); */ - - for(ovp = NtCurrentTeb()->pending_list; ovp; ovp = ovp->next) - if(ovp->lpOverlapped == overlapped) - break; - - if(!ovp) - return; - - if(status != STATUS_ALERTED) - ovp->lpOverlapped->Internal = status; - - if(ovp->lpOverlapped->Internal==STATUS_PENDING) - { - ovp->func(ovp); - FILE_StartAsync(ovp->handle, ovp->lpOverlapped, ovp->type, 0, ovp->lpOverlapped->Internal); - } - - if(ovp->lpOverlapped->Internal!=STATUS_PENDING) - finish_async(ovp,ovp->lpOverlapped->Internal); -} - - /*********************************************************************** * wait_reply * diff -ruNX diffignore CVS/wine/server/async.c MW/wine/server/async.c --- CVS/wine/server/async.c Tue Apr 2 15:39:41 2002 +++ MW/wine/server/async.c Tue Apr 2 17:17:00 2002 @@ -190,3 +190,28 @@ release_object(obj); } +DECL_HANDLER(cancel_async) +{ + struct object *obj; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL)) ) + return; + + if(obj->ops->queue_async) + { + struct async_queue *q = obj->ops->queue_async(obj, NULL, req->type, 0); + struct async *async; + + async = find_async(q, current, req->overlapped); + if (async) + { + destroy_async(async); + reply->cancelled = 1; + set_select_events(obj,obj->ops->get_poll_events(obj)); + } + else reply->cancelled = 0; + } + + release_object(obj); +} + diff -ruNX diffignore CVS/wine/server/protocol.def MW/wine/server/protocol.def --- CVS/wine/server/protocol.def Tue Apr 2 15:39:41 2002 +++ MW/wine/server/protocol.def Tue Apr 2 17:17:00 2002 @@ -1615,7 +1615,7 @@ #define SERIALINFO_SET_ERROR 0x04 -/* Create/Destroy an async I/O */ +/* Create / reschedule an async I/O */ @REQ(register_async) handle_t handle; /* handle to comm port, socket or file */ void* func; @@ -1629,6 +1629,14 @@ #define ASYNC_TYPE_WRITE 0x02 #define ASYNC_TYPE_WAIT 0x03 +/* Cancel an async I/O */ +@REQ(cancel_async) + handle_t handle; + int type; + void* overlapped; +@REPLY + int cancelled; +@END /* Create a named pipe */ @REQ(create_named_pipe) diff -ruNX diffignore CVS/wine/server/request.h MW/wine/server/request.h --- CVS/wine/server/request.h Tue Apr 2 15:39:41 2002 +++ MW/wine/server/request.h Wed Apr 3 13:06:02 2002 @@ -228,6 +228,7 @@ DECL_HANDLER(get_serial_info); DECL_HANDLER(set_serial_info); DECL_HANDLER(register_async); +DECL_HANDLER(cancel_async); DECL_HANDLER(create_named_pipe); DECL_HANDLER(open_named_pipe); DECL_HANDLER(connect_named_pipe); @@ -388,6 +389,7 @@ (req_handler)req_get_serial_info, (req_handler)req_set_serial_info, (req_handler)req_register_async, + (req_handler)req_cancel_async, (req_handler)req_create_named_pipe, (req_handler)req_open_named_pipe, (req_handler)req_connect_named_pipe, diff -ruNX diffignore CVS/wine/server/trace.c MW/wine/server/trace.c --- CVS/wine/server/trace.c Tue Apr 2 15:39:42 2002 +++ MW/wine/server/trace.c Wed Apr 3 13:06:02 2002 @@ -1853,6 +1853,18 @@ fprintf( stderr, " status=%08x", req->status ); } +static void dump_cancel_async_request( const struct cancel_async_request *req ) +{ + fprintf( stderr, " handle=%d,", req->handle ); + fprintf( stderr, " type=%d,", req->type ); + fprintf( stderr, " overlapped=%p", req->overlapped ); +} + +static void dump_cancel_async_reply( const struct cancel_async_reply *req ) +{ + fprintf( stderr, " cancelled=%d", req->cancelled ); +} + static void dump_create_named_pipe_request( const struct create_named_pipe_request *req ) { fprintf( stderr, " openmode=%08x,", req->openmode ); @@ -2292,6 +2304,7 @@ (dump_func)dump_get_serial_info_request, (dump_func)dump_set_serial_info_request, (dump_func)dump_register_async_request, + (dump_func)dump_cancel_async_request, (dump_func)dump_create_named_pipe_request, (dump_func)dump_open_named_pipe_request, (dump_func)dump_connect_named_pipe_request, @@ -2449,6 +2462,7 @@ (dump_func)dump_get_serial_info_reply, (dump_func)0, (dump_func)0, + (dump_func)dump_cancel_async_reply, (dump_func)dump_create_named_pipe_reply, (dump_func)dump_open_named_pipe_reply, (dump_func)0, @@ -2606,6 +2620,7 @@ "get_serial_info", "set_serial_info", "register_async", + "cancel_async", "create_named_pipe", "open_named_pipe", "connect_named_pipe",

1 0

Unicode, i18n support
by Francois Gouget 03 Apr '02

03 Apr '02

Bug 98 - Unicode, i18n support is quite vague. How could I flesh it out? For instance I am thinking that we could convert this into a metabug and have one sub bug for each control that still needs to be unicodified. So: * which are the common controls that still need to be unicodified? * are there other controls that need to be unicodified * do common dialogs need work? As usual the goal is to make the individual tasks more visible so as to give inspiration to potential contributors, and so that we have a better idea of our progress and what remains to be done. Another issue, which would fall more in the i18n part is BiDi support. What is the scope of this? Does it require modifications of all the controls like unicode? http://www.winehq.com/hypermail/wine-devel/2002/03/0236.html Shachar, it sounds like you started working on this, should I say so when I create a bugzilla task for this? Even better, can I assign the task to you? (it can always be reassigned later, it's just a more flexible way of doing things). -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Broadcast message : fin du monde dans cinq minutes, repentez vous !

5 15

RE: IE6ALL.zip
by Richard Vout 03 Apr '02

03 Apr '02

I could use this also. Is it likely I will be able to get it to work with the windows integrated security? I use a proxy server here which is integrated into a Windows NT Domain. I have managed to get smbclient to map to drives but I can't join the two. Personally I'd rather avoid the native DLL's if possible. Thanks, Richard. -----Original Message----- From: Sylvain Petreolle [mailto:spetreolle@yahoo.fr] Sent: 02 April 2002 22:55 To: Lonnie Cumberland; wine-devel(a)winehq.com Subject: Re: IE6ALL.zip For me I installed IE6 with a few native DLLs. But sometimes Web sites are opening into a loop. They just appear as entirely loaded, but continue to download things and end with unknown error as said by IE. Even problems appear in 'About' box... What do you need IE6 for ? --- Lonnie Cumberland <lonnie(a)outstep.com> a écrit : > Hello All, > > I have been trying to get the ie6 setup to run but > keep running into > many functions that do not seem to be implemented > yet. > > Has anyone gotten IE6 installed under wine? If so > then is there some > where that I can just download the installed > directories and unpack > them in my wine-c structure? > > Thanks, > Lonnie > > -- > Lonnie Cumberland > OutStep Technologies Incorporated > EMAIL: Lonnie(a)OutStep.com > : Lonnie_Cumberland(a)yahoo.com > > The Basis Express Virtual Office > & > Data Backup and Recovery Services > > URL: http://www.basis-express.com > > "The Virtual Office without boundaries!!!" > > > > > ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

1 0

warn:wave:OSS_OpenDevice Another thread is trying to access audio...
by Jan Dvorak 03 Apr '02

03 Apr '02

Hi, attached patch fixes counter-strike/multiplayer halflife for latest wine snapshots & CVS. It's probably not the Right Way (TM) but it works for me, and it seems that it doesn't broke anything. Jan Dvorak

2 2

wine/debugger/stabs.c patch breaks FreeBSD
by Gerald Pfeifer 03 Apr '02

03 Apr '02

The following patch to wine/debugger/stabs.c breaks FreeBSD: revision 1.45 date: 2002/04/02 02:38:37; author: julliard; state: Exp; lines: +2 -0 Check ELF signature before processing file. stabs.c: In function `DEBUG_ProcessElfFile': stabs.c:1232: `ELFMAG' undeclared (first use in this function) stabs.c:1232: (Each undeclared identifier is reported only once stabs.c:1232: for each function it appears in.) stabs.c:1232: `SELFMAG' undeclared (first use in this function) In /usr/include/sys/elf_common FreeBSD has /* Values for the magic number bytes. */ #define ELFMAG0 0x7f #define ELFMAG1 'E' #define ELFMAG2 'L' #define ELFMAG3 'F' but not ELFMAG and nothing similiar to SELFMAG. Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/

2 3

[PATCH] NtQueryInformationProcess & ProcessDebugPort
by Laurent Pinchart 03 Apr '02

03 Apr '02

Hi, Here's a small patch which implements NtQueryInformationProcess properly for ProcessInformationClass set to ProcessDebugPort. It fixes cases when ProcessInformationLength != 4, but doesn't check if a debugger is present or not. Should it ? I don't expect that anyone would like to run Visual Studio on Wine to debug a Win32 program :-) Laurent Pinchart

3 4

ExitProcess crashes apps
by 520007368975-0001＠t-online.de 03 Apr '02

03 Apr '02

Hi After just compiling and installing current cvs wine I get an unhandled exception every time an app closes. The culprit seems to be somewhere in kernel32.ExitProcess: Here is the relay output of the uninstaller that comes with wine (last 50 lines) Enrico farmboy1(a)subdimension.com 08070840:Ret x11drv.SelectPen() retval=000000e6 ret=4070c3e1 08070840:Call x11drv.SelectBrush(403b44b0,0000075a) ret=4070c3b2 08070840:Ret x11drv.SelectBrush() retval=0000075a ret=4070c3b2 08070840:Call x11drv.SelectPen(403b44b0,0000008a) ret=4070c3e1 08070840:Ret x11drv.SelectPen() retval=0000008a ret=4070c3e1 08070840:Call x11drv.SelectBrush(403b44b0,0000006e) ret=4070c3b2 08070840:Ret x11drv.SelectBrush() retval=0000006e ret=4070c3b2 08070840:Call x11drv.SetDeviceClipping(403b44b0) ret=406fecee 08070840:Ret x11drv.SetDeviceClipping() retval=00000000 ret=406fecee 08070840:Call x11drv.SelectBrush(403b44b0,0000006e) ret=4070c3b2 08070840:Ret x11drv.SelectBrush() retval=0000006e ret=4070c3b2 08070840:Call x11drv.GetDeviceCaps(403b44b0,00000022) ret=407019ed 08070840:Ret x11drv.GetDeviceCaps() retval=000079f7 ret=407019ed 08070840:Call x11drv.SelectFont(403b44b0,000000a2) ret=4070c24c 08070840:Ret x11drv.SelectFont() retval=00000001 ret=4070c24c 08070840:Call x11drv.SelectPen(403b44b0,0000008a) ret=4070c3e1 08070840:Ret x11drv.SelectPen() retval=0000008a ret=4070c3e1 08070840:Call x11drv.SetBkColor(403b44b0,00ffffff) ret=40701a8a 08070840:Ret x11drv.SetBkColor() retval=00ffffff ret=40701a8a 08070840:Call x11drv.SetTextColor(403b44b0,00000000) ret=40701b3a 08070840:Ret x11drv.SetTextColor() retval=00000000 ret=40701b3a 08070840:Ret window proc 0x405e96f4 (hwnd=00010025,msg=BM_SETSTATE,wp=00000000,lp=00000000) retval=00000000 08070840:Call window proc 0x405e96f4 (hwnd=00010025,msg=WM_CAPTURECHANGED,wp=00000000,lp=00000000) 08070840:Ret window proc 0x405e96f4 (hwnd=00010025,msg=WM_CAPTURECHANGED,wp=00000000,lp=00000000) retval=00000000 08070840:Call window proc 0x4001c7f8 (hwnd=00010021,msg=WM_COMMAND,wp=00000002,lp=00010025) 08070840:Call user32.PostQuitMessage(00000000) ret=4001ce19 08070840:Ret user32.PostQuitMessage() retval=00000001 ret=4001ce19 08070840:Ret window proc 0x4001c7f8 (hwnd=00010021,msg=WM_COMMAND,wp=00000002,lp=00010025) retval=00000000 08070840:Ret window proc 0x405e96f4 (hwnd=00010025,msg=WM_LBUTTONUP,wp=00000000,lp=000a0057) retval=00000000 08070840:Ret user32.DispatchMessageA() retval=00000000 ret=4001c311 08070840:Call user32.GetMessageA(40586e18,00000000,00000000,00000000) ret=4001c31d 08070840:Call x11drv.MsgWaitForMultipleObjectsEx(00000000,00000000,00000000,00000000,00000000) ret=405deb9a 08070840:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000102 ret=405deb9a 08070840:Ret user32.GetMessageA() retval=00000000 ret=4001c31d 08070840:Call kernel32.ExitProcess(00000000) ret=4001b07c 08070840:Call PE DLL (proc=0x405e5140,module=405c5000,type=0,res=0x1) 08070840:Ret PE DLL (proc=0x405e5140,module=405c5000,type=0,res=0x1) retval=1 08070840:Call PE DLL (proc=0x40829860,module=4081e000,type=0,res=0x1) 080a9e40:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000001 ret=405deec9 080a9e40:Call x11drv.MsgWaitForMultipleObjectsEx(00000000,00000000,00000000,00000000,00000000) ret=405deb9a 080a9e40:Ret x11drv.MsgWaitForMultipleObjectsEx() retval=00000102 ret=405deb9a 080a9e40:Call x11drv.MsgWaitForMultipleObjectsEx(00000001,403b3070,ffffffff,00000000,00000000) ret=405deec9 08070840:Ret PE DLL (proc=0x40829860,module=4081e000,type=0,res=0x1) retval=1 08070840:Call PE DLL (proc=0x406ee894,module=406e1000,type=0,res=0x1) 08070840:Ret PE DLL (proc=0x406ee894,module=406e1000,type=0,res=0x1) retval=1 08070840:Call PE DLL (proc=0x407749e0,module=40764000,type=0,res=0x1) 08070840:Ret PE DLL (proc=0x407749e0,module=40764000,type=0,res=0x1) retval=1 wine: Unhandled exception, starting debugger... err:win:WIN_FindWndPtr window 10021 belongs to other process err:win:WIN_FindWndPtr window 10021 belongs to other process

2 1

Re: error: no implementation for WININET.dll.102(InternetGetConnectedState)
by Jason M Bell 03 Apr '02

03 Apr '02

okay - Alexandre's solution did it. After turning on --debugmsg +loaddll, I noticed that wininet.dll was being loaded from "c:\windows\system". I'm running wine from a UNIX partition. adding "wininet" = "builtin, native" to config fixed the problem. thanks, Jason

4 5

Race condition in TemrinateThread
by Geoffrey Hausheer 03 Apr '02

03 Apr '02

I've discovered a race condition in TerminateThread. Basically, if a thread is terminated before it has fully started, than the thread leaves a wine process around when the process exits. I wouldn't have figured this out if it weren't for the OpenThread code which was just added (it slowed down my test enough that with '--winver win2000' the thread was able to start, whereas with '--winver win98' it couldn't (due to testing OpenThread before calling TerminateThread when in win2k mode). It should be duplicatable by simply calling thread=CreateThread(); TerminateThread(thread,0); with no wait between them. Anyhow, I really have no idea how to locate this, but I'd be happy to try if someone can give me a hand. Thanks, .Geoff

1 0

Re: MaskBlt function almost working
by Lonnie Cumberland 03 Apr '02

03 Apr '02

Hello All, I just found out that the Maskblt code that I submitted earlier is free to use, but there is still a little problem with it and I am not sure how to fix it. Cheers, Lonnie > -----BEGIN PGP SIGNED MESSAGE----- > > Moin, > > On 02-Apr-02 Tels carved into stone: >> -----BEGIN PGP SIGNED MESSAGE----- >> >> Moin, >> >> On 02-Apr-02 Dimitrie O. Paun carved into stone: >>> On April 2, 2002 12:48 pm, Lonnie Cumberland wrote: >>>> Hello All, >>> [...] >>>> By the way, I found this function at: >>>> >>>> http://www.codeproject.com/bitmap/maskblt.asp >>>> >>>> and modified it to work with wine. >>> >>> What about the license? Is it LGPL compatible? >> >> I have searched the entire site and I couldn't find a single bit >> about the >> licence that submitted (or otherwise available code at that >> site) falls under. It is heavy MS-centric, so I guess it is not >> very /L?GPL/ friendly. >> >> Best bet would probably be to send them an email and ask ;) > > Ah, I overread this in the FAQ: > >>If you post to CodeProject then you retain copyright of your >>article and code. You also give CodeProject permission to use it >>in a fair manner and also permit all developers to freely use the >>code in their own >>applications. >> >>Note that we do not accept time limited or shareware >>contributions: All code that is available from our site must be >>available for use for free. > > IANLSBIPAH (I am no Licence specialist, but I play one at home) > so somebody else could chime in and tell us if that is > "compatible". Also aksing the original author nonetheless because > it is kind and friendly wouldn#t hurt, either. > > Cheers, > > Tels > > - -- > "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"' > widespreadedly synthesize second-generation markets > > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v1.0.6 (GNU/Linux) > Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir > cevinpl. > > iQEVAwUBPKoBpHcLPEOTuEwVAQEhKgf+OyAxJsidtYoY9O+5r7OjYK9RcKFVF8ED > SiwlbJsohA7Ip681sFovCrcixli/11LuImHSbHCBhgunocq/fAmsSUbhR7gYcd0F > irzaDbRFFHvVUadLBdCecDeaI4FBKK22+dW7zl2uiShfQMb+BgkAsWtOmwBBRLlW > 2qaStWbbNXL+XbHal/m9qGlQ+G4zHOpd7mz0li8B/NMWdbmIv5pFYP2Fs+hKE5t4 > 1546AShXiFyj36cdB9iB71BK2nmYtiECB0b4G7HhR8foT7JDfIZUxP+0LrC14pfh > ITOczNEbZzaVs+lIg3tSdM6nymzaCHHIQWsxXMbtgJwbDd4RJcoxFA== > =FMIm > -----END PGP SIGNATURE----- -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

1 0

Where is "cprof"
by Luca Fini 02 Apr '02

02 Apr '02

I've seen that the Wine development team has also developed a profiler for multi-threaded programs. I'd be very interested in using it to profile an application which I'm developing (with no connection with wine itlself). Unfortunately the site which is suppose to be the cprof home is at Corel, which I understand is no longer in business. Where can I found a workable version of cprof? Many thanks for any reoply. l.f. -- -------------------------------------------------------------------------- -- ) Luca Fini Tel: +39 055 2752 307 ___ |\ Osservatorio Astrofisico di Arcetri Fax: +39 055 2752 292 / | | |-_ L.go E.Fermi, 5 +----------------------------------------- (___|___//___) 50125 Firenze / WWW: http://www.arcetri.astro.it/~lfini (_) (_) Italia / e-mail: lfini(a)arcetri.astro.it -----------------------------+--------------------------------------------

2 1

create process test (for review)
by Eric Pouech 02 Apr '02

02 Apr '02

as already discussed a bit, here's a first shot at testing CreateProcess patch is made of two parts: - extension to existing C test framework to pass argc/argv to any test function - the test itself any comments are welcome A+ Name: test_arg ChangeLog: now C tests are able to access argc/argv as passed to the program License: X11 GenDate: 2002/04/01 15:49:15 UTC ModifiedFiles: programs/winetest/wtmain.c include/wine/test.h AddedFiles: =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/programs/winetest/wtmain.c,v retrieving revision 1.4 diff -u -u -r1.4 wtmain.c --- programs/winetest/wtmain.c 29 Mar 2002 18:05:17 -0000 1.4 +++ programs/winetest/wtmain.c 30 Mar 2002 06:55:02 -0000 @@ -31,6 +31,10 @@ /* current platform */ const char *winetest_platform = "windows"; +/* passing arguments around */ +static int winetest_argc; +static char** winetest_argv; + struct test { const char *name; @@ -153,6 +157,12 @@ todo_level--; } +int winetest_get_mainargs( char*** pargv ) +{ + *pargv = winetest_argv; + return winetest_argc; +} + /* Find a test by name */ static const struct test *find_test( const char *name ) { @@ -205,6 +215,9 @@ int main( int argc, char **argv ) { char *p; + + winetest_argc = argc; + winetest_argv = argv; if ((p = getenv( "WINETEST_PLATFORM" ))) winetest_platform = p; if ((p = getenv( "WINETEST_DEBUG" ))) winetest_debug = atoi(p); Index: include/wine/test.h =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/include/wine/test.h,v retrieving revision 1.3 diff -u -u -r1.3 test.h --- include/wine/test.h 22 Mar 2002 00:58:00 -0000 1.3 +++ include/wine/test.h 30 Mar 2002 06:50:53 -0000 @@ -38,6 +38,7 @@ extern void winetest_start_todo( const char* platform ); extern int winetest_loop_todo(void); extern void winetest_end_todo( const char* platform ); +extern int winetest_get_mainargs( char*** pargv ); #define START_TEST(name) void func_##name(void) Name: test_cp ChangeLog: added a framework for testing CreateProcess and a few tests License: X11 GenDate: 2002/04/01 16:32:58 UTC ModifiedFiles: dlls/kernel/Makefile.in dlls/kernel/tests/.cvsignore AddedFiles: dlls/kernel/tests/process.c =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/dlls/kernel/Makefile.in,v retrieving revision 1.29 diff -u -u -r1.29 Makefile.in --- dlls/kernel/Makefile.in 27 Mar 2002 21:03:50 -0000 1.29 +++ dlls/kernel/Makefile.in 28 Mar 2002 06:27:06 -0000 @@ -41,7 +41,8 @@ CTESTS = \ tests/alloc.c \ - tests/directory.c + tests/directory.c \ + tests/process.c PLTESTS = \ tests/atom.pl Index: dlls/kernel/tests/.cvsignore =================================================================== RCS file: /home/cvs/cvsroot/wine/wine/dlls/kernel/tests/.cvsignore,v retrieving revision 1.3 diff -u -u -r1.3 .cvsignore --- dlls/kernel/tests/.cvsignore 27 Mar 2002 21:18:02 -0000 1.3 +++ dlls/kernel/tests/.cvsignore 28 Mar 2002 06:27:19 -0000 @@ -2,4 +2,5 @@ atom.ok directory.ok kernel32_test.spec.c +process.ok testlist.c --- /dev/null Thu Jan 1 01:00:00 1970 +++ dlls/kernel/tests/process.c Mon Apr 1 18:32:36 2002 @@ -0,0 +1,732 @@ +/* + * Unit test suite for CreateProcess function. + * + * Copyright 2002 Eric Pouech + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include "winbase.h" +#include "winuser.h" +#include "wine/test.h" + +static char base[MAX_PATH]; +static char selfname[MAX_PATH]; +static char resfile[MAX_PATH]; + +static int myARGC; +static char** myARGV; + +/* ---------------- portable memory allocation thingie */ + +static char memory[16384]; +static char* memory_index = memory; + +static char* grab_memory(size_t len) +{ + char* ret = memory_index; + /* align on dword */ + len = (len + 3) & ~3; + memory_index += len; + assert(memory_index <= memory + sizeof(memory)); + return ret; +} + +static void release_memory(void) +{ + memory_index = memory; +} + +/* ---------------- simplistic tool to encode/decode strings (to hide \ " ' and such) */ + +static char* encodeA(const char* str) +{ + size_t len; + char* ptr; + int i; + + if (!str) return ""; + len = strlen(str) + 1; + ptr = grab_memory(len * 2 + 1); + for (i = 0; i < len; i++) + sprintf(&ptr[i * 2], "%02x", (unsigned char)str[i]); + ptr[2 * len] = '\0'; + return ptr; +} + +static char* encodeW(const WCHAR* str) +{ + size_t len; + char* ptr; + int i; + + if (!str) return ""; + len = lstrlenW(str) + 1; + ptr = grab_memory(len * 4 + 1); + assert(ptr); + for (i = 0; i < len; i++) + sprintf(&ptr[i * 4], "%04x", (unsigned int)(unsigned short)str[i]); + ptr[4 * len] = '\0'; + return ptr; +} + +static unsigned decode_char(char c) +{ + if (c >= '0' && c <= '9') return c - '0'; + if (c >= 'a' && c <= 'f') return c - 'a' + 10; + assert(c >= 'A' && c <= 'F'); + return c - 'A' + 10; +} + +static char* decodeA(const char* str) +{ + size_t len; + char* ptr; + int i; + + len = strlen(str) / 2; + if (!len--) return NULL; + ptr = grab_memory(len + 1); + for (i = 0; i < len; i++) + ptr[i] = (decode_char(str[2 * i]) << 4) | decode_char(str[2 * i + 1]); + ptr[len] = '\0'; + return ptr; +} + +static WCHAR* decodeW(const char* str) +{ + size_t len; + WCHAR* ptr; + int i; + + len = strlen(str) / 4; + if (!len--) return NULL; + ptr = (WCHAR*)grab_memory(len * 2 + 1); + for (i = 0; i < len; i++) + ptr[i] = (decode_char(str[4 * i]) << 12) | + (decode_char(str[4 * i + 1]) << 8) | + (decode_char(str[4 * i + 2]) << 4) | + (decode_char(str[4 * i + 3]) << 0); + ptr[len] = '\0'; + return ptr; +} + +/****************************************************************** + * init + * + * generates basic information like: + * base: top of wine tree on linux, curr dir on windows + * selfname: the way to reinvoke ourselves + */ +static int init(void) +{ + myARGC = winetest_get_mainargs( &myARGV ); + if (strcmp(winetest_platform, "windows")) + { + char* ptr = getenv("WINELOADER"); + + if (!ptr) return 0; + strcpy(base, ptr); + ptr = strrchr(base, '/'); + if (!ptr) return 0; + *ptr = '\0'; + /* be sure to use absolute pathnames so we can change dirs whenever we want */ + sprintf(selfname, + "%s/programs/winetest/runtest -q -P wine -M kernel32.dll -T %s -p %s/dlls/kernel/tests/kernel32_test", + base, base, base); + } + else + { + if (!GetCurrentDirectoryA(sizeof(base), base)) return 0; + strcpy(selfname, myARGV[0]); + } + + return 1; +} + +/****************************************************************** + * get_file_name + * + * generates an absolute file_name for temporary file + * + */ +static int get_file_name(char* buf, size_t len, const char* hint) +{ + char* ptr; + if (strcmp(winetest_platform, "windows")) + { + sprintf(buf, "%s/%s", base, hint); + for (ptr = buf; *ptr; ptr++) + if (*ptr == '\\') *ptr = '/'; + } + else + { + sprintf(buf, "%s\\%s", base, hint); + for (ptr = buf; *ptr; ptr++) + if (*ptr == '/') *ptr = '\\'; + } + //fprintf(stderr, "resfile=%s\n", buf); + return 0; +} + +/****************************************************************** + * doChild + * + * output most of the information in the child process + */ +static void doChild(const char* file) +{ + FILE* f = fopen(file, "w+"); + STARTUPINFOA siA; + STARTUPINFOW siW; + int i; + char* ptrA; + WCHAR* ptrW; + char bufA[MAX_PATH]; + WCHAR bufW[MAX_PATH]; + + if (!f) return; + + /* output of startup info (Ansi) */ + GetStartupInfoA(&siA); + fprintf(f, + "[StartupInfoA]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" + "dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" + "dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" + "dwFlags=%lu\nwShowWindow=%u\n" + "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", + siA.cb, encodeA(siA.lpDesktop), encodeA(siA.lpTitle), + siA.dwX, siA.dwY, siA.dwXSize, siA.dwYSize, + siA.dwXCountChars, siA.dwYCountChars, siA.dwFillAttribute, + siA.dwFlags, siA.wShowWindow, + (DWORD)siA.hStdInput, (DWORD)siA.hStdOutput, (DWORD)siA.hStdError); + + /* since GetStartupInfoW is only implemented in win2k, + * zero out before calling so we can notice the difference + */ + memset(&siW, 0, sizeof(siW)); + GetStartupInfoW(&siW); + fprintf(f, + "[StartupInfoW]\ncb=%08ld\nlpDesktop=%s\nlpTitle=%s\n" + "dwX=%lu\ndwY=%lu\ndwXSize=%lu\ndwYSize=%lu\n" + "dwXCountChars=%lu\ndwYCountChars=%lu\ndwFillAttribute=%lu\n" + "dwFlags=%lu\nwShowWindow=%u\n" + "hStdInput=%lu\nhStdOutput=%lu\nhStdError=%lu\n\n", + siW.cb, encodeW(siW.lpDesktop), encodeW(siW.lpTitle), + siW.dwX, siW.dwY, siW.dwXSize, siW.dwYSize, + siW.dwXCountChars, siW.dwYCountChars, siW.dwFillAttribute, + siW.dwFlags, siW.wShowWindow, + (DWORD)siW.hStdInput, (DWORD)siW.hStdOutput, (DWORD)siW.hStdError); + + /* Arguments */ + fprintf(f, "[Arguments]\nargcA=%d\n", myARGC); + for (i = 0; i < myARGC; i++) + { + fprintf(f, "argvA%d=%s\n", i, encodeA(myARGV[i])); + } + fprintf(f, "CommandLineA=%s\n", encodeA(GetCommandLineA())); + +#if 0 + int argcW; + WCHAR** argvW; + + /* this is part of shell32... and should be tested there */ + argvW = CommandLineToArgvW(GetCommandLineW(), &argcW); + for (i = 0; i < argcW; i++) + { + fprintf(f, "argvW%d=%s\n", i, encodeW(argvW[i])); + } +#endif + fprintf(f, "CommandLineW=%s\n", encodeW(GetCommandLineW())); + fprintf(f, "\n"); + + /* output of environment (Ansi) */ + ptrA = GetEnvironmentStringsA(); + if (ptrA) + { + fprintf(f, "[EnvironmentA]\n"); + i = 0; + while (*ptrA) + { + if (strlen(ptrA) < 128) + { + fprintf(f, "env%d=%s\n", i, encodeA(ptrA)); + i++; + } + ptrA += strlen(ptrA) + 1; + } + fprintf(f, "\n"); + } + + /* output of environment (Unicode) */ + ptrW = GetEnvironmentStringsW(); + if (ptrW) + { + fprintf(f, "[EnvironmentW]\n"); + i = 0; + while (*ptrW) + { + if (lstrlenW(ptrW) < 128) + { + fprintf(f, "env%d=%s\n", i, encodeW(ptrW)); + i++; + } + ptrW += lstrlenW(ptrW) + 1; + } + fprintf(f, "\n"); + } + + fprintf(f, "[Misc]\n"); + if (GetCurrentDirectoryA(sizeof(bufA), bufA)) + fprintf(f, "cdirA=%s\n", encodeA(bufA)); + if (GetCurrentDirectoryW(sizeof(bufW) / sizeof(bufW[0]), bufW)) + fprintf(f, "cdirW=%s\n", encodeW(bufW)); + fprintf(f, "\n"); + + fclose(f); +} + +static char* getChildString(const char* sect, const char* key) +{ + char buf[1024]; + char* ret; + + GetPrivateProfileStringA(sect, key, "-", buf, sizeof(buf), resfile); + if (buf[0] == '\0' || (buf[0] == '-' && buf[1] == '\0')) return NULL; + assert(!(strlen(buf) & 1)); + ret = decodeA(buf); + return ret; +} + +static int cmpChildString(const char* sect, const char* key, const char* result) +{ + char* ptr = getChildString(sect, key); + int ret; + + if (!ptr && !result) return 0; + if (!ptr) return -1; + if (!result) return 1; + if ((ret = strcmp(ptr, result)) == 0) return 0; + fprintf(stderr, "%s <> %s\n", ptr, result); + return ret; +} + +/* FIXME: this may be moved to the wtmain.c file, because it may be needed by + * others... (windows uses stricmp while Un*x uses strcasecmp...) + */ +static int mystrcasecmp(const char* p1, const char* p2) +{ + char c1, c2; + + c1 = c2 = '@'; + while (c1 == c2 && c1) + { + c1 = *p1++; c2 = *p2++; + if (c1 != c2) + { + c1 = toupper(c1); c2 = toupper(c2); + } + } + return c1 - c2; +} + +static int cmpiChildString(const char* sect, const char* key, const char* result) +{ + char* ptr = getChildString(sect, key); + int ret; + + if (!ptr && !result) return 0; + if (!ptr) return -1; + if (!result) return 1; + if ((ret = mystrcasecmp(ptr, result)) == 0) return 0; + fprintf(stderr, "%s <I> %s\n", ptr, result); + return ret; +} + +static int cmpChildInt(const char* sect, const char* key, int val) +{ + /* using !val insures that the test will fail if the sect/key isn't present + * in result file + */ + return GetPrivateProfileIntA(sect, key, !val, resfile) == val; +} + +static void test_Startup(void) +{ + char buffer[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + + /* let's start simplistic */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* not so simplistic now */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpTitle = "I'm the title string"; + startup.lpDesktop = "I'm the desktop string"; + startup.dwXCountChars = 0x12121212; + startup.dwYCountChars = 0x23232323; + startup.dwX = 0x34343434; + startup.dwY = 0x45454545; + startup.dwXSize = 0x56565656; + startup.dwYSize = 0x67676767; + startup.dwFillAttribute = 0xA55A; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* not so simplistic now */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpTitle = "I'm the title string"; + startup.lpDesktop = NULL; + startup.dwXCountChars = 0x12121212; + startup.dwYCountChars = 0x23232323; + startup.dwX = 0x34343434; + startup.dwY = 0x45454545; + startup.dwXSize = 0x56565656; + startup.dwYSize = 0x67676767; + startup.dwFillAttribute = 0xA55A; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* not so simplistic now */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpTitle = "I'm the title string"; + startup.lpDesktop = ""; + startup.dwXCountChars = 0x12121212; + startup.dwYCountChars = 0x23232323; + startup.dwX = 0x34343434; + startup.dwY = 0x45454545; + startup.dwXSize = 0x56565656; + startup.dwYSize = 0x67676767; + startup.dwFillAttribute = 0xA55A; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + todo_wine ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* not so simplistic now */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpTitle = NULL; + startup.lpDesktop = "I'm the desktop string"; + startup.dwXCountChars = 0x12121212; + startup.dwYCountChars = 0x23232323; + startup.dwX = 0x34343434; + startup.dwY = 0x45454545; + startup.dwXSize = 0x56565656; + startup.dwYSize = 0x67676767; + startup.dwFillAttribute = 0xA55A; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* not so simplistic now */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpTitle = ""; + startup.lpDesktop = "I'm the desktop string"; + startup.dwXCountChars = 0x12121212; + startup.dwYCountChars = 0x23232323; + startup.dwX = 0x34343434; + startup.dwY = 0x45454545; + startup.dwXSize = 0x56565656; + startup.dwYSize = 0x67676767; + startup.dwFillAttribute = 0xA55A; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + todo_wine ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* not so simplistic now */ + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + startup.lpTitle = ""; + startup.lpDesktop = ""; + startup.dwXCountChars = 0x12121212; + startup.dwYCountChars = 0x23232323; + startup.dwX = 0x34343434; + startup.dwY = 0x45454545; + startup.dwXSize = 0x56565656; + startup.dwYSize = 0x67676767; + startup.dwFillAttribute = 0xA55A; + + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("StartupInfoA", "cb", startup.cb), NULL); + todo_wine ok(cmpChildString("StartupInfoA", "lpDesktop", startup.lpDesktop) == 0, NULL); + todo_wine ok(cmpChildString("StartupInfoA", "lpTitle", startup.lpTitle) == 0, NULL); + ok(cmpChildInt("StartupInfoA", "dwX", startup.dwX), NULL); + ok(cmpChildInt("StartupInfoA", "dwY", startup.dwY), NULL); + ok(cmpChildInt("StartupInfoA", "dwXSize", startup.dwXSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwYSize", startup.dwYSize), NULL); + ok(cmpChildInt("StartupInfoA", "dwXCountChars", startup.dwXCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwYCountChars", startup.dwYCountChars), NULL); + ok(cmpChildInt("StartupInfoA", "dwFillAttribute", startup.dwFillAttribute), NULL); + ok(cmpChildInt("StartupInfoA", "dwFlags", startup.dwFlags), NULL); + ok(cmpChildInt("StartupInfoA", "wShowWindow", startup.wShowWindow), NULL); + release_memory(); + assert(unlink(resfile) == 0); + + /* TODO: test for A/W and W/A and W/W */ +} + +static void test_CommandLine(void) +{ + char buffer[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + /* the basics */ + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s \"C:\\Program Files\\my nice app.exe\"", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("Arguments", "argcA", 4), NULL); + ok(cmpChildString("Arguments", "argvA3", "C:\\Program Files\\my nice app.exe") == 0, NULL); + ok(cmpChildString("Arguments", "argvA4", NULL) == 0, NULL); + ok(cmpChildString("Arguments", "CommandLineA", buffer) == 0, NULL); + release_memory(); + assert(unlink(resfile) == 0); + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + /* from François */ + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s \"a\\\"b\\\\\" c\\\" d", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, NULL, &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpChildInt("Arguments", "argcA", 6), NULL); + ok(cmpChildString("Arguments", "argvA3", "a\"b\\") == 0, NULL); + ok(cmpChildString("Arguments", "argvA4", "c\"") == 0, NULL); + ok(cmpChildString("Arguments", "argvA5", "d") == 0, NULL); + ok(cmpChildString("Arguments", "argvA6", NULL) == 0, NULL); + ok(cmpChildString("Arguments", "CommandLineA", buffer) == 0, NULL); + release_memory(); + assert(unlink(resfile) == 0); +} + +static void test_Directory(void) +{ + char buffer[MAX_PATH]; + PROCESS_INFORMATION info; + STARTUPINFOA startup; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + startup.dwFlags = STARTF_USESHOWWINDOW; + startup.wShowWindow = SW_SHOWNORMAL; + + /* the basics */ + get_file_name(resfile, sizeof(resfile), "foo.ini"); + sprintf(buffer, "%s tests/process.c %s", selfname, resfile); + ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0L, NULL, "C:\\Windows", &startup, &info), "CreateProcess"); + /* wait for child to terminate */ + ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination"); + /* child process has changed result file, so let profile functions know about it */ + WritePrivateProfileStringA(NULL, NULL, NULL, resfile); + + ok(cmpiChildString("Misc", "cdirA", "C:\\Windows") == 0, NULL); + release_memory(); + assert(unlink(resfile) == 0); +} + +START_TEST(process) +{ + int b = init(); + ok(b, "Basic init of CreateProcess test"); + if (!b) return; + + if (myARGC >= 3) + { + doChild(myARGV[2]); + return; + } + test_Startup(); + test_CommandLine(); + test_Directory(); + + /* things that can be tested: + * lookup: check the way program to be executed is searched + * environment: check environment string passing + * handles: check the handle inheritance stuff (+sec options) + * console: check if console creation parameters work + */ +}

3 4

IE6ALL.zip
by Lonnie Cumberland 02 Apr '02

02 Apr '02

Hello All, I have been trying to get the ie6 setup to run but keep running into many functions that do not seem to be implemented yet. Has anyone gotten IE6 installed under wine? If so then is there some where that I can just download the installed directories and unpack them in my wine-c structure? Thanks, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

2 1

codeweavers wine and StarOffice 6.0 Beta
by Lonnie Cumberland 02 Apr '02

02 Apr '02

Hello All, Just a note. I recently installed the codeweavers preview 5 wine version as a test and found that it will not even run the windows StarOffice 6.0 Beta so something has changed between that version and the WineHQ version. I was unable to get any debug information as well because it froze my screen. Cheers, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

1 0

multiple instance freezes
by Lonnie Cumberland 02 Apr '02

02 Apr '02

Hello All, I was trying to do a test of my Wine install, which is the latest stable release, by starting up 2 different instances of Wine and StarOffice 6.0 Beta for Windows as 2 different users. what I have found is that the the first user running Wine SO6.0 will start up just fine and even run with no problems. The second test user can also start up the application but within just a few seconds it freezes and I can do nothing. Each test user has a complete directory structure for the windows to run and I am not using any of the real windows stuff, just that which came with wine. I also find that the first user application can still run. Is there something going on with the shared libraries of Wine and the wine server? Best regards, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

1 0

Re: MaskBlt function almost working
by Tels 02 Apr '02

02 Apr '02

-----BEGIN PGP SIGNED MESSAGE----- Moin, On 02-Apr-02 Tels carved into stone: > -----BEGIN PGP SIGNED MESSAGE----- > > Moin, > > On 02-Apr-02 Dimitrie O. Paun carved into stone: >> On April 2, 2002 12:48 pm, Lonnie Cumberland wrote: >>> Hello All, >> [...] >>> By the way, I found this function at: >>> >>> http://www.codeproject.com/bitmap/maskblt.asp >>> >>> and modified it to work with wine. >> >> What about the license? Is it LGPL compatible? > > I have searched the entire site and I couldn't find a single bit about > the > licence that submitted (or otherwise available code at that site) falls > under. It is heavy MS-centric, so I guess it is not very /L?GPL/ > friendly. > > Best bet would probably be to send them an email and ask ;) Ah, I overread this in the FAQ: >If you post to CodeProject then you retain copyright of your article and >code. You also give CodeProject permission to use it in a fair manner and >also permit all developers to freely use the code in their own >applications. > >Note that we do not accept time limited or shareware contributions: All >code that is available from our site must be available for use for free. IANLSBIPAH (I am no Licence specialist, but I play one at home) so somebody else could chime in and tell us if that is "compatible". Also aksing the original author nonetheless because it is kind and friendly wouldn#t hurt, either. Cheers, Tels - -- "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"' widespreadedly synthesize second-generation markets -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.0.6 (GNU/Linux) Comment: When cryptography is outlawed, bayl bhgynjf jvyy unir cevinpl. iQEVAwUBPKoBpHcLPEOTuEwVAQEhKgf+OyAxJsidtYoY9O+5r7OjYK9RcKFVF8ED SiwlbJsohA7Ip681sFovCrcixli/11LuImHSbHCBhgunocq/fAmsSUbhR7gYcd0F irzaDbRFFHvVUadLBdCecDeaI4FBKK22+dW7zl2uiShfQMb+BgkAsWtOmwBBRLlW 2qaStWbbNXL+XbHal/m9qGlQ+G4zHOpd7mz0li8B/NMWdbmIv5pFYP2Fs+hKE5t4 1546AShXiFyj36cdB9iB71BK2nmYtiECB0b4G7HhR8foT7JDfIZUxP+0LrC14pfh ITOczNEbZzaVs+lIg3tSdM6nymzaCHHIQWsxXMbtgJwbDd4RJcoxFA== =FMIm -----END PGP SIGNATURE-----

1 0

MaskBlt function almost working
by Lonnie Cumberland 02 Apr '02

02 Apr '02

Hello All, I have come across a function called MaskBlt which I have tried to implement in the grphics/bitblt.c The functions works, but still has a few problems and was wondering if someone had any experience with this function so that I can try to see how to fix it. -------------------------------------------------------------- #define FORE_ROP3(ROP4) (0x00FFFFFF&(ROP4)) //#define BACK_ROP3(ROP4) (ROP3FromIndex(SwapROP3_SrcDst (((ROP4)>>24)))) #define BACK_ROP3(ROP4) (ROP3FromIndex(SwapROP3_SrcDst ((ROP4)>>24))) // // See the Raster operations in MSDN // DWORD ROP3FromIndex(DWORD dwIndex) { static DWORD ROP3Table[256] = { 0x00000042, 0x00010289, 0x00020C89, 0x000300AA, 0x00040C88, 0x000500A9, 0x00060865, 0x000702C5, 0x00080F08, 0x00090245, 0x000A0329, 0x000B0B2A, 0x000C0324, 0x000D0B25, 0x000E08A5, 0x000F0001, 0x00100C85, 0x001100A6, 0x00120868, 0x001302C8, 0x00140869, 0x001502C9, 0x00165CCA, 0x00171D54, 0x00180D59, 0x00191CC8, 0x001A06C5, 0x001B0768, 0x001C06CA, 0x001D0766, 0x001E01A5, 0x001F0385, 0x00200F09, 0x00210248, 0x00220326, 0x00230B24, 0x00240D55, 0x00251CC5, 0x002606C8, 0x00271868, 0x00280369, 0x002916CA, 0x002A0CC9, 0x002B1D58, 0x002C0784, 0x002D060A, 0x002E064A, 0x002F0E2A, 0x0030032A, 0x00310B28, 0x00320688, 0x00330008, 0x003406C4, 0x00351864, 0x003601A8, 0x00370388, 0x0038078A, 0x00390604, 0x003A0644, 0x003B0E24, 0x003C004A, 0x003D18A4, 0x003E1B24, 0x003F00EA, 0x00400F0A, 0x00410249, 0x00420D5D, 0x00431CC4, 0x00440328, 0x00450B29, 0x004606C6, 0x0047076A, 0x00480368, 0x004916C5, 0x004A0789, 0x004B0605, 0x004C0CC8, 0x004D1954, 0x004E0645, 0x004F0E25, 0x00500325, 0x00510B26, 0x005206C9, 0x00530764, 0x005408A9, 0x00550009, 0x005601A9, 0x00570389, 0x00580785, 0x00590609, 0x005A0049, 0x005B18A9, 0x005C0649, 0x005D0E29, 0x005E1B29, 0x005F00E9, 0x00600365, 0x006116C6, 0x00620786, 0x00630608, 0x00640788, 0x00650606, 0x00660046, 0x006718A8, 0x006858A6, 0x00690145, 0x006A01E9, 0x006B178A, 0x006C01E8, 0x006D1785, 0x006E1E28, 0x006F0C65, 0x00700CC5, 0x00711D5C, 0x00720648, 0x00730E28, 0x00740646, 0x00750E26, 0x00761B28, 0x007700E6, 0x007801E5, 0x00791786, 0x007A1E29, 0x007B0C68, 0x007C1E24, 0x007D0C69, 0x007E0955, 0x007F03C9, 0x008003E9, 0x00810975, 0x00820C49, 0x00831E04, 0x00840C48, 0x00851E05, 0x008617A6, 0x008701C5, 0x008800C6, 0x00891B08, 0x008A0E06, 0x008B0666, 0x008C0E08, 0x008D0668, 0x008E1D7C, 0x008F0CE5, 0x00900C45, 0x00911E08, 0x009217A9, 0x009301C4, 0x009417AA, 0x009501C9, 0x00960169, 0x0097588A, 0x00981888, 0x00990066, 0x009A0709, 0x009B07A8, 0x009C0704, 0x009D07A6, 0x009E16E6, 0x009F0345, 0x00A000C9, 0x00A11B05, 0x00A20E09, 0x00A30669, 0x00A41885, 0x00A50065, 0x00A60706, 0x00A707A5, 0x00A803A9, 0x00A90189, 0x00AA0029, 0x00AB0889, 0x00AC0744, 0x00AD06E9, 0x00AE0B06, 0x00AF0229, 0x00B00E05, 0x00B10665, 0x00B21974, 0x00B30CE8, 0x00B4070A, 0x00B507A9, 0x00B616E9, 0x00B70348, 0x00B8074A, 0x00B906E6, 0x00BA0B09, 0x00BB0226, 0x00BC1CE4, 0x00BD0D7D, 0x00BE0269, 0x00BF08C9, 0x00C000CA, 0x00C11B04, 0x00C21884, 0x00C3006A, 0x00C40E04, 0x00C50664, 0x00C60708, 0x00C707AA, 0x00C803A8, 0x00C90184, 0x00CA0749, 0x00CB06E4, 0x00CC0020, 0x00CD0888, 0x00CE0B08, 0x00CF0224, 0x00D00E0A, 0x00D1066A, 0x00D20705, 0x00D307A4, 0x00D41D78, 0x00D50CE9, 0x00D616EA, 0x00D70349, 0x00D80745, 0x00D906E8, 0x00DA1CE9, 0x00DB0D75, 0x00DC0B04, 0x00DD0228, 0x00DE0268, 0x00DF08C8, 0x00E003A5, 0x00E10185, 0x00E20746, 0x00E306EA, 0x00E40748, 0x00E506E5, 0x00E61CE8, 0x00E70D79, 0x00E81D74, 0x00E95CE6, 0x00EA02E9, 0x00EB0849, 0x00EC02E8, 0x00ED0848, 0x00EE0086, 0x00EF0A08, 0x00F00021, 0x00F10885, 0x00F20B05, 0x00F3022A, 0x00F40B0A, 0x00F50225, 0x00F60265, 0x00F708C5, 0x00F802E5, 0x00F90845, 0x00FA0089, 0x00FB0A09, 0x00FC008A, 0x00FD0A0A, 0x00FE02A9, 0x00FF0062, }; return ROP3Table[dwIndex&0xFF]; } BYTE SwapROP3_SrcDst(BYTE bRop3) { // swap 1,2 bit and 5,6 bit typedef struct { unsigned bit0 : 1; unsigned bit1 : 1; unsigned bit2 : 1; unsigned bit3 : 1; unsigned bit4 : 1; unsigned bit5 : 1; unsigned bit6 : 1; unsigned bit7 : 1; } BITS; DWORD dwRop3 = bRop3; BITS bits = *(BITS*)&dwRop3; unsigned t = bits.bit1; bits.bit1 = bits.bit2; bits.bit2 = t; t = bits.bit5; bits.bit5 = bits.bit6; bits.bit6 = t; return *(BYTE*)&bits; } /********************************************************************* ** * MaskBlt [GDI32.@] */ //BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest, // INT nWidth, INT nHeight, HDC hdcSource, // INT nXSrc, INT nYSrc, HBITMAP hbmMask, // INT xMask, INT yMask, DWORD dwRop) // FIXME("(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%ld): stub\n", // hdcDest,nXDest,nYDest,nWidth,nHeight,hdcSource,nXSrc,nYSrc, // hbmMask,xMask,yMask,dwRop); BOOL WINAPI MaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, HDC hdcSrc, int nXSrc, int nYSrc, HBITMAP hbmMask, int xMask, int yMask, DWORD dwRop ) { HDC hDCMask; HBITMAP hOldMaskBitmap; HDC hDC1; HBITMAP hBitmap2; HBITMAP hOldBitmap2; HDC hDC2; HBITMAP hBitmap3; HBITMAP hOldBitmap3; DWORD dwRop3; if ( hbmMask == NULL ) return BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, FORE_ROP3(dwRop)); // 1. make mask bitmap's dc hDCMask = CreateCompatibleDC(hdcDest); hOldMaskBitmap = (HBITMAP)SelectObject(hDCMask, hbmMask); ASSERT ( hOldMaskBitmap ); // 2. make masked dest bitmap // 2.1 make bitmap hDC1 = CreateCompatibleDC(hdcDest); ASSERT ( hDC1 ); hBitmap2 = CreateCompatibleBitmap(hdcDest, nWidth, nHeight); hOldBitmap2 = (HBITMAP)SelectObject(hDC1, hBitmap2); ASSERT ( hOldBitmap2 ); // 2.2 draw dest bitmap and mask // BitBlt(hDC1, 0, 0, nWidth, nHeight, hdcDest, nXDest, nYDest, FORE_ROP3(dwRop)); // BitBlt(hDC1, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, DSTERASE); // 3. make masked src bitmap // 3.1 make bitmap hDC2 = CreateCompatibleDC(hdcSrc); ASSERT ( hDC2 ); hBitmap3 = CreateCompatibleBitmap(hdcSrc, nWidth, nHeight); hOldBitmap3 = (HBITMAP)SelectObject(hDC2, hBitmap3); ASSERT ( hOldBitmap3 ); // 3.2 draw src bitmap and mask // dwRop3 = BACK_ROP3(dwRop); dwRop3 = ROP3FromIndex(SwapROP3_SrcDst(((dwRop)>>24))); BitBlt(hDC2, 0, 0, nWidth, nHeight, hdcSrc, nXSrc, nYSrc, dwRop3); BitBlt(hDC2, 0, 0, nWidth, nHeight, hDCMask, xMask, yMask, SRCAND); // 4. combine two bitmap and copy it to hdcDest BitBlt(hDC1, 0, 0, nWidth, nHeight, hDC2, 0, 0, SRCPAINT); BitBlt(hdcDest, nXDest, nYDest, nWidth, nHeight, hDC1, 0, 0, SRCCOPY); // 5. restore all object SelectObject(hDCMask, hOldMaskBitmap); SelectObject(hDC1, hOldBitmap2); SelectObject(hDC2, hOldBitmap3); // 6. delete all temp object DeleteObject(hBitmap2); DeleteObject(hBitmap3); DeleteDC(hDC1); DeleteDC(hDC2); DeleteDC(hDCMask); return TRUE; // return 1; } ---------------------------------------------------------------- When I test this with my example code, it appears to change the other images as well even though I have not done anything with them. any ideas? By the way, I found this function at: http://www.codeproject.com/bitmap/maskblt.asp and modified it to work with wine. cheers, Lonnie -- Lonnie Cumberland OutStep Technologies Incorporated EMAIL: Lonnie(a)OutStep.com : Lonnie_Cumberland(a)yahoo.com The Basis Express Virtual Office & Data Backup and Recovery Services URL: http://www.basis-express.com "The Virtual Office without boundaries!!!"

3 3

wine/dlls/winedos/dosvm.c breaks FreeBSD
by Gerald Pfeifer 02 Apr '02

02 Apr '02

The following patch breaks building on FreeBSD 4.5: revision 1.15 date: 2002/04/01 20:56:15; author: julliard; state: Exp; lines: +15 -4 Jukka Heinonen <jhei(a)iki.fi> Routine DOSVM_Wait now wakes up if new events are queued and it returns if it processed any queued events. with the following error: /usr/bin/gcc -c -I. -I. -I../../include -I../../include -g -O2 -Wall -mpreferred-stack-boundary=2 -fPIC -D__WINE__ -D_REENTRANT -I/usr/X11R6/include -o dosvm.o dosvm.c dosvm.c: In function `DOSVM_Init': dosvm.c:687: `event_notifier' undeclared (first use in this function) dosvm.c:687: (Each undeclared identifier is reported only once dosvm.c:687: for each function it appears in.) gmake: *** [dosvm.o] Error 1 because event_notifier is defined within an #ifdef MZ_SUPPORTED covering most of this file which is not active on FreeBSD, but -- after this patch -- referenced in code that *is* active on FreeBSD. I'd appreciate could you have a look... Gerald -- Gerald "Jerry" pfeifer(a)dbai.tuwien.ac.at http://www.dbai.tuwien.ac.at/~pfeifer/

1 0

[regression] crash in bitblt.c:87
by Thomas Duffy 02 Apr '02

02 Apr '02

This used to not happen. Now, I get a crash everytime I start up AOL 5.0 under recent (today) cvs. (cut an paste bug still exists, but you can at least read the backtrace :) Unhandled exception: page fault on read access to 0x00000010 in 32-bit code (0x40829fd4). In 32-bit mode. Symbol h_errno is invalid Symbol __strtol_internal is invalid 0x40829fd4 (BitBlt+0xb8 [bitblt.c:87] in libgdi32.dll.so): pushl 0x10(%esi) 87 ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, Wine-dbg>bt Backtrace: In 32-bit mode. Symbol h_errno is invalid Symbol __strtol_internal is invalid 0x40829fd4 (BitBlt+0xb8 [bitblt.c:87] in libgdi32.dll.so): pushl 0x10(%esi) 87 ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, Wine-dbg>bt Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf Symbol h_errno is invalid Symbol __strtol_internal is invalid 0x40829fd4 (BitBlt+0xb8 [bitblt.c:87] in libgdi32.dll.so): pushl 0x10(%esi) 87 ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, Wine-dbg>bt Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) Symbol __strtol_internal is invalid 0x40829fd4 (BitBlt+0xb8 [bitblt.c:87] in libgdi32.dll.so): pushl 0x10(%esi) 87 ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, Wine-dbg>bt Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 0x40829fd4 (BitBlt+0xb8 [bitblt.c:87] in libgdi32.dll.so): pushl 0x10(%esi) 87 ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, Wine-dbg>bt Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 87 ret = dcDst->funcs->pBitBlt( dcDst->physDev, xDst, yDst, width, height, Wine-dbg>bt Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) Wine-dbg>bt Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) Backtrace: =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:1 =>0 0x40829fd4 (BitBlt+0xb8(hdcDst=0x860, xDst=0x3, yDst=0x3, width=0x1, height=0x11, hdcSrc=0x0, xSrc=0x0, ySrc=0x0, rop=0xf00021) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) [bitblt.c:87] in libgdi32.dll.so) (ebp=405c6328) 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] 1 0x62a03f34 (OBJDRCT.DLL.ListDrawItem+0x2ac in C:\AMERICA ONLINE 5.0\OBJDRCT.DLL) (ebp=405c640c) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 2 0x62210179 (MANAGER.TOL.FontComboClassProc+0xa6b in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c641c) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) 3 0x62211770 (MANAGER.TOL.DisplayWindowProc+0x414 in C:\AMERICA ONLINE 5.0\TOOL\MANAGER.TOL) (ebp=405c6490) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) 4 0x40767b83 (WINPROC_wrapper+0x17 in user32.dll.so) (ebp=405c64b4) 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) Wine-dbg> 5 0x40767c02 (WINPROC_CallWndProc+0x76(proc=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:181] in user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) Wine-dbg> user32.dll.so) (ebp=405c64e4) 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) Wine-dbg> 6 0x4076d650 (CallWindowProcA+0xf8(func=0x6221135c, hwnd=0x20026, msg=0x2b, wParam=0x0, lParam=0x405c6708) [winproc.c:2631] in user32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) Wine-dbg> r32.dll.so) (ebp=405c6518) 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) Wine-dbg> 7 0x64102027 (DRAGMAN.DLL..text+0x1027 in C:\AMERICA ONLINE 5.0\DRAGMAN.DLL) (ebp=405c6708) Wine-dbg> Wine-dbg> Wine-dbg> -- YOO-ESS-AYE! YOO-ESS-AYE!

1 0

Re: Two fixes for the testing framework makefiles
by Alexandre Julliard 02 Apr '02

02 Apr '02

Francois Gouget <fgouget(a)codeweavers.com> writes: > The first one, in Make.rules.in, makes sure that if you modify > wtmain.o, then all tests will be rebuilt. You would think that the .c.o > implicit rule should do that already, but this is not the case. I > suppose it's because the file is not in the local directory. Actually this should be done from the top-level makefile, rebuilding from the sub-makefiles can cause trouble, particularly with parallel makes. > The second one, in winetest/Makefile.in, fixes out of tree builds > (wine.xs may be in ../../../src/program/winetest). VPATH should take care of that. Do you have a make that requires this? If so there are many other places we need to fix too. -- Alexandre Julliard julliard(a)winehq.com

1 0

CreateProcess design
by Eric Pouech 01 Apr '02

01 Apr '02

before latest Alexandre patch, CreateProcess was able to use stuff like: CreateProcess(NULL, "foo.exe --wine_opt -- --foo_opt") --wine_opt was seen by foo as options for wine, whereas foo_opt could be a command line option for foo (in foo, the command line would only be "--foo_opt") since last night, this is broken: - --wine_opt is still seen as a wine option - however, the command line passed to foo isn't cleaned up... we get the whole line "--wine_opt -- --foo_opt"... what should we do. I think Alexandre long term option is to really get rid of the options on the command line and use the WINEOPTION(S) env var (we could still have a wrapper script to do the conversion) should we adopt this right away or clean up the command line option ? as a consequence, you no longer can use any CUI program in the user/graphical mode, including winedbg - it still work as a unix console though A+

2 3

File names and Wine.
by Insyde 01 Apr '02

01 Apr '02

Hi, I was looking at th wine source and I couldn't find any support to long file names under wine (yet). I was reading the DOSFS part and there is a lot of code that handles 8.3 file names, but wine support long file names. Can anyone show me where is it? or long names depend on Linux? thanks, Ricardo.

1 0

error: no implementation for WININET.dll.102(InternetGetConnectedState)
by Jason M Bell 01 Apr '02

01 Apr '02

hey everybody, I'm trying to debug a windows application - the Paradise Poker client program. I keep getting an error when it runs: -------------- err:win32:PE_fixup_imports No implementation for WININET.dll.102(InternetGetConnectedState) imported from C:\Program Files\ParadisePoker\client.exe, setting to 0xdeadbeef wine: Unhandled exception, starting debugger... err:seh:start_debugger Couldn't start debugger ("/usr/bin/winedbg 134662856 112") (2) Read the Wine Developers Guide on how to set up winedbg or another debugger -------------- The source in dlls/wininet/internet.c clearly shows a (simple) implementation for InternetGetConnectedState, but Wine isn't importing it for some reason. I've turned on other debug traces, but haven't gotten any other useful information. What are some other ways of attacking the problem? I'm pretty new at Wine development - any tips you have would be greatly appreciated. thanks in advance, Jason

3 4

wineconf 2002 summary
by Andreas Mohr 01 Apr '02

01 Apr '02

Hi all, I just added a link to my final wineconf 2002 summary page at http://home.arcor.de/andi.mohr/wine/wineconf2002/ to the WineHQ News. If anyone else has anything to contribute, then feel free to tell me NOW :) BTW, Michael, what about your photos ? Are they supposed to get published somewhere ? Thanks for listening ! -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://home.arcor.de/andi.mohr/

2 1

make test leaves 2 wine processes running
by Sylvain Petreolle 01 Apr '02

01 Apr '02

Hi, Running make test with a desktop window leaves ok but 2 processes are still running and the desktop windows not closed. They cannot be closed when I use the cross or the close command, i must kill them. (don't have to use -9 parameter) Running processes are : /home/wine/wine tests/vartest.c /home/wine/wine tests/sysparams.c (wineserver is here) I tried to winedbg them, but got error when I typed attach : error 5 (ERROR_ACCESS_DENIED). ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

3 5

problems with the alt button and window switching
by Rizsanyi Zsolt 31 Mar '02

31 Mar '02

Hi! If I change the window with keyboard (eg with ALT-TAB), then when I switch back to the wine window wine still thinks that the ALT button is depressed. I happens, because the key event of pressing ALT arrives to the wine window before the switch. And I see in the console (with --debugmsg +key) the next lines: trace:key:X11DRV_KeyEvent state = 10 trace:key:X11DRV_KeyEvent KeyPress : keysym=FFE9 (Alt_L), ascii chars=0 / 0 / '' trace:key:X11DRV_KeyEvent keycode 0x40 converted to vkey 0x12 trace:key:X11DRV_KeyEvent bScan = 0x38. trace:key:queue_kbd_event wParam=0012, lParam=20380001, InputKeyState=81 trace:key:TranslateMessage (WM_SYSKEYDOWN, 0012, 20380001) trace:key:TranslateMessage Translating key VK_MENU (0012), scancode 38 trace:key:X11DRV_ToUnicode (0012, 2038) : faked state = 10 trace:key:X11DRV_ToUnicode ToUnicode about to return 0 with char bbc6 trace:key:queue_kbd_event wParam=0012, lParam=c0000001, InputKeyState=1 That is the key state has been changed. And when I return to the wine window (by keyboard or mouse) it acts like if the ALT button were depressed. The solution is that the key states should be reset when the wine gets back the focus or loses the focus. That is more exactly in windows/winpos.c in the function WINPOS_SetActiveWindow when the hWnd is NULL ! That is the case when switching from a wine window to an non-wine window. So I have found the place :), just I dont know whats the preferred way to reset all the key states to not pressed. I have added the next few lines: --- oldwinpos.c Fri Mar 29 16:54:59 2002 +++ winpos.c Fri Mar 29 16:55:08 2002 @@ -1217,6 +1217,12 @@ if ((wndPtr = WIN_FindWndPtr(hWnd))) hWnd = wndPtr->hwndSelf; /* make it a full handle */ + /* reset key states when switching to a non-wine window */ + if (hWnd == 0) + { + InputKeyStateTable[VK_MENU] &= ~0x80; + goto CLEANUP_END; + } + /* paranoid checks */ if( hWnd == GetDesktopWindow() || (bRet = (hWnd == hwndActive)) ) goto CLEANUP_END; And now my problem is fixed. But I have experienced the same problem with the Control button (altough it is harder to reproduce). So maybe all the key states should be reset. So I would like to have this patch or something similar in wine. Best regards Zsolt Rizsanyi

2 1

WineLib newbie question
by Boris Buegling 31 Mar '02

31 Mar '02

Hi all. I'm wondering how difficult it is to port an application to Linux with WineLib. There are quite a few N64 emulators with source code on Windoze and I want to port one of them to Linux, because there is no decent native emulator, First, is it possible that things which don't work well with Wine, work when they are ported using WineLib ? Second, how much work is involved ? Regards, -- Boris Buegling <boris(a)icculus.org> "Sleep less - live longer." - "Ok good, 1 down... Now all I need is beer, video games and hacking to be linked to living longer and I'm set." "If it stinks, it's chemistry. If it moves, it's biology. If it does not work, it's computer science."

1 0

DIB engine
by Francois Gouget 31 Mar '02

31 Mar '02

The DIB engine was discussed quite a lot at WineConf. I am now trying to summarize these discussions to update bug 421 - Implement a DIB engine. http://wine.codeweavers.com/bugzilla/show_bug.cgi?id=421 Is the following accurate, complete, etc? Comments? Other ideas? Any volunteers? This was discussed quite a bit at WineConf. Ideas that were floated around are: 1. Have X export the required API --------------------------------- XFree86 4 has all the needed code, for all bit depths and layouts we care about. We could try to have the X guys export this in the form of an API ala Xft. Wine could then link with this library to implement the DIB engine (or dlopen that library). * Is the needed API already available? * If not, are the XFree86 guys willing to export it? * Almost everyone is using XFree86, but what about people who don't (embedded devices, Wine on Solaris...). We need a fallback. * We won't have to maintain that code which is a good thing, although it is not supposed to change much once written. * Will we be able to do all that we need with that API? Probably yes since it can be expected to match the X API quite closely and we are abel to use the X API. 2. Copy the relevant X code into Wine ------------------------------------- Since X has all the code and that code is under the X11 license we could copy it all into Wine. * This means we will have to maintain the code ourselves, although it is not supposed to change much once written. 3. Copy the relevant code from MicroWindows/NanoGUI to Wine ----------------------------------------------------------- MicroWindows/NanoGUI also has code that could help us bootstrap our DIB engine. We probably don't want Wine to depend on these projects but we could copy their code into Wine. * Are the licenses compatible? * Do they support all the bit depths and layouts we care about? * This means we will have to maintain the code ourselves, although it is not supposed to change much once written. 4. Copy the relevant code from GGI to Wine ------------------------------------------ GGI also has similar code. Again we probably don't want to introduce a dependency on GGI so the same questions apply: * Are the licenses compatible? * Do they support all the bit depths and layouts we care about? * This means we will have to maintain the code ourselves, although it is not supposed to change much once written. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ "Utilisateur" (nom commun) : Mot utilisé par les informaticiens en lieu et place d'"idiot".

4 4

problem creating/finding files
by Insyde 30 Mar '02

30 Mar '02

Hi, I'm getting this error running a system under WINE: 0806faa8:Call kernel32.CreateFileA(405b63ec "C:\\WIN\\IY032097.DAT",80000000,00000003,00000000,00000003,08000001,0000000 0) ret=6002912b 0806faa8:trace:file:CreateFileA C:\WIN\IY032097.DAT GENERIC_READ FILE_SHARE_READ FILE_SHARE_WRITE OPEN_EXISTING 0806faa8:trace:dosfs:DOSFS_GetFullName C:\WIN\IY032097.DAT (last=1) 0806faa8:trace:string:lstrcpynA (0x405b5a4c, "/mnt/c", 1024) 0806faa8:trace:dosfs:DOSFS_FindUnixName /mnt/c,WIN\IY032097.DAT 0806faa8:trace:heap:RtlAllocateHeap (40360000,00000002,00010bfc): returning 403a9e6c 0806faa8:trace:heap:RtlAllocateHeap (40360000,00000002,00000018): returning 403a7d10 0806faa8:trace:dosfs:DOSFS_FindUnixName (/mnt/c,WIN\IY032097.DAT) -> win (WIN) 0806faa8:trace:heap:RtlFreeHeap (40360000,00000002,403a7d10): returning TRUE 0806faa8:trace:heap:RtlFreeHeap (40360000,00000002,403a9e6c): returning TRUE 0806faa8:trace:dosfs:DOSFS_FindUnixName /mnt/c/win,IY032097.DAT 0806faa8:trace:heap:RtlAllocateHeap (40360000,00000002,00010bfc): returning 403a9e6c 0806faa8:trace:heap:RtlAllocateHeap (40360000,00000002,00000018): returning 403a7d10 0806faa8:warn:dosfs:DOSFS_FindUnixName 'IY032097.DAT' not found in '/mnt/c/win' 0806faa8:trace:heap:RtlFreeHeap (40360000,00000002,403a7d10): returning TRUE 0806faa8:trace:heap:RtlFreeHeap (40360000,00000002,403a9e6c): returning TRUE 0806faa8:warn:file:CreateFileA Unable to get full filename from 'C:\WIN\IY032097.DAT' (GLE 2) ......... 08079370:RET MFRTS32.1199: _mFfindp() retval = 409c5e90 ret=0042b3b7 08079370:CALL MFRTS32.1425: mF_fh_set_fe_stat(00000000) ret=0042b3c8 08079370:RET MFRTS32.1425: mF_fh_set_fe_stat() retval = 00000000 ret=0042b3c8 08079370:RET MFRTS32.1202: _mFg2star_fast() retval = 00000000 ret=0042889a 08079370:RET MFRTS32.1400: ixfile() retval = 00000000 ret=60025e45 08079370:RET MFRTS32.145: EXTFH() retval = 00000000 ret=0044095a 08079370:Call user32.MessageBoxA(00000000,004472de "External Path string <UPCW56-DEV-DATA-DIR> not found. File IYF029. "...,004471c8 "IYP139 ",00002010) ret=00404c01 08079370:warn:dialog:MessageBoxA Messagebox 08079370:trace:resource:RES_FindResource2 (4067a000, 00000005, 40718554"MSGBOX", 0000, A, PE) 08079370:trace:heap:RtlAllocateHeap (40360000,00000002,00000018): returning 403af734 08079370:trace:heap:RtlFreeHeap (40360000,00000002,403af734): returning TRUE 08079370:trace:resource:RES_LoadResource (4067a000, 407234f8, PE) ......... Seems like the file isn't being created. (Uwe Bonnes helped me with this). But we disagree what part of WINE (or outside WINE) is wrong. The first part of the log shows a CreateFileA that is unable to create a file. This API works fine when the file is in the same dir as the application (had tested it). The second part of the log shows the last screen I get after start the program (MessageBox API). MFRTS32 is a .dll the program calls. We thougth of there too. But this program works under Windows. Everything is in the path. Both wine.conf and Linux. I could reproduce the error in Win2k this way: Created a set of programs (L1, L2 and L3) that will run one after one with conditions. If the field in L1 is fulfilled then we jump directly to L3. Else We fulfill the field in L2 and then jump to L3. In details: L1 would creates a file with a name if the filed is fulfilled an L3 NEEDS to know that name. If we had to run L2 then the file will be with another name and L3 will get data from that file. But the file ins't created in neither of the cases. So a screen shows up: "External path string <G-PATH> not found. File FILE-LINUX." That message is the same I get under WINE: "External path string <UPCW56-DEV-DATA-DIR> not found. File IYF029." Refers to a file (IYF029), that exists (located in the ./data dir) but was not filled with data it need to work, or incorretly filled. Both G-PATH and UPCW56-DEV-DATA-DIR are variables of a file that has a number of them inside. As here we use APIs I'll list 2 of them that are used within the function and their definiton, took from MSDN: CreateProcess CreateProcess( LPCWSTR lpszImageName, LPCWSTR lpszCmdLine, LPSECURITY_ATTRIBUTES lpsaProcess, LPSECURITY_ATTRIBUTES lpsaThread, BOOL fInheritHandles, DWORD fdwCreate, LPVOID lpvEnvironment, LPWSTR lpszCurDir, LPSTARTUPINFOW lpsiStartInfo, LPPROCESS_INFORMATION lppiProcInfo); ........ StartupInfo.dwFillAttribute dwFillAttribute Ignored unless dwFlags specifies STARTF_USEFILLATTRIBUTE. Specifies the initial text and background colors if a new console window is created in a console application. These values are ignored in GUI applications. This value can be any combination of the following values: FOREGROUND_BLUE, FOREGROUND_GREEN, FOREGROUND_RED, FOREGROUND_INTENSITY, BACKGROUND_BLUE, BACKGROUND_GREEN, BACKGROUND_RED, and BACKGROUND_INTENSITY. For example, the following combination of values produces red text on a white background: FOREGROUND_RED| BACKGROUND_RED| BACKGROUND_GREEN| BACKGROUND_BLUE OBS.: We do NOT use this to send this kind of attributes. We DO send more data as we saw that it handles well. We also DO use this in gui applications. typedef struct _STARTUPINFO { DWORD cb; LPTSTR lpReserved; LPTSTR lpDesktop; LPTSTR lpTitle; DWORD dwX; DWORD dwY; DWORD dwXSize; DWORD dwYSize; DWORD dwXCountChars; DWORD dwYCountChars; DWORD dwFillAttribute; DWORD dwFlags; WORD wShowWindow; WORD cbReserved2; LPBYTE lpReserved2; HANDLE hStdInput; HANDLE hStdOutput; HANDLE hStdError; } STARTUPINFO, *LPSTARTUPINFO; ............... CreateFile HANDLE CreateFile( LPCTSTR lpFileName, // file name DWORD dwDesiredAccess, // access mode DWORD dwShareMode, // share mode LPSECURITY_ATTRIBUTES lpSecurityAttributes, // SD DWORD dwCreationDisposition, // how to create DWORD dwFlagsAndAttributes, // file attributes HANDLE hTemplateFile // handle to template file ); .................. Any thoughs? Thanks, Ricardo.

2 1

Improving the regression testing infrastructure
by Geoffrey Hausheer 30 Mar '02

30 Mar '02

I know regression testing isn't as interesting as doing real development, and so I appologize with once again spamming the list with regression questions... As I've been writing tests (only for the last week or so), I realized that as we get a lot more tests, it will be very difficult to keep track of what is being tested, and what is not. I'd like to propose a list of which functions for each DLL are being tested, which file tests it, as well as any comments on the current tests. Currently, there is no great way to do this. I may use several functions in a directed test which I am not actually testing (for instance I've found it necessary to retrieve the page-size using GetSystemInfo, but my tests have nothing to do with this function, and so writing a directed test for it is a task for another day). Thus just grepping for which functions are used in a test is not sufficient. Also, I have found that some functions, or even specific task functions are very difficult to test, and so I've been leaving these out so that perhaps people ore skilled than myself could take a crack at them late (A good example is testing inheritance with CreateThread. It is a task that is beyond my capabilities at the moment, at least until I can find a good way to test CreateProcess...this would be much easier if Windows had something equivalent to 'fork'). In any case, I've tried to be thorough about commenting what I do and don't test, but it would be a lot more convenient if this information was more easily parsed than trying to find my comments intersperesed through the tests. So does anyone thing that creating a easily parsable list with the state of the current tests is this a reasonable thing to do, and would creating a simple file in each /tests directory with the information be good enough? If so, I can add one to my next test, and update it with what I've done so far. In general, while Francois' presentation is a good place to get started, I think it'd be a lot easier if there was a document off of winehq with recommendations on how to build, test, and document tests. Lowering the difficulty threshold, is more likely to draw more people to do so. Thanks, .Geoff

4 11

Re: Wine List Control compatibility
by Tony Lambregts 30 Mar '02

30 Mar '02

Peter Quax wrote: >Hello, > >>>Some things will break if you start trying to use a bunch of native >>>DLLs. And especially trying to use the native comctrl is likely to break >>>things. >>> >>>That said, I downloaded and tried out the program. To get it to run, I >>>used these native DLLs: >>> > >>>With that, the listview appears to be working for me just fine, assuming >>>you are talking about the one with the labels Oefening, Titel, and Item. >>>This is with current CVS. >>> >>I get about the same thing with the same problems (except I havent >>crashed) but I have some time.It would be much easier if there is an >>english version of this program.I don't have a soundcard.(maybe thats >>why I havnt crashed yet). I probably could get one. Does anyone want to >>recommend a cheep one that works well with linux? >> > >Both of you, thanks very much for your help. > >First of all I forgot to mention that the use of sound is not an issue (we >don't use that at our school), so that is not a problem whatsoever. > >I tried using the dll configuration as given and indeed it shows the list >control (just as it did before), but as I mentioned the image lists are >incorrect. To demonstrate this, I've taken a couple of screen shots to give >you an idea of what it should look like : > >http://alpha.luc.ac.be/~lucp1313/juniorwin.jpg : this is the windows version >that shows the correct icons in the list control (at the bottom) > >http://alpha.luc.ac.be/~lucp1313/juniorwine.jpg : this is the wine version >which demonstrates the incorrect behaviour of the icons > >You can clearly see that there is a difference. Now, when I doubleclick for >example 4-1 in the 'oefening' column to start this exercise, the window that >comes up doesn't show all of the text. A second anomaly is that from time to >time, the cursor will disappear. This is shown in the next 2 screenshots : > >http://alpha.luc.ac.be/~lucp1313/juniorwin2.jpg : this is the windows >version that shows the correct text > >http://alpha.luc.ac.be/~lucp1313/juniorwine2.jpg : this is the wine version >which demonstrate the lack of text in the upper left corner > >I hope this made my problems a bit more clear ? Also, I'm afraid that there >isn't an english version of this package available. I tried contacting the >authors but they don't seem to respond to any of my emails. > >Again, thanks for all your help > >Regards, >Peter Quax. > It looks like its not translating the color palet correctly. What color depth are you running at? My guess is that it is 16. If this is correct then try increasing it. It may be that the text is just not showing up because of this problem. I have CC:ed the Wine development list in order that the real wine gurus can have a look at this. How long do you have before you have to subject the little children to the "Windows Solution". Tony Lambregts

1 0

RE: Improving the regression testing infrastructure
by Geoffrey Hausheer 30 Mar '02

30 Mar '02

> > True. So what we need is to add a function in the > testing framework > > so that tests can get argc/argv/envp. Seems like a > reasonable approach. > I was more thinking adding some wt_argc and wt_argv, with init in main > so that we don't have to deal with the portability issues of > the __argc, > __ ARGC... Is there a reason we can't just use environment variables rather than argc/argv? I would think that would be less of a hassle than using argc/argv. .Geoff ----------------------------------------------------- Protect yourself from spam, use http://sneakemail.com

3 2

Unicode header control used by listview
by Uwe Bonnes 29 Mar '02

29 Mar '02

Hallo, some application made from a zip archive "4957.exe", that uses the listview.c sample from microsoft floating around since at least 1996, uses commctrl headers and shows only the first letter of the text in the header tabs. This is caused by (wine) listview.c creating the header windows as unicode, but in the commctrl initialization the header class was registered as ascii. When the header text is inserted, it is translated to unicode. When it is read out for display, it is treated as ascii, as the unicode flag of the header control isn't set. So reading of only one character succeeds. So either we set the header unicode-flag when creating the header control in listview, or we register the header class as unicode. Appended patch switches the charset after creating the control in listview.c. Does this sound right? Feedback welcome! Changelog dlls/comctrl32/listview.c: LISTVIEW_Create Switch header control charset to unicode -- Uwe Bonnes bon(a)elektron.ikp.physik.tu-darmstadt.de Free Software: If you contribute nothing, expect nothing -- Index: wine/dlls/comctl32/listview.c =================================================================== RCS file: /home/wine/wine/dlls/comctl32/listview.c,v retrieving revision 1.125 diff -u -r1.125 listview.c --- wine/dlls/comctl32/listview.c 20 Mar 2002 00:53:42 -0000 1.125 +++ wine/dlls/comctl32/listview.c 29 Mar 2002 20:58:21 -0000 @@ -8002,6 +8002,9 @@ 0, 0, 0, 0, hwnd, (HMENU)0, lpcs->hInstance, NULL); + /* set header unicode format */ + SendMessageW(infoPtr->hwndHeader, HDM_SETUNICODEFORMAT,(WPARAM)TRUE,(LPARAM)NULL); + /* set header font */ SendMessageW(infoPtr->hwndHeader, WM_SETFONT, (WPARAM)infoPtr->hFont, (LPARAM)TRUE);

1 0

freetype
by Morten Welinder 29 Mar '02

29 Mar '02

I get the message *** Note: Your system appears to have the FreeType 2 runtime libraries *** installed, but 'freetype-config' is not in your PATH. Install the *** freetype-devel package (or its equivalent on your distribution) to *** enable Wine to use TrueType fonts. even though I do have freetype-config in my PATH. It seems related to the test dnl Check that we have at least freetype/freetype.h if test "$ac_cv_header_freetype_freetype_h" = "yes" -a "$wine_cv_fttrigon" = "yes" (Note: comments, message, and code do not agree) I don't seem to have the <ft2build.h> and <freetype/fttrigon.h> files. Should I? This is on a SuSE7.3 system, FWIW. Morten

1 0

cvs doesn't build .. my fault?
by Paul Millar 29 Mar '02

29 Mar '02

Hi, A couple of things: First, I've noticed cvs didn't build for me anymore. The problem was because I removed the header files for ncurses (ie removed the ncurses-devel RPM). The file dlls/ttydrv/bitmap.c then failed to compile. Having had a look at the code in ttydrv, its fairly obvious it wont build without either curses or ncurses installed. A simple patch (wine-diff-1) provides a better error message. It shouldn't be needed (with the next patch), but might help bug finding in the future. But, shouldn't wine simply abstain from building ttydrv if a (n?)curses package isn't available? I've attached another patch (wine-diff-2) that does that. AFAIK, there's no knock-on effects. Second problem, when attempting to verify the build-failure on a different machine (hathi), it failed, but in a different part of the build! It only succeeded on the third machine (romulus) On hathi, a RH-7.0 (w/ Linus-2.4.3 kernel) I got: > make[2]: Entering directory `/disk/hathi1/paulm/wine/dlls/ntdll' > LD_LIBRARY_PATH="../../unicode:$LD_LIBRARY_PATH" > ../../tools/winebuild/winebuild -fPIC -L../../dlls -o ntdll.spec.c > -spec ./ntdll.spec > make[2]: *** [ntdll.spec.c] Segmentation fault (core dumped) [...] After some investigation, it transpires that gcc on hathi (the RH-7.0 machine) builds broken winebuild programs (the unicode library was fine). The RH-7.1 (romulus) could "fix" the problem by recompiling just the winebuild directory. The problem turned out to be because I had old gcc-2.96 RPMs installed. After updating to the latest upgrade RPMs winebuild is built correctly, but wrc is now broken: it segfaults whenever its run. Can anyone with a 7.0 machine verify this? Cheers, Paul.

3 3

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