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

Re: wine/ole error on Mingw32/MSYS

by Raphaël Junqueira

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Saturday 11 January 2003 01:53, Steven Edwards wrote: > Platform is a older MSYS and GCC (3.1 something I think). I'm still getting > settled in from getting tied-down so I cant test this on the latest > mingw-current. only on dial-up here for now =(. > Anyway any idea about this? > > Thanks > Steven > > > > $ make > gcc -c -I. -I. -I../include -I../include -DWINE_NOWINSOCK -Wall > -mpreferred-sta ck-boundary=2 -gstabs+ -D__WINESRC__ -D_REENTRANT -o > dx8guid.o dx8guid.c In file included from dx8guid.c:26: > .../include/winuser.h:2396: unnamed fields of type other than struct or > union are not allowed > .../include/winuser.h:2409: unnamed fields of type other than struct or > union are not allowed > make: *** [dx8guid.o] Error 1 it seems it don't like this: typedef struct tagMONITORINFOEXA { MONITORINFO DUMMYSTRUCTNAME; CHAR szDevice[CCHDEVICENAME]; } MONITORINFOEXA, *LPMONITORINFOEXA; who become (as unnamed is active): typedef struct tagMONITORINFOEXA { MONITORINFO ; CHAR szDevice[CCHDEVICENAME]; } MONITORINFOEXA, *LPMONITORINFOEXA; hmmmm it don't seems correct to me and if i do: - -={$:'/cvs-src/winetest/dlls/d3d8'}=->grep DUMMYSTRUCTNAME ../../include/* ../../include/d3d8types.h: } DUMMYSTRUCTNAME; ../../include/dsdriver.h: } DUMMYSTRUCTNAME; ../../include/mmsystem.h: } DUMMYSTRUCTNAME; ../../include/mmsystem.h: } DUMMYSTRUCTNAME1; ../../include/mmsystem.h: } DUMMYSTRUCTNAME; ../../include/mmsystem.h: } DUMMYSTRUCTNAME1; ../../include/objidl.h: } DUMMYSTRUCTNAME; ../../include/winbase.h: } DUMMYSTRUCTNAME; ../../include/wingdi.h: } DUMMYSTRUCTNAME1; ../../include/wingdi.h: } DUMMYSTRUCTNAME1; ../../include/winnt.h:#define DUMMYSTRUCTNAME ../../include/winnt.h:#define DUMMYSTRUCTNAME1 ../../include/winnt.h:#define DUMMYSTRUCTNAME2 ../../include/winnt.h:#define DUMMYSTRUCTNAME3 ../../include/winnt.h:#define DUMMYSTRUCTNAME4 ../../include/winnt.h:#define DUMMYSTRUCTNAME5 ../../include/winnt.h:#define DUMMYSTRUCTNAME s ../../include/winnt.h:#define DUMMYSTRUCTNAME1 s1 ../../include/winnt.h:#define DUMMYSTRUCTNAME2 s2 ../../include/winnt.h:#define DUMMYSTRUCTNAME3 s3 ../../include/winnt.h:#define DUMMYSTRUCTNAME4 s4 ../../include/winnt.h:#define DUMMYSTRUCTNAME5 s5 ../../include/winnt.h: } DUMMYSTRUCTNAME1; ../../include/winnt.h: } DUMMYSTRUCTNAME2; ../../include/winnt.h: } DUMMYSTRUCTNAME3; ../../include/winnt.h: } DUMMYSTRUCTNAME; ../../include/winnt.h: } DUMMYSTRUCTNAME; ../../include/winuser.h: MONITORINFO DUMMYSTRUCTNAME; ../../include/winuser.h: MONITORINFO DUMMYSTRUCTNAME; ../../include/wtypes.h: } DUMMYSTRUCTNAME; ../../include/wtypes.idl:cpp_quote(" } DUMMYSTRUCTNAME;") only 2 typedefed_struct DUMMYSTRUCTNAME; exists and they don't compile ... Raphael > __________________________________________________ > Do you Yahoo!? > Yahoo! Mail Plus - Powerful. Affordable. Sign up now. > http://mailplus.yahoo.com -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE+H2/up7NA3AmQTU4RAgVEAJ9Yxwfx0YCwaxNwM55AvgUc3qSWoQCdErG4 OAIkzuYrr0uHgS1ypEEL+Co= =0QTd -----END PGP SIGNATURE-----

Jan. 11, 2003

wine/ole error on Mingw32/MSYS

by Steven Edwards

