January 2003 - Wine-Devel - list.winehq.org

wxWindows: it's now official (almost)

by Dimitrie O. Paun

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.

Jan. 4, 2003

Re: [D3D 78] Small patch to get Tomb Raider 3 to work

by Lionel Ulmer

On Sat, Jan 04, 2003 at 07:28:26PM +0100, Sylvain Petreolle wrote: > Do you know if tomb raider needs absolutely OpenGL to work ? > Mine fails because NVidia driver makes bad access to the memory :/ No idea if Tomb Raider 3 still has a software rasterizer or not. I will try on my box at home when I come back and will tell you if it works here with my NVIDIA drivers :-) Lionel -- Lionel Ulmer - http://www.bbrox.org/

Jan. 4, 2003

Re: Mac OS X/Darwin port of Wine

by Lionel Ulmer

> This issue comes up a few times a year (isn't it in a FAQ > somewhere?) Anyway, take a look at these threads: Yeah, this is one of the most persistant 'Wine dream' around :-) I had once a long discussion with a fellow hacker on this subject (going into the likes of using Valgrind's virtualization engine to output non-X86 code to do dynamic translation and so on). We agreed that before starting with Wine, one could start with running, for example, Linux/x86 binaries on Linux/PPC. That would already validate the fact that you can draw the line at one point and from there run such an heterogenous environment. It's a very nice subject... A pitty it has such a low importance (seeing how X86 dominates the desktop market). Lionel -- Lionel Ulmer - http://www.bbrox.org/

Jan. 4, 2003

Re: Windows Debugging Tools under Wine: "Could not inject logging thread into process"

by Dan Kegel

Sylvain Petreolle wrote: > do you mean you manage to install the MSI service ? > >>2. to fix the "can't execute msiexec.exe" error, >> copy /dos/c/windows/system/msi* ~/c/windows/system >> I dunno. All I know is that copying all the msi* files from my real windows/system directory to my fake windows/system directory (and also copying cabinet.dll and using it) made the installer work under cvs wine. So I guess yes. Is that unusual? - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Jan. 4, 2003

Re: argv[0] needs to be an absolute path

by Dan Kegel

