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

Re: Set/WindowLong problem in user/win test

by Greg Turner

On Tuesday 24 December 2002 08:23 pm, Francois Gouget wrote: > On Tue, 24 Dec 2002, Greg Turner wrote: > > This type of scenario seems to come up a lot lately... perhaps > > there should be a standard way to detect windows 95 (or another > > platform) during a test and skip things as may be appropriate on > > that platform? What do you think? > > Tests should *not* check whether they are running on Windows 95, 98 > or other. Just like individual autoconf-like functionality tests are > better than relying on __LINUX__ or other macros, tests should check > for the existence of the functions they want to test. Why not, it seems reasonable enough to me? I'm talking about run-time checks here -- I don't know the API's, but surely there is some Microsoft-sanctioned way to determine the OS you are running on...? And as the wine developers, surely we can decide if we are running under wine... so why is this really so bad, assuming it's implemented well, in an easy-to-re-use manner. > So the best way to handle A/W issues is to just call the function and > check for failure with the ERROR_CALL_NOT_IMPLEMENTED error. If that > happens then the check(s) should be skipped. Similarly, the way to > deal with APIs that only exist on some platforms is to use > LoadLibrary and GetProcAddress. If the resulting pointer is NULL, > then skip the test(s). It may even make sense to do so in cases where > the whole library may be missing (kind of depends on the impact of > missing libraries on automated runs: does it stop the batch file with > a messagebox?). > > The real issue is that up until now all tests have been written using > Wine and never tested in Windows. Or if they were actually tested in > Windows they were only tested with one version of Windows and one > quickly finds whether that was Win9x or an NT-something. Yes, the concept of what is being tested seems to have broadened a bit, from "test the guts of wine" to "test the guts of wine in a windows-compatible way," which seems like a good thing to me, btw. It hasn't really been an issue, and perhaps it need never be, but, as you point out, certainly one could imagine scenarios where it's not so simple as just checking for ERROR_CALL_NOT_IMPLEMENTED: perhaps there is no such API to call on some platform, or perhaps the user needs permission to write to some resource that might depend on the user's permission on the particular machine... who knows? Testing a big system like wine which goes pretty deep into the architectural roots, and all the way up to big honkin' "assemblies" (or what-have-you's) like the java virtual machine or directx... there could be a lot of circumstances where the outcome might not be reliable but we don't want to drop the test out of the default testrun... this is precisely why it seems that being able to rule out 90% of such cases with a simple "what environment do I run under?" test seems like a win... but perhaps you have thought this through more carefully than I? Am I missing something? Merry Christmas, and thanks for all the great code and hard work, -- gmt "It does not take a majority to prevail ... but rather an irate, tireless minority, keen on setting brushfires of freedom in the minds of men." --Samuel Adams, Patriot

Dec. 24, 2002

Re: Set/WindowLong problem in user/win test

by Francois Gouget

On Tue, 24 Dec 2002, Greg Turner wrote: > On Tuesday 24 December 2002 03:23 pm, Francois Gouget wrote: > > This test uses {Get,Set}WindowLongW which of course does not work on > > Win9x, thus causing the test to fail. > > This type of scenario seems to come up a lot lately... perhaps there > should be a standard way to detect windows 95 (or another platform) > during a test and skip things as may be appropriate on that platform? > What do you think? Tests should *not* check whether they are running on Windows 95, 98 or other. Just like individual autoconf-like functionality tests are better than relying on __LINUX__ or other macros, tests should check for the existence of the functions they want to test. So the best way to handle A/W issues is to just call the function and check for failure with the ERROR_CALL_NOT_IMPLEMENTED error. If that happens then the check(s) should be skipped. Similarly, the way to deal with APIs that only exist on some platforms is to use LoadLibrary and GetProcAddress. If the resulting pointer is NULL, then skip the test(s). It may even make sense to do so in cases where the whole library may be missing (kind of depends on the impact of missing libraries on automated runs: does it stop the batch file with a messagebox?). The real issue is that up until now all tests have been written using Wine and never tested in Windows. Or if they were actually tested in Windows they were only tested with one version of Windows and one quickly finds whether that was Win9x or an NT-something. But now that it's easy to compile and run these tests on Windows this problem should pretty much disappear (or rather tests will be fixed as they come rather than accumulate). It has been some time since I last updated the zip file that contains the windows test executables as I tried to focus on actually fixing the tests. Now that some progress has been made I'll try to put something together in the comming days. -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ May your Tongue stick to the Roof of your Mouth with the Force of a Thousand Caramels.

Dec. 24, 2002

Re: Validate imagelists

by Andreas Mohr

On Tue, Dec 24, 2002 at 11:27:57AM -0800, Duane Clark wrote: > Changelog: > Validate imagelists with christmas magic. Huh ? > Index: dlls/comctl32/imagelist.h > =================================================================== > RCS file: /home/wine/wine/dlls/comctl32/imagelist.h,v > retrieving revision 1.3 > diff -u -r1.3 imagelist.h > --- dlls/comctl32/imagelist.h 31 May 2002 23:25:44 -0000 1.3 > +++ dlls/comctl32/imagelist.h 24 Dec 2002 19:26:09 -0000 > @@ -53,6 +53,8 @@ > INT nOvlIdx[15]; > }; > > +#define IMAGELIST_MAGIC 0x4C4D4948 "HIML" ?? Wouldn't that be more like 0x53414D58 ??? Merry Christmas, BTW ! :-) -- Andreas Mohr Stauferstr. 6, D-71272 Renningen, Germany Tel. +49 7159 800604 http://mohr.de.tt

Dec. 24, 2002

Re: Some D3D status updates...

by Chris Thielen

Awesome work so far! Keep it up, I can't wait for a more complete D3D in Wine. On Tue, 2002-12-24 at 10:33, Lionel Ulmer wrote: > Hi all, > > As it was one of my objectives when Christian's work prodded me into > restarting working on D3D, I am happy to show here the first screen > shot of SystemShock2 working (alas texture-less) with Wine : > > http://www.bbrox.org/system_shock2.png > > Merry Christmas to everybody :-) > > Lionel (with one week and a half of almost full-time hack vacation > left :-) ) -- Chris Thielen <chris(a)luethy.net>

Dec. 24, 2002

Re: Set/WindowLong problem in user/win test

by Greg Turner

On Tuesday 24 December 2002 03:23 pm, Francois Gouget wrote: > This test uses {Get,Set}WindowLongW which of course does not work on > Win9x, thus causing the test to fail. This type of scenario seems to come up a lot lately... perhaps there should be a standard way to detect windows 95 (or another platform) during a test and skip things as may be appropriate on that platform? What do you think? -gmt "It does not take a majority to prevail ... but rather an irate, tireless minority, keen on setting brushfires of freedom in the minds of men." --Samuel Adams, Patriot

Dec. 24, 2002

Re: [JOY] wxWindows

by David Fraser

Dimitrie O. Paun wrote: >Folks, > >Last night I managed to compile, link, and successfully run >all(1) samples that come with wxWindows. > >In all honesty I am overjoyed! Let me explain why: > Excellent news! > -- wxWindows is a large piece of software that touches on > most (if not all) Wine aspects. It does put our headers > through their paces. > -- The porting effort has been simple, and it took me > a just a few days to do it. > -- I have not used _any_ of the previous efforts to port > wxWindows to Wine. I rather started with their MinGW port. > -- Most of the changes have been trivial fixes for Wine > which I have sent to wine-patches in the last few days. > -- The hacks to wxWindows have been trivial and few in > number. I have touched only a few files, and the > changes are real simple. They'll need some cleaning up, > and I'll submit them to the wxWindows folks for inclusion. > -- The wine{gcc,wrap} combo is a great success. All I had > to do was to touch only *one* file (makeg95.env), and > modify only a few lines to get *everything* to compile > and link. > >What does Wine get out of it: > -- A good test for our headers > -- Proof that wine{gcc,wrap} are a good idea (at least for me) > -- A large number of sample that show quite a few problems in Wine. > >If anyone is interested in more details please let me know, and I'll >be glad to provide them. Once we decide on the __WINE__ vs. __WINESRC__ >thing, I'll cleanup the wxWindows changes and submit them for inclusion >in their tree, so hopefully you'll be able to play with it using the >official version not before long. > I'd be very interested in this, as I use wxWindows alot in my work... This means we can try compile our app like this (it already kind of works using wxGTK, but this will be interesting too) Thanks a lot... David

Dec. 24, 2002

Re: [JOY] wxWindows

by Dimitrie O. Paun

