- Wine-Devel - list.winehq.org

[RFC] io.h & friends
by Dimitrie O. Paun Jan. 9, 2003

Jan. 9, 2003

Folks, Just as I thought 'fine, I'll add the #ifdef, and get it over with', this thing comes back to haunt me. For the record, I've delete the previous thread, _and_ the io.h patch from my tree, thinking the issue was put to rest. As you can probably guess, I have the io.h problems in wxWindows, simply because this is what I work on right now. Let me state the problem again: -- When you compile with winegcc, you get these macros: __WINE__, __WIN32__, __UNIX__ -- You want your source to compile with the native libc and/or msvcrt -- You want it portable between Wine/MinGW/Cygwin. So, let's say I do: #ifndef __UNIX__ #include <io.h> #endif Well, this will not work if I want to compile with msvcrt, because __UNIX__ will be defined anyway. So what do I have to test for? I have to define a new symbol (USE_MSVCRT) and test for it #if !defined(__UNIX__) || defined(USE_MSVCRT) #include <io.h> #endif But this is not all! For example, wxWindows includes stuff like this: #include <sys/unistd.h> #include <sys/stat.h> Since they are available in mingw, and cygwin, and in UNIX, but if I want to use msvcrt they conflit with stuff from there! It's a mess. As you can see, the defines alone can make a grown man cry, and this is for a simple include. And I don't even know I've covered all the basis! Problem is that there are already 5 platforms: UNIX, Wine, Cygwin, MinGW, MS. And complexity grows exponentially with the number of platforms and combinations you have to test for. This way lays madness. It is now clear to me why the Cygwin people included io.h. It's so that you can compile with or without the -mno-cygwin switch, and have everything work. The only way for that to happen without ungodly defines and tests, is to have a flat space of include files: a union of MS & Unix files. Even if they are empty! This way you can simply do: #include <unistd.h> #include <io.h> and you make sure you get the access() definition regardless if you use the msvcrt of the libc. I'm not sure what to do. I was hoping to get a include/cygwin and/or a include/mingw directory so we can deal with these problems. I didn't know mingw had Unix headers as well, this complicates matters. Any fresh ideas in this matter are highly appreciated. -- Dimi.

4 8

Help with /?? stuff
by Shachar Shemesh Jan. 9, 2003

Jan. 9, 2003

Hi list, Can someone please give me a good place to RTFM what the !$&!% to do with paths that have /?? in them? Can I just give them over to win32 functions, or do I need to do something with them first? Also, does anyone have any docs on "runonce.exe"? I have a very vauge knowledge of what it does, and I could find -q -b mentioned as command lines. Shachar

4 3

Re: wrc: -v, --[no-]use-temp-file
by Dimitrie O. Paun Jan. 9, 2003

Jan. 9, 2003

On January 8, 2003 11:59 pm, Dimitrie O. Paun wrote: > ChangeLog > Added windres compatibility switches: -v, --[no-]use-temp-file. > Updated documentation, minor option parsing cleanup. My apologies, I changed my mind: I decided to do a bigger patch that will obsolete this one. Initially I thought they are disjunct, but the new patch touches 50% of the lines in this one, so I might as well collapse them together. It's in the works. -- Dimi.

1 0

Re: DIB sync bug fix
by Tony Lambregts Jan. 9, 2003

Jan. 9, 2003

Duane Clark wrote: > In the bitblt functions, if the source and destination DCs are the > same DC, the call: > X11DRV_UnlockDIBSection( physDevSrc, FALSE ); > caused the DC to be labeled as "InSync" without committing the changes > resulting from the bitblt. > > This fixes bug 885. > > Changelog: > If bit/stretchblt source and destination DCs are the same, > make sure the changes are committed before unlocking. Yup Fixes up bug 885 real slick With this patch Riven is (almost) Gold. I tried it out on bug 911and it improves the display but there is still some problems with this program (vast improvement but not perfect) <hint>if you want to look at it its free to download</hint> Bug 1095 might benefit from this patch I asked the reporter to try it. -- Tony Lambregts

1 0

wxWindows: it's official!
by Dimitrie O. Paun Jan. 9, 2003

Jan. 9, 2003