Uwe Bonnes wrote: > >> Did you check that it is CreateProcess that adds the absolute path? > >> I would guess the MS C Library will do it. > > Dan> Not quite sure how to check. Can you suggest a way? > > Run with relay and snoop on builtin and native msvcrt. Eventually instrument > the builtin msvcrt with more debugging output. (I assume by "eventually" you mean "possibly", given that your native tongue is german...) > >> Fiddling with CreateProcess needs good throught. > > Dan> I have not as yet fiddled with CreateProcess, only with the code > Dan> that starts off the initial process when you run Wine, I think. > > There has been discussion on that subject before. Did you check that your > problems is unrelated? Can't find it in the archive. Can you send me the URL? > But don't take my arguments to serious;-) I'm more worried about the fact that I haven't run the regression tests on native Windows -- my first run of microsoft's api logger under winxp suggests that argv[0] isn't always an absolute path there! (Yeah, that's easy to check without fancy tools, but I ran the fancy tools to watch ShellExecuteA, and happened to notice it.) Also, I should probably run them with native msvcrt under wine as you suggest. I guess I should vow never to post a patch until I have a conformance test to check it, and have run all conformance tests under both Wine and at least one version of Windows (maybe both win9x and winxp to be safe). - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Jan. 4, 2003

[D3D 78] Small patch to get Tomb Raider 3 to work

by Sylvain Petreolle

Do you know if tomb raider needs absolutely OpenGL to work ? Mine fails because NVidia driver makes bad access to the memory :/ ===== Sylvain Petreolle spetreolle(a)users.sourceforge.net Fight against Spam ! http://www.euro.cauce.org/en/index.html ICQ #170597259 "Don't think you are. Know you are." Morpheus in Matrix, chapter 15. ___________________________________________________________ Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com

Jan. 4, 2003

RE: problem using msvcmaker to build conformance test suite project file

by Patrik Stridvall

> http://www.winehq.com/Docs/wine-devel/testing-windows.shtml says: > > > Run msvcmaker to generate Visual C++ project files for > > the tests. ... > > > > $ ./tools/winapi/msvcmaker --no-wine > > I did that in my cvs wine directory, and all I got was > .: searching for /\.spec$/ > .: searching for /^Makefile.in$/ > <internal>: options.pm: member W0B5 does not exists > > Um, did I do something wrong? Or is there a bug in msvcmaker? There is nothing wrong with msvcmaker on my computer. The error above is very strange, nothing reasonable in the script that I think of can have caused it. > I'm on Red Hat 8.0, btw. It can be some sort of name collision when the Perl modules are imported. My guess is that one (or more) of the imported modules happens to depend on a module named "options" which causes a name collision.

Jan. 4, 2003

problem using msvcmaker to build conformance test suite project file

by Dan Kegel

http://www.winehq.com/Docs/wine-devel/testing-windows.shtml says: > Run msvcmaker to generate Visual C++ project files for > the tests. ... > > $ ./tools/winapi/msvcmaker --no-wine I did that in my cvs wine directory, and all I got was .: searching for /\.spec$/ .: searching for /^Makefile.in$/ <internal>: options.pm: member W0B5 does not exists Um, did I do something wrong? Or is there a bug in msvcmaker? I'm on Red Hat 8.0, btw. - Dan -- Dan Kegel Linux User #78045 http://www.kegel.com

Jan. 4, 2003

Re: sharpdevelop and .NET

by Roderick Colenbrander

Hi, Sharpdevelop won't run on wine for a long time (perhaps even never). It is a 100% .NET app. The app will run on mono, a free .NET implementation, when they are done with Windows.Forms. Windows.Forms will be implemented using WineLib. When it fully functions Sharpdevelop will natively run on Linux (or any other OS supported by mono and WineLib). I wouldn't run MS .NET framework on Wine. Really look at www.go-mono.net for the mono project. Use Eclipse or some other tool as the IDE. Good Luck, Roderick Colenbrander On Saturday 04 January 2003 19:00, Sylvain Petreolle wrote: > --- tom potts <madtom1999(a)yahoo.com> a écrit : > > Sylvain > > I cant get on the list from home but I tried copying > > mscoree.dll and sharpdevelop got as far as asking for > > some registry settings to be set!! > > lol :) that was an evidence ! otherwise microsoft wouldn't give a 20 Mb > file to download. > > > I tried installing the redistributable but I need > > IE5.01 or higher and the M$ download fails under wine! > > I beleive I have a CD install at work so I'll try that > > on monday and then try installing .Net again. > > shouldnt fail... check the wine-users archive. many work has > been done to make this possible. > if this really fails, make a bygreport on wine-users and set these > entries. this will > an ie6 installed. > > [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Internet Explorer] > "Build"="62800" > "Version"="6.0.2800.1106" > "W2kVersion"="6.0.2800.1106" > "IntegratedBrowser"=dword:00000001 > "MkEnabled"="Yes" > > > All I want is a good IDE for .NET/Mono on Linux and > > then I can help to get Mono up and running.... > > Tom > > understood ;) does mono already run .NET ? > > ===== > Sylvain Petreolle > spetreolle(a)users.sourceforge.net > Fight against Spam ! http://www.euro.cauce.org/en/index.html > ICQ #170597259 > > "Don't think you are. Know you are." Morpheus in Matrix, chapter 15. > > ___________________________________________________________ > Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! > Yahoo! Mail : http://fr.mail.yahoo.com

Jan. 4, 2003

RE: IE browsing local files

by Luís Marques

Mike Hearn wrote: > Also, a bit OT this one, but I've been told that the MS EULA > in Office XP forbids running it on anything other than > Windows. Is this true, and if so, is it legal for them to say this? Microsoft was convicted a monopoly. AFAIK, according to the Sherman Act, Microsoft is not allowed to restrict their products to another of which they detain a monopoly. Thus they cannot restrict Office XP to Windows. Luís Marques

Jan. 4, 2003