On December 24, 2002 04:36 pm, David Fraser wrote: > I'd be very interested in this, as I use wxWindows alot in my work... OK, here are the _raw_ modifications that I had to make. All trivially fixable also (waiting on the __WINE__ decision). Look for example to the makeg95.env changes to see how few were needed! Here's the diff (against latest wxWindows CVS). Index: include/wx/filefn.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/filefn.h,v retrieving revision 1.63 diff -u -r1.63 filefn.h --- include/wx/filefn.h 2002/12/07 15:41:11 1.63 +++ include/wx/filefn.h 2002/12/24 22:17:25 @@ -74,9 +74,9 @@ // ---------------------------------------------------------------------------- // Microsoft compiler loves underscores, feed them to it -#if defined( __VISUALC__ ) \ +#if 0 && (defined( __VISUALC__ ) \ || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ - || ( defined(__MWERKS__) && defined(__WXMSW__) ) + || ( defined(__MWERKS__) && defined(__WXMSW__) )) // functions #define wxClose _close #define wxRead _read Index: include/wx/sckaddr.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/sckaddr.h,v retrieving revision 1.16 diff -u -r1.16 sckaddr.h --- include/wx/sckaddr.h 2002/08/31 11:29:11 1.16 +++ include/wx/sckaddr.h 2002/12/24 22:17:26 @@ -102,7 +102,7 @@ #endif #if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__)) -#include <sys/socket.h> +//#include <sys/socket.h> #ifndef __VMS__ # include <sys/un.h> #endif Index: include/wx/wxchar.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/wxchar.h,v retrieving revision 1.102 diff -u -r1.102 wxchar.h --- include/wx/wxchar.h 2002/12/10 00:43:24 1.102 +++ include/wx/wxchar.h 2002/12/24 22:17:27 @@ -248,6 +248,7 @@ // it in Unicode build as well // ---------------------------------------------------------------------------- +#undef wxHAVE_TCHAR_SUPPORT #ifdef wxHAVE_TCHAR_SUPPORT #include <ctype.h> Index: include/wx/msw/gccpriv.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/gccpriv.h,v retrieving revision 1.6 diff -u -r1.6 gccpriv.h --- include/wx/msw/gccpriv.h 2001/08/02 19:02:17 1.6 +++ include/wx/msw/gccpriv.h 2002/12/24 22:17:28 @@ -48,6 +48,7 @@ // Mingw runtime 1.0-20010604 has some missing _tXXXX functions, // so let's define them ourselves: +#include <tchar.h> #if defined(__GNUWIN32__) && wxCHECK_W32API_VERSION( 1, 0 ) #ifndef _tsetlocale #if wxUSE_UNICODE Index: include/wx/msw/gnuwin32/extra.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/gnuwin32/extra.h,v retrieving revision 1.8 diff -u -r1.8 extra.h --- include/wx/msw/gnuwin32/extra.h 2001/06/08 15:03:59 1.8 +++ include/wx/msw/gnuwin32/extra.h 2002/12/24 22:17:29 @@ -3,7 +3,7 @@ * have (B18/B19). */ -#ifndef _WX_EXTRAH_ +#if 0 #define _WX_EXTRAH_ #ifndef __CYGWIN10__ Index: include/wx/msw/gnuwin32/winresrc.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/gnuwin32/winresrc.h,v retrieving revision 1.2 diff -u -r1.2 winresrc.h --- include/wx/msw/gnuwin32/winresrc.h 1999/01/19 18:20:15 1.2 +++ include/wx/msw/gnuwin32/winresrc.h 2002/12/24 22:17:32 @@ -1409,12 +1409,12 @@ -#ifdef UNICODE -#define __TEXT(quote) L##quote -#else /* UNICODE */ -#define __TEXT(quote) quote -#endif /* UNICODE */ -#define TEXT(quote) __TEXT(quote) +#ifdef UNICODE +#define __TEXT(quote) L##quote +#else +#define __TEXT(quote) quote +#endif +#define TEXT(quote) __TEXT(quote) // // Language IDs. Index: samples/makefile.g95 =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/samples/makefile.g95,v retrieving revision 1.16 diff -u -r1.16 makefile.g95 --- samples/makefile.g95 2002/04/12 13:15:44 1.16 +++ samples/makefile.g95 2002/12/24 22:17:32 @@ -17,7 +17,7 @@ THISDIR=$(WXDIR)/samples MAKEFILE=makefile.g95 MAKEFLAGS=WXUSINGDLL=$(WXUSINGDLL) UNICODE=$(UNICODE) -CMDLINE=-f $(MAKEFILE) $(MAKEFLAGS) +CMDLINE=-s -f $(MAKEFILE) $(MAKEFLAGS) # Mingw make may not have a shell to use, so can't use a loop here. Sigh. # Please add new sample directories alphabetically to make it easier to Index: src/makeg95.env =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/makeg95.env,v retrieving revision 1.73 diff -u -r1.73 makeg95.env --- src/makeg95.env 2002/12/18 08:33:27 1.73 +++ src/makeg95.env 2002/12/24 22:17:37 @@ -22,7 +22,7 @@ # use forward slashes, we need to set this when # invoking the makefile from DOS, or the wrong separators # will be assumed. -#OSTYPE=msys +OSTYPE=msys # If building DLL, the version WXVERSION=250 @@ -81,6 +81,7 @@ else CC = gcc endif +CC=winegcc # C compiler for pure C programs CCC = $(CC) @@ -102,7 +103,7 @@ # Settings for Cyginw/Mingw32 # Some versions of windres cannot cope with the --preprocessor # option. Uncomment the RCPREPROCESSOR line below if yours can. -RESCOMP=windres +RESCOMP=wrc RCINPUTSWITCH=-i RCOUTPUTSWITCH=-o RCINCSWITCH=--include-dir @@ -125,7 +126,7 @@ # Miscellaneous compiler options # GRG: the __MINGW32__ option is not needed anymore # add "-DHAVE_W32API_H" if you have w32api >= 0.5 -OPTIONS = -DSTRICT # -D__MINGW32__ +OPTIONS = -DSTRICT -DwxSIZE_T_IS_UINT -DHAVE_W32API_H -D__MINGW32__ -D_FORCENAMELESSUNION # Add "-mthreads" if you want to have threads under mingw32 COMMON_THREADFLAGS = @@ -198,12 +199,12 @@ ########################## Directories ############################### -OLELIBS=-lole32 -loleaut32 -luuid +OLELIBS=-lole32 -loleaut32 /usr/local/lib/libwine_uuid.a BASELIBS=-lstdc++ -lgcc -lodbc32 -lwsock32 ifeq ($(wxUSE_GUI),1) WINLIBS= $(BASELIBS) \ -lwinspool -lwinmm -lshell32 \ - -lcomctl32 -lctl3d32 -lodbc32 -ladvapi32 \ + -lcomctl32 -lcomdlg32 -lodbc32 -ladvapi32 \ -lodbc32 -lwsock32 -lopengl32 -lglu32 $(OLELIBS) # -loldnames else WINLIBS=$(BASELIBS) @@ -238,7 +239,7 @@ # png, jpeg, etc are exported from wx dll, so skip and save on link time. LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(COMPLIBS) else - LIBS = $(EXTRALIBS) $(WXLIB) -lregex -lpng -ljpeg -lzlib -ltiff $(WINLIBS) $(COMPLIBS) + LIBS = $(EXTRALIBS) $(WXLIB) /home/dimi/dev/wine/wxWindows/lib/libregex.a /home/dimi/dev/wine/wxWindows/lib/libpng.a /home/dimi/dev/wine/wxWindows/lib/libjpeg.a /home/dimi/dev/wine/wxWindows/lib/libzlib.a /home/dimi/dev/wine/wxWindows/lib/libtiff.a $(WINLIBS) $(COMPLIBS) endif WINFLAGS=-D_X86_=1 -DWIN32 -D_WIN32 $(WINVERSION) Index: src/common/datetime.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/datetime.cpp,v retrieving revision 1.71 diff -u -r1.71 datetime.cpp --- src/common/datetime.cpp 2002/12/04 14:06:21 1.71 +++ src/common/datetime.cpp 2002/12/24 22:17:42 @@ -286,7 +286,8 @@ #ifdef WX_GMTOFF_IN_TM return (int)gmtoffset; #else - return (int)WX_TIMEZONE; + //return (int)WX_TIMEZONE; + return LONG_MAX; #endif } Index: src/common/dynarray.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/dynarray.cpp,v retrieving revision 1.28 diff -u -r1.28 dynarray.cpp --- src/common/dynarray.cpp 2002/12/04 14:06:27 1.28 +++ src/common/dynarray.cpp 2002/12/24 22:17:43 @@ -28,6 +28,7 @@ #include <stdlib.h> #include <string.h> // for memmove +#include <search.h> #ifndef max #define max(a, b) (((a) > (b)) ? (a) : (b)) Index: src/common/encconv.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/encconv.cpp,v retrieving revision 1.14 diff -u -r1.14 encconv.cpp --- src/common/encconv.cpp 2002/01/25 14:45:20 1.14 +++ src/common/encconv.cpp 2002/12/24 22:17:44 @@ -23,6 +23,7 @@ #include "wx/encconv.h" #include <stdlib.h> +#include <search.h> // conversion tables, generated by scripts in $(WXWIN)/misc/unictabl: #ifdef __BORLANDC__ Index: src/common/filefn.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/filefn.cpp,v retrieving revision 1.161 diff -u -r1.161 filefn.cpp --- src/common/filefn.cpp 2002/12/10 21:44:08 1.161 +++ src/common/filefn.cpp 2002/12/24 22:17:49 @@ -1258,7 +1258,7 @@ // assume mkdir() has 2 args on non Windows-OS/2 platforms and on Windows too // for the GNU compiler -#if (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__) +#if 1 || (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WXMICROWIN__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #elif defined(__WXPM__) if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? Index: src/common/filename.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/filename.cpp,v retrieving revision 1.101 diff -u -r1.101 filename.cpp --- src/common/filename.cpp 2002/12/04 14:06:32 1.101 +++ src/common/filename.cpp 2002/12/24 22:17:51 @@ -99,7 +99,7 @@ #include <sys/types.h> #include <utime.h> #include <sys/stat.h> -#include <unistd.h> +//#include <unistd.h> #endif #ifdef __DJGPP__ Index: src/common/list.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/list.cpp,v retrieving revision 1.38 diff -u -r1.38 list.cpp --- src/common/list.cpp 2002/02/06 01:38:08 1.38 +++ src/common/list.cpp 2002/12/24 22:17:52 @@ -31,6 +31,7 @@ #include <stdarg.h> #include <stdlib.h> #include <string.h> +#include <search.h> #ifndef WX_PRECOMP #include "wx/defs.h" Index: src/common/mimecmn.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/mimecmn.cpp,v retrieving revision 1.23 diff -u -r1.23 mimecmn.cpp --- src/common/mimecmn.cpp 2002/12/04 14:06:45 1.23 +++ src/common/mimecmn.cpp 2002/12/24 22:17:53 @@ -486,7 +486,7 @@ bool wxMimeTypesManager::Unassociate(wxFileType *ft) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) +#if 0 && defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) return m_impl->Unassociate(ft); #else return ft->Unassociate(); @@ -596,7 +596,7 @@ void wxMimeTypesManager::Initialize(int mcapStyle, const wxString& sExtraDir) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) +#if 0 && defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) EnsureImpl(); m_impl->Initialize(mcapStyle, sExtraDir); @@ -609,7 +609,7 @@ // and this function clears all the data from the manager void wxMimeTypesManager::ClearData() { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) +#if 0 && defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) EnsureImpl(); m_impl->ClearData(); Index: src/common/string.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/string.cpp,v retrieving revision 1.166 diff -u -r1.166 string.cpp --- src/common/string.cpp 2002/12/10 12:13:23 1.166 +++ src/common/string.cpp 2002/12/24 22:17:55 @@ -41,6 +41,7 @@ #include <ctype.h> #include <string.h> #include <stdlib.h> +#include <search.h> #ifdef __SALFORDC__ #include <clib.h> Index: src/common/wxchar.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/wxchar.cpp,v retrieving revision 1.51 diff -u -r1.51 wxchar.cpp --- src/common/wxchar.cpp 2002/12/10 00:43:28 1.51 +++ src/common/wxchar.cpp 2002/12/24 22:17:57 @@ -105,7 +105,7 @@ bool WXDLLEXPORT wxOKlibc() { -#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) +#if 0 && wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) // glibc 2.0 uses UTF-8 even when it shouldn't wchar_t res = 0; if ((MB_CUR_MAX == 2) && Index: src/jpeg/jmorecfg.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/jpeg/jmorecfg.h,v retrieving revision 1.19 diff -u -r1.19 jmorecfg.h --- src/jpeg/jmorecfg.h 2002/05/26 11:49:37 1.19 +++ src/jpeg/jmorecfg.h 2002/12/24 22:17:58 @@ -130,6 +130,7 @@ */ /* UINT8 must hold at least the values 0..255. */ +#ifndef __WINE_BASETSD_H #ifdef HAVE_UNSIGNED_CHAR typedef unsigned char UINT8; @@ -154,6 +155,8 @@ #ifndef XMD_H /* X11/xmd.h correctly defines INT16 */ typedef short INT16; #endif + +#endif /* __WINE_BASETSD_H */ /* INT32 must hold at least signed 32-bit values. */ Index: src/msw/app.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/msw/app.cpp,v retrieving revision 1.174 diff -u -r1.174 app.cpp --- src/msw/app.cpp 2002/12/04 14:09:06 1.174 +++ src/msw/app.cpp 2002/12/24 22:18:01 @@ -1382,5 +1382,5 @@ // For some reason, with MSVC++ 1.5, WinMain isn't linked in properly // if in a separate file. So include it here to ensure it's linked. #if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL)) -#include "main.cpp" +//#include "main.cpp" #endif Index: src/msw/dialup.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/msw/dialup.cpp,v retrieving revision 1.34 diff -u -r1.34 dialup.cpp --- src/msw/dialup.cpp 2002/08/30 20:34:25 1.34 +++ src/msw/dialup.cpp 2002/12/24 22:18:02 @@ -50,7 +50,7 @@ // Doesn't yet compile under VC++ 4, BC++, Watcom C++, // Wine: no wininet.h -#if !defined(__BORLANDC__) && \ +#if 0 && !defined(__BORLANDC__) && \ (!defined(__GNUWIN32__) || wxCHECK_W32API_VERSION(0, 5)) && \ !defined(__GNUWIN32_OLD__) && \ !defined(__WATCOMC__) && \ Index: src/msw/gsocket.c =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/msw/gsocket.c,v retrieving revision 1.42 diff -u -r1.42 gsocket.c --- src/msw/gsocket.c 2002/12/06 16:57:30 1.42 +++ src/msw/gsocket.c 2002/12/24 22:18:04 @@ -11,6 +11,8 @@ * PLEASE don't put C++ comments here - this is a C source file. */ +#include <winsock.h> + #ifdef _MSC_VER /* RPCNOTIFICATION_ROUTINE in rasasync.h (included from winsock.h), * warning: conditional expression is constant. @@ -55,8 +57,6 @@ #include <stdlib.h> #include <stddef.h> #include <ctype.h> - -#include <winsock.h> /* if we use configure for MSW SOCKLEN_T will be already defined */ #ifndef SOCKLEN_T Index: src/msw/utils.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/msw/utils.cpp,v retrieving revision 1.102 diff -u -r1.102 utils.cpp --- src/msw/utils.cpp 2002/12/07 00:58:11 1.102 +++ src/msw/utils.cpp 2002/12/24 22:18:06 @@ -47,6 +47,7 @@ #endif #include "wx/timer.h" +#include <unistd.h> #if !defined(__GNUWIN32__) && !defined(__WXWINE__) && !defined(__SALFORDC__) && !defined(__WXMICROWIN__) #include <direct.h> Index: src/png/pngconf.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/png/pngconf.h,v retrieving revision 1.7 diff -u -r1.7 pngconf.h --- src/png/pngconf.h 2002/12/04 14:10:03 1.7 +++ src/png/pngconf.h 2002/12/24 22:18:08 @@ -1157,9 +1157,10 @@ # endif #endif -#if defined(__CYGWIN__) +#if 1 || defined(__CYGWIN__) # undef PNGAPI -# define PNGAPI __cdecl +//# define PNGAPI __cdecl +# define PNGAPI # undef PNG_IMPEXP # define PNG_IMPEXP #endif -- Dimi.

Dec. 24, 2002

Set/WindowLong problem in user/win test

by Francois Gouget