That right, As of today, the patch I've sent a few days ago to the list has been integrated into the tree. Turns out that all those "#include <search.h>" were not needed, so the patch was even smaller than I thought! :) There are some things that need to go into the Wine tree before you can play with the wxWindows thing: 1. Dan's patch that fixes the RECT definition 2. Francois' patch that fixes winsock.h 3. My patch that adds io.h 4. My patch that adds wineg++ 5. My patch for tchar.h I think that's it... (I can't quite tell because I have the big NONAMELESS* patch in my tree). Alexandre, the wxWindows folks are eager to play with it, and have asked me to let them know when they can do so. Not a big deal, but if there are problems with any of these, please let me know so I can address them. -- Dimi.

3 13

wxWindows: it's now official (almost)
by Dimitrie O. Paun Jan. 8, 2003

Jan. 8, 2003

Hi folks, Last night I had nothing better to do than to cleanup my wxWindows patch. The entire thing is less than 500 lines! This says quite a few things about the maturity of our headers. The changes to the build system are just a few lines changed in src/makeg95.env. In fact, most of those are just documentation changes, and convenience things. *All* interesting changes are just: CC=winegcc CXX=winegcc -xc++ WINDRES=wrc Needless to say, I am sooooo happy! :)))) Below I've included a diffstat of the patch (to give you an idea how few things I had to change), and the patch itself (first to show how trivial the changes are, and second in the hope that my experience doing this port can be of some use to someone else). The exact same patch (with the only difference being that it has only 2 lines of context for the unified diff, to conform to the wxWindows patch guidelines) will be submitted for inclusion in the official wxWindows tree in the next 10 minutes. But I figured you guys should be the first to know, so here it is! :) Enjoy! diffstat wine.diff include/wx/filefn.h | 2 +- include/wx/longlong.h | 1 + include/wx/msw/gccpriv.h | 4 ++-- include/wx/msw/setup0.h | 2 +- include/wx/platform.h | 2 +- include/wx/sckaddr.h | 2 +- src/common/datetime.cpp | 2 +- src/common/dynarray.cpp | 1 + src/common/encconv.cpp | 1 + src/common/filefn.cpp | 2 +- src/common/list.cpp | 1 + src/common/mimecmn.cpp | 6 +++--- src/common/sckaddr.cpp | 4 ++-- src/common/sckipc.cpp | 2 +- src/common/string.cpp | 1 + src/common/wxchar.cpp | 2 +- src/jpeg/jmorecfg.h | 3 +++ src/makeg95.env | 24 +++++++++++++++++++++--- src/msw/app.cpp | 2 +- src/msw/dialup.cpp | 1 + src/msw/fontenum.cpp | 2 +- src/msw/gsocket.c | 4 ++-- src/msw/ole/automtn.cpp | 1 + src/png/pngconf.h | 8 ++++++-- 24 files changed, 56 insertions(+), 24 deletions(-) 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 2003/01/04 19:32:59 @@ -75,7 +75,7 @@ // Microsoft compiler loves underscores, feed them to it #if defined( __VISUALC__ ) \ - || ( defined(__MINGW32__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ + || ( defined(__MINGW32__) && !defined(__WINE__) && wxCHECK_W32API_VERSION( 0, 5 ) ) \ || ( defined(__MWERKS__) && defined(__WXMSW__) ) // functions #define wxClose _close Index: include/wx/longlong.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/longlong.h,v retrieving revision 1.44 diff -u -r1.44 longlong.h --- include/wx/longlong.h 2002/12/04 13:58:18 1.44 +++ include/wx/longlong.h 2003/01/04 19:33:00 @@ -63,6 +63,7 @@ #define wxLongLongFmtSpec _T("I64") #elif (defined(SIZEOF_LONG_LONG) && SIZEOF_LONG_LONG >= 8) || \ defined(__MINGW32__) || \ + defined(__GNUC__) || \ defined(__CYGWIN__) || \ defined(__WXMICROWIN__) || \ (defined(__DJGPP__) && __DJGPP__ >= 2) Index: include/wx/platform.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/platform.h,v retrieving revision 1.9 diff -u -r1.9 platform.h --- include/wx/platform.h 2002/12/07 12:36:03 1.9 +++ include/wx/platform.h 2003/01/04 19:33:00 @@ -137,7 +137,7 @@ #define __HPUX__ #endif /* HP-UX */ - #if defined(__CYGWIN__) + #if defined(__CYGWIN__) || defined(__WINE__) #if !defined(wxSIZE_T_IS_UINT) #define wxSIZE_T_IS_UINT #endif 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 2003/01/04 19:33:01 @@ -101,7 +101,7 @@ }; #endif -#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) #include <sys/socket.h> #ifndef __VMS__ # include <sys/un.h> Index: include/wx/msw/gccpriv.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/gccpriv.h,v retrieving revision 1.7 diff -u -r1.7 gccpriv.h --- include/wx/msw/gccpriv.h 2002/12/29 19:37:08 1.7 +++ include/wx/msw/gccpriv.h 2003/01/04 19:33:02 @@ -3,7 +3,7 @@ #ifndef _WX_MSW_GCCPRIV_H_ #define _WX_MSW_GCCPRIV_H_ -#if defined( __MINGW32__ ) && !defined( HAVE_W32API_H ) +#if defined( __MINGW32__ ) && !defined(__WINE__) && !defined( HAVE_W32API_H ) #if ( __GNUC__ > 2 ) || ( ( __GNUC__ == 2 ) && ( __GNUC_MINOR__ >= 95 ) ) #include <_mingw.h> #if __MINGW32_MAJOR_VERSION >= 1 @@ -24,7 +24,7 @@ // Cygwin / Mingw32 with gcc >= 2.95 use new windows headers which // are more ms-like (header author is Anders Norlander, hence the name) -#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95))) +#if (defined(__MINGW32__) || defined(__CYGWIN__) || defined(__WINE__)) && ((__GNUC__>2) || ((__GNUC__==2) && (__GNUC_MINOR__>=95))) #ifndef wxUSE_NORLANDER_HEADERS #define wxUSE_NORLANDER_HEADERS 1 #endif Index: include/wx/msw/setup0.h =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/include/wx/msw/setup0.h,v retrieving revision 1.126 diff -u -r1.126 setup0.h --- include/wx/msw/setup0.h 2003/01/02 23:28:53 1.126 +++ include/wx/msw/setup0.h 2003/01/04 19:33:03 @@ -1068,7 +1068,7 @@ // ---------------------------------------------------------------------------- #ifndef wxUSE_NORLANDER_HEADERS -#if (defined(__MINGW32__) || defined(__CYGWIN__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) +#if ((defined(__MINGW32__) && defined(__CYGWIN__)) ||defined(__WINE__)) && ((__GNUC__>2) ||((__GNUC__==2) && (__GNUC_MINOR__>=95))) # define wxUSE_NORLANDER_HEADERS 1 #else # define wxUSE_NORLANDER_HEADERS 0 Index: src/makeg95.env =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/makeg95.env,v retrieving revision 1.78 diff -u -r1.78 makeg95.env --- src/makeg95.env 2002/12/29 19:37:10 1.78 +++ src/makeg95.env 2003/01/04 19:33:11 @@ -52,12 +52,21 @@ # gcc 3.x provides a win32api.h header MINGW32VERSION=3.0 +# If you want to compile on Wine, simply uncomment this variable +# If you don't want to edit the file, you can simply define it +# on the command line like so: make WINE=1 -f makefile.g95 +#WINE=1 + # If we're using MSYS, or other utilities that use forward slashes, # you need to set this when invoking the makefile from DOS, or the # wrong separators will be assumed. However, if you're using MSYS, # you really ought to invoke the makefile from MSYS--or, even better, # use the './configure && make' technique that MSYS is designed for. +ifndef WINE #OSTYPE=msys +else +OSTYPE=msys +endif # If building DLL, the version WXVERSION=250 @@ -133,7 +142,9 @@ # Versions since 3.0 provide win32api.h . An old comment said to # define this 'if you have w32api >= 0.5', but mingw 2.95.2-1 # has no such header. +ifndef WINE _USE_W32API_HEADER_IF_SUPPORTED = -DHAVE_W32API_H +endif # # Revision 1.70.2.6 of this file suggested '--pipe' for mingw but # not for cygwin, and only for version 3.0 or later. Since then, @@ -145,11 +156,14 @@ # endif -# C compiler +# Define the C++ and C compiler respectively +ifndef WINE CXX = g++ - -# C compiler CC = gcc +else +CXX = winegcc -xc++ +CC = winegcc +endif # Compiler used for LEX generated C # For now at least, it can be the same as the regular C compiler @@ -169,7 +183,11 @@ # Settings for Cyginw/Mingw32 # Some versions of windres cannot cope with the --preprocessor # option. Uncomment the RCPREPROCESSOR line below if yours can. +ifndef WINE RESCOMP=windres $(_USE_TEMP_FILE_IF_SUPPORTED) +else +RESCOMP=wrc +endif RCINPUTSWITCH=-i RCOUTPUTSWITCH=-o RCINCSWITCH=--include-dir 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 2003/01/04 19:33:25 @@ -103,7 +103,7 @@ #elif defined(__MWERKS__) long wxmw_timezone = 28800; #define WX_TIMEZONE wxmw_timezone - #elif defined(__DJGPP__) + #elif defined(__DJGPP__) || defined(__WINE__) #include <sys/timeb.h> #include <values.h> static long wxGetTimeZone() 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 2003/01/04 19:33:28 @@ -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 2003/01/04 19:33:29 @@ -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.162 diff -u -r1.162 filefn.cpp --- src/common/filefn.cpp 2003/01/01 17:52:58 1.162 +++ src/common/filefn.cpp 2003/01/04 19:33:35 @@ -1262,7 +1262,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 (!(defined(__WXMSW__) || defined(__WXPM__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WXWINE__) || defined(__WINE__) || defined(__WXMICROWIN__) if ( mkdir(wxFNCONV(dirname), perm) != 0 ) #elif defined(__WXPM__) if (::DosCreateDir((PSZ)dirname, NULL) != 0) // enhance for EAB's?? 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 2003/01/04 19:33:37 @@ -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 2003/01/04 19:33:38 @@ -486,7 +486,7 @@ bool wxMimeTypesManager::Unassociate(wxFileType *ft) { -#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) +#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) && !defined(__WINE__) 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 defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) && !defined(__WINE__) 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 defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WXWINE__) && !defined(__WINE__) EnsureImpl(); m_impl->ClearData(); Index: src/common/sckaddr.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/sckaddr.cpp,v retrieving revision 1.34 diff -u -r1.34 sckaddr.cpp --- src/common/sckaddr.cpp 2002/12/04 14:06:51 1.34 +++ src/common/sckaddr.cpp 2003/01/04 19:33:39 @@ -46,7 +46,7 @@ #ifdef ENABLE_IPV6 IMPLEMENT_DYNAMIC_CLASS(wxIPV6address, wxSockAddress) #endif -#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) IMPLEMENT_DYNAMIC_CLASS(wxUNIXaddress, wxSockAddress) #endif @@ -237,7 +237,7 @@ #endif // 0 -#if defined(__UNIX__) && (!defined(__WXMAC__) || defined(__DARWIN__)) +#if defined(__UNIX__) && !defined(__WINE__) && (!defined(__WXMAC__) || defined(__DARWIN__)) // --------------------------------------------------------------------------- // wxUNIXaddress Index: src/common/sckipc.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/common/sckipc.cpp,v retrieving revision 1.34 diff -u -r1.34 sckipc.cpp --- src/common/sckipc.cpp 2002/09/14 02:09:51 1.34 +++ src/common/sckipc.cpp 2003/01/04 19:33:41 @@ -89,7 +89,7 @@ GetAddressFromName(const wxString& serverName, const wxString& host = _T("")) { // we always use INET sockets under non-Unix systems -#if defined(__UNIX__) && !defined(__WXMAC__) +#if defined(__UNIX__) && !defined(__WXMAC__) && !defined(__WINE__) // under Unix, if the server name looks like a path, create a AF_UNIX // socket instead of AF_INET one if ( serverName.Find(_T('/')) != wxNOT_FOUND ) 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 2003/01/04 19:33:45 @@ -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 2003/01/04 19:33:47 @@ -105,7 +105,7 @@ bool WXDLLEXPORT wxOKlibc() { -#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) +#if wxUSE_WCHAR_T && defined(__UNIX__) && defined(__GLIBC__) && !defined(__WINE__) // 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 2003/01/04 19:33:49 @@ -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 2003/01/04 19:33:52 @@ -1381,6 +1381,6 @@ // 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)) +#if (defined(__VISUALC__) && !defined(__WIN32__)) || (defined(__GNUWIN32__) && !defined(__WINE__) && !defined(__TWIN32__) && !defined(WXMAKINGDLL)) #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 2003/01/04 19:33:55 @@ -55,6 +55,7 @@ !defined(__GNUWIN32_OLD__) && \ !defined(__WATCOMC__) && \ !defined(__WXWINE__) && \ + !defined(__WINE__) && \ (!defined(__VISUALC__) || (__VISUALC__ >= 1020)) #include <ras.h> Index: src/msw/fontenum.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/msw/fontenum.cpp,v retrieving revision 1.30 diff -u -r1.30 fontenum.cpp --- src/msw/fontenum.cpp 2003/01/02 23:38:07 1.30 +++ src/msw/fontenum.cpp 2003/01/04 19:33:55 @@ -152,7 +152,7 @@ #define wxFONTENUMPROC FONTENUMPROCEX #elif (defined(__GNUWIN32__) && !defined(__CYGWIN10__) && !wxCHECK_W32API_VERSION( 1, 1 )) #if wxUSE_NORLANDER_HEADERS - #define wxFONTENUMPROC int(*)(const LOGFONT *, const TEXTMETRIC *, long unsigned int, LPARAM) + #define wxFONTENUMPROC FONTENUMPROC #else #define wxFONTENUMPROC int(*)(ENUMLOGFONTEX *, NEWTEXTMETRICEX*, int, LPARAM) #endif 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 2003/01/04 19:33:58 @@ -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/ole/automtn.cpp =================================================================== RCS file: /pack/cvsroots/wxwindows/wxWindows/src/msw/ole/automtn.cpp,v retrieving revision 1.26 diff -u -r1.26 automtn.cpp --- src/msw/ole/automtn.cpp 2003/01/03 14:59:07 1.26 +++ src/msw/ole/automtn.cpp 2003/01/04 19:34:00 @@ -26,6 +26,7 @@ // With Borland C++, all samples crash if this is compiled in. #if wxUSE_OLE &&!defined(__WATCOMC__) && !(defined(__BORLANDC__) && (__BORLANDC__ < 0x520)) && !defined(__CYGWIN10__) && !defined(__WXWINE__) +#define _FORCENAMELESSUNION #include "wx/log.h" #include "wx/msw/ole/automtn.h" #include "wx/msw/private.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 2003/01/04 19:34:04 @@ -1157,9 +1157,13 @@ # endif #endif -#if defined(__CYGWIN__) +#if defined(__CYGWIN__) || defined(__WINE__) # undef PNGAPI -# define PNGAPI __cdecl +# if defined(__WINE__) +# define PNGAPI +# else +# define PNGAPI __cdecl +# endif # undef PNG_IMPEXP # define PNG_IMPEXP #endif -- Dimi.

