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

RE: Send the first two mingw32 patches to /dev/null and use these instead

by Steven Edwards

> > Index: windef.h > > =================================================================== > > RCS file: /home/wine/wine/include/windef.h,v > > retrieving revision 1.62 > > diff -u -r1.62 windef.h > > --- windef.h 10 Mar 2002 00:02:34 -0000 1.62 > > +++ windef.h 25 Apr 2002 02:09:36 -0000 > > @@ -157,8 +157,9 @@ > > #define _MAX_EXT _MAX_FNAME > > #define _MAX_PATH 260 > > #endif > > +#if ! defined (__MINGW__) > > #define MAX_PATH _MAX_PATH > > - > > +#endif > > This seems to be a mingw32 bug, it is not supposed to define > MAX_PATH, only _MAX_PATH. At least that's how it's done under Windows. > > I will email the mingw team and ask them about this and stdlib.h. Other then the MAX_* stuff and the basetsd.h issue there are no more major/annoying header problems I have found. Once again I guess a HAVE_MAX_PATH check could be written or this should work also. #ifdef __MINGW__ #undef MAX_PATH #endif #define MAX_PATH _MAX_PATH Steven "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

April 26, 2002

RE: Last header patch for Mingw32 I think (wingdi.h)

by Steven Edwards

> > diff -u -r1.69 wingdi.h > > --- wingdi.h 3 Apr 2002 22:08:27 -0000 1.69 > > +++ wingdi.h 25 Apr 2002 16:48:19 -0000 > > @@ -24,6 +24,14 @@ > > extern "C" { > > #endif > > > > +#ifdef __MINGW__ > > +#undef _MAX_PATH > > +#undef _MAX_DIR > > +#undef _MAX_EXT > > +#undef _MAX_DRIVE > > +#include "stdlib.h" > > +#endif > > + > > Why do you need stdlib.h in wingdi.h? It's not there under Windows. > > -- > Alexandre Julliard I think I needed it there for another define of MAX_PATH. stdlib.h does exist in mingw. Do you think I should just use wines windef.h and disregard this? I guess there could be a configure check for the MAX_* definitions also. Steve "Every revolution was once a thought in one man's mind" - Ralph Waldo Emerson

April 26, 2002

First attempt at unit testing. Victim of choice: _hread()

by Jakob Eriksson

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

April 25, 2002

Re: wine/ dlls/winsock/socket.c dlls/winsock/ws2_3 ...

by Alexandre Julliard

Michael Cardenas <michael.cardenas(a)lindows.com> writes: > do these patches include his fixes from today? Not yet, coming up soon. -- Alexandre Julliard julliard(a)winehq.com

April 25, 2002

Re: Bug 572

by Alexandre Julliard

Andriy Palamarchuk <apa3a(a)yahoo.com> writes: > Alexandre, could you look at bug 572: > http://bugs.codeweavers.com/show_bug.cgi?id=572 > > It is possible that this bug is caused by your patch. Quite possible, but I'm afraid the trace is not really helpful. I'd need to see a backtrace, and probably a complete relay trace too. -- Alexandre Julliard julliard(a)winehq.com

April 25, 2002

Re: Last header patch for Mingw32 I think (wingdi.h)

by Alexandre Julliard

"Steven Edwards" <Steven_Ed4153(a)yahoo.com> writes: > diff -u -r1.69 wingdi.h > --- wingdi.h 3 Apr 2002 22:08:27 -0000 1.69 > +++ wingdi.h 25 Apr 2002 16:48:19 -0000 > @@ -24,6 +24,14 @@ > extern "C" { > #endif > > +#ifdef __MINGW__ > +#undef _MAX_PATH > +#undef _MAX_DIR > +#undef _MAX_EXT > +#undef _MAX_DRIVE > +#include "stdlib.h" > +#endif > + Why do you need stdlib.h in wingdi.h? It's not there under Windows. -- Alexandre Julliard julliard(a)winehq.com

April 25, 2002

Re: Send the first two mingw32 patches to /dev/null and use these instead

by Alexandre Julliard

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

April 25, 2002

Re: More BUG fixes for winsock2 patch series

by Michael Cardenas

I tried applying these patches also, and they didn't help the aol bug. On Thursday 25 April 2002 03:09 pm, Martin Wilck wrote: > Patch: BUGS in my recently submitted patch series > > This applies over my complete patch series - > I will send clean patches tomorrow.

April 25, 2002

dragging trillian's window causes the X server to crash

by Michael Cardenas

Using wine from 04/23/2002, when drag my buddy list window in trillian the X server crashes.

April 25, 2002

cprof Profiler

by John Levon

Hi, saw your question on the weekly news. I noticed nobody had pointed out that what was cprof is now available under the eazel-tools module of the Gnome CVS repository (I believe). It also has some changes from the old cprof version like shared library support regards john -- "I continue to be amazed at what Andrei can make templates do. Some of it still makes my head hurt." - Herb Sutter

April 25, 2002