- Wine-Devel - list.winehq.org

3/4 patches for compilation of ATL & MFC
by Boaz Harrosh March 12, 2004

March 12, 2004

PATCH 3 msvcrt.diff minor fixes to msvcrt - include/msvcrt/limits.h very much synced with MSVC, needed by MFC - include/msvcrt/math.h I'm not sure who submitted a broken empty math.h header. Just to show that no one is doing serious winlib work lately, or they are not reporting about it. This header is the one I have for use with STLPort, it will Just #include the standard lib one. If it is not acceptable than at least completely remove the one in now. - include/msvcrt/mbctype.h Some missing constants for the _setmbcp, used by MFC - include/msvcrt/wchar.h Some code was copy pasted from <sys/stat.h> and was protected by an #ifndef. The <sys/stat.h> added some newer definitions that where not added to wchar. This patch removes the old definitions and instead #includes <sys/stat.h>. It is the same way in ms-headers. In fact I had some code that presupposed stat.h included by wchar that would hence not compile under the old version. ? include/msvcrt/exception ? include/msvcrt/float.h ? include/msvcrt/new ? include/msvcrt/stdarg.h ? include/msvcrt/typeinfo Index: include/msvcrt/limits.h =================================================================== RCS file: /home/wine/wine/include/msvcrt/limits.h,v retrieving revision 1.1 diff -u -r1.1 limits.h --- include/msvcrt/limits.h 2 Sep 2003 00:58:21 -0000 1.1 +++ include/msvcrt/limits.h 10 Mar 2004 08:36:47 -0000 @@ -1,10 +1,32 @@ #ifndef __WINE_LIMITS_H #define __WINE_LIMITS_H -#define INT_MAX 2147483647 -#define INT_MIN (-2147483648) -#define SHRT_MAX 32767 -#define SHRT_MIN (-32768) +/*chars and mb's*/ +#define CHAR_BIT 8 +#define CHAR_MIN (-128) +#define CHAR_MAX 127 +#define SCHAR_MIN (-128) +#define SCHAR_MAX 127 +#define UCHAR_MIN 0 +#define UCHAR_MAX 0xff +#define MB_LEN_MAX 2 + +/*shorts ints longs*/ +#define SHRT_MIN 0x8000 +#define SHRT_MAX 0x0fff + +#define USHRT_MAX 0xffff +#define INT_MIN (-2147483647 - 1) +#define INT_MAX 2147483647 +#define UINT_MAX 0xffffffff +#define LONG_MIN (-2147483647L - 1) +#define LONG_MAX 2147483647L +#define ULONG_MAX 0xffffffffUL + +/* __int64 */ +#define _I64_MIN (-9223372036854775807i64 - 1) +#define _I64_MAX 9223372036854775807i64 +#define _UI64_MAX 0xffffffffffffffffui64 #ifdef __cplusplus extern "C" { Index: include/msvcrt/math.h =================================================================== RCS file: /home/wine/wine/include/msvcrt/math.h,v retrieving revision 1.1 diff -u -r1.1 math.h --- include/msvcrt/math.h 2 Sep 2003 00:58:21 -0000 1.1 +++ include/msvcrt/math.h 10 Mar 2004 08:36:47 -0000 @@ -1,12 +1,14 @@ -#ifndef __WINE_MATH_H -#define __WINE_MATH_H -#ifdef __cplusplus -extern "C" { -#endif +#include <../include/math.h> -#ifdef __cplusplus -} -#endif - -#endif /* __WINE_MATH_H */ Index: include/msvcrt/mbctype.h =================================================================== RCS file: /home/wine/wine/include/msvcrt/mbctype.h,v retrieving revision 1.4 diff -u -r1.4 mbctype.h --- include/msvcrt/mbctype.h 18 Jul 2003 22:57:15 -0000 1.4 +++ include/msvcrt/mbctype.h 10 Mar 2004 08:36:47 -0000 @@ -30,6 +30,12 @@ unsigned char* __p__mbctype(void); #define _mbctype (__p__mbctype()) +/* _setmbcp parameter defines */ +#define _MB_CP_SBCS 0 +#define _MB_CP_OEM -2 +#define _MB_CP_ANSI -3 +#define _MB_CP_LOCALE -4 + int _getmbcp(void); int _ismbbalnum(unsigned int); int _ismbbalpha(unsigned int); Index: include/msvcrt/wchar.h =================================================================== RCS file: /home/wine/wine/include/msvcrt/wchar.h,v retrieving revision 1.5 diff -u -r1.5 wchar.h --- include/msvcrt/wchar.h 18 Jul 2003 22:57:15 -0000 1.5 +++ include/msvcrt/wchar.h 10 Mar 2004 08:36:48 -0000 @@ -151,35 +151,7 @@ #endif /* MSVCRT_WFINDDATA_T_DEFINED */ #ifndef MSVCRT_STAT_DEFINED -#define MSVCRT_STAT_DEFINED - -struct _stat { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - MSVCRT(_off_t) st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; -}; - -struct _stati64 { - _dev_t st_dev; - _ino_t st_ino; - unsigned short st_mode; - short st_nlink; - short st_uid; - short st_gid; - _dev_t st_rdev; - __int64 st_size; - MSVCRT(time_t) st_atime; - MSVCRT(time_t) st_mtime; - MSVCRT(time_t) st_ctime; -}; +#include <sys/stat.h> #endif /* MSVCRT_STAT_DEFINED */ /* ASCII char classification table - binary compatible */