This test uses {Get,Set}WindowLongW which of course does not work on Win9x, thus causing the test to fail. I guess part of the goal is to check that mixing Ansi calls (CreatewindowExA) with Unicode calls works. So I wrote a function test_set_window_long function that calls SetWindowLongW and then SetWindowLongA and checks that their results match but that causes the test to fail (at least on NT4 and Wine). More precisely even if all this function does is the following, then the test fails: { LONG rc=SetWindowLongA(hwnd,nIndex,dwNewLong); SetWindowLongA(hwnd,nIndex,dwNewLong); return rc; } Comment out the second SetWindowLongA and it works. Why would calling SetWindowLong a second time make any difference? Here's the full patch, just change '#if 0' into '#if 1' to make the test fail. Index: dlls/user/tests/win.c =================================================================== RCS file: /home/wine/wine/dlls/user/tests/win.c,v retrieving revision 1.5 diff -u -r1.5 win.c --- dlls/user/tests/win.c 15 Nov 2002 00:02:51 -0000 1.5 +++ dlls/user/tests/win.c 24 Dec 2002 03:16:36 -0000 @@ -45,6 +45,47 @@ static HWND hwndMain, hwndMain2; +static LONG test_set_window_long(HWND hwnd, int nIndex, LONG dwNewLong) +{ + LONG rc; + + SetLastError(0); + rc=SetWindowLongW(hwnd,nIndex,dwNewLong); + if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { + rc=SetWindowLongA(hwnd,nIndex,dwNewLong); + } +#if 0 + else { + LONG set,get; + get=GetWindowLongW(hwnd,nIndex); + set=SetWindowLongA(hwnd,nIndex,dwNewLong); + ok(set==get, + "SetWindowLongA/W(%ld) failed: got %ld, expected %ld\n", + dwNewLong,set,get); + } +#endif + return rc; +} + +static LONG test_get_window_long(HWND hwnd, int nIndex) +{ + LONG rc; + + SetLastError(0); + rc=GetWindowLongW(hwnd,nIndex); + if (rc==0 && GetLastError()==ERROR_CALL_NOT_IMPLEMENTED) { + rc=GetWindowLongA(hwnd,nIndex); + } else { + LONG rcA; + SetLastError(0); + rcA=GetWindowLongA(hwnd,nIndex); + ok(rc==rcA, + "GetWindowLongW failed: got %ld, expected %ld\n", + rc,rcA); + } + return rc; +} + /* check the values returned by the various parent/owner functions on a given window */ static void check_parents( HWND hwnd, HWND ga_parent, HWND gwl_parent, HWND get_parent, HWND gw_owner, HWND ga_root, HWND ga_root_owner ) @@ -56,7 +97,7 @@ res = pGetAncestor( hwnd, GA_PARENT ); ok( res == ga_parent, "Wrong result for GA_PARENT %p expected %p", res, ga_parent ); } - res = (HWND)GetWindowLongW( hwnd, GWL_HWNDPARENT ); + res = (HWND)test_get_window_long( hwnd, GWL_HWNDPARENT ); ok( res == gwl_parent, "Wrong result for GWL_HWNDPARENT %p expected %p", res, gwl_parent ); res = GetParent( hwnd ); ok( res == get_parent, "Wrong result for GetParent %p expected %p", res, get_parent ); @@ -97,31 +138,31 @@ /* desktop window */ check_parents( desktop, 0, 0, 0, 0, 0, 0 ); - style = GetWindowLongW( desktop, GWL_STYLE ); - ok( !SetWindowLongW( desktop, GWL_STYLE, WS_POPUP ), "Set GWL_STYLE on desktop succeeded" ); - ok( !SetWindowLongW( desktop, GWL_STYLE, 0 ), "Set GWL_STYLE on desktop succeeded" ); - ok( GetWindowLongW( desktop, GWL_STYLE ) == style, "Desktop style changed" ); + style = test_get_window_long( desktop, GWL_STYLE ); + ok( !SetWindowLongA( desktop, GWL_STYLE, WS_POPUP ), "Set GWL_STYLE on desktop succeeded" ); + ok( !SetWindowLongA( desktop, GWL_STYLE, 0 ), "Set GWL_STYLE on desktop succeeded" ); + ok( test_get_window_long( desktop, GWL_STYLE ) == style, "Desktop style changed" ); /* normal child window */ test = create_tool_window( WS_CHILD, hwndMain ); trace( "created child %p\n", test ); check_parents( test, hwndMain, hwndMain, hwndMain, 0, hwndMain, hwndMain ); - SetWindowLongW( test, GWL_STYLE, 0 ); + test_set_window_long( test, GWL_STYLE, 0 ); check_parents( test, hwndMain, hwndMain, 0, 0, hwndMain, test ); - SetWindowLongW( test, GWL_STYLE, WS_POPUP ); + test_set_window_long( test, GWL_STYLE, WS_POPUP ); check_parents( test, hwndMain, hwndMain, 0, 0, hwndMain, test ); - SetWindowLongW( test, GWL_STYLE, WS_POPUP|WS_CHILD ); + test_set_window_long( test, GWL_STYLE, WS_POPUP|WS_CHILD ); check_parents( test, hwndMain, hwndMain, 0, 0, hwndMain, test ); - SetWindowLongW( test, GWL_STYLE, WS_CHILD ); + test_set_window_long( test, GWL_STYLE, WS_CHILD ); DestroyWindow( test ); /* child of desktop */ test = create_tool_window( WS_CHILD, desktop ); trace( "created child of desktop %p\n", test ); check_parents( test, desktop, 0, desktop, 0, test, desktop ); - SetWindowLongW( test, GWL_STYLE, WS_POPUP ); + test_set_window_long( test, GWL_STYLE, WS_POPUP ); check_parents( test, desktop, 0, 0, 0, test, test ); - SetWindowLongW( test, GWL_STYLE, 0 ); + test_set_window_long( test, GWL_STYLE, 0 ); check_parents( test, desktop, 0, 0, 0, test, test ); DestroyWindow( test ); @@ -129,9 +170,9 @@ test = create_tool_window( WS_CHILD, child ); trace( "created child of child %p\n", test ); check_parents( test, child, child, child, 0, hwndMain, hwndMain ); - SetWindowLongW( test, GWL_STYLE, 0 ); + test_set_window_long( test, GWL_STYLE, 0 ); check_parents( test, child, child, 0, 0, hwndMain, test ); - SetWindowLongW( test, GWL_STYLE, WS_POPUP ); + test_set_window_long( test, GWL_STYLE, WS_POPUP ); check_parents( test, child, child, 0, 0, hwndMain, test ); DestroyWindow( test ); @@ -139,9 +180,9 @@ test = create_tool_window( 0, 0 ); trace( "created top-level %p\n", test ); check_parents( test, desktop, 0, 0, 0, test, test ); - SetWindowLongW( test, GWL_STYLE, WS_POPUP ); + test_set_window_long( test, GWL_STYLE, WS_POPUP ); check_parents( test, desktop, 0, 0, 0, test, test ); - SetWindowLongW( test, GWL_STYLE, WS_CHILD ); + test_set_window_long( test, GWL_STYLE, WS_CHILD ); check_parents( test, desktop, 0, desktop, 0, test, desktop ); DestroyWindow( test ); @@ -149,9 +190,9 @@ test = create_tool_window( 0, hwndMain ); trace( "created owned top-level %p\n", test ); check_parents( test, desktop, hwndMain, 0, hwndMain, test, test ); - SetWindowLongW( test, GWL_STYLE, WS_POPUP ); + test_set_window_long( test, GWL_STYLE, WS_POPUP ); check_parents( test, desktop, hwndMain, hwndMain, hwndMain, test, hwndMain ); - SetWindowLongW( test, GWL_STYLE, WS_CHILD ); + test_set_window_long( test, GWL_STYLE, WS_CHILD ); check_parents( test, desktop, hwndMain, desktop, hwndMain, test, desktop ); DestroyWindow( test ); @@ -159,9 +200,9 @@ test = create_tool_window( WS_POPUP, 0 ); trace( "created popup %p\n", test ); check_parents( test, desktop, 0, 0, 0, test, test ); - SetWindowLongW( test, GWL_STYLE, WS_CHILD ); + test_set_window_long( test, GWL_STYLE, WS_CHILD ); check_parents( test, desktop, 0, desktop, 0, test, desktop ); - SetWindowLongW( test, GWL_STYLE, 0 ); + test_set_window_long( test, GWL_STYLE, 0 ); check_parents( test, desktop, 0, 0, 0, test, test ); DestroyWindow( test ); @@ -169,9 +210,9 @@ test = create_tool_window( WS_POPUP, hwndMain ); trace( "created owned popup %p\n", test ); check_parents( test, desktop, hwndMain, hwndMain, hwndMain, test, hwndMain ); - SetWindowLongW( test, GWL_STYLE, WS_CHILD ); + test_set_window_long( test, GWL_STYLE, WS_CHILD ); check_parents( test, desktop, hwndMain, desktop, hwndMain, test, desktop ); - SetWindowLongW( test, GWL_STYLE, 0 ); + test_set_window_long( test, GWL_STYLE, 0 ); check_parents( test, desktop, hwndMain, 0, hwndMain, test, test ); DestroyWindow( test ); @@ -210,7 +251,7 @@ /* desktop window */ check_parents( desktop, 0, 0, 0, 0, 0, 0 ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); ok( !ret, "Set GWL_HWNDPARENT succeeded on desktop" ); check_parents( desktop, 0, 0, 0, 0, 0, 0 ); ok( !SetParent( desktop, hwndMain ), "SetParent succeeded on desktop" ); @@ -220,24 +261,24 @@ test = create_tool_window( WS_CHILD, hwndMain ); trace( "created child %p\n", test ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); ok( ret == hwndMain, "GWL_HWNDPARENT return value %p expected %p", ret, hwndMain ); check_parents( test, hwndMain2, hwndMain2, hwndMain2, 0, hwndMain2, hwndMain2 ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)child ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)child ); ok( ret == hwndMain2, "GWL_HWNDPARENT return value %p expected %p", ret, hwndMain2 ); check_parents( test, child, child, child, 0, hwndMain, hwndMain ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)desktop ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)desktop ); ok( ret == child, "GWL_HWNDPARENT return value %p expected %p", ret, child ); check_parents( test, desktop, 0, desktop, 0, test, desktop ); /* window is now child of desktop so GWL_HWNDPARENT changes owner from now on */ - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)child ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)child ); ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0", ret ); check_parents( test, desktop, child, desktop, child, test, desktop ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, 0 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, 0 ); ok( ret == child, "GWL_HWNDPARENT return value %p expected %p", ret, child ); check_parents( test, desktop, 0, desktop, 0, test, desktop ); DestroyWindow( test ); @@ -246,15 +287,15 @@ test = create_tool_window( 0, 0 ); trace( "created top-level %p\n", test ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0", ret ); check_parents( test, desktop, hwndMain2, 0, hwndMain2, test, test ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)child ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)child ); ok( ret == hwndMain2, "GWL_HWNDPARENT return value %p expected %p", ret, hwndMain2 ); check_parents( test, desktop, child, 0, child, test, test ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, 0 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, 0 ); ok( ret == child, "GWL_HWNDPARENT return value %p expected %p", ret, child ); check_parents( test, desktop, 0, 0, 0, test, test ); DestroyWindow( test ); @@ -263,15 +304,15 @@ test = create_tool_window( WS_POPUP, 0 ); trace( "created popup %p\n", test ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)hwndMain2 ); ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0", ret ); check_parents( test, desktop, hwndMain2, hwndMain2, hwndMain2, test, hwndMain2 ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (LONG_PTR)child ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (LONG_PTR)child ); ok( ret == hwndMain2, "GWL_HWNDPARENT return value %p expected %p", ret, hwndMain2 ); check_parents( test, desktop, child, child, child, test, hwndMain ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, 0 ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, 0 ); ok( ret == child, "GWL_HWNDPARENT return value %p expected %p", ret, child ); check_parents( test, desktop, 0, 0, 0, test, test ); DestroyWindow( test ); @@ -310,7 +351,7 @@ ok( ret == desktop, "SetParent return value %p expected %p", ret, desktop ); check_parents( test, child, child, hwndMain2, hwndMain2, hwndMain, hwndMain2 ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (ULONG_PTR)hwndMain ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (ULONG_PTR)hwndMain ); ok( ret == child, "GWL_HWNDPARENT return value %p expected %p", ret, child ); check_parents( test, hwndMain, hwndMain, hwndMain2, hwndMain2, hwndMain, hwndMain2 ); DestroyWindow( test ); @@ -343,7 +384,7 @@ owner = create_tool_window( WS_CHILD, hwndMain2 ); test = create_tool_window( WS_POPUP, 0 ); trace( "created owner %p and popup %p\n", owner, test ); - ret = (HWND)SetWindowLongW( test, GWL_HWNDPARENT, (ULONG_PTR)owner ); + ret = (HWND)test_set_window_long( test, GWL_HWNDPARENT, (ULONG_PTR)owner ); ok( ret == 0, "GWL_HWNDPARENT return value %p expected 0", ret ); check_parents( test, desktop, owner, owner, owner, test, hwndMain2 ); DestroyWindow( owner ); -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Before you criticize someone, walk a mile in his shoes. That way, if he gets angry, he'll be a mile away - and barefoot.

Dec. 24, 2002

Re: __WINE__ vs. __WINESRC__

by Dimitrie O. Paun

On December 22, 2002 03:04 pm, Francois Gouget wrote: > But I'm open to change, '__WINE__' looks more like the others. Maybe > '__WINELIB__' would do? (but I prefer '__WINE__') Alexandre, what do you think? I'd like to have winegcc define this by default, but we have to decide on a symbol name. Sorry to bug you with this now, but I'd like to get it out of the way so I can properly finish the wxWindows port. -- Dimi.

Dec. 24, 2002

Re: tchar fixes: _tcs{dup,icmp}

by Francois Gouget

On Tue, 24 Dec 2002, Dimitrie O. Paun wrote: > On December 23, 2002 10:52 pm, Francois Gouget wrote: > > Then the question is whether tchar.h should be considered to be a pure > > msvcrt thing, i.e. don't use it if you don't link to msvcrt, or whether > > we want to make is usable in Ansi mode with a regular C library. > > If using tchar.h forces you to link in msvcrt, it should be moved to > include/msvcrt. Thing is that MinGW supports tchar.h it seems, so we > can do one of two things: > 1. Add conditionals in tchar.h as you suggested to do things differently > depending on whether or not we link in msvcrt > 2. Move the current tchar.h to include/msvcrt, and create a new one > to support the MinGW/glibc case. Solution 2 seems likely to cause directory include order headaches... -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ In a world without fences who needs Gates?

Dec. 24, 2002

Re: tchar fixes: _tcs{dup,icmp}

by Dimitrie O. Paun

On December 24, 2002 03:43 pm, Francois Gouget wrote: > Solution 2 seems likely to cause directory include order headaches... Not really. We should have another directory called include/cygwin, and you either use include/msvcrt or include/cygwin. They are mutually exclusive. Where is the problem? -- Dimi.

Dec. 24, 2002

Re: 'make test' failure on sysparams.c

by Dan Kegel

Dan Kegel wrote: > On fresh cvs: > > ../../../tools/runtest -q -P wine -M user32.dll -T ../../.. -p > user32_test.exe.so sysparams.c && touch sysparams.ok > X Error of failed request: BadWindow (invalid Window parameter) > Major opcode of failed request: 15 (X_QueryTree) > Resource id in failed request: 0x2600003 > Serial number of failed request: 45 > Current serial number in output stream: 45 > make[3]: *** [sysparams.ok] Error 1 > > This happens if I run 'make test' with a remote X window > between two Red Hat 8.0 systems. Darn. It's nonrepeatable. I'll post again if I figure out how to repeat it. FWIW I was using ssh X forwarding. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Dec. 24, 2002

Some D3D status updates...

by Lionel Ulmer

Hi all, As it was one of my objectives when Christian's work prodded me into restarting working on D3D, I am happy to show here the first screen shot of SystemShock2 working (alas texture-less) with Wine : http://www.bbrox.org/system_shock2.png Merry Christmas to everybody :-) Lionel (with one week and a half of almost full-time hack vacation left :-) ) -- Lionel Ulmer - http://www.bbrox.org/

Dec. 24, 2002

Re: Validate imagelists

by Dimitrie O. Paun

On December 24, 2002 02:27 pm, Duane Clark wrote: > + if (himl == NULL || himl->magic!=IMAGELIST_MAGIC) What about a: static inline BOOL is_valid(HIMAGELIST himl) { return himl && himl->magic == IMAGELIST_MAGIC; } -- Dimi.

Dec. 24, 2002

Re: Some D3D status updates...

by Dimitrie O. Paun

On December 24, 2002 01:33 pm, Lionel Ulmer wrote: > As it was one of my objectives when Christian's work prodded me into > restarting working on D3D, I am happy to show here the first screen > shot of SystemShock2 working (alas texture-less) with Wine : > > http://www.bbrox.org/system_shock2.png Way to go Lionel! Way, way cool :) Marry Christmas people! -- Dimi.

Dec. 24, 2002

Re: tchar fixes: _tcs{dup,icmp}

by Dimitrie O. Paun

On December 23, 2002 10:52 pm, Francois Gouget wrote: > Then the question is whether tchar.h should be considered to be a pure > msvcrt thing, i.e. don't use it if you don't link to msvcrt, or whether > we want to make is usable in Ansi mode with a regular C library. If using tchar.h forces you to link in msvcrt, it should be moved to include/msvcrt. Thing is that MinGW supports tchar.h it seems, so we can do one of two things: 1. Add conditionals in tchar.h as you suggested to do things differently depending on whether or not we link in msvcrt 2. Move the current tchar.h to include/msvcrt, and create a new one to support the MinGW/glibc case. Alexandre? -- Dimi.

Dec. 24, 2002

Re: Mozilla-Win32 Winelib build update..

by Dimitrie O. Paun

On December 24, 2002 11:07 am, Dustin Navea wrote: > Hi guys, just wanted to update you all that I am having some trouble > getting my hands on that DSL router I was planning on having last week. I > should have it shortly after the first and can begin the build process > then.. Hi Dustin, I think I might take over the Mozilla porting, I need a large test set for wine{gcc,wrap} anyway :) -- Dimi.

Dec. 24, 2002

[JOY] wxWindows

by Dimitrie O. Paun