Platform is a older MSYS and GCC (3.1 something I think). I'm still getting settled in from getting tied-down so I cant test this on the latest mingw-current. only on dial-up here for now =(. Anyway any idea about this? Thanks Steven $ make gcc -c -I. -I. -I../include -I../include -DWINE_NOWINSOCK -Wall -mpreferred-sta ck-boundary=2 -gstabs+ -D__WINESRC__ -D_REENTRANT -o dx8guid.o dx8guid.c In file included from dx8guid.c:26: ../include/winuser.h:2396: unnamed fields of type other than struct or union are not allowed ../include/winuser.h:2409: unnamed fields of type other than struct or union are not allowed make: *** [dx8guid.o] Error 1 __________________________________________________ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com

Jan. 11, 2003

Re: msvcrt: stubs for chsize, dup, dup2

by Steven Edwards

--- "Dimitrie O. Paun" <dpaun(a)rogers.com> wrote: > These are needed by the inline functions in the header. > > ChangeLog > Create stubs for chsize, dup, and dup2. I think chsize and ftruncate do the same thing so is there anyway to forward the call for chsize to ftruncate on platforms that have it? I added a configure check for this a while back because windows doesnt have ftruncate and makedep needs it. __________________________________________________ Do you Yahoo!? Yahoo! Mail Plus - Powerful. Affordable. Sign up now. http://mailplus.yahoo.com

Jan. 11, 2003

Re: [D3D8 - 1] resend of Jason Texture work + many fixes