2 4

Re: _wine_ldt_copy can not be auto-imported when building under cygwin
by Dimitrie O. Paun Jan. 8, 2003

Jan. 8, 2003

On January 8, 2003 02:33 am, Jeroen Janssen wrote: > The attached patch fixes the following problem: > > '_wine_ldt_copy' can't be auto-imported" when building under cygwin Jeroen, Can you please test if the attach patch work? Index: include/wine/library.h =================================================================== RCS file: /var/cvs/wine/include/wine/library.h,v retrieving revision 1.17 diff -u -r1.17 library.h --- include/wine/library.h 3 Jan 2003 03:12:58 -0000 1.17 +++ include/wine/library.h 8 Jan 2003 15:00:48 -0000 @@ -72,7 +72,16 @@ extern int wine_ldt_set_entry( unsigned short sel, const LDT_ENTRY *entry ); /* the local copy of the LDT */ -extern struct __wine_ldt_copy +#ifdef __CYGWIN__ +# ifdef WINE_EXPORT_LDT_COPY +# define WINE_LDT_EXTERN __declspec(dllexport) +# else +# define WINE_LDT_EXTERN __declspec(dllimport) +#else +# define WINE_LDT_EXTERN extern +#endif + +WINE_LDT_EXTERN struct __wine_ldt_copy { void *base[8192]; /* base address or 0 if entry is free */ unsigned long limit[8192]; /* limit in bytes or 0 if entry is free */ Index: library/ldt.c =================================================================== RCS file: /var/cvs/wine/library/ldt.c,v retrieving revision 1.5 diff -u -r1.5 ldt.c --- library/ldt.c 14 Aug 2002 21:10:50 -0000 1.5 +++ library/ldt.c 8 Jan 2003 14:56:31 -0000 @@ -28,6 +28,7 @@ #include <errno.h> #include "winbase.h" +#define WINE_EXPORT_LDT_COPY #include "wine/library.h" #ifdef __i386__ -- Dimi.