Folks, Last night I managed to compile, link, and successfully run all(1) samples that come with wxWindows. In all honesty I am overjoyed! Let me explain why: -- wxWindows is a large piece of software that touches on most (if not all) Wine aspects. It does put our headers through their paces. -- The porting effort has been simple, and it took me a just a few days to do it. -- I have not used _any_ of the previous efforts to port wxWindows to Wine. I rather started with their MinGW port. -- Most of the changes have been trivial fixes for Wine which I have sent to wine-patches in the last few days. -- The hacks to wxWindows have been trivial and few in number. I have touched only a few files, and the changes are real simple. They'll need some cleaning up, and I'll submit them to the wxWindows folks for inclusion. -- The wine{gcc,wrap} combo is a great success. All I had to do was to touch only *one* file (makeg95.env), and modify only a few lines to get *everything* to compile and link. What does Wine get out of it: -- A good test for our headers -- Proof that wine{gcc,wrap} are a good idea (at least for me) -- A large number of sample that show quite a few problems in Wine. If anyone is interested in more details please let me know, and I'll be glad to provide them. Once we decide on the __WINE__ vs. __WINESRC__ thing, I'll cleanup the wxWindows changes and submit them for inclusion in their tree, so hopefully you'll be able to play with it using the official version not before long. Notes 1. All but a few: - 'dialup' did not compile because I had to disable dialup support in wxWindows since wine does not have a wininet.h - 'proplist' did not compile because I forgot to enable property lists in the configuration when I compiled wxWindows - 'tab' sample did not compile because it's recommended to not enable this deprecated option, so I did not. - the samples 'listbox', 'memcheck', and 'opengl/*' are not supported by wxWindows under MinGW, so I did not bother. -- Dimi.

Dec. 24, 2002

Re: Couldn't find a decent font, aborting

by Eric Pouech

> I've quickly searched through the Devel and User archives, and searched > using Google, but found just about nothing on the subject. wineconsole looks for a fixed size font which will fit the 80x25 console on the screen. it doesn't seem to find one. a possible workaround is to install more fixed size TTF fonts A+ -- Eric Pouech

Dec. 24, 2002

Re: MSVC4, next two buttons on installer

by Eric Pouech

> Q4. Is winefile going to be installed in some standard place? winefile is installed in wine's normal installation process > Also, > is it a problem that winefile is a winelib application? Wouldn't > we rather it be a straight Windows application if we're going to > invoke it from inside wine? there shouldn't be any problem there A+ -- Eric Pouech

Dec. 24, 2002

Mozilla-Win32 Winelib build update..

by Dustin Navea

Hi guys, just wanted to update you all that I am having some trouble getting my hands on that DSL router I was planning on having last week. I should have it shortly after the first and can begin the build process then.. if all goes as planned. Sorry about the long wait and happy holidays to all. -Dustin

Dec. 24, 2002

Re: RECT (take 2)

by Dan Kegel