by Raphaël Junqueira

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Saturday 11 January 2003 01:27, Raphaël Junqueira wrote: > Hi again, I forgot to say with this patch now: - - i have run successfully the NVIDIA Effects Browser 3.0 (http://developer.nvidia.com/view.asp?IO=NVEffectsBrowser_3) with many effects as Aniso (http://developer.nvidia.com/view.asp?IO=Anisotropic_Lighting) or membrane_lighting (http://developer.nvidia.com/view.asp?IO=membrane_lighting) in pure vertex shader software emulation - - Warcraf3 Demo begin to run - - SplinterCell Demo now complain about stencil support anyone have other Dx8 games demos for testing (simple if possible) ? > Thanks > Raphael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE+H2hKp7NA3AmQTU4RAvalAJ9v746sFf+RiEGzC/Vuv1NBnprAsQCaAwdQ WiIc/yV8HbZe0iw3CwJoFuE= =He8Q -----END PGP SIGNATURE-----

Jan. 11, 2003

Re: wine/ole error on Mingw32/MSYS

by Dimitrie O. Paun

On January 10, 2003 07:53 pm, Steven Edwards wrote: > $ make > gcc -c -I. -I. -I../include -I../include -DWINE_NOWINSOCK -Wall > -mpreferred-sta ck-boundary=2 -gstabs+ -D__WINESRC__ -D_REENTRANT -o > dx8guid.o dx8guid.c In file included from dx8guid.c:26: > ../include/winuser.h:2396: unnamed fields of type other than struct or > union are not allowed > ../include/winuser.h:2409: unnamed fields of type other than struct or > union are not allowed > make: *** [dx8guid.o] Error 1 Yes, Try adding: #define NONAMELESSUNION #define NONAMELESSSTRUCT Before the windows includes in files where you get this error. Look in dlls/comctl32/comctl32undoc.c for an example. -- Dimi.

Jan. 10, 2003

Re: PATCH - Check/Define for vsnprintf/_vsnprintf

by Dimitrie O. Paun

On January 10, 2003 07:47 pm, Steven Edwards wrote: > Changelog: (porting fix for Mingw/Windows) > check for vsnprintf and _vsnprintf > define vsnprintf with _vsnprintf Alexandre, why don't we link with oldnames.lib in Windows, and get rid of all these tests? -- Dimi.

Jan. 10, 2003

Re: [RFC] msvcrt: defines break C++ code

by Dimitrie O. Paun

On January 10, 2003 01:05 pm, Alexandre Julliard wrote: > I think making them inline functions should work for now. <whine>How come I always get these assignments?</whine> :) Hey, I did just some of them (basically io.h and sys/*.h), to preserve some form of sanity. Too much header work can lead to violent behaviour... This patch depends on "msvcrt: stubs for chsize, dup, dup2" and it obsoletes "sys/{stat,types}.h: mode_t, umask (take 2)" since I was difficult to separate them. Also, I did not know what to do about _open(), and _sopen() as they take variable number of arguments, so I've left them as macros. Any ideas for these are welcome. ChangeLog Use inline functions instead of macros to avoid problems in C++ Inline functions respect scope, whereas macros don't. Define umask in sys/stat.h and sys/types.h, and mode_t in sys/types.h Index: include/msvcrt/io.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/io.h,v retrieving revision 1.3 diff -u -r1.3 io.h --- include/msvcrt/io.h 18 Dec 2002 20:17:20 -0000 1.3 +++ include/msvcrt/io.h 10 Jan 2003 23:00:10 -0000 @@ -156,27 +156,30 @@ #ifndef USE_MSVCRT_PREFIX -#define access _access -#define chmod _chmod -#define chsize _chsize -#define close _close -#define creat _creat -#define dup _dup -#define dup2 _dup2 -#define eof _eof -#define filelength _filelength -#define isatty _isatty -#define locking _locking -#define lseek _lseek -#define mktemp _mktemp +inline int access(const char* path, int mode) { return _access(path, mode); } +inline int chmod(const char* path, int mode) { return _chmod(path, mode); } +inline int chsize(int fd, long size) { return _chsize(fd, size); } +inline int close(int fd) { return _close(fd); } +inline int creat(const char* path, int mode) { return _creat(path, mode); } +inline int dup(int od) { return _dup(od); } +inline int dup2(int od, int nd) { return _dup2(od, nd); } +inline int eof(int fd) { return _eof(fd); } +inline long filelength(int fd) { return _filelength(fd); } +inline int isatty(int fd) { return _isatty(fd); } +inline int locking(int fd, int mode, long size) { return _locking(fd, mode, size); } +inline long lseek(int fd, long off, int where) { return _lseek(fd, off, where); } +inline char* mktemp(char* pat) { return _mktemp(pat); } #define open _open -#define read _read -#define setmode _setmode +inline int read(int fd, void* buf, unsigned int size) { return _read(fd, buf, size); } +inline int setmode(int fd, int mode) { return _setmode(fd, mode); } #define sopen _sopen -#define tell _tell -#define umask _umask -#define unlink _unlink -#define write _write -#endif /* USE_MSVCRT_PREFIX */ +inline long tell(int fd) { return _tell(fd); } +#ifndef MSVCRT_UMASK_DEFINED +inline int umask(int fd) { return _umask(fd); } +#define MSVCRT_UMASK_DEFINED +#endif +inline int unlink(const char* path) { return _unlink(path); } +inline int write(int fd, const void* buf, unsigned int size) { return _write(fd, buf, size); } +#endif /* USE _MSVCRT_PREFIX */ #endif /* __WINE_IO_H */ Index: include/msvcrt/sys/stat.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/stat.h,v retrieving revision 1.6 diff -u -r1.6 stat.h --- include/msvcrt/sys/stat.h 18 Dec 2002 20:17:20 -0000 1.6 +++ include/msvcrt/sys/stat.h 10 Jan 2003 19:15:38 -0000 @@ -106,6 +106,7 @@ int MSVCRT(_stat)(const char*,struct _stat*); int _fstati64(int,struct _stati64*); int _stati64(const char*,struct _stati64*); +int _umask(int); #ifndef MSVCRT_WSTAT_DEFINED #define MSVCRT_WSTAT_DEFINED @@ -127,8 +128,12 @@ #define S_IWRITE _S_IWRITE #define S_IEXEC _S_IEXEC -#define fstat _fstat -#define stat _stat +inline int fstat(int fd, struct _stat* ptr) { return _fstat(fd, ptr); } +inline int stat(const char* path, struct _stat* ptr) { return _stat(path, ptr); } +#ifndef MSVCRT_UMASK_DEFINED +inline int umask(int fd) { return _umask(fd); } +#define MSVCRT_UMASK_DEFINED +#endif #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_SYS_STAT_H */ Index: include/msvcrt/sys/timeb.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/timeb.h,v retrieving revision 1.4 diff -u -r1.4 timeb.h --- include/msvcrt/sys/timeb.h 18 Dec 2002 20:17:20 -0000 1.4 +++ include/msvcrt/sys/timeb.h 10 Jan 2003 18:10:39 -0000 @@ -60,7 +60,7 @@ #ifndef USE_MSVCRT_PREFIX #define timeb _timeb -#define ftime _ftime +inline void ftime(struct _timeb* ptr) { return _ftime(ptr); } #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_SYS_TIMEB_H */ Index: include/msvcrt/sys/types.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/types.h,v retrieving revision 1.6 diff -u -r1.6 types.h --- include/msvcrt/sys/types.h 18 Dec 2002 20:17:20 -0000 1.6 +++ include/msvcrt/sys/types.h 10 Jan 2003 19:15:14 -0000 @@ -39,6 +39,11 @@ #define MSVCRT_INO_T_DEFINED #endif +#ifndef MSVCRT_MODE_T_DEFINED +typedef unsigned short _mode_t; +#define MSVCRT_MODE_T_DEFINED +#endif + #ifndef MSVCRT_OFF_T_DEFINED typedef int MSVCRT(_off_t); #define MSVCRT_OFF_T_DEFINED @@ -49,11 +54,25 @@ #define MSVCRT_TIME_T_DEFINED #endif +#ifdef __cplusplus +extern "C" { +#endif + +int _umask(int); + +#ifdef __cplusplus +} +#endif #ifndef USE_MSVCRT_PREFIX #define dev_t _dev_t #define ino_t _ino_t +#define mode_t _mode_t #define off_t _off_t +#ifndef MSVCRT_UMASK_DEFINED +inline int umask(int fd) { return _umask(fd); } +#define MSVCRT_UMASK_DEFINED +#endif #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_SYS_TYPES_H */ Index: include/msvcrt/sys/utime.h =================================================================== RCS file: /var/cvs/wine/include/msvcrt/sys/utime.h,v retrieving revision 1.4 diff -u -r1.4 utime.h --- include/msvcrt/sys/utime.h 18 Dec 2002 20:17:20 -0000 1.4 +++ include/msvcrt/sys/utime.h 10 Jan 2003 18:11:48 -0000 @@ -67,7 +67,7 @@ #ifndef USE_MSVCRT_PREFIX #define utimbuf _utimbuf -#define utime _utime +inline int utime(const char* path, struct _utimbuf* buf) { return _utime(path, buf); } #endif /* USE_MSVCRT_PREFIX */ #endif /* __WINE_SYS_UTIME_H */ -- Dimi.

Jan. 10, 2003

Re: dx8 Patches - Question

by Raphaël Junqueira

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Friday 10 January 2003 23:47, Alexandre Julliard wrote: > "Ann and Jason Edmeades" <us(a)the-edmeades.demon.co.uk> writes: > > Just a question, I noticed some of the dx8 patches are not applied - Is > > it due to the Chrismas backlog where Alexander took a very well deserved > > break, or because they have slipped through the cracks (or are there > > problems with them)? > > > > Will it help to resubmit them based off the current cvs since there were > > about 4 chained together each based off the previous one? > > Most likely they slipped through the cracks; I may still have them in > my queue, but it never hurts to resubmit. And especially in an area > that has been undergoing many changes, I always prefer to apply an > up-to-date patch than a 2 weeks old one. Hi all, i coming back just in time ;) Ok, how do you prefer: - - a huge d3d8 patch (very easy for me) - - many many little patches (hmmmm) but we have a new external need: the new x11drv/GLX stuff (know as "[WINE-D3D] glx init and D3D stuff") who is the begin for GL abstraction. thanks, Raphael -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.1 (GNU/Linux) iD8DBQE+H1CBp7NA3AmQTU4RAngtAKCNnwizlB/6Iv6lwQwxcnQHEoRrdACfa3Vc BZrME9svDXLUIIlwncUaGM0= =IjwJ -----END PGP SIGNATURE-----