2 1

Re: wine 20021219 install patch : registry installation failed
by Dimitrie O. Paun Jan. 8, 2003

Jan. 8, 2003

On January 8, 2003 09:18 am, Thai Dang wrote: > if you have troubles during installation (especially with registry > installation failed) > > patch -p1 -l < patchwine-20021219.diff Thai, You've sent a 190K email for a patch that changes 3 lines! Please, if you don't use CVS, at least use the -x switch for diff: diff -u -x "*.o" ... Or do a make clean before creating the patch. Or delete the garbage by hand. Any of these are OK, as long as you send in _just_ the patch, without the 99% extraneous garbage. -- Dimi.

2 1

Re: Mac OS X/Darwin port of Wine
by Mike Hearn Jan. 8, 2003

Jan. 8, 2003

Supposedly Mac OS X already has the largest installed base of any single *nix distribution and certainly is ahead of Linux on the desktop. So there are easily as many potential users of Wine for Mac OS X as Wine for X86-whatever. And Virtual PC has been popular & successful. Actually, according to figures from Apple and IDC (guess which is more neutral) desktop Linux has at least double and possibly quadruple the installed userbase of MacOS X. I have pointed this out several times when people make statements such as that, and have yet to be refuted, so be careful when saying things like MacOS is "certainly ahead of Linux", as the statistics don't back that up. *shrug* Bear in mind that to actually do a MacOS port would require rewriting quite large parts of Wine even if you still use an X server, and then Windows apps would still look like Windows apps, not Aqua apps. Please don't get discouraged, but you should be aware of how much work it involves before starting. As CPU emulation would be one of the trickier parts, I'd definately go with the advice to start by making x86 binaries work on Linux/PPC, as that keeps the number of things that could interfere to a minimum. ta -mike -- Mike Hearn <m.hearn(a)signal.qinetiq.com> QinetiQ - Malvern Technology Center