Dimitrie O. Paun wrote: > Fixing the RECT definition (how come it fell through the cracks, > it's such a fundamental definition in Win32?) in one go doesn't > seem like it's going to happen. A lot of places need fixing, so > unless a Perl wizard (hint, hint) comes up with a magic script, > it's going to be a while until this is fixed. I had a go at the perl approach, at least for a subset of the changes. Here's the script I used to generate the initial patch: #!/bin/sh rm -rf orig after #make > log 2>&1 || /bin/true grep "warning: int format, LONG arg" log | sed -e 's/:.*//' | sort -u | sed 's,\.\./,,g' > fils find . | fgrep -f fils > absfils tar -czvf orig.tgz `cat absfils` mkdir orig cd orig; tar -xzvf ../orig.tgz; cd .. mkdir after cd after; tar -xzvf ../orig.tgz; cd .. cd after find . -type f | xargs perl -p -i.bak -e 's/$%d,%d$/(%ld,%ld)/g' cd .. diff -aur orig after > longify.patch I then removed any part of the patch that was wrong (first by eye, then iteratively by looking at compiler logs). This gets rid of quite a few of the warnings. The resulting patch is attached. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com diff -aur orig/controls/menu.c after/controls/menu.c --- orig/controls/menu.c 2002-12-21 21:52:08.000000000 -0800 +++ after/controls/menu.c 2002-12-24 05:11:18.000000000 -0800 @@ -965,7 +965,7 @@ - arrow_bitmap_width; } } - TRACE("(%d,%d)-(%d,%d)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom); + TRACE("(%ld,%ld)-(%ld,%ld)\n", lpitem->rect.left, lpitem->rect.top, lpitem->rect.right, lpitem->rect.bottom); } @@ -2688,7 +2688,7 @@ mt.pt.x = x; mt.pt.y = y; - TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%d,%d)-(%d,%d)\n", + TRACE("hmenu=%p flags=0x%08x (%d,%d) hwnd=%p (%ld,%ld)-(%ld,%ld)\n", hmenu, wFlags, x, y, hwnd, (lprect) ? lprect->left : 0, (lprect) ? lprect->top : 0, (lprect) ? lprect->right : 0, (lprect) ? lprect->bottom : 0); diff -aur orig/dlls/comctl32/comboex.c after/dlls/comctl32/comboex.c --- orig/dlls/comctl32/comboex.c 2002-12-21 21:52:08.000000000 -0800 +++ after/dlls/comctl32/comboex.c 2002-12-24 05:11:18.000000000 -0800 @@ -385,7 +385,7 @@ h = mysize.cy + 1; y = rect.bottom - h - 1; - TRACE("Combo client (%d,%d)-(%d,%d), setting Edit to (%d,%d)-(%d,%d)\n", + TRACE("Combo client (%ld,%ld)-(%ld,%ld), setting Edit to (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom, x, y, x + w, y + h); SetWindowPos(infoPtr->hwndEdit, HWND_TOP, x, y, w, h, SWP_SHOWWINDOW | SWP_NOACTIVATE | SWP_NOZORDER); @@ -891,10 +891,10 @@ height = cb_wrect.bottom-cb_wrect.top + cbx_wrect.bottom-cbx_wrect.top - (cbx_crect.bottom-cbx_crect.top); - TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\n", cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom, cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom); - TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n", + TRACE("CB window=(%ld,%ld)-(%ld,%ld), EX setting=(0,0)-(%d,%d)\n", cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom, cbx_wrect.right-cbx_wrect.left, height); SetWindowPos (infoPtr->hwndSelf, HWND_TOP, 0, 0, @@ -942,7 +942,7 @@ /* create combo box */ GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); - TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom); @@ -1033,7 +1033,7 @@ GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("EX window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) CB wnd=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) CB wnd=(%ld,%ld)-(%ld,%ld)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom); @@ -1042,7 +1042,7 @@ SWP_NOACTIVATE | SWP_NOREDRAW); GetWindowRect(infoPtr->hwndCombo, &cmbwrc); - TRACE("CB window=(%d,%d)-(%d,%d)\n", + TRACE("CB window=(%ld,%ld)-(%ld,%ld)\n", cmbwrc.left, cmbwrc.top, cmbwrc.right, cmbwrc.bottom); SetWindowPos(hwnd, HWND_TOP, 0, 0, cmbwrc.right-cmbwrc.left, cmbwrc.bottom-cmbwrc.top, @@ -1291,7 +1291,7 @@ dis->CtlType, dis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", dis->itemID, dis->itemAction, dis->itemState); - TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", dis->hwndItem, dis->hDC, dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, dis->itemData); @@ -1311,7 +1311,7 @@ if ( ( (dis->itemAction & ODA_FOCUS) && (dis->itemState & ODS_SELECTED)) || ( (dis->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)) && (dis->itemState & ODS_FOCUS) ) ) { - TRACE("drawing item -1 special focus, rect=(%d,%d)-(%d,%d)\n", + TRACE("drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld)\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom); } @@ -1327,14 +1327,14 @@ edrc.left=edrc.top=edrc.right=edrc.bottom=-1; if (infoPtr->hwndEdit) GetWindowRect (infoPtr->hwndEdit, &edrc); - TRACE("window rects ex=(%d,%d)-(%d,%d), cb=(%d,%d)-(%d,%d), ed=(%d,%d)-(%d,%d)\n", + TRACE("window rects ex=(%ld,%ld)-(%ld,%ld), cb=(%ld,%ld)-(%ld,%ld), ed=(%ld,%ld)-(%ld,%ld)\n", exrc.left, exrc.top, exrc.right, exrc.bottom, cbrc.left, cbrc.top, cbrc.right, cbrc.bottom, edrc.left, edrc.top, edrc.right, edrc.bottom); } } else { - ERR("NOT drawing item -1 special focus, rect=(%d,%d)-(%d,%d), action=%08x, state=%08x\n", + ERR("NOT drawing item -1 special focus, rect=(%ld,%ld)-(%ld,%ld), action=%08x, state=%08x\n", dis->rcItem.left, dis->rcItem.top, dis->rcItem.right, dis->rcItem.bottom, dis->itemAction, dis->itemState); @@ -1491,7 +1491,7 @@ rect.right = x + txtsize.cx; rect.top = dis->rcItem.top + 1; rect.bottom = dis->rcItem.bottom - 1; - TRACE("drawing item %d text, rect=(%d,%d)-(%d,%d)\n", + TRACE("drawing item %d text, rect=(%ld,%ld)-(%ld,%ld)\n", dis->itemID, rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (dis->hDC, x, y, ETO_OPAQUE | ETO_CLIPPED, &rect, str, len, 0); @@ -1617,10 +1617,10 @@ TRACE("winpos=(%d,%d %dx%d) flags=0x%08x\n", wp->x, wp->y, wp->cx, wp->cy, wp->flags); - TRACE("EX window=(%d,%d)-(%d,%d), client=(%d,%d)-(%d,%d)\n", + TRACE("EX window=(%ld,%ld)-(%ld,%ld), client=(%ld,%ld)-(%ld,%ld)\n", cbx_wrect.left, cbx_wrect.top, cbx_wrect.right, cbx_wrect.bottom, cbx_crect.left, cbx_crect.top, cbx_crect.right, cbx_crect.bottom); - TRACE("CB window=(%d,%d)-(%d,%d), EX setting=(0,0)-(%d,%d)\n", + TRACE("CB window=(%ld,%ld)-(%ld,%ld), EX setting=(0,0)-(%d,%d)\n", cb_wrect.left, cb_wrect.top, cb_wrect.right, cb_wrect.bottom, width, cb_wrect.bottom-cb_wrect.top); @@ -1702,7 +1702,7 @@ hDC = (HDC) wParam; obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW)); GetClientRect (hwnd, &rect); - TRACE("erasing (%d,%d)-(%d,%d)\n", + TRACE("erasing (%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); @@ -1907,7 +1907,7 @@ hDC = (HDC) wParam; obkc = SetBkColor (hDC, GetSysColor (COLOR_WINDOW)); GetClientRect (hwnd, &rect); - TRACE("erasing (%d,%d)-(%d,%d)\n", + TRACE("erasing (%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, rect.right, rect.bottom); ExtTextOutW (hDC, 0, 0, ETO_OPAQUE, &rect, 0, 0, 0); SetBkColor (hDC, obkc); diff -aur orig/dlls/comctl32/listview.c after/dlls/comctl32/listview.c --- orig/dlls/comctl32/listview.c 2002-12-23 22:59:36.000000000 -0800 +++ after/dlls/comctl32/listview.c 2002-12-24 05:11:18.000000000 -0800 @@ -6462,7 +6462,7 @@ infoPtr->iconSpacing.cx = cx; infoPtr->iconSpacing.cy = cy; - TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%ld,%ld), ntmH=%d\n", + TRACE("old=(%d,%d), new=(%d,%d), iconSize=(%ld,%ld), ntmH=%d\n", LOWORD(oldspacing), HIWORD(oldspacing), cx, cy, infoPtr->iconSize.cx, infoPtr->iconSize.cy, infoPtr->ntmHeight); diff -aur orig/dlls/comctl32/pager.c after/dlls/comctl32/pager.c --- orig/dlls/comctl32/pager.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/pager.c 2002-12-24 05:11:18.000000000 -0800 @@ -897,7 +897,7 @@ DefWindowProcA (hwnd, WM_NCCALCSIZE, wParam, lParam); - TRACE("orig rect=(%d,%d)-(%d,%d)\n", + TRACE("orig rect=(%ld,%ld)-(%ld,%ld)\n", lpRect->left, lpRect->top, lpRect->right, lpRect->bottom); if (PAGER_IsHorizontal(hwnd)) @@ -912,7 +912,7 @@ /* Reset buttons and hide any grey ones */ scrollRange = infoPtr->nWidth - (rcmyw.right - rcmyw.left); - TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n", + TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n", infoPtr->nPos, scrollRange, infoPtr->nHeight, rcmyw.left, rcmyw.top, rcmyw.right, rcmyw.bottom, @@ -926,7 +926,7 @@ ltrc.right = ltrc.left + infoPtr->nButtonSize; rbrc = wnrc; rbrc.left = rbrc.right - infoPtr->nButtonSize; - TRACE("horz lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n", + TRACE("horz lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n", ltrc.left, ltrc.top, ltrc.right, ltrc.bottom, rbrc.left, rbrc.top, rbrc.right, rbrc.bottom); if (PtInRect (&ltrc, cursor) && infoPtr->TLbtnState) @@ -961,7 +961,7 @@ /* Reset buttons and hide any grey ones */ scrollRange = infoPtr->nHeight - (rcmyw.bottom - rcmyw.top); - TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%d,%d)-(%d,%d), cursor=(%ld,%ld)\n", + TRACE("nPos=%d, scrollrange=%d, nHeigth=%d, myw=(%ld,%ld)-(%ld,%ld), cursor=(%ld,%ld)\n", infoPtr->nPos, scrollRange, infoPtr->nHeight, rcmyw.left, rcmyw.top, rcmyw.right, rcmyw.bottom, @@ -986,7 +986,7 @@ ltrc.right = ltrc.left + infoPtr->nButtonSize; rbrc = wnrc; rbrc.left = rbrc.right - infoPtr->nButtonSize; - TRACE("vert lt rect=(%d,%d)-(%d,%d), rb rect=(%d,%d)-(%d,%d)\n", + TRACE("vert lt rect=(%ld,%ld)-(%ld,%ld), rb rect=(%ld,%ld)-(%ld,%ld)\n", ltrc.left, ltrc.top, ltrc.right, ltrc.bottom, rbrc.left, rbrc.top, rbrc.right, rbrc.bottom); if (PtInRect (&ltrc, cursor) && infoPtr->TLbtnState) @@ -1003,7 +1003,7 @@ lpRect->bottom = infoPtr->nHeight; } - TRACE("[%p] client rect set to %dx%d at (%d,%d) BtnState[%d,%d]\n", + TRACE("[%p] client rect set to %dx%d at (%ld,%ld) BtnState[%d,%d]\n", hwnd, lpRect->right-lpRect->left, lpRect->bottom-lpRect->top, lpRect->left, lpRect->top, infoPtr->TLbtnState, infoPtr->BRbtnState); @@ -1232,7 +1232,7 @@ /* If in one of the buttons the capture and draw buttons */ if (btnrect) { - TRACE("[%p] draw btn (%d,%d)-(%d,%d), Capture %s, style %08lx\n", + TRACE("[%p] draw btn (%ld,%ld)-(%ld,%ld), Capture %s, style %08lx\n", hwnd, btnrect->left, btnrect->top, btnrect->right, btnrect->bottom, (infoPtr->bCapture) ? "TRUE" : "FALSE", diff -aur orig/dlls/comctl32/propsheet.c after/dlls/comctl32/propsheet.c --- orig/dlls/comctl32/propsheet.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/propsheet.c 2002-12-24 05:11:18.000000000 -0800 @@ -745,7 +745,7 @@ rc.right -= rc.left; rc.bottom -= rc.top; - TRACE("setting tab %08lx, rc (0,0)-(%d,%d)\n", + TRACE("setting tab %08lx, rc (0,0)-(%ld,%ld)\n", (DWORD)hwndTabCtrl, rc.right, rc.bottom); SetWindowPos(hwndTabCtrl, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -761,7 +761,7 @@ /* * Resize the property sheet. */ - TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n", + TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n", (DWORD)hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -830,7 +830,7 @@ /* * Resize the property sheet. */ - TRACE("setting dialog %08lx, rc (0,0)-(%d,%d)\n", + TRACE("setting dialog %08lx, rc (0,0)-(%ld,%ld)\n", (DWORD)hwndDlg, rc.right, rc.bottom); SetWindowPos(hwndDlg, 0, 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); @@ -1422,7 +1422,7 @@ pageHeight = rc.bottom - rc.top; padding = PROPSHEET_GetPaddingInfoWizard(hwndParent, psInfo); - TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d, padx=%d, pady=%d\n", + TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d, padx=%d, pady=%d\n", (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom, pageWidth, pageHeight, padding.x, padding.y); SetWindowPos(hwndPage, HWND_TOP, @@ -1438,7 +1438,7 @@ PROPSHEET_GetPageRect(psInfo, hwndParent, &rc); pageWidth = rc.right - rc.left; pageHeight = rc.bottom - rc.top; - TRACE("setting page %08lx, rc (%d,%d)-(%d,%d) w=%d, h=%d\n", + TRACE("setting page %08lx, rc (%ld,%ld)-(%ld,%ld) w=%d, h=%d\n", (DWORD)hwndPage, rc.left, rc.top, rc.right, rc.bottom, pageWidth, pageHeight); SetWindowPos(hwndPage, HWND_TOP, diff -aur orig/dlls/comctl32/rebar.c after/dlls/comctl32/rebar.c --- orig/dlls/comctl32/rebar.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/rebar.c 2002-12-24 05:11:18.000000000 -0800 @@ -466,11 +466,11 @@ i, (pB->lpText) ? debugstr_w(pB->lpText) : "(null)"); TRACE("band # %u: lcx=%u, ccx=%u, hcx=%u, lcy=%u, ccy=%u, hcy=%u, offChild=%ld,%ld\n", i, pB->lcx, pB->ccx, pB->hcx, pB->lcy, pB->ccy, pB->hcy, pB->offChild.cx, pB->offChild.cy); - TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%d,%d)-(%d,%d), Grip=(%d,%d)-(%d,%d)\n", + TRACE("band # %u: fStatus=%08x, fDraw=%08x, Band=(%ld,%ld)-(%ld,%ld), Grip=(%ld,%ld)-(%ld,%ld)\n", i, pB->fStatus, pB->fDraw, pB->rcBand.left, pB->rcBand.top, pB->rcBand.right, pB->rcBand.bottom, pB->rcGripper.left, pB->rcGripper.top, pB->rcGripper.right, pB->rcGripper.bottom); - TRACE("band # %u: Img=(%d,%d)-(%d,%d), Txt=(%d,%d)-(%d,%d), Child=(%d,%d)-(%d,%d)\n", + TRACE("band # %u: Img=(%ld,%ld)-(%ld,%ld), Txt=(%ld,%ld)-(%ld,%ld), Child=(%ld,%ld)-(%ld,%ld)\n", i, pB->rcCapImage.left, pB->rcCapImage.top, pB->rcCapImage.right, pB->rcCapImage.bottom, pB->rcCapText.left, pB->rcCapText.top, pB->rcCapText.right, pB->rcCapText.bottom, @@ -679,7 +679,7 @@ (lpBand->rcoldBand.right !=lpBand->rcBand.right) || (lpBand->rcoldBand.bottom !=lpBand->rcBand.bottom)) { lpBand->fDraw |= NTF_INVALIDATE; - TRACE("band %d row=%d: changed to (%d,%d)-(%d,%d) from (%d,%d)-(%d,%d)\n", + TRACE("band %d row=%d: changed to (%ld,%ld)-(%ld,%ld) from (%ld,%ld)-(%ld,%ld)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, @@ -687,7 +687,7 @@ lpBand->rcoldBand.right, lpBand->rcoldBand.bottom); } else - TRACE("band %d row=%d: unchanged (%d,%d)-(%d,%d)\n", + TRACE("band %d row=%d: unchanged (%ld,%ld)-(%ld,%ld)\n", i, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -763,7 +763,7 @@ lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth; else lpBand->rcBand.right = lpBand->rcBand.left + curwidth; - TRACE("Phase 1 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n", + TRACE("Phase 1 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n", i, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep); x = rcBrb(lpBand); @@ -833,7 +833,7 @@ lpBand->rcBand.bottom = lpBand->rcBand.top + curwidth; else lpBand->rcBand.right = lpBand->rcBand.left + curwidth; - TRACE("Phase 2 band %d, (%d,%d)-(%d,%d), orig x=%d, xsep=%d\n", + TRACE("Phase 2 band %d, (%ld,%ld)-(%ld,%ld), orig x=%d, xsep=%d\n", i, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, x, xsep); x = rcBrb(lpBand); @@ -961,14 +961,14 @@ ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) || (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) { TRACE("Child rectangle changed for band %u\n", i); - TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", + TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", oldChild.left, oldChild.top, oldChild.right, oldChild.bottom, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom); } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%d,%d)-(%d,%d)\n", + TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right + ((lpBand->fDraw & DRAW_RIGHTSEP) ? SEP_WIDTH_SIZE : 0), @@ -1100,14 +1100,14 @@ ((oldChild.right-oldChild.left != lpBand->rcChild.right-lpBand->rcChild.left) || (oldChild.bottom-oldChild.top != lpBand->rcChild.bottom-lpBand->rcChild.top))) { TRACE("Child rectangle changed for band %u\n", i); - TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", + TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", oldChild.left, oldChild.top, oldChild.right, oldChild.bottom, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom); } if (lpBand->fDraw & NTF_INVALIDATE) { - TRACE("invalidating (%d,%d)-(%d,%d)\n", + TRACE("invalidating (%ld,%ld)-(%ld,%ld)\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right + ((lpBand->fDraw & DRAW_BOTTOMSEP) ? SEP_WIDTH_SIZE : 0), @@ -1264,7 +1264,7 @@ REBAR_Notify ((NMHDR *)&rbcz, infoPtr, RBN_CHILDSIZE); if (!EqualRect (&lpBand->rcChild, &rbcz.rcChild)) { TRACE("Child rect changed by NOTIFY for band %u\n", i); - TRACE(" from (%d,%d)-(%d,%d) to (%d,%d)-(%d,%d)\n", + TRACE(" from (%ld,%ld)-(%ld,%ld) to (%ld,%ld)-(%ld,%ld)\n", lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right, lpBand->rcChild.bottom, rbcz.rcChild.left, rbcz.rcChild.top, @@ -1310,7 +1310,7 @@ ERR("DeferWindowPos returned NULL\n"); } else { - TRACE("moving child (Other) %p to (%d,%d) for (%d,%d)\n", + TRACE("moving child (Other) %p to (%ld,%ld) for (%ld,%ld)\n", lpBand->hwndChild, lpBand->rcChild.left, lpBand->rcChild.top, lpBand->rcChild.right - lpBand->rcChild.left, @@ -1370,12 +1370,12 @@ if (!infoPtr->DoRedraw) infoPtr->fStatus |= BAND_NEEDS_REDRAW; GetClientRect (infoPtr->hwndSelf, &rcClient); - TRACE("Client is (%d,%d)-(%d,%d)\n", + TRACE("Client is (%ld,%ld)-(%ld,%ld)\n", rcClient.left, rcClient.top, rcClient.right, rcClient.bottom); if (lpRect) { rcAdj = *lpRect; - TRACE("adjustment rect is (%d,%d)-(%d,%d)\n", + TRACE("adjustment rect is (%ld,%ld)-(%ld,%ld)\n", rcAdj.left, rcAdj.top, rcAdj.right, rcAdj.bottom); } else { @@ -1531,7 +1531,7 @@ lpBand->uMinHeight = lpBand->lcy; x = rightx; } - TRACE("P1 band %u, row %d, (%d,%d)-(%d,%d)\n", + TRACE("P1 band %u, row %d, (%ld,%ld)-(%ld,%ld)\n", i, row, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -1672,11 +1672,11 @@ current->rcBand.bottom = current->rcBand.top + new_rh; y += adj_rh; } - TRACE("P2 moving band %d to own row at (%d,%d)-(%d,%d)\n", + TRACE("P2 moving band %d to own row at (%ld,%ld)-(%ld,%ld)\n", current_idx, current->rcBand.left, current->rcBand.top, current->rcBand.right, current->rcBand.bottom); - TRACE("P2 prev band %d at (%d,%d)-(%d,%d)\n", + TRACE("P2 prev band %d at (%ld,%ld)-(%ld,%ld)\n", prev_idx, prev->rcBand.left, prev->rcBand.top, prev->rcBand.right, prev->rcBand.bottom); @@ -1779,7 +1779,7 @@ lpBand->rcBand.right = lpBand->rcBand.left + j; else lpBand->rcBand.bottom = lpBand->rcBand.top + j; - TRACE("P2b band %d, row %d changed to (%d,%d)-(%d,%d)\n", + TRACE("P2b band %d, row %d changed to (%ld,%ld)-(%ld,%ld)\n", iband, lpBand->iRow, lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom); @@ -2141,7 +2141,7 @@ rcRowSep.right = infoPtr->calcSize.cx; DrawEdge (hdc, &rcRowSep, EDGE_ETCHED, BF_BOTTOM); } - TRACE ("drawing band separator bottom (%d,%d)-(%d,%d)\n", + TRACE ("drawing band separator bottom (%ld,%ld)-(%ld,%ld)\n", rcRowSep.left, rcRowSep.top, rcRowSep.right, rcRowSep.bottom); } @@ -2159,7 +2159,7 @@ rcSep.right += SEP_WIDTH_SIZE; DrawEdge (hdc, &rcSep, EDGE_ETCHED, BF_RIGHT); } - TRACE("drawing band separator right (%d,%d)-(%d,%d)\n", + TRACE("drawing band separator right (%ld,%ld)-(%ld,%ld)\n", rcSep.left, rcSep.top, rcSep.right, rcSep.bottom); } @@ -2186,7 +2186,7 @@ old = SetBkColor (hdc, new); rect = lpBand->rcBand; - TRACE("%s background color=0x%06lx, band (%d,%d)-(%d,%d), clip (%d,%d)-(%d,%d)\n", + TRACE("%s background color=0x%06lx, band (%ld,%ld)-(%ld,%ld), clip (%ld,%ld)-(%ld,%ld)\n", (lpBand->clrBack == CLR_NONE) ? "none" : ((lpBand->clrBack == CLR_DEFAULT) ? "dft" : ""), GetBkColor(hdc), @@ -2340,7 +2340,7 @@ LEADJ(band, Leadjust); READJ(band, Readjust); - TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%d,%d)-(%d,%d)\n", + TRACE("band %d: left=%d, right=%d, move=%d, rtn=%d, rcBand=(%ld,%ld)-(%ld,%ld)\n", i, Leadjust, Readjust, movement, ret, band->rcBand.left, band->rcBand.top, band->rcBand.right, band->rcBand.bottom); @@ -2422,7 +2422,7 @@ infoPtr->ihitoffset); infoPtr->dragNow = *ptsmove; - TRACE("before: movement=%d (%d,%d), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n", + TRACE("before: movement=%d (%ld,%ld), imindBand=%d, ihitBand=%d, imaxdBand=%d, LSum=%d, RSum=%d\n", movement, ptsmove->x, ptsmove->y, imindBand, ihitBand, imaxdBand, LHeaderSum, RHeaderSum); REBAR_DumpBand (infoPtr); @@ -2864,7 +2864,7 @@ lpBand = &infoPtr->bands[iBand]; CopyRect (lprc, &lpBand->rcBand); - TRACE("band %d, (%d,%d)-(%d,%d)\n", iBand, + TRACE("band %d, (%ld,%ld)-(%ld,%ld)\n", iBand, lprc->left, lprc->top, lprc->right, lprc->bottom); return TRUE; @@ -3208,7 +3208,7 @@ movement = lpBand->rcBand.right - lpBand->rcBand.left - lpBand->cxHeader; if (movement < 0) { - ERR("something is wrong, band=(%d,%d)-(%d,%d), cxheader=%d\n", + ERR("something is wrong, band=(%ld,%ld)-(%ld,%ld), cxheader=%d\n", lpBand->rcBand.left, lpBand->rcBand.top, lpBand->rcBand.right, lpBand->rcBand.bottom, lpBand->cxHeader); @@ -3650,7 +3650,7 @@ if (TRACE_ON(rebar)) { GetWindowRect(infoPtr->hwndSelf, &wnrc1); GetClientRect(infoPtr->hwndSelf, &clrc1); - TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n", + TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cs->x, cs->y, cs->cx, cs->cy); @@ -3827,7 +3827,7 @@ InflateRect((LPRECT)lParam, -GetSystemMetrics(SM_CXEDGE), -GetSystemMetrics(SM_CYEDGE)); } - TRACE("new client=(%d,%d)-(%d,%d)\n", + TRACE("new client=(%ld,%ld)-(%ld,%ld)\n", ((LPRECT)lParam)->left, ((LPRECT)lParam)->top, ((LPRECT)lParam)->right, ((LPRECT)lParam)->bottom); return 0; @@ -3852,7 +3852,7 @@ if (TRACE_ON(rebar)) { GetWindowRect(hwnd, &wnrc1); GetClientRect(hwnd, &clrc1); - TRACE("window=(%d,%d)-(%d,%d) client=(%d,%d)-(%d,%d) cs=(%d,%d %dx%d)\n", + TRACE("window=(%ld,%ld)-(%ld,%ld) client=(%ld,%ld)-(%ld,%ld) cs=(%d,%d %dx%d)\n", wnrc1.left, wnrc1.top, wnrc1.right, wnrc1.bottom, clrc1.left, clrc1.top, clrc1.right, clrc1.bottom, cs->x, cs->y, cs->cx, cs->cy); @@ -3985,7 +3985,7 @@ return 0; GetWindowRect (infoPtr->hwndSelf, &rcWindow); OffsetRect (&rcWindow, -rcWindow.left, -rcWindow.top); - TRACE("rect (%d,%d)-(%d,%d)\n", + TRACE("rect (%ld,%ld)-(%ld,%ld)\n", rcWindow.left, rcWindow.top, rcWindow.right, rcWindow.bottom); DrawEdge (hdc, &rcWindow, EDGE_ETCHED, BF_RECT); @@ -4026,7 +4026,7 @@ GetClientRect(infoPtr->hwndSelf, &rc); hdc = wParam==0 ? BeginPaint (infoPtr->hwndSelf, &ps) : (HDC)wParam; - TRACE("painting (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n", + TRACE("painting (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom, rc.left, rc.top, rc.right, rc.bottom); @@ -4151,14 +4151,14 @@ TRACE("still in CreateWindow\n"); infoPtr->fStatus &= ~CREATE_RUNNING; GetWindowRect ( infoPtr->hwndSelf, &rcWin); - TRACE("win rect (%d,%d)-(%d,%d)\n", + TRACE("win rect (%ld,%ld)-(%ld,%ld)\n", rcWin.left, rcWin.top, rcWin.right, rcWin.bottom); if ((lParam == 0) && (rcWin.right-rcWin.left == 0) && (rcWin.bottom-rcWin.top == 0)) { /* native control seems to do this */ GetClientRect (GetParent(infoPtr->hwndSelf), &rcClient); - TRACE("sizing rebar, message and client zero, parent client (%d,%d)\n", + TRACE("sizing rebar, message and client zero, parent client (%ld,%ld)\n", rcClient.right, rcClient.bottom); } else { @@ -4172,7 +4172,7 @@ /* do the actual WM_SIZE request */ GetClientRect (infoPtr->hwndSelf, &rcClient); - TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", + TRACE("sizing rebar from (%ld,%ld) to (%ld,%ld), client (%ld,%ld)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, LOWORD(lParam), HIWORD(lParam), rcClient.right, rcClient.bottom); @@ -4192,11 +4192,11 @@ /* on a WM_SIZE to zero and current client not zero and AUTOSIZE */ /* native seems to use the current client rect for the size */ infoPtr->fStatus |= BAND_NEEDS_LAYOUT; - TRACE("sizing rebar to client (%d,%d) size is zero but AUTOSIZE set\n", + TRACE("sizing rebar to client (%ld,%ld) size is zero but AUTOSIZE set\n", rcClient.right, rcClient.bottom); } else { - TRACE("sizing rebar from (%ld,%ld) to (%d,%d), client (%d,%d)\n", + TRACE("sizing rebar from (%ld,%ld) to (%ld,%ld), client (%ld,%ld)\n", infoPtr->calcSize.cx, infoPtr->calcSize.cy, LOWORD(lParam), HIWORD(lParam), rcClient.right, rcClient.bottom); @@ -4210,7 +4210,7 @@ autosize.fChanged = 0; /* ??? */ autosize.rcActual = autosize.rcTarget; /* ??? */ REBAR_Notify((NMHDR *) &autosize, infoPtr, RBN_AUTOSIZE); - TRACE("RBN_AUTOSIZE client=(%d,%d), lp=%08lx\n", + TRACE("RBN_AUTOSIZE client=(%ld,%ld), lp=%08lx\n", autosize.rcTarget.right, autosize.rcTarget.bottom, lParam); } @@ -4251,7 +4251,7 @@ ret = DefWindowProcA(infoPtr->hwndSelf, WM_WINDOWPOSCHANGED, wParam, lParam); GetWindowRect(infoPtr->hwndSelf, &rc); - TRACE("hwnd %p new pos (%d,%d)-(%d,%d)\n", + TRACE("hwnd %p new pos (%ld,%ld)-(%ld,%ld)\n", infoPtr->hwndSelf, rc.left, rc.top, rc.right, rc.bottom); return ret; } diff -aur orig/dlls/comctl32/tab.c after/dlls/comctl32/tab.c --- orig/dlls/comctl32/tab.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/tab.c 2002-12-24 05:11:18.000000000 -0800 @@ -366,7 +366,7 @@ SELECTED_TAB_OFFSET, 0); } - TRACE("item %d tab h=%d, rect=(%d,%d)-(%d,%d)\n", + TRACE("item %d tab h=%d, rect=(%ld,%ld)-(%ld,%ld)\n", itemIndex, infoPtr->tabHeight, itemRect->left, itemRect->top, itemRect->right, itemRect->bottom); @@ -487,7 +487,7 @@ */ if (isVisible) { - TRACE("invalidate (%d,%d)-(%d,%d)\n", + TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", selectedRect.left,selectedRect.top, selectedRect.right,selectedRect.bottom); InvalidateRect(hwnd, &selectedRect, TRUE); @@ -1571,7 +1571,7 @@ else center_offset = ((drawRect->right - drawRect->left) - (cx + HORIZONTAL_ITEM_PADDING + (rcText.right - rcText.left))) / 2; - TRACE("for <%s>, c_o=%d, draw=(%d,%d)-(%d,%d), textlen=%d\n", + TRACE("for <%s>, c_o=%d, draw=(%ld,%ld)-(%ld,%ld), textlen=%d\n", debugstr_w(infoPtr->items[iItem].pszText), center_offset, drawRect->left, drawRect->top, drawRect->right, drawRect->bottom, (rcText.right-rcText.left)); @@ -1855,7 +1855,7 @@ /* Adjust both rectangles to match native */ r.left += (1-ZZ); - TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -1899,7 +1899,7 @@ /* Adjust both rectangles to match native */ fillRect.right += (1-ZZ); - TRACE("<left> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<left> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -1956,7 +1956,7 @@ r.bottom--; r.top -= ZZ; - TRACE("<bottom> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<bottom> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2001,7 +2001,7 @@ /* Adjust both rectangles to match native */ fillRect.bottom += (1-ZZ); - TRACE("<top> item=%d, fill=(%d,%d)-(%d,%d), edge=(%d,%d)-(%d,%d)\n", + TRACE("<top> item=%d, fill=(%ld,%ld)-(%ld,%ld), edge=(%ld,%ld)-(%ld,%ld)\n", iItem, fillRect.left,fillRect.top,fillRect.right,fillRect.bottom, r.left,r.top,r.right,r.bottom); @@ -2096,7 +2096,7 @@ } } - TRACE("border=(%d,%d)-(%d,%d)\n", + TRACE("border=(%ld,%ld)-(%ld,%ld)\n", rect.left, rect.top, rect.right, rect.bottom); DrawEdge(hdc, &rect, EDGE_RAISED, BF_SOFT|BF_RECT); @@ -2348,7 +2348,7 @@ ((lStyle & TCS_BUTTONS) ? lastRow * BUTTON_SPACINGY : 0) + 2; } - TRACE("invalidate (%d,%d)-(%d,%d)\n", + TRACE("invalidate (%ld,%ld)-(%ld,%ld)\n", clientRect.left,clientRect.top, clientRect.right,clientRect.bottom); InvalidateRect(hwnd, &clientRect, TRUE); @@ -2362,7 +2362,7 @@ hdc = wParam== 0 ? BeginPaint (hwnd, &ps) : (HDC)wParam; - TRACE("erase %d, rect=(%d,%d)-(%d,%d)\n", + TRACE("erase %d, rect=(%ld,%ld)-(%ld,%ld)\n", ps.fErase, ps.rcPaint.left,ps.rcPaint.top,ps.rcPaint.right,ps.rcPaint.bottom); diff -aur orig/dlls/comctl32/toolbar.c after/dlls/comctl32/toolbar.c --- orig/dlls/comctl32/toolbar.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/toolbar.c 2002-12-24 05:11:18.000000000 -0800 @@ -231,7 +231,7 @@ bP->fsState, bP->fsStyle, bP->dwData, bP->iString); TRACE("string %s\n", debugstr_w(TOOLBAR_GetText(infoPtr,bP))); if (internal) - TRACE("button %d id %d, hot=%s, row=%d, rect=(%d,%d)-(%d,%d)\n", + TRACE("button %d id %d, hot=%s, row=%d, rect=(%ld,%ld)-(%ld,%ld)\n", btn_num, bP->idCommand, (bP->bHot) ? "TRUE":"FALSE", bP->nRow, bP->rect.left, bP->rect.top, @@ -474,7 +474,7 @@ InflateRect (&myrect, -2, 0); - TRACE("rect=(%d,%d)-(%d,%d)\n", + TRACE("rect=(%ld,%ld)-(%ld,%ld)\n", myrect.left, myrect.top, myrect.right, myrect.bottom); newcolor = (infoPtr->clrBtnShadow == CLR_DEFAULT) ? @@ -530,7 +530,7 @@ /* draw text */ if (lpText) { - TRACE("string rect=(%d,%d)-(%d,%d)\n", + TRACE("string rect=(%ld,%ld)-(%ld,%ld)\n", rcText->left, rcText->top, rcText->right, rcText->bottom); hOldFont = SelectObject (hdc, infoPtr->hFont); @@ -677,7 +677,7 @@ else rcBitmap.top+=(infoPtr->nButtonHeight - infoPtr->nBitmapHeight) / 2; - TRACE("iBitmap: %d, start=(%d,%d) w=%d, h=%d\n", + TRACE("iBitmap: %d, start=(%ld,%ld) w=%d, h=%d\n", btnPtr->iBitmap, rcBitmap.left, rcBitmap.top, infoPtr->nBitmapWidth, infoPtr->nBitmapHeight); TRACE ("iString: %x\n", btnPtr->iString); @@ -4578,7 +4578,7 @@ InvalidateRect(hwnd, 0, 1); GetWindowRect(hwnd, &rc); MapWindowPoints(0, hwndParent, (LPPOINT)&rc, 2); - TRACE("mapped to (%d,%d)-(%d,%d)\n", + TRACE("mapped to (%ld,%ld)-(%ld,%ld)\n", rc.left, rc.top, rc.right, rc.bottom); lpsize->cx = max(rc.right-rc.left, infoPtr->rcBound.right - infoPtr->rcBound.left); @@ -5397,7 +5397,7 @@ hdc = wParam==0 ? BeginPaint(hwnd, &ps) : (HDC)wParam; - TRACE("psrect=(%d,%d)-(%d,%d)\n", + TRACE("psrect=(%ld,%ld)-(%ld,%ld)\n", ps.rcPaint.left, ps.rcPaint.top, ps.rcPaint.right, ps.rcPaint.bottom); diff -aur orig/dlls/comctl32/treeview.c after/dlls/comctl32/treeview.c --- orig/dlls/comctl32/treeview.c 2002-12-21 21:52:09.000000000 -0800 +++ after/dlls/comctl32/treeview.c 2002-12-24 05:11:18.000000000 -0800 @@ -2554,7 +2554,7 @@ InflateRect(&rcText, -2, -1); /* allow for the focus rect */ - TRACE("drawing text %s at (%d,%d)-(%d,%d)\n", + TRACE("drawing text %s at (%ld,%ld)-(%ld,%ld)\n", debugstr_a(wineItem->pszText), rcText.left, rcText.top, rcText.right, rcText.bottom); diff -aur orig/dlls/d3d8/device.c after/dlls/d3d8/device.c --- orig/dlls/d3d8/device.c 2002-12-23 22:59:37.000000000 -0800 +++ after/dlls/d3d8/device.c 2002-12-24 05:11:18.000000000 -0800 @@ -1048,7 +1048,7 @@ int copyperline = (r->right - r->left) * bytesPerPixel; int j; - TRACE("Copying rect %d (%d,%d),(%d,%d) -> (%ld,%ld)\n", i, r->left, r->top, + TRACE("Copying rect %d (%ld,%ld),(%ld,%ld) -> (%ld,%ld)\n", i, r->left, r->top, r->right, r->bottom, p->x, p->y); /* Find where to start */ diff -aur orig/dlls/oleaut32/olepicture.c after/dlls/oleaut32/olepicture.c --- orig/dlls/oleaut32/olepicture.c 2002-11-11 11:54:22.000000000 -0800 +++ after/dlls/oleaut32/olepicture.c 2002-12-24 05:11:18.000000000 -0800 @@ -498,7 +498,7 @@ TRACE("(%p)->(%p, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n", This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds); if(prcWBounds) - TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top, + TRACE("prcWBounds (%ld,%ld) - (%ld,%ld)\n", prcWBounds->left, prcWBounds->top, prcWBounds->right, prcWBounds->bottom); /* diff -aur orig/dlls/user/text.c after/dlls/user/text.c --- orig/dlls/user/text.c 2002-11-22 13:22:15.000000000 -0800 +++ after/dlls/user/text.c 2002-12-24 05:11:18.000000000 -0800 @@ -846,7 +846,7 @@ int prefix_offset; ellipsis_data ellip; - TRACE("%s, %d , [(%d,%d),(%d,%d)]\n", debugstr_wn (str, count), count, + TRACE("%s, %d , [(%ld,%ld),(%ld,%ld)]\n", debugstr_wn (str, count), count, rect->left, rect->top, rect->right, rect->bottom); if (dtp) TRACE("Params: iTabLength=%d, iLeftMargin=%d, iRightMargin=%d\n", diff -aur orig/dlls/wineps/escape.c after/dlls/wineps/escape.c --- orig/dlls/wineps/escape.c 2002-11-14 16:02:13.000000000 -0800 +++ after/dlls/wineps/escape.c 2002-12-24 05:11:18.000000000 -0800 @@ -182,7 +182,7 @@ WARN("cbInput != sizeof(RECT) (=%d) for SET_BOUNDS\n", cbInput); return 0; } - TRACE("SET_BOUNDS (%d,%d) - (%d,%d)\n", r->left, r->top, + TRACE("SET_BOUNDS (%ld,%ld) - (%ld,%ld)\n", r->left, r->top, r->right, r->bottom); return 0; } diff -aur orig/dlls/x11drv/winpos.c after/dlls/x11drv/winpos.c --- orig/dlls/x11drv/winpos.c 2002-12-21 21:52:19.000000000 -0800 +++ after/dlls/x11drv/winpos.c 2002-12-24 05:11:18.000000000 -0800 @@ -1589,7 +1589,7 @@ GetWindowRect( hwnd, &rect ); if (rect.left == winpos.x && rect.top == winpos.y) winpos.flags |= SWP_NOMOVE; else - TRACE( "%p moving from (%d,%d) to (%d,%d)\n", + TRACE( "%p moving from (%ld,%ld) to (%d,%d)\n", hwnd, rect.left, rect.top, winpos.x, winpos.y ); if ((rect.right - rect.left == winpos.cx && rect.bottom - rect.top == winpos.cy) || diff -aur orig/windows/nonclient.c after/windows/nonclient.c --- orig/windows/nonclient.c 2002-12-21 21:52:39.000000000 -0800 +++ after/windows/nonclient.c 2002-12-24 05:11:18.000000000 -0800 @@ -424,7 +424,7 @@ WS_EX_STATICEDGE | WS_EX_TOOLWINDOW); if (exStyle & WS_EX_DLGMODALFRAME) style &= ~WS_THICKFRAME; - TRACE("(%d,%d)-(%d,%d) %08lx %d %08lx\n", + TRACE("(%ld,%ld)-(%ld,%ld) %08lx %d %08lx\n", rect->left, rect->top, rect->right, rect->bottom, style, menu, exStyle ); diff -aur orig/windows/spy.c after/windows/spy.c --- orig/windows/spy.c 2002-12-21 21:52:39.000000000 -0800 +++ after/windows/spy.c 2002-12-24 05:11:18.000000000 -0800 @@ -2106,7 +2106,7 @@ { LPRECT rc = (LPRECT) sp_e->lParam; if (rc) { - TRACE("lParam rect (%d,%d)-(%d,%d)\n", + TRACE("lParam rect (%ld,%ld)-(%ld,%ld)\n", rc->left, rc->top, rc->right, rc->bottom); } break; @@ -2149,7 +2149,7 @@ lpdis->CtlType, lpdis->CtlID); TRACE("itemID=0x%08x itemAction=0x%08x itemState=0x%08x\n", lpdis->itemID, lpdis->itemAction, lpdis->itemState); - TRACE("hWnd=%p hDC=%p (%d,%d)-(%d,%d) itemData=0x%08lx\n", + TRACE("hWnd=%p hDC=%p (%ld,%ld)-(%ld,%ld) itemData=0x%08lx\n", lpdis->hwndItem, lpdis->hDC, lpdis->rcItem.left, lpdis->rcItem.top, lpdis->rcItem.right, lpdis->rcItem.bottom, lpdis->itemData); @@ -2187,7 +2187,7 @@ case WM_NCCALCSIZE: { RECT *rc = (RECT *)sp_e->lParam; - TRACE("Rect (%d,%d)-(%d,%d)\n", + TRACE("Rect (%ld,%ld)-(%ld,%ld)\n", rc->left, rc->top, rc->right, rc->bottom); } break; diff -aur orig/windows/win.c after/windows/win.c --- orig/windows/win.c 2002-12-21 21:52:40.000000000 -0800 +++ after/windows/win.c 2002-12-24 05:11:18.000000000 -0800 @@ -576,7 +576,7 @@ win->rectWindow = *rectWindow; win->rectClient = *rectClient; - TRACE( "win %p window (%d,%d)-(%d,%d) client (%d,%d)-(%d,%d)\n", hwnd, + TRACE( "win %p window (%ld,%ld)-(%ld,%ld) client (%ld,%ld)-(%ld,%ld)\n", hwnd, rectWindow->left, rectWindow->top, rectWindow->right, rectWindow->bottom, rectClient->left, rectClient->top, rectClient->right, rectClient->bottom ); } diff -aur orig/windows/winpos.c after/windows/winpos.c --- orig/windows/winpos.c 2002-12-21 21:52:40.000000000 -0800 +++ after/windows/winpos.c 2002-12-24 05:11:18.000000000 -0800 @@ -158,7 +158,7 @@ if (ret) { MapWindowPoints( GetAncestor( hwnd, GA_PARENT ), 0, (POINT *)rect, 2 ); - TRACE( "hwnd %p (%d,%d)-(%d,%d)\n", + TRACE( "hwnd %p (%ld,%ld)-(%ld,%ld)\n", hwnd, rect->left, rect->top, rect->right, rect->bottom); } return ret;

Dec. 24, 2002

'make test' failure on sysparams.c

by Dan Kegel

On fresh cvs: ../../../tools/runtest -q -P wine -M user32.dll -T ../../.. -p user32_test.exe.so sysparams.c && touch sysparams.ok X Error of failed request: BadWindow (invalid Window parameter) Major opcode of failed request: 15 (X_QueryTree) Resource id in failed request: 0x2600003 Serial number of failed request: 45 Current serial number in output stream: 45 make[3]: *** [sysparams.ok] Error 1 This happens if I run 'make test' with a remote X window between two Red Hat 8.0 systems. (I haven't run the test locally on the screen that causes trouble, but I bet it'd be ok.) Can someone suggest the best way of tackling this? Thanks, Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Dec. 24, 2002

Wine Contrib v0.4

by Dimitrie O. Paun

Hi folks, Tom Wickline took over the Wine Contrib page, and cleaned it up. He already went through 4 iterations, and asked me to post it on my site for your reviewing pleasure: http://www.dssd.ca/wine/Wine-Contrib-0.4.html Please take a look at it, and let us know what you think. The idea is to get it over with as soon as possible so that work on other pages can commence. -- Dimi.

Dec. 24, 2002

Re: winebuild -N generalization (take 2)

by Alexandre Julliard

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > Yeah, that's why I said it's a hack. What about a new -F option? Sure that would be fine. -- Alexandre Julliard julliard(a)winehq.com

Dec. 23, 2002

Re: tchar fixes: _tcs{dup,icmp}

by Francois Gouget

On Mon, 23 Dec 2002, Dimitrie O. Paun wrote: > That's what I have to do on my system. > > Francois, does this seem OK to you? If the fix is right, > what about the other _str* symbols? According to the latest sdk I have (2000), _tcsdup is supposed to map to _strdup and _tcsicmp to _stricmp. I think the catch is you are supposed to link with the msvcrt library since these symbols are only exported there. Now, pointing _tcsdup to strdup should not make any difference. However I am not sure that _stricmp really behaves exactly like strcasecmp: you would need to check how each of these handles accentuated characters and locale. Then the question is whether tchar.h should be considered to be a pure msvcrt thing, i.e. don't use it if you don't link to msvcrt, or whether we want to make is usable in Ansi mode with a regular C library. Currently we set the macros based on _MBCS and _UNICODE. Maybe we need to add a WINE_LIBC flag and add mappings to the native C library routines? -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ A black hole is just God dividing by zero.

Dec. 23, 2002

Re: wine/. configure.ac configure

by Alexandre Julliard

Michael Stefaniuc <mstefani(a)redhat.de> writes: > i don't think this patch is too correct. I get in the Makefiles > following: > INSTALL = $(TOPSRCDIR)//usr/bin/install -c $(INSTALL_FLAGS) > and that obviously dosn't exist thus make install is failing. That was a quoting problem, should be fixed now. Thanks for the note. -- Alexandre Julliard julliard(a)winehq.com

Dec. 23, 2002

Re: winebuild -N generalization (take 2)

by Dimitrie O. Paun

On December 23, 2002 08:07 pm, Alexandre Julliard wrote: > No, it's still wrong IMO. DLLName and DLLFileName are two different > things and you shouldn't use the same option for both. Yeah, that's why I said it's a hack. What about a new -F option? -- Dimi.

Dec. 23, 2002

Re: wine/. configure.ac configure

by Michael Stefaniuc

Hello, i don't think this patch is too correct. I get in the Makefiles following: INSTALL = $(TOPSRCDIR)//usr/bin/install -c $(INSTALL_FLAGS) and that obviously dosn't exist thus make install is failing. bye michael On Mon, Dec 23, 2002 at 06:35:19PM -0600, Alexandre Julliard wrote: > ChangeSet ID: 6794 > CVSROOT: /opt/cvs-commit > Module name: wine > Changes by: julliard(a)wine.codeweavers.com 2002/12/23 18:35:19 > > Modified files: > . : configure.ac configure > > Log message: > Make sure INSTALL path is relative to the top dir when using the > script in tools/. > > Patch: http://cvs.winehq.com/patch.py?id=6794 > > Old revision New revision Changes Path > 1.112 1.113 +6 -1 wine/configure.ac > 1.380 1.381 +1993 -652 wine/configure -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani(a)redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart

Dec. 23, 2002

Re: winebuild -N generalization (take 2)

by Alexandre Julliard

"Dimitrie O. Paun" <dpaun(a)rogers.com> writes: > What about this hack instead? Alexandre, if this is acceptable, > I can update the man page and submit a patch. Motivation for > having an option to force the DLLFileName is as before. No, it's still wrong IMO. DLLName and DLLFileName are two different things and you shouldn't use the same option for both. -- Alexandre Julliard julliard(a)winehq.com

Dec. 23, 2002

winebuild -N generalization (take 2)

by Dimitrie O. Paun

Of course, 99.99% percent of my previous message on this subject was just a bunch of crap, sorry to waste bandwidth, and kill neurons. I just want to note the DLLFileName has a very well defined semantics that should not get changed as I initially suggested. Mea culpa. What about this hack instead? Alexandre, if this is acceptable, I can update the man page and submit a patch. Motivation for having an option to force the DLLFileName is as before. Index: tools/winebuild/main.c =================================================================== RCS file: /var/cvs/wine/tools/winebuild/main.c,v retrieving revision 1.43 diff -u -r1.43 main.c --- tools/winebuild/main.c 12 Dec 2002 04:06:28 -0000 1.43 +++ tools/winebuild/main.c 23 Dec 2002 23:53:26 -0000 @@ -263,6 +263,7 @@ { strncpy( DLLName, arg, sizeof(DLLName) ); DLLName[sizeof(DLLName) - 1] = 0; + set_dll_file_name( arg ); } static void do_entry( const char *arg ) -- Dimi.

Dec. 23, 2002

Re: winebuild -N generalization

by Dimitrie O. Paun

On December 23, 2002 03:10 pm, Dimitrie O. Paun wrote: > ChangeLog > Support the -N option in all modes. <blush>This doesn't work.</blush> -- Dimi.

Dec. 23, 2002

Re: Winelib Apps v0.2

by Jeff Smith

Dimi, Alexandre has implemented import libraries. Your page does not yet reflect this fact. -- Jeff S >From: "Dimitrie O. Paun" <dpaun(a)rogers.com> > >Hi, > >It's been almost a month since the last release of the >Winelib page, and a _lot_ has changes since then: > http://www.dssd.ca/wine/Winelib-Apps-0.2.html > >The page has been reorganized, enhanced, etc. Too many >changes to list here. If you haven't followed the working >version, it's a good time to check it out. > >-- >Dimi. _________________________________________________________________ Add photos to your messages with MSN 8. Get 2 months FREE*. http://join.msn.com/?page=features/featuredemail&xAPID=42&PS=47575&PI=7324&… http://www.hotmail.msn.com/cgi-bin/getmsg&HL=1216hotmailtaglines_addphotos_…

Dec. 23, 2002

Re: Winelib Apps v0.2

by Dimitrie O. Paun

On December 23, 2002 05:03 pm, Jeff Smith wrote: > Alexandre has implemented import libraries. Your > page does not yet reflect this fact. Yes, thanks for catching it. Updated in the working version, available here: http://www.dssd.ca/wine/Winelib-Apps.html -- Dimi.

Dec. 23, 2002

Re: Changing FS type reported by Wine

by Tony Lambregts

Duane Clark wrote: > Stephen Mollett wrote: > >> >> I'm using ReiserFS. I've also tried on a 40GB ext3 filesystem on a >> spare drive. The error comes from VirtualDub, which believes that >> it's running on a FAT32 filesystem (obviously that's what Wine >> reports to any program that asks what FS type a drive is). I've tried >> working around it by using vdub's 'segmented AVI' feature (which >> creates multiple AVIs <= 2GB) but I can't use these successfully >> under Linux. > > > In the file wine/files/drive.c, in the function > GetVolumeInformationW() (down around line 1965), is this: > > > if (fsname && fsname_len) > { > /* Diablo checks that return code ... */ > if (DOSDrives[drive].type == DRIVE_CDROM) > { > static const WCHAR cdfsW[] = {'C','D','F','S',0}; > strncpyW( fsname, cdfsW, fsname_len ); > } > else > { > static const WCHAR fatW[] = {'F','A','T',0}; > strncpyW( fsname, fatW, fsname_len ); > } > fsname[fsname_len - 1] = 0; /* ensure 0 termination */ > } > > That appears to hardcode the filesystem "name" to FAT. You might try > changing that to NTFS. That assumes that this is the call your app is > using to determine filesystem type. > > I assume you have already determined that ReiserFS supports files > larger than 2GB? > Well thats a patch that shouldn't go into cvs. <g> If it does "fix" the application though then there should be some way for wine to do it the "right way". The way I see it there are two ways to do this. 1.) wine should try to set the fsname to NTFS if underlying file system can support files sizes > 4GB. 2.)There should be a conf file option for NTFS along with MSDOS, unix and win95. The difficulty with wine trying to do this automaticly is that it would need to find the file system type of the current directory and not the root. This is of course because of the way the unix file system works. The current directory could very well be an MSDOS drive while the root drive is an ext3 and this function is only aware of the root drive. AFAICS Having it as a config option is easier to implement and removes the problem from the developers hands.<g> For myself I (think I) could implement it as a config option but Iwould prefer that wine could deal with it automaticly. If anyone has any suggestions I would appreciate it. -- Tony Lambregts