4 3

fixme:msvcrt:MSVCRT__sopen
by Erik de Castro Lopo March 12, 2004

March 12, 2004

HI all, I have a console program which spits out messages along the lines of: fixme:msvcrt:MSVCRT__sopen : pmode 0x01a0 ignored Looking at the code to MSVCRT__sopen I find this: if(pmode & ~(_S_IREAD | _S_IWRITE)) FIXME(": pmode 0x%04x ignored\n", pmode); else WARN(": pmode 0x%04x ignored\n", pmode); Would it not be safe to just delete both the FIXME and the WARN or am I missing something? Cheers, Erik -- +-----------------------------------------------------------+ Erik de Castro Lopo nospam(a)mega-nerd.com (Yes it's valid) +-----------------------------------------------------------+ "The X-files is too optimistic. The truth is not out there." -- Anthony Ord

1 0

NULL DIALOGINFO structure
by Santosh Siddheshwar March 12, 2004

March 12, 2004

Hi All, Does anyone visualize a scenario where DIALOGINFO is going to be NULL and subsequently we cannot process DM_SETDEFID and DM_GETDEFID messages? Regards Santosh S ********************************************************************* Disclaimer: The information in this e-mail and any attachments is confidential / privileged. It is intended solely for the addressee or addressees. If you are not the addressee indicated in this message, you may not copy or deliver this message to anyone. In such case, you should destroy this message and kindly notify the sender by reply email. Please advise immediately if you or your employer does not consent to Internet email for messages of this kind. *********************************************************************

1 0

CreateFile problem (with patch)
by Stefan Leichter March 12, 2004

March 12, 2004

Sorry, this time with patch attached Hello, i have a program that trys to open the serial port with CreateFile() like this: Call kernel32.CreateFileA(00422f7c "\\\\.\\COM1",c0000000,00000000, 00000000,00000003,00000080,00000000) The function call fail with current CVS. After debugging some time i found a fix for the problem. But my knowlodge of the CreateFile function an all its different usages is verry limited. Therefore i post the patch here for comment. Bye Stefan

4 4

Tracking of single files in cvs
by Christian Britz March 12, 2004

March 12, 2004

Hi, This might be just a general cvs related question but hopefully someone of you could help; I don't think that I am the only interested person! Is there a simple way to get informed when ever a specified file in cvs changes (e.g. by mail)? In my case I would like to track the README file. Or will I have to write a script or something myself? Thank you Christian

2 2

Re: Notepad - Richedit Window
by Mike McCormack March 12, 2004

March 12, 2004

Hi Steven, I still think it would be better to create a seperate write.exe and implement rtf support in that (using Richedit). My feeling is that extending notepad.exe past what it's meant to do is going to cause trouble. Sorry to discourage you from working on Richedit :( It could be a satistfying project if you were willing to stick with it ... Mike Steven Edwards wrote: > Hello, > I was thinking about doing some work on richedit until Mike McCormack > said it would take a year of work. That means it would take me two or > three and I am just not that interested. Anyway it was still good for > me to get to pratice writting something that really works for once, > even if it is worthless on WINE. This patch does make running notepad > on windows look much better though and has no effect on WINE that I can > tell. > > Thanks > Steven > > Changelog: > Use a richedit control in notepad

1 0

Documentation does not get installed with cvs sources?!
by Christian Britz March 11, 2004

March 11, 2004

Hi, As far as I remember the Wine documentation tree always got installed to /usr/share/doc when I compiled from official releases. Since few days I install from the sources in cvs. Yesterday I noticed that they were not copied from the source tree to /usr/share/doc. Is this normal behaviour for builds from cvs? Sorry if I made just some stupid mistake. Christian

1 0

Application database
by Frank Hendriksen March 11, 2004

March 11, 2004

I've noticed that the application database hasn't been updated for quite some time. I'm willing to help to keep it up to date or become the maintainer.

2 1

one more patches for compilation of ATL & MFC
by Boaz Harrosh March 11, 2004

March 11, 2004

winegcc.diff I know I promised 4 but here is a 5th. - include/wine/winegccdef.h (new) This is an exact replica of what winegcc is doing (extracted from winegcc.c) it is for use by people like me that cannot use winegcc directly. I hope that some day winegcc will just do: "-include wine/winegccdef.h" and save space and time. One addition I have added is an NO_NO_WARNING_MODE option that will eliminate lots off warnings. The default is warning off. - winegcc.c needed missing stuff Dimi what should I do with the work I have done with STLPort compiled over wine-msvcrt (dynamic or static libraries). I have not received any response from STLPort. Should I prepare a patch against the Original STLPort? where do I than send it? Index: tools/winegcc/winegcc.c =================================================================== RCS file: /home/wine/wine/tools/winegcc/winegcc.c,v retrieving revision 1.19 diff -u -r1.19 winegcc.c --- tools/winegcc/winegcc.c 9 Mar 2004 04:49:42 -0000 1.19 +++ tools/winegcc/winegcc.c 10 Mar 2004 16:00:42 -0000 @@ -275,6 +275,7 @@ strarray_add(comp_args, "-D_cdecl=__attribute__((__cdecl__))"); strarray_add(comp_args, "-D_fastcall=__attribute__((__fastcall__))"); strarray_add(comp_args, "-D__declspec(x)=__declspec_##x"); + strarray_add(comp_args, "-D_declspec(x)=__declspec_##x"); strarray_add(comp_args, "-D__declspec_align(x)=__attribute__((aligned(x)))"); strarray_add(comp_args, "-D__declspec_allocate(x)=__attribute__((section(x)))"); strarray_add(comp_args, "-D__declspec_deprecated=__attribute__((deprecated))"); --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/wine/winegccdef.h 2004-03-10 17:40:19.000000000 +0200 @@ -0,0 +1,99 @@ +/* + * Definitions that are defined by the winegcc when invoked. + * It is listed here so it can be used by anyone who needs to use + * gcc directly + * + * Copyright 2004 wine project + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __WINEGCCDEF_H +#define __WINEGCCDEF_H + +#ifndef _MSC_VER + +#define WIN32 +#define _WIN32 +#define __WIN32 +#define __WIN32__ +#define __WINNT +#define __WINNT__ + +#define __stdcall __attribute__((__stdcall__)) +#define __cdecl __attribute__((__cdecl__)) +#define __fastcall //__attribute__((__fastcall__)) +#define _stdcall __attribute__((__stdcall__)) +#define _cdecl __attribute__((__cdecl__)) +#define _fastcall __attribute__((__fastcall__)) + +/* Wine specific defines */ +#define __WINE__ +#define WINE_UNICODE_NATIVE +#define __int8 char +#define __int16 short +#define __int32 int +#define __int64 long long +#define __WINE_GCC__ /* using both wine & gcc for STLPort */ + + +#define __declspec(x) __declspec_##x +#define _declspec(x) __declspec_##x + +/* works well. Some times the exact placing veries with in the statment */ +#define __declspec_selectany __attribute__((weak)) + +/* ignored by GCC and is warned (supported by MinGW) */ +#ifndef _NO_NO_WINEGCC_WARNING +# define __declspec_dllexport +#else +# define __declspec_dllexport __attribute__((dllexport)) +#endif + +/* ignored by GCC and is warned (supported by MinGW) */ +#ifndef _NO_NO_WINEGCC_WARNING +# define __declspec_dllimport +#else +# define __declspec_dllimport __attribute__((dllimport)) +#endif + +/* works */ +#define __declspec_noreturn __attribute__ ((noreturn)) +/* works */ +#define __declspec_nothrow __attribute__ ((nothrow)) +/* works ?? */ +#define __declspec_naked __attribute__ ((naked)) + +/* GCC is more restrictive about placing. look for TLS in gcc & msdn documentation */ +#define __declspec_thread __thread +/* no paralle defined to nothing */ +#define __declspec_novtable +/* Gcc only suports code ?? */ +#define __declspec_allocate(segname) __attribute__ (( section(segname) )) + +/* property is supported thrugh the file pretty_com.h */ +/* property( get=get_func_name|, put=put_func_name ) */ + +/* _declspec( uuid() ) and __uuidof are supported with code changes */ +/* see uuidof.h */ +#define __declspec_uuid(ComObjectGUID) error_SEE__uuidof_h__for_use_of_uuid + +#define __declspec_align(x) __attribute__((aligned(x))) +#define __declspec_deprecated __attribute__((deprecated)) +#define __declspec_noinline __attribute__((noinline)) + +#endif //_MSC_VER + +#endif /* __WINEGCCDEF_H */

3 2

testing win32 apps with wine
by brian＠chrissyandbrian.com March 11, 2004

March 11, 2004

Can anyone point me to a good read on testing win32 apps on linux with wine? I want to write scripts that automate mouse clicks on buttons, read output from text fields, and grab pixel colors. My language of choice is python. -- Brian Edwards <brian at chrissyandbrian.com>

3 2