6 11

Re: Re: Sound driver autodetection
by chrismorgan＠rcn.com Jan. 8, 2003

Jan. 8, 2003

So the external tool would try to load each driver and put the detected one into the appropriate location in the registry? Chris > > From: Eric Pouech <eric.pouech(a)wanadoo.fr> > Date: 2003/01/07 Tue PM 05:09:02 EST > To: cmorgan(a)alum.wpi.edu > CC: wine-devel(a)winehq.com > Subject: Re: Sound driver autodetection > > chrismorgan(a)rcn.com wrote: > > I've been thinking about implementing sound driver autodetection in wine. On startup wine would try to open a device with each of the drivers until one was opened successfully. This seems pretty simple to implement, I was wondering if there was a dynamic way of detecting the list of drivers to try or whether this list would have to be hardcoded in a c file. Eric, any hints? > > I don't think this belongs to wine. What we could need is: > 1/ an external tool that lists all available drivers > 2/ then creates the corrects initialization of the registry. this would > also include defining the default driver > 3/ then all MM DLLs would get their configuration from the registry > > of course, 1/ will get complicated with different wine drivers outputing > to the same physical device, but we could infer some of the rules here > 1 & 2 could be implemented as a control panel (for better user > performance), but also as a pure command line tool so that it can be > invoked at wine initialisation (at least for 2/) > > as a matter of fact, I already have 3/ implemented, but never committed > it because of the lack of 1&2 > > A+ > -- > Eric Pouech > > >

3 2