Dec. 23, 2002

making an so wrapper for a windows dll

by Patrick Michael Kane

Hi: I have some business logic that is wrapped up inside of a 32-bit Windows DLL. Unfortunately, the source code to this DLL is not available and it is unlikely to be ported to Linux anytime soon. The good news is that the DLL is just a bunch of business logic. It doesn't try to access hardware directly, rely on 9000 other DLLs, etc. My goal here is to end up with a Linux shared library that wraps the DLL, so that I can then create wrappers to call the business logic from Perl and/or Python. winemaker seems to want to build an application, not a library. mplayer/aviplayer seem to do this sort of thing, but there's no documentation and it's all fairly obscure to a newcomer. Is there a quick and easy way to accomplish this? If not, is there a Wine developer who might be interested in a small consulting project to solve this problem? Best, -- Patrick Michael Kane <modus(a)pr.es.to>

Dec. 23, 2002

Re: wineboot - Andy's version

by Andreas Mohr

On Tue, Dec 17, 2002 at 09:17:48PM +0200, Shachar Shemesh wrote: > Changelog: > Andreas Mohr > > programs/wineboot > > * Initial implementation This is exactly my implementation AFAICS. I could easily have submitted it on my own, thank you very much. Instead, I thought that somebody should refine some parts before submitting. Also, GUI.txt was meant to be an internal note only. Hmm, well, maybe it's indeed best to have it committed now and then get some improvements real soon. (like e.g. to have it integrated into startup) Andreas Mohr