Jan. 10, 2003

Re: dx8 Patches - Question

by Alexandre Julliard

"Ann and Jason Edmeades" <us(a)the-edmeades.demon.co.uk> writes: > Just a question, I noticed some of the dx8 patches are not applied - Is it > due to the Chrismas backlog where Alexander took a very well deserved break, > or because they have slipped through the cracks (or are there problems with > them)? > > Will it help to resubmit them based off the current cvs since there were > about 4 chained together each based off the previous one? Most likely they slipped through the cracks; I may still have them in my queue, but it never hurts to resubmit. And especially in an area that has been undergoing many changes, I always prefer to apply an up-to-date patch than a 2 weeks old one. -- Alexandre Julliard julliard(a)winehq.com

Jan. 10, 2003

Re: Wine, Mozilla & IE ?

by Alexandre Julliard

Mike Hearn <m.hearn(a)signal.qinetiq.com> writes: > Alexandre, what's the reasoning behind the no C++ rule? Some of the reasons are related to C++ itself: lack of standard ABI, large differences between compilers making it harder to write portable code. Other reasons would apply to any language: more complex build process, more external tool dependencies, harder to debug, developers need to be familiar with both languages, harder to copy code around, etc. None of these are showstoppers, but it needs a *really* good reason to overcome all of them. So far I haven't heard anything convincing enough. -- Alexandre Julliard julliard(a)winehq.com

Jan. 10, 2003