Dec. 23, 2002

Winelib Apps v0.2

by Dimitrie O. Paun

Hi, It's been almost a month since the last release of the Winelib page, and a _lot_ has changes since then: http://www.dssd.ca/wine/Winelib-Apps-0.2.html The page has been reorganized, enhanced, etc. Too many changes to list here. If you haven't followed the working version, it's a good time to check it out. -- Dimi.

Dec. 23, 2002

Couldn't find a decent font, aborting

by Mark Knecht

Hi, On many installations, and even when running just wcmd, I'm getting this error message: [mark(a)Godzilla mark]$ wcmd err:wineconsole:WINECON_Fatal Couldn't find a decent font, aborting [mark(a)Godzilla mark]$ wine --version Wine 20021219 [mark(a)Godzilla mark]$ I've quickly searched through the Devel and User archives, and searched using Google, but found just about nothing on the subject. The only suggestion was to run in 640x480 desktop mode, which I tried but it didn't help at all. Tony has been very helpful at Wine-User but we haven't discovered the solution. Wine is running Quicken, Winzip and WS_FTP just fine. I've tried WinAmp3 which comes up but does not generate sound at all. I'm using the new Jack drivers for Wine, so I wasn't expecting perfection in that area just yet, but hope to work with Chris Morgan to make that more solid. I have lots of Windows audio apps to try out. My machine is RH 7.3, running Alsa and Jack for sound and doing high-end audio stuff. It's up to date with new RPMs, but is a sort of minimalistic machine in terms of non-audio apps. Wine is from CVS yesterday. I'm running a no Windows installation. I'm currently running KDE 3.0.X. Can you folks recommend how I go about fixing this? What fonts are required to be installed to make Wine happy? How do I give you good feedback if I can't run the debugger? This morning I've done: make uninstall make clean make but chose to not overwrite my current registry file. Let me know if you need more information. I appreciate your help in advance. Merry Christmas and Happy Holidays! Cheers, Mark

Dec. 23, 2002

Re: DDE command 'ActivateProgMan'?

by Mike Hearn

I'm no expert, but that sounds like it's part of the code to add stuff to the start menu. As WineHQ doesn't have menu integration, it doesn't work. Wine does have its own program manager implementation, I suppose this means it's not being found/started correctly. On Mon, 2002-12-23 at 06:17, Dan Kegel wrote: > With current CVS wine, doing a minimum install of MSVC4 > works fine (once you jump through the proper hoops), but > at the very end, I get the dialog box > Setup cannot execute the DDE command 'ActivateProgMan' > Press Abort to to (sic) stop installing shortcuts and continue Setup. > > I googled for ActivateProgMan, but found nothing... > > For the moment, I'm just going to say "Press Abort" in my > recipe for running msvc4 under Wine. > I'd be willing to track this down further if someone > feels like pointing me in the right direction. > - Dan -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

Dec. 23, 2002

msvc4 success!

by Dan Kegel

wine still needs some polish before it can install msvc4 nicely, but it can indeed install it, and the installed copy of msdev appears to work! I used the IDE to create a "hello, world" console app, and it compiled and ran perfectly! The UI seems snappy enough on my dual pentium 650, too. I'm sure I'll find many problems with this later, but for now, I think it's awesome that Wine can install and run msvc4 at all! - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Dec. 23, 2002

DDE command 'ActivateProgMan'?

by Dan Kegel

With current CVS wine, doing a minimum install of MSVC4 works fine (once you jump through the proper hoops), but at the very end, I get the dialog box Setup cannot execute the DDE command 'ActivateProgMan' Press Abort to to (sic) stop installing shortcuts and continue Setup. I googled for ActivateProgMan, but found nothing... For the moment, I'm just going to say "Press Abort" in my recipe for running msvc4 under Wine. I'd be willing to track this down further if someone feels like pointing me in the right direction. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Dec. 23, 2002

MSVC4, "install" button. Possible wine bug.

by Dan Kegel

Big progress. Turns out the best way to trace these installer splash screens is wine --debugmsg +exec since all they do is exec other programs. The only problem with this button under Wine is that the current working directory MUST be /mnt/cdrom before starting setup.exe for the "install" button to work, else it doesn't find the subdirectory's setup.exe to launch. This is not true under Windows. This seems like an important little difference to track down. I guess something in Windows might implicitly change the working directory of a newly launched program, or...? I suppose I could write a little win32 program to mimic what setup.exe is doing, and see if it behaves differently on Windows and on Wine. I feel a regression test coming on... I might not have time to get to this for a bit, so I'm posting the output of wine --debugmsg +exec,+dosfs,+file d:setup.exe (click on "Install Visual C++" button) to http://kegel.com/msvc4/install.txt.gz in case someone else wants to look. Search for ShellExecute to find the interesting bits. The current directory is my Wine directory... disappointing the program, which expected it to be the root of the cd-rom. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Dec. 22, 2002

Re: Serious problem with / and mount points

by Tony Lambregts

Sylvain Petreolle wrote: > --- Tony Lambregts <tony_lambregts(a)telusplanet.net> a écrit : > Jeff >Smith wrote: > > >>>What I have so far: >>> in files/dos_fs.c:1343, drive is receiving the value -1. >>> at line 1358, this is blindly added to 'A'. As you may >>> know, in ASCII, 'A' - 1 = '@'. >>> >>> >The problem is that we don't check the status of DRIVE_FindDriveRoot, >as you spotted it. >The sources clearly states that -1 is error. > Well I was convinced it should not be an error. The path is valid if you are sitting at the mount point. Part of the problem is that the drives are initialized when the program starts, this sets the .ino for that drive, however the ino for a removeable drive can change depending on whether it is mounted or not. DRIVE_FindDriveRootW does the same thing without relying on the .ino. I have modified DRIVE_FindDriveRoot to work the same way. The way I see it is that if the drive is removable (or network) .ino is not a good way of dealing with it. Change Log: Modify DRIVE_FindDriveRoot to not use .ino Files: files/drive.c Tony Lambregts Index: drive.c =================================================================== RCS file: /home/wine/wine/files/drive.c,v retrieving revision 1.80 diff -u -r1.80 drive.c --- drive.c 7 Dec 2002 23:47:01 -0000 1.80 +++ drive.c 23 Dec 2002 05:21:21 -0000 @@ -408,63 +408,36 @@ */ int DRIVE_FindDriveRoot( const char **path ) { - /* Starting with the full path, check if the device and inode match any of - * the wine 'drives'. If not then remove the last path component and try - * again. If the last component was a '..' then skip a normal component - * since it's a directory that's ascended back out of. - */ - int drive, level, len; + int drive, rootdrive = -1; char buffer[MAX_PATHNAME_LEN]; char *p; - struct stat st; + int len = -1, match_len = -1 ; strcpy( buffer, *path ); while ((p = strchr( buffer, '\\' )) != NULL) - *p = '/'; - len = strlen(buffer); - - /* strip off trailing slashes */ - while (len > 1 && buffer[len - 1] == '/') buffer[--len] = 0; - - for (;;) + *p = '/'; + + for (drive = 0; drive < MAX_DOS_DRIVES; drive++) { - /* Find the drive */ - if (stat( buffer, &st ) == 0 && S_ISDIR( st.st_mode )) - { - for (drive = 0; drive < MAX_DOS_DRIVES; drive++) - { - if (!DOSDrives[drive].root || - (DOSDrives[drive].flags & DRIVE_DISABLED)) - continue; - - if ((DOSDrives[drive].dev == st.st_dev) && - (DOSDrives[drive].ino == st.st_ino)) - { - if (len == 1) len = 0; /* preserve root slash in returned path */ - TRACE( "%s -> drive %c:, root='%s', name='%s'\n", - *path, 'A' + drive, buffer, *path + len); - *path += len; - if (!**path) *path = "\\"; - return drive; - } - } - } - if (len <= 1) return -1; /* reached root */ - - level = 0; - while (level < 1) - { - /* find start of the last path component */ - while (len > 1 && buffer[len - 1] != '/') len--; - if (!buffer[len]) break; /* empty component -> reached root */ - /* does removing it take us up a level? */ - if (strcmp( buffer + len, "." ) != 0) - level += strcmp( buffer + len, ".." ) ? 1 : -1; - buffer[len] = 0; - /* strip off trailing slashes */ - while (len > 1 && buffer[len - 1] == '/') buffer[--len] = 0; - } + if (!DOSDrives[drive].root || + (DOSDrives[drive].flags & DRIVE_DISABLED)) continue; + + len = strlen(DOSDrives[drive].root); + if(strncmp(DOSDrives[drive].root, buffer, len)) continue; + + if(len <= match_len) continue; + match_len = len; + rootdrive = drive; + drive = MAX_DOS_DRIVES + 1; + } + if (rootdrive != -1) + { + TRACE("%s -> drive %c:, root='%s', name=%s\n", + *path, 'A' + rootdrive, DOSDrives[rootdrive].root, *path + len) ; + *path += len; + if (!**path) *path = "\\"; } + return rootdrive; }

Dec. 22, 2002

Re: A crash destroying imagelists

by Dimitrie O. Paun

On December 22, 2002 02:50 pm, Duane Clark wrote: > That area is then freed. When freed, COMCTL32_Free writes prev and next > entries into himl. Where? COMCTL32_Free() simply calls HeapFree(): BOOL WINAPI COMCTL32_Free (LPVOID lpMem) { TRACE("(%p)\n", lpMem); return HeapFree (COMCTL32_hHeap, 0, lpMem); } > The listview does not know that the imagelist was already destroyed, so > it again calls ImageList_Destroy. Yes, a common problem. > At the end of ImageList_Destroy, there is a call to ZeroMemory, which > obliterates the prev and next pointers which had been written there. > Then another COMCTL32_Free call detects the error. At least I assume it > is an error. Does this work any better? It shouldn't make any difference, but ... There is something else funny here. I can't see why zeroing out an area we're just about to free is problematic. Index: dlls/comctl32/imagelist.c =================================================================== RCS file: /var/cvs/wine/dlls/comctl32/imagelist.c,v retrieving revision 1.68 diff -u -r1.68 imagelist.c --- dlls/comctl32/imagelist.c 5 Dec 2002 20:33:09 -0000 1.68 +++ dlls/comctl32/imagelist.c 23 Dec 2002 04:37:55 -0000 @@ -693,7 +693,7 @@ if (himl->hbrBlend50) DeleteObject (himl->hbrBlend50); - ZeroMemory(himl, sizeof(*himl)); + ZeroMemory(himl, sizeof(struct _IMAGELIST)); COMCTL32_Free (himl); return TRUE; -- Dimi.

Dec. 22, 2002

Re: [RFH] _FORCENAMELESSUNION

by Dimitrie O. Paun

On December 22, 2002 02:22 pm, Francois Gouget wrote: > Maybe you should submit patches to wxWindows and/or MinGW. I think this > could only improve these projects to be more compatible with the Windows > headers... Well, but of course, I just want to make sure I fix the right thing. You see, I don't have the any MS devel stuff, so I have to ask if our implementation is correct or not. If it is, a fix we'll go to the other projects, don't worry :) -- Dimi.

Dec. 22, 2002

Re: MSVC4, next two buttons on installer

by Dan Kegel

Eric Pouech wrote: > so you're stuck with either using native riched20.dll, or doing lots of > hard work to implement version 1.0 and 2.0 Er, ok, I'll stick with native for now :-) >> Q2. Any idea what I'd need to do to get a Windows Explorer going >> without actually installing the real Windows Explorer?-) >> Does Wine have a builtin Windows Explorer clone yet? > > there's a winfile compatible (winefile) in the programs directory, but > this isn't really an explorer clone. however making it explorer.exe > compatible (from the command line point of view) shouldn't be too > difficult. but there are lots of other stuff in there (DDE server for > example) which will require quite some work too. Cool. OK, here's how things stand, then: With native mfc42.dll, riched20.dll, and wordpad.exe, and winefile running, I can put the msvc4.0 cd-rom in the drive, mount it, click on the 'd:' drive icon in winefile, double-click on setup.exe, and the setup program launches properly; clicking on "Standard Template Library" properly brings up WordPad (yay!), but with a display problem (see below); clicking on "Explore the CD" does nothing (because I didn't install native Windows Explorer). Q3. Although I'm using native riched20 and wordpad, all the section headers in the stl\Readme.WRI file are screwed up under Wine. Anyone seen that problem before, or know how to fix it? I've uploaded the file as http://www.kegel.com/readme.wri in case anyone wants to see it. Q4. Is winefile going to be installed in some standard place? I'm quite willing to write a tiny, stunted windows\explorer.exe that's just a wrapper around winefile, but that won't help if the standard installer isn't yet installing winefile. Also, is it a problem that winefile is a winelib application? Wouldn't we rather it be a straight Windows application if we're going to invoke it from inside wine? Thanks, Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Dec. 22, 2002

Re: Winemaker line 3041: "WRCFLAGS = -r -L" -> "WRCFLAGS = -r" ?

by Tony Lambregts

Kjetil S. Matheussen wrote: >Shouldnt it? Breaks the compilation of the vstserver. > >Please apply. :) > > > > Please refer to http://www.winehq.org/Docs/wine-devel/patches.shtml for how to submit future patches. Change Log: fix for compiling wstserver Files: tools/winemaker -- Tony Lambregts Index: winemaker =================================================================== RCS file: /home/wine/wine/tools/winemaker,v retrieving revision 1.59 diff -u -r1.59 winemaker --- winemaker 15 Dec 2002 03:00:40 -0000 1.59 +++ winemaker 23 Dec 2002 01:45:47 -0000 @@ -3038,7 +3038,7 @@ WRC = @WRC@ CFLAGS = @CFLAGS@ CXXFLAGS = @CXXFLAGS@ -WRCFLAGS = -r -L +WRCFLAGS = -r OPTIONS = @OPTIONS@ -D_REENTRANT -DWINELIB $(GLOBAL_DEFINES) $(GLOBAL_INCLUDE_PATH) LIBS = @LIBS@ $(LIBRARY_PATH) ALLFLAGS = $(DEFINES) -I$(SRCDIR) $(INCLUDE_PATH) $(WINE_INCLUDE_PATH)

Dec. 22, 2002

Re: __WINE__ vs. __WINESRC__

by Francois Gouget

On Sun, 22 Dec 2002, Dimitrie O. Paun wrote: [...] > So, my proposal is: let's rename the __WINE__ symbol (as it's > currently used) to something else (__WINESRC__, or whatever, > suggestions welcome), once that's done, define __WINE__ when > __WINESRC__ is not defined (the symbols would be mutually > exclusive). winemaker defines 'WINELIB'. But I'm open to change, '__WINE__' looks more like the others. Maybe '__WINELIB__' would do? (but I prefer '__WINE__') -- Francois Gouget fgouget(a)free.fr http://fgouget.free.fr/ Cahn's Axiom: When all else fails, read the instructions.

Dec. 22, 2002

Re: A crash destroying imagelists

by Duane Clark

Duane Clark wrote: > > ... > At the end of ImageList_Destroy, there is a call to ZeroMemory, which > obliterates the prev and next pointers which had been written there. > Then another COMCTL32_Free call detects the error. At least I assume it > is an error. And indeed simply commenting out the ZeroMemory fixes the application. Though I have no idea what the correct fix would be.

Dec. 22, 2002