wine-devel March 2004

wine-devel@winehq.org

128 participants
264 discussions

Documentation does not get installed with cvs sources?!
by Christian Britz 11 Mar '04

11 Mar '04

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 11 Mar '04

11 Mar '04

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 11 Mar '04

11 Mar '04

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 11 Mar '04

11 Mar '04

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

4/4 patches for compilation of ATL & MFC
by Boaz Harrosh 11 Mar '04

11 Mar '04

PATCH 4 warning_off.diff some of these might be controversial but would eliminate 17 tons off warnings when compiling MFC/ATL and user code. I have found (the hard way) that GCC in some cases would produce none working code but will Just warn about it. Having thousands of warnings or turning warning off will eliminate the ability to catch these cases. I have found that most of the trivial warnings can be avoided with a few small tricks. here they are below. (for complete discussion of GCC's bad code please post me) - include/msvcrt/mbstring.h This one will eliminate 1000 warnings in MFC and any using code The actual issue is definitely a mal-practice in the code of CString. But since MSVC does not care it was never fixed by MS . In effect it does nothing. ( I think code looks better, but that is subjective). It lets me a way to avoid these warnings when compiling MFC with -D_MBCS. (I did not currently managed to compile it with out it. And I did not even get to Unicode). This single patch would be very hard to maintain outside of wine. If any one has other suggestions I would be happy to hear them. for now it is the best I could do. - include/msvcrt/stddef.h Lots of offsetof in MFC headers and code. GCC will automatically warn on use of this macro on c++ objects. Regardless if it is right or wrong to do so. (for a complete discussion of this topic just browse to www.gcc.org and search for "offsetof"). this patch will eliminate the warning. ( Maybe it is best to keep this patch separate) ? include/wine/winegccdef.h Index: include/msvcrt/mbstring.h =================================================================== RCS file: /home/wine/wine/include/msvcrt/mbstring.h,v retrieving revision 1.4 diff -u -r1.4 mbstring.h --- include/msvcrt/mbstring.h 18 Jul 2003 22:57:15 -0000 1.4 +++ include/msvcrt/mbstring.h 10 Mar 2004 08:36:47 -0000 @@ -36,6 +36,12 @@ #define MSVCRT_SIZE_T_DEFINED #endif +#ifdef MBCS_CHAR + typedef MBCS_CHAR mbs_char ; +#else + typedef unsigned char mbs_char ; +#endif + #ifndef MSVCRT_NLSCMP_DEFINED #define _NLSCMPERROR ((unsigned int)0x7fffffff) #define MSVCRT_NLSCMP_DEFINED @@ -64,66 +70,66 @@ unsigned int _mbbtombc(unsigned int); int _mbbtype(unsigned char,int); #define _mbccmp(_cpc1,_cpc2) _mbsncmp((_cpc1),(_cpc2),1) -void _mbccpy(unsigned char*,const unsigned char*); +void _mbccpy(mbs_char*,const mbs_char*); unsigned int _mbcjistojms(unsigned int); unsigned int _mbcjmstojis(unsigned int); -MSVCRT(size_t) _mbclen(const unsigned char*); +MSVCRT(size_t) _mbclen(const mbs_char*); unsigned int _mbctohira(unsigned int); unsigned int _mbctokata(unsigned int); unsigned int _mbctolower(unsigned int); unsigned int _mbctombb(unsigned int); unsigned int _mbctoupper(unsigned int); -int _mbsbtype(const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbscat(unsigned char*,const unsigned char*); -unsigned char* _mbschr(const unsigned char*,unsigned int); -int _mbscmp(const unsigned char*,const unsigned char*); -int _mbscoll(const unsigned char*,const unsigned char*); -unsigned char* _mbscpy(unsigned char*,const unsigned char*); -MSVCRT(size_t) _mbscspn(const unsigned char*,const unsigned char*); -unsigned char* _mbsdec(const unsigned char*,const unsigned char*); -unsigned char* _mbsdup(const unsigned char*); -int _mbsicmp(const unsigned char*,const unsigned char*); -int _mbsicoll(const unsigned char*,const unsigned char*); -unsigned char* _mbsinc(const unsigned char*); -MSVCRT(size_t) _mbslen(const unsigned char*); -unsigned char* _mbslwr(unsigned char*); -unsigned char* _mbsnbcat(unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnbcmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnbcoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -MSVCRT(size_t) _mbsnbcnt(const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsnbcpy(unsigned char*,const unsigned char* +int _mbsbtype(const mbs_char*,MSVCRT(size_t)); +mbs_char* _mbscat(mbs_char*,const mbs_char*); +mbs_char* _mbschr(const mbs_char*,unsigned int); +int _mbscmp(const mbs_char*,const mbs_char*); +int _mbscoll(const mbs_char*,const mbs_char*); +mbs_char* _mbscpy(mbs_char*,const mbs_char*); +MSVCRT(size_t) _mbscspn(const mbs_char*,const mbs_char*); +mbs_char* _mbsdec(const mbs_char*,const mbs_char*); +mbs_char* _mbsdup(const mbs_char*); +int _mbsicmp(const mbs_char*,const mbs_char*); +int _mbsicoll(const mbs_char*,const mbs_char*); +mbs_char* _mbsinc(const mbs_char*); +MSVCRT(size_t) _mbslen(const mbs_char*); +mbs_char* _mbslwr(mbs_char*); +mbs_char* _mbsnbcat(mbs_char*,const mbs_char*,MSVCRT(size_t)); +int _mbsnbcmp(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +int _mbsnbcoll(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +MSVCRT(size_t) _mbsnbcnt(const mbs_char*,MSVCRT(size_t)); +mbs_char* _mbsnbcpy(mbs_char*,const mbs_char* ,MSVCRT(size_t)); -int _mbsnbicmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnbicoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsnbset(unsigned char*,unsigned int,MSVCRT(size_t)) +int _mbsnbicmp(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +int _mbsnbicoll(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +mbs_char* _mbsnbset(mbs_char*,unsigned int,MSVCRT(size_t)) ; -unsigned char* _mbsncat(unsigned char*,const unsigned char*, +mbs_char* _mbsncat(mbs_char*,const mbs_char*, MSVCRT(size_t)); -MSVCRT(size_t) _mbsnccnt(const unsigned char*,MSVCRT(size_t)); -int _mbsncmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsncoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsncpy(unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned int _mbsnextc (const unsigned char*); -int _mbsnicmp(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -int _mbsnicoll(const unsigned char*,const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsninc(const unsigned char*,MSVCRT(size_t)); -unsigned char* _mbsnset(unsigned char*,unsigned int,MSVCRT(size_t)); -unsigned char* _mbspbrk(const unsigned char*,const unsigned char*); -unsigned char* _mbsrchr(const unsigned char*,unsigned int); -unsigned char* _mbsrev(unsigned char*); -unsigned char* _mbsset(unsigned char*,unsigned int); -MSVCRT(size_t) _mbsspn(const unsigned char*,const unsigned char*); -unsigned char* _mbsspnp(const unsigned char*,const unsigned char*); -unsigned char* _mbsstr(const unsigned char*,const unsigned char*); -unsigned char* _mbstok(unsigned char*,const unsigned char*); -unsigned char* _mbsupr(unsigned char*); +MSVCRT(size_t) _mbsnccnt(const mbs_char*,MSVCRT(size_t)); +int _mbsncmp(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +int _mbsncoll(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +mbs_char* _mbsncpy(mbs_char*,const mbs_char*,MSVCRT(size_t)); +unsigned int _mbsnextc (const mbs_char*); +int _mbsnicmp(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +int _mbsnicoll(const mbs_char*,const mbs_char*,MSVCRT(size_t)); +mbs_char* _mbsninc(const mbs_char*,MSVCRT(size_t)); +mbs_char* _mbsnset(mbs_char*,unsigned int,MSVCRT(size_t)); +mbs_char* _mbspbrk(const mbs_char*,const mbs_char*); +mbs_char* _mbsrchr(const mbs_char*,unsigned int); +mbs_char* _mbsrev(mbs_char*); +mbs_char* _mbsset(mbs_char*,unsigned int); +MSVCRT(size_t) _mbsspn(const mbs_char*,const mbs_char*); +mbs_char* _mbsspnp(const mbs_char*,const mbs_char*); +mbs_char* _mbsstr(const mbs_char*,const mbs_char*); +mbs_char* _mbstok(mbs_char*,const mbs_char*); +mbs_char* _mbsupr(mbs_char*); #ifndef MSVCRT_MBLEADTRAIL_DEFINED #define MSVCRT_MBLEADTRAIL_DEFINED int _ismbblead(unsigned int); int _ismbbtrail(unsigned int); -int _ismbslead(const unsigned char*,const unsigned char*); -int _ismbstrail(const unsigned char*,const unsigned char*); +int _ismbslead(const mbs_char*,const mbs_char*); +int _ismbstrail(const mbs_char*,const mbs_char*); #endif /* MSVCRT_MBLEADTRAIL_DEFINED */ #ifdef __cplusplus Index: include/msvcrt/stddef.h =================================================================== RCS file: /home/wine/wine/include/msvcrt/stddef.h,v retrieving revision 1.7 diff -u -r1.7 stddef.h --- include/msvcrt/stddef.h 18 Jul 2003 22:57:15 -0000 1.7 +++ include/msvcrt/stddef.h 10 Mar 2004 08:36:47 -0000 @@ -56,7 +56,7 @@ #endif #endif -#define offsetof(s,m) (size_t)&(((s*)NULL)->m) +#define offsetof(s,m) (((size_t)&(((s*)128)->m)) - 128 ) #ifdef __cplusplus

1 0

2/4 patches for compilation of ATL & MFC
by Boaz Harrosh 11 Mar '04

11 Mar '04

PATCH 2 ForAtlMfc.diff some fixes and additional files needed by ATL/MFC - include/Makefile.in Added some new .idl files, see below - include/expdisp.idl Add the DWebBrowserEvents + the IWebBrowser2 and events - include/expdispid.h (new) needed by expdisp.idl and ATL code - include/olectl.h the font constant will not compile. I think it should also be fixed for c but I can't be sure. It was written like in MS headers, MSVC will compile it, but GCC will not. The way I did it works for both. - include/mshtmhst.idl (new) other Interfaces related to IE that are not present in expdisp.idl - include/msstkppg.h (new) some GUIDs used by MFC - include/objsafe.idl (new) common Interface also used by ATL * Not all Interfaces needed by AT/MFC are included here. These are the more commons that I have found used in other places. I will have available Makefiles, extra headers, directory listings, documentation ,demo applications, that are needed to compile MFC/ATL. One could grab the missing Interfaces together with the MFC/ATL source code, from where ever he/she Legally got them. Index: include/Makefile.in =================================================================== RCS file: /home/wine/wine/include/Makefile.in,v retrieving revision 1.121 diff -u -r1.121 Makefile.in --- include/Makefile.in 9 Mar 2004 01:29:56 -0000 1.121 +++ include/Makefile.in 10 Mar 2004 08:36:46 -0000 @@ -23,7 +23,9 @@ strmif.idl \ unknwn.idl \ urlmon.idl \ - wtypes.idl + wtypes.idl \ + mshtmhst.idl \ + objsafe.idl IDL_INCLUDES = \ axcore.idl \ Index: include/exdisp.idl =================================================================== RCS file: /home/wine/wine/include/exdisp.idl,v retrieving revision 1.1 diff -u -r1.1 exdisp.idl --- include/exdisp.idl 4 Sep 2003 02:00:46 -0000 1.1 +++ include/exdisp.idl 10 Mar 2004 08:36:46 -0000 @@ -84,6 +84,81 @@ HRESULT get_Busy([out] VARIANT_BOOL *pBool); } +#include "exdispid.h" +/***************************************************************************** + * DWebBrowserEvents: This Interface is the Events from the IWebBrowser above + */ +[ + oleautomation, + uuid(EAB22AC2-30C1-11CF-A7EB-0000C05BAE0B) +] +dispinterface DWebBrowserEvents +{ + properties: + methods: + [id(DISPID_BEFORENAVIGATE)] + void BeforeNavigate([in] BSTR URL, long Flags, BSTR TargetFrameName, VARIANT * PostData, BSTR Headers, [in, out]VARIANT_BOOL * Cancel); + + [id(DISPID_NAVIGATECOMPLETE)] + void NavigateComplete([in] BSTR URL ); + + [id(DISPID_STATUSTEXTCHANGE)] + void StatusTextChange([in]BSTR Text); + + [id(DISPID_PROGRESSCHANGE)] + void ProgressChange([in] long Progress, [in] long ProgressMax); + + [id(DISPID_DOWNLOADCOMPLETE)] + void DownloadComplete(); + + [id(DISPID_COMMANDSTATECHANGE)] + void CommandStateChange([in] long Command, [in] VARIANT_BOOL Enable); + + [id(DISPID_DOWNLOADBEGIN)] + void DownloadBegin(); + + [id(DISPID_NEWWINDOW)] + void NewWindow([in] BSTR URL, [in] long Flags, [in] BSTR TargetFrameName, [in] VARIANT * PostData, [in] BSTR Headers, [in,out] VARIANT_BOOL * Processed); + + [id(DISPID_TITLECHANGE)] + void TitleChange([in]BSTR Text); + + [id(DISPID_FRAMEBEFORENAVIGATE)] + void FrameBeforeNavigate([in] BSTR URL, long Flags, BSTR TargetFrameName, VARIANT * PostData, BSTR Headers, [in, out]VARIANT_BOOL * Cancel); + + [id(DISPID_FRAMENAVIGATECOMPLETE)] + void FrameNavigateComplete([in] BSTR URL ); + + [id(DISPID_FRAMENEWWINDOW)] + void FrameNewWindow([in] BSTR URL, [in] long Flags, [in] BSTR TargetFrameName, [in] VARIANT * PostData, [in] BSTR Headers, [in,out] VARIANT_BOOL * Processed); + + + + [id(DISPID_QUIT)] + void Quit([in, out] VARIANT_BOOL * Cancel); + + [id(DISPID_WINDOWMOVE)] + void WindowMove(); + + [id(DISPID_WINDOWRESIZE)] + void WindowResize(); + + [id(DISPID_WINDOWACTIVATE)] + void WindowActivate(); + + [id(DISPID_PROPERTYCHANGE)] + void PropertyChange([in] BSTR Property); +} + +typedef +[ + uuid(34A226E0-DF30-11CF-89A9-00A0C9054129) +] +enum CommandStateChangeConstants { + CSC_UPDATECOMMANDS = 0xFFFFFFFF, + CSC_NAVIGATEFORWARD = 0x00000001, + CSC_NAVIGATEBACK = 0x00000002, +} CommandStateChangeConstants; /***************************************************************************** * IWebBrowserApp interface @@ -117,5 +192,138 @@ HRESULT put_FullScreen([in] VARIANT_BOOL bFullScreen); } +/***************************************************************************** + * IWebBrowser2 interface + */ +[ + object, + oleautomation, + dual, + uuid(D30C1661-CDAF-11d0-8A3E-00C04FC9E26E) +] +interface IWebBrowser2 : IWebBrowserApp +{ + [id(500)] + HRESULT Navigate2([in] VARIANT * URL, + [in] VARIANT * Flags, + [in] VARIANT * TargetFrameName, + [in] VARIANT * PostData, + [in] VARIANT * Headers); + + + [id(501)] + HRESULT QueryStatusWB([in] OLECMDID cmdID, [out, retval] OLECMDF * pcmdf); + [id(502)] + HRESULT ExecWB([in] OLECMDID cmdID, [in] OLECMDEXECOPT cmdexecopt, [in] VARIANT * pvaIn, [out, in] VARIANT * pvaOut); + [id(503)] + HRESULT ShowBrowserBar( [in] VARIANT * pvaClsid, + [in] VARIANT * pvarShow, + [in] VARIANT * pvarSize ); + + [id(DISPID_READYSTATE)] + HRESULT get_ReadyState([retval, out] READYSTATE * plReadyState); + + [id(550)] + HRESULT get_Offline([out, retval] VARIANT_BOOL * pbOffline); + [id(550)] + HRESULT put_Offline([in] VARIANT_BOOL bOffline); + + [id(551)] + HRESULT get_Silent([out, retval] VARIANT_BOOL * pbSilent); + [id(551)] + HRESULT put_Silent([in] VARIANT_BOOL bSilent); + + [id(552)] + HRESULT get_RegisterAsBrowser([out, retval] VARIANT_BOOL * pbRegister); + [id(552)] + HRESULT put_RegisterAsBrowser([in] VARIANT_BOOL bRegister); + + [id(553)] + HRESULT get_RegisterAsDropTarget([out, retval] VARIANT_BOOL * pbRegister); + [id(553)] + HRESULT put_RegisterAsDropTarget([in] VARIANT_BOOL bRegister); + + [id(554)] + HRESULT get_TheaterMode([out, retval] VARIANT_BOOL * pbRegister); + [id(554)] + HRESULT put_TheaterMode([in] VARIANT_BOOL bRegister); + + [id(555)] + HRESULT get_AddressBar([out, retval] VARIANT_BOOL * Value); + [id(555)] + HRESULT put_AddressBar([in] VARIANT_BOOL Value); + + [id(556)] + HRESULT get_Resizable([out, retval] VARIANT_BOOL * Value); + [id(556)] + HRESULT put_Resizable([in] VARIANT_BOOL Value); +} + +[ + oleautomation, + uuid(34A715A0-6587-11D0-924A-0020AFC7AC4D) +] +interface DWebBrowserEvents2 : IDispatch +{ + [id(DISPID_STATUSTEXTCHANGE)] + void StatusTextChange([in]BSTR Text); + + [id(DISPID_PROGRESSCHANGE)] + void ProgressChange([in] long Progress, [in] long ProgressMax); + + [id(DISPID_COMMANDSTATECHANGE)] + void CommandStateChange([in] long Command, [in] VARIANT_BOOL Enable); + + [id(DISPID_DOWNLOADBEGIN)] + void DownloadBegin(); + + [id(DISPID_DOWNLOADCOMPLETE)] + void DownloadComplete(); + + [id(DISPID_TITLECHANGE)] + void TitleChange([in] BSTR Text); + + [id(DISPID_PROPERTYCHANGE)] + void PropertyChange([in] BSTR szProperty); + + + + [id(DISPID_BEFORENAVIGATE2)] + void BeforeNavigate2([in] IDispatch* pDisp, + [in] VARIANT * URL, [in] VARIANT * Flags, [in] VARIANT * TargetFrameName, [in] VARIANT * PostData, [in] VARIANT * Headers, + [in,out] VARIANT_BOOL * Cancel); + + [id(DISPID_NEWWINDOW2)] + void NewWindow2([in, out] IDispatch** ppDisp, [in, out] VARIANT_BOOL * Cancel); + + [id(DISPID_NAVIGATECOMPLETE2)] + void NavigateComplete2([in] IDispatch* pDisp, [in] VARIANT * URL ); + + [id(DISPID_DOCUMENTCOMPLETE)] + void DocumentComplete([in] IDispatch* pDisp, [in] VARIANT * URL ); + + [id(DISPID_ONQUIT)] + void OnQuit(); + + [id(DISPID_ONVISIBLE)] + void OnVisible([in] VARIANT_BOOL Visible); + + [id(DISPID_ONTOOLBAR)] + void OnToolBar([in] VARIANT_BOOL ToolBar); + + [id(DISPID_ONMENUBAR)] + void OnMenuBar([in] VARIANT_BOOL MenuBar); + + [id(DISPID_ONSTATUSBAR)] + void OnStatusBar([in] VARIANT_BOOL StatusBar); + + [id(DISPID_ONFULLSCREEN)] + void OnFullScreen([in] VARIANT_BOOL FullScreen); + + [id(DISPID_ONTHEATERMODE)] + void OnTheaterMode([in] VARIANT_BOOL TheaterMode); +} + /* FIXME */ cpp_quote("DEFINE_GUID(CLSID_WebBrowser, 0x8856f961, 0x340a, 0x11d0, 0xa9, 0x6b, 0x00, 0xc0, 0x4f, 0xd7, 0x05, 0xa2);") +cpp_quote("DEFINE_GUID(CLSID_InternetExplorer, 0x0002DF01, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);") Index: include/olectl.h =================================================================== RCS file: /home/wine/wine/include/olectl.h,v retrieving revision 1.19 diff -u -r1.19 olectl.h --- include/olectl.h 5 Sep 2003 23:15:44 -0000 1.19 +++ include/olectl.h 10 Mar 2004 08:36:47 -0000 @@ -19,6 +19,8 @@ #ifndef __WINE_OLECTL_H #define __WINE_OLECTL_H +#if !defined(__WIDL__) + #include <ocidl.h> #ifdef __cplusplus @@ -97,7 +99,11 @@ BOOL fStrikethrough; } FONTDESC, *LPFONTDESC; -#define FONTSIZE(n) { n##0000, 0 } +#ifdef __cplusplus +# define FONTSIZE(n) { n##0000 } +#else +# define FONTSIZE(n) { n##0000, 0 } +#endif /*__cplusplus*/ #define PICTYPE_UNINITIALIZED (-1) #define PICTYPE_NONE 0 @@ -169,6 +175,8 @@ HRESULT WINAPI OleTranslateColor( OLE_COLOR clr, HPALETTE hpal, COLORREF* lpcolorref); + +#endif /*!defined(__WIDL__)*/ /* standard dispatch ID's */ #define DISPID_AUTOSIZE (-500) --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/mshtmhst.idl 2004-01-12 14:11:33.000000000 +0200 @@ -0,0 +1,223 @@ +/* + * Defines advanced COM interfaces and APIs related to the IE Web browser + * + * Copyright (C) 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 + */ + + +cpp_quote("#define CONTEXT_MENU_DEFAULT 0") +cpp_quote("#define CONTEXT_MENU_IMAGE 1") +cpp_quote("#define CONTEXT_MENU_CONTROL 2") +cpp_quote("#define CONTEXT_MENU_TABLE 3") +cpp_quote("/* in browse mode*/") +cpp_quote("#define CONTEXT_MENU_TEXTSELECT 4") +cpp_quote("#define CONTEXT_MENU_ANCHOR 5") +cpp_quote("#define CONTEXT_MENU_UNKNOWN 6") +cpp_quote("#define CONTEXT_MENU_IMGDYNSRC 7") +cpp_quote("#define CONTEXT_MENU_IMGART 8") +cpp_quote("#define CONTEXT_MENU_DEBUG 9") + +cpp_quote("#define MENUEXT_SHOWDIALOG 0x1") + +cpp_quote("#define DOCHOSTUIFLAG_BROWSER DOCHOSTUIFLAG_DISABLE_HELP_MENU | DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE ") + +import "ocidl.idl"; +import "objidl.idl"; +import "oleidl.idl"; +import "oaidl.idl"; +import "docobj.idl"; +/*import "mshtml.idl";*/ + +/* FIXME +cpp_quote("EXTERN_C const GUID CGID_MSHTML;") +cpp_quote("#define CMDSETID_Forms3 CGID_MSHTML") +cpp_quote("#define SZ_HTML_CLIENTSITE_OBJECTPARAM L\"{d4db6850-5385-11d0-89e9-00a0c90a90ac}\"") +*/ + +cpp_quote("typedef HRESULT STDAPICALLTYPE SHOWHTMLDIALOGFN (HWND hwndParent, IMoniker *pmk, VARIANT *pvarArgIn, TCHAR* pchOptions, VARIANT *pvArgOut);") + +cpp_quote("STDAPI ShowHTMLDialog( ") +cpp_quote(" HWND hwndParent,") +cpp_quote(" IMoniker * pMk, ") +cpp_quote(" VARIANT * pvarArgIn, ") +cpp_quote(" TCHAR * pchOptions,") +cpp_quote(" VARIANT * pvarArgOut ") +cpp_quote("); ") + +/***************************************************************************** + * IDocHostUIHandler interface + */ + +typedef +enum tagDOCHOSTUITYPE { + DOCHOSTUITYPE_BROWSE = 0, + DOCHOSTUITYPE_AUTHOR = 1, +} DOCHOSTUITYPE; + +typedef enum tagDOCHOSTUIDBLCLK { + DOCHOSTUIDBLCLK_DEFAULT = 0, + DOCHOSTUIDBLCLK_SHOWPROPERTIES = 1, + DOCHOSTUIDBLCLK_SHOWCODE = 2, +} DOCHOSTUIDBLCLK ; + +typedef enum tagDOCHOSTUIFLAG { + DOCHOSTUIFLAG_DIALOG = 1, + DOCHOSTUIFLAG_DISABLE_HELP_MENU = 2, + DOCHOSTUIFLAG_NO3DBORDER = 4, + DOCHOSTUIFLAG_SCROLL_NO = 8, + DOCHOSTUIFLAG_DISABLE_SCRIPT_INACTIVE = 16, + DOCHOSTUIFLAG_OPENNEWWIN = 32, + DOCHOSTUIFLAG_DISABLE_OFFSCREEN = 64, + DOCHOSTUIFLAG_FLAT_SCROLLBAR = 128, + DOCHOSTUIFLAG_DIV_BLOCKDEFAULT = 256, + DOCHOSTUIFLAG_ACTIVATE_CLIENTHIT_ONLY = 512, + DOCHOSTUIFLAG_DISABLE_COOKIE = 1024, +} DOCHOSTUIFLAG ; + + +[ + object, + uuid(bd3f23c0-d43e-11cf-893b-00aa00bdce1a), + pointer_default(unique), + local +] +interface IDocHostUIHandler : IUnknown +{ + + typedef struct _DOCHOSTUIINFO + { + ULONG cbSize; + DWORD dwFlags; + DWORD dwDoubleClick; + } DOCHOSTUIINFO; + + HRESULT ShowContextMenu( + [in] DWORD dwID, + [in] POINT* ppt, + [in] IUnknown* pcmdtReserved, + [in] IDispatch* pdispReserved); + HRESULT GetHostInfo([in, out] DOCHOSTUIINFO * pInfo); + HRESULT ShowUI( + [in] DWORD dwID, + [in] IOleInPlaceActiveObject * pActiveObject, + [in] IOleCommandTarget * pCommandTarget, + [in] IOleInPlaceFrame * pFrame, + [in] IOleInPlaceUIWindow * pDoc); + HRESULT HideUI(); + HRESULT UpdateUI(); + HRESULT EnableModeless([in] BOOL fEnable); + HRESULT OnDocWindowActivate([in] BOOL fActivate); + HRESULT OnFrameWindowActivate([in] BOOL fActivate); + HRESULT ResizeBorder( + [in] LPCRECT prcBorder, + [in] IOleInPlaceUIWindow * pUIWindow, + [in] BOOL fRameWindow); + HRESULT TranslateAccelerator( + [in] LPMSG lpMsg, + [in] const GUID * pguidCmdGroup, + [in] DWORD nCmdID); + HRESULT GetOptionKeyPath([out] LPOLESTR * pchKey, [in] DWORD dw); + HRESULT GetDropTarget( + [in] IDropTarget * pDropTarget, + [out] IDropTarget ** ppDropTarget); + HRESULT GetExternal([out] IDispatch **ppDispatch); + HRESULT TranslateUrl([in]DWORD dwTranslate, [in]OLECHAR *pchURLIn, [out]OLECHAR **ppchURLOut); + HRESULT FilterDataObject([in]IDataObject *pDO, [out]IDataObject **ppDORet); +} + + +//------------------------------------------------------------------------- +// ICustomDoc +// +//------------------------------------------------------------------------- + +[ + object, + uuid(3050f3f0-98b5-11cf-bb82-00aa00bdce0b), + pointer_default(unique), + local +] +interface ICustomDoc : IUnknown +{ + HRESULT SetUIHandler( + [in] IDocHostUIHandler * pUIHandler); +} + +//------------------------------------------------------------------------- +// IDocHostShowUI +// +//------------------------------------------------------------------------- + +[ + object, + uuid(c4d244b0-d43e-11cf-893b-00aa00bdce1a), + pointer_default(unique), + local +] +interface IDocHostShowUI : IUnknown +{ + HRESULT ShowMessage( + [in] HWND hwnd, + [in] LPOLESTR lpstrText, + [in] LPOLESTR lpstrCaption, + [in] DWORD dwType, + [in] LPOLESTR lpstrHelpFile, + [in] DWORD dwHelpContext, + [out] LRESULT * plResult); + HRESULT ShowHelp( + [in] HWND hwnd, + [in] LPOLESTR pszHelpFile, + [in] UINT uCommand, + [in] DWORD dwData, + [in] POINT ptMouse, + [out] IDispatch * pDispatchObjectHit); +} + +/* +//------------------------------------------------------------------------- +// ICSSFilterSite +// +//------------------------------------------------------------------------- +[ + odl, + oleautomation, + dual, + uuid(3050f3ed-98b5-11cf-bb82-00aa00bdce0b) +] +interface ICSSFilterSite : IUnknown +{ + [] HRESULT GetElement([retval, out] IHTMLElement** ppElem); + [] HRESULT FireOnFilterChangeEvent(); +}; + + +//------------------------------------------------------------------------- +// ICSSFilter +// +//------------------------------------------------------------------------- +[ + odl, + oleautomation, + dual, + uuid(3050f3ec-98b5-11cf-bb82-00aa00bdce0b) +] +interface ICSSFilter : IUnknown +{ + [] HRESULT SetSite([in] ICSSFilterSite* pSink); + [] HRESULT OnAmbientPropertyChange([in] LONG dispid); +}; +*/ --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/msstkppg.h 2004-01-14 19:41:33.000000000 +0200 @@ -0,0 +1,33 @@ +/* + * CLSIDs for msprop32 property pages. + * + * Copyright (C) the 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 + */ + +#if !defined(WINE_MSSTKPPG_H) +#define WINE_MSSTKPPG_H + +/* {7EBDAAE0-8120-11cf-899F-00AA00688B10}*/ +DEFINE_GUID(CLSID_StockFontPage, 0x7ebdaae0, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); + +/* {7EBDAAE1-8120-11cf-899F-00AA00688B10}*/ +DEFINE_GUID(CLSID_StockColorPage, 0x7ebdaae1, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); + +/* {7EBDAAE2-8120-11cf-899F-00AA00688B10}*/ +DEFINE_GUID(CLSID_StockPicturePage, 0x7ebdaae2, 0x8120, 0x11cf, 0x89, 0x9f, 0x0, 0xaa, 0x0, 0x68, 0x8b, 0x10); + +#endif /* WINE_MSSTKPPG_H*/ --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/objsafe.idl 2004-03-10 11:44:43.000000000 +0200 @@ -0,0 +1,52 @@ +/* + * objsafe.idl + * Object Safety Interfaces + * + * Copyright (C) wine + * + * 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 + */ + +cpp_quote("") +import "unknwn.idl"; +cpp_quote("") +cpp_quote("/* Masks used in IObjectSafety:*/") +cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_CALLER 0x00000001" ) +cpp_quote("#define INTERFACESAFE_FOR_UNTRUSTED_DATA 0x00000002" ) +cpp_quote("#define INTERFACE_USES_DISPEX 0x00000004" ) +cpp_quote("#define INTERFACE_USES_SECURITY_MANAGER 0x00000008" ) +cpp_quote("") +cpp_quote("EXTERN_C GUID CATID_SafeForScripting;") +cpp_quote("EXTERN_C GUID CATID_SafeForInitializing;") +cpp_quote("") + +[ + object, + uuid(CB5BDC81-93C1-11cf-8F20-00805F2CD064) +] +interface IObjectSafety : IUnknown +{ + HRESULT GetInterfaceSafetyOptions( + [in] REFIID riid, + [out] DWORD * pdwSupportedOptions, + [out] DWORD * pdwEnabledOptions); + + HRESULT SetInterfaceSafetyOptions( + [in] REFIID riid, + [in] DWORD dwOptionSetMask, + [in] DWORD dwEnabledOptions); +} + +typedef [unique] IObjectSafety *LPOBJECTSAFETY; --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/exdispid.h 2004-03-10 12:57:25.000000000 +0200 @@ -0,0 +1,57 @@ +/* + * IDs used by exdisp.idl + * + */ + +#ifndef WINE_EXDISPID_H__ +#define WINE_EXDISPID_H__ + +#define DISPID_BEFORENAVIGATE 100 +#define DISPID_NAVIGATECOMPLETE 101 +#define DISPID_STATUSTEXTCHANGE 102 +#define DISPID_QUIT 103 +#define DISPID_DOWNLOADCOMPLETE 104 +#define DISPID_COMMANDSTATECHANGE 105 +#define DISPID_DOWNLOADBEGIN 106 +#define DISPID_NEWWINDOW 107 +#define DISPID_PROGRESSCHANGE 108 +#define DISPID_WINDOWMOVE 109 +#define DISPID_WINDOWRESIZE 110 +#define DISPID_WINDOWACTIVATE 111 +#define DISPID_PROPERTYCHANGE 112 +#define DISPID_TITLECHANGE 113 + +#define DISPID_FRAMEBEFORENAVIGATE 200 +#define DISPID_FRAMENAVIGATECOMPLETE 201 +#define DISPID_FRAMENEWWINDOW 204 + +#define DISPID_BEFORENAVIGATE2 250 +#define DISPID_NEWWINDOW2 251 +#define DISPID_NAVIGATECOMPLETE2 252 +#define DISPID_ONQUIT 253 +#define DISPID_ONVISIBLE 254 +#define DISPID_ONTOOLBAR 255 +#define DISPID_ONMENUBAR 256 +#define DISPID_ONSTATUSBAR 257 +#define DISPID_ONFULLSCREEN 258 +#define DISPID_DOCUMENTCOMPLETE 259 +#define DISPID_ONTHEATERMODE 260 +#define DISPID_ONADDRESSBAR 261 + +#define DISPID_SELECTIONCHANGED 200 + +#define DISPID_WINDOWREGISTERED 200 +#define DISPID_WINDOWREVOKED 201 + +#define DISPID_RESETFIRSTBOOTMODE 1 +#define DISPID_RESETSAFEMODE 2 +#define DISPID_REFRESHOFFLINEDESKTOP 3 +#define DISPID_ADDFAVORITE 4 +#define DISPID_ADDCHANNEL 5 +#define DISPID_ADDDESKTOPCOMPONENT 6 +#define DISPID_ISSUBSCRIBED 7 +#define DISPID_SHELLUIHELPERLAST 7 + +#define DISPID_READYSTATE (-525) + +#endif /* WINE_EXDISPID_H__*/

1 0

1/4 patches for compilation of ATL & MFC
by Boaz Harrosh 11 Mar '04

11 Mar '04

I'll send 4 patches here for review. Once the comments stop I'll send them to patches. Do I send patches to .h files or the .idl is enough? PATCH 1 uuidof.diff - enable use of some ms extensions - include/wine/uuidof.h (new) Lets GCC compiler use the uuidof MSVC++ extension used in ATL. See comments inside the file - include wine/pretty_com.h (new) Lets any C++ compiler use the __decelspec( property () ) MSVC++ extension. See comments inside the file - tools/pretty_com.pl A Perl script that changes __decelspec( property () ) declarations to the proper macros from pretty_com.h. see comments inside the file - include/unknwn.idl (updated) Adds a C++ only extension to the IUnknown Interface. This is to let ATL compile (use of uuidof.h) Index: include/unknwn.idl =================================================================== RCS file: /home/wine/wine/include/unknwn.idl,v retrieving revision 1.4 diff -u -r1.4 unknwn.idl --- include/unknwn.idl 12 Apr 2003 00:09:14 -0000 1.4 +++ include/unknwn.idl 10 Mar 2004 08:36:47 -0000 @@ -30,7 +30,6 @@ cpp_quote("#endif") /* Interfaces */ - [ local, object, @@ -46,7 +45,58 @@ [out, iid_is(riid)] void **ppvObject); ULONG AddRef(); ULONG Release(); + +cpp_quote("/*This is so we can add the Template QueryInterface for use by ATL*/") +cpp_quote("/*do a -D_WINE_NO_UUIDOF_ if your cplusplus compiler breaks on it*/") +cpp_quote("#if defined(__cplusplus) && !defined(_WINE_NO_UUIDOF_)") +cpp_quote("") +cpp_quote("#include <wine/uuidof.h>") +cpp_quote("#ifndef __IUnknown_INTERFACE_DEFINED__") +cpp_quote("#define __IUnknown_INTERFACE_DEFINED__") +cpp_quote("") +cpp_quote("DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);") +cpp_quote("") +cpp_quote("extern \"C++\" {") +cpp_quote("") +cpp_quote("#ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE") +cpp_quote("struct __attribute__((com_interface)) IUnknown") +cpp_quote("#else") +cpp_quote("struct IUnknown") +cpp_quote("#endif") +cpp_quote("{") +cpp_quote(" virtual HRESULT STDMETHODCALLTYPE QueryInterface(") +cpp_quote(" REFIID riid,") +cpp_quote(" void** ppvObject) = 0;") +cpp_quote("") +cpp_quote(" virtual ULONG STDMETHODCALLTYPE AddRef(") +cpp_quote(" ) = 0;") +cpp_quote("") +cpp_quote(" virtual ULONG STDMETHODCALLTYPE Release(") +cpp_quote(" ) = 0;") +cpp_quote("") +cpp_quote(" template <class Q>") +cpp_quote(" HRESULT STDMETHODCALLTYPE QueryInterface(Q** pp)") +cpp_quote(" {") +cpp_quote(" return QueryInterface(__uuidof(Q), (void**)pp);") +cpp_quote(" }") +cpp_quote("};") +cpp_quote("") +cpp_quote("} // extern \"C++\"") +cpp_quote("") +cpp_quote("#define IUnknown_METHODS \\") +cpp_quote(" ICOM_MSVTABLE_COMPAT_FIELDS \\") +cpp_quote(" /*** IUnknown methods ***/ \\") +cpp_quote(" STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \\") +cpp_quote(" STDMETHOD_(ULONG,AddRef)(THIS) PURE; \\") +cpp_quote(" STDMETHOD_(ULONG,Release)(THIS) PURE;") +cpp_quote("") +cpp_quote("#endif //__IUnknown_INTERFACE_DEFINED__") +cpp_quote("#else /* defined(__cplusplus) && !defined(_WINE_NO_UUIDOF_) */") } + +cpp_quote("#endif /* defined(__cplusplus) && !defined(_WINE_NO_UUIDOF_) */") +cpp_quote("") +cpp_quote("") [ object, --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/wine/pretty_com.h 2004-02-25 21:21:18.000000000 +0200 @@ -0,0 +1,218 @@ +/* + * Add support for Microsoft extention + * __declspec( property (get= xxxx,put = yyyy) ) + * + * Copyright 2004 Boaz Harrosh boaz(a)ElectroZaur.com + * + * 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 __pretty_com_h__ +#define __pretty_com_h__ + +#if !defined( __cplusplus ) +# error Use this file only for C++ compilation +#endif + +/* +explanation: + the ms-extention __declspec(property()) lets you associate a ?fake? variable name to + one or a pair of class member functions. So function calls will be made where in + code a variable assignment or access is made. This makes C++ syntax look more + like script or 4th generation language. + +For example: + class HasProperty{ + public: + __declspec( property ( get=GetFoo ,put=PutFoo ) ) + int Foo ; + + int GetFoo() ; + void PutFoo(int newVal) ; + } +will let you use code like: + HasProperty hp ; + int i = hp.Foo ; + hp.Foo = i * 17 ; + +In effect Line 2 above invokes GetFoo() (R-Value) +and Line 3 will invoke PutFoo(..) (L-Value) +Foo has no allocation in memory and HasProperty does not grow in any way +by the presence of Foo. + +Below code will let such code usage to be used by any standard C++ compiler. + __declspec declarations must change but source code can stay the same. + Same new declarations can than be used by both MSVC or other compilers. + +Use: + ALL_P( type, PropertyName ) + GET_P( type, PropertyName ) + PUT_P( type, PropertyName ) +if the Foo name will have a GetFoo/PutFoo corresponding members. + +Use: + ALL_PROP( type, PropertyName, GetFunction ,PutFunction ) + GET_PROP( type, PropertyName, GetFunction ) + PUT_PROP( type, PropertyName, PutFunction ) +if you need specific control on associated member function names + +Don't forget to use DECLARE_PROP_CLASS( classname ) anywhere in +the class before the first property. + +Note: + the pretty_com.pl program was written for code generated by the MSVC + #import directive. It will assume the simple GetFoo/PutFoo naming. + Feel free to submit fixes for a more general program +*/ + +#if defined( _GNUC_ ) +// original offsetof will warn on GCC so below will turn this warning off +// 128 is to avoid alignment fix ups. +# undef offsetof +# define offsetof(s,m) ( ((size_t)&( ((s*)128)->m )) - 128 ) +#endif + +#ifdef _MSC_EXTENSIONS +/*compiled under msvc with extentions turned on (default for msvc)*/ + +#define DECLARE_PROP_CLASS( aclass ) + +#define ALL_P( type ,name )\ +__declspec(property(get=Get##name,put=Put##name))\ +type name ; + +#define GET_P( type ,name )\ +__declspec(property(get=Get##name))\ +type name ; + +#define PUT_P( type ,name )\ +__declspec(property(put=Put##name))\ +type name ; + +#define ALL_PROP( type ,name ,get_f ,put_f)\ +__declspec(property(get=get_f,put=put_f))\ +type name ; + +#define GET_PROP( type ,name ,get_f)\ +__declspec(property(get=get_f))\ +type name ; + +#define PUT_PROP( type ,name ,put_f)\ +__declspec(property(put=put_f))\ +type name ; + +#else //_MSC_EXTENSIONS +/*compiled with other c++ (not msvc) compiler, or without extentions turned on */ + +#define DECLARE_PROP_CLASS( aclass ) typedef aclass __this_class__ ; + +#define ALL_P( type ,name )\ + class prop_func_##name{public: \ + __this_class__& MyClass() \ + { char* p = (char*)this - offsetof(__this_class__,name) ; \ + return *((__this_class__*)p) ; \ + } \ + operator type(){return MyClass().Get##name();} \ + type operator =(type val){MyClass().Put##name(val);return val;} \ + } name ; + +#define GET_P( type ,name )\ + class prop_func_##name{public: \ + __this_class__& MyClass() \ + { char* p = (char*)this - offsetof(__this_class__,name) ; \ + return *((__this_class__*)p) ; \ + } \ + operator type(){return MyClass().Get##name();} \ + } name ; + +#define PUT_P( type ,name )\ + class prop_func_##name{public: \ + __this_class__& MyClass() \ + { char* p = (char*)this - offsetof(__this_class__,name) ; \ + return *((__this_class__*)p) ; \ + } \ + type operator =(type val){MyClass().Put##name(val);return val;} \ + } name ; + +#define ALL_PROP( type ,name ,get_f ,put_f)\ + class prop_func_##name{public: \ + __this_class__& MyClass() \ + { char* p = (char*)this - offsetof(__this_class__,name) ; \ + return *((__this_class__*)p) ; \ + } \ + operator type(){return MyClass().get_f();} \ + type operator =(type val){MyClass().put_f(val);return val;} \ + } name ; + +#define GET_PROP( type ,name ,get_f)\ + class prop_func_##name{public: \ + __this_class__& MyClass() \ + { char* p = (char*)this - offsetof(__this_class__,name) ; \ + return *((__this_class__*)p) ; \ + } \ + operator type(){return MyClass().get_f();} \ + } name ; + +#define PUT_PROP( type ,name ,put_f)\ + class prop_func_##name{public: \ + __this_class__& MyClass() \ + { char* p = (char*)this - offsetof(__this_class__,name) ; \ + return *((__this_class__*)p) ; \ + } \ + type operator =(type val){MyClass().put_f(val);return val;} \ + } name ; + +#endif //_MSC_EXTENSIONS + +/* +Implementation notes: +1) + the trick is in the MyClass() member of each property. it will calculate + the containing class address from its own (this) address. + Since properties are size less - [Q] what will be the offset of such a property? + + Yes you guest right! always 0. where ever it will be declared inside the class and + as many as there are. So in effect above can Just be: "return this;". + and the all offset-of warnings can be avoided. Now, not that I think that any compiler + on any imaginable machine will ever produce a different code. Its Just that I do + Imagine a long class hierarchy that have special properties with none zero size. + So I'll leave the code as is. It is clearer this way and the optimizer will always + remove the -0 operation. So it is only for us programmers. + +2) + Originally I have tried to keep the __declspec( property (get=xxx,put=yyy) ) syntax + but since I absolutely needed a macro, and macros can not be overloaded + the only close syntax I could achieve was + __declspec( property ((get=xxx,put=yyy)) ) with double brackets on the inside. And I do + need the type inside the macro - something like: + __declspec( property<type_name> ((get=xxx,put=yyy)) ) + Since code had to be changed any way (and it is more complicated) I did it as above. + +[Q] Student exercise: + Original ms-extension will also let you define an Array of properties where the index + of the array is supplied as parameter to the function member. + +Example: + __declspec( property (get=GetArray) ) + double Array[117] ; + double GetArray(size_t index) ; + ... + double f = Foo.Array[17] ; +How would you extend the above to support such syntax? +(When I ever see such code used I'll supply a fix) +*/ + +#endif //__pretty_com_h__ --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ include/wine/uuidof.h 2004-02-09 14:55:24.000000000 +0200 @@ -0,0 +1,145 @@ +/* + * Description: + * + * __decelspec(uuid()) and __uuidof are Microsoft extensions to the C++ compiler that lets you attach + * a GUID (128 bit number) to a class/struct and than retrieve it by the use of __uuidof + * + * below code tries to do that. + * any code using __uuidof does not change and expected run time is identical to MSVC. + * declareations of the uuid has to change. There are two alternatives. + * 1) Leave __declspec(uuid(...)) has is. Which is #defined to nothing in wine. Than + collect all uuid classes used in your project into one .CPP file + and use the MAKE_UUIDOF??? macros to define them. + (other wise the linker will complain) + * 2) Use the pretty_com.pl script to change all __declspec(uuid(...)) to the __decelspec_uuid2(...,InterfaceName) + macro. That will do a similar thing to the above but can survive in an header. + (or change these declarations manually) + + * Copyright (C) the 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 WINE_UUIDOF_H_ +#define WINE_UUIDOF_H_ + +#if defined( __cplusplus ) && \ + !defined ( _WINE_NO_UUIDOF_ ) && \ + !defined (_MSC_VER) && \ + defined (__GNUC__) + +extern "C++" { + +/* + at first I tried to use macros but ATL, who all this work was for, + uses __uuidof in template parametrization, which forces me to use template too. + Any way with templates the solution becomes trivial, much simpler + than macros. (the ones I had) please send comments to boaz(a)hishome.net + I would love to talk about it. +*/ +template< class T> +struct hold_uuidof +{ + static GUID __IID ; +}; + +} /*extern C++*/ + +/* + this is a nice one. In MSVC++ u can do: + __uuidof(Foo) __uuidof(pointer2Foo) __uuidof(refranceofFoo) + and __uuidof(classAFoo). The GCC typeof() will take care of that + (get it: use one's extension to implement another) +*/ +#define __uuidof( Q ) hold_uuidof< typeof(Q) >::__IID + +/* + use this macro to assosiate a guid to a class/struct. +*/ +#define MAKE_UUIDOF_ID( class ,IID ) \ + template<> \ + GUID hold_uuidof<class>::__IID = IID; + +/* + This one is the same as above but: + presupposes an IID_Interface was already defined +*/ +#define MAKE_UUIDOF( class ) \ + MAKE_UUIDOF_ID(class, IID_##class) + + +/* + [Q] why add more macros to the mess? + + uuid uses a registry notation of the form: + "12345678-1234-1234-1234-123456789ABC" + + the classic DEFINE_GUID will use +(IID_NAME ,0x12345678, 0x1234, 0x1234, 0x12,0x34, 0x12,0x34,0x56,0x78,0x9A,0xBC); + + it was easier for me to write a pearl script (see pretty_com.pl) and is more readable + if it was of the form: + ( 0x12345678, 0x1234, 0x1234, 0x1234, 0x123456789ABCLL, class ) + + to add to all the mess Microsoft MIDL compiler will use 2 other macros + DECLSPEC_UUID(x) MIDL_INTERFACE(x) which are the same only the later imposes + a struct definition. They expect a registry notation as uuid above. + Wine steers away from these macros by defining them to nothing. + + pretty_com.pl will translate all __declspec( uuid(X) ) instances to __declspec_uuid2(x,InterfaceName) + defined below. + + An alternative to __declspec_uuid2 and pretty_com.pl can be to use below MAKE_XXX macros + + What is MinGW-gcc position on all this? + +*/ + +#include <pshpack1.h> +struct betterguid{ + unsigned long Data1; + unsigned short Data2; + unsigned short Data3; + unsigned short Data4; + unsigned short Data5; + unsigned long Data6; +} ; +#include <poppack.h> + +#define INSTANTIATE_BETTER_GUID(ld1 ,sd2 ,sd3 ,sd4 ,ll5) \ + { ld1,sd2,sd3,sd4,ll5>>32, ll5&0xffffffff } + +#define DEFINE_IID( ld1 ,sd2 ,sd3 ,sd4 ,ll5 ,class ) \ +__attribute__((weak)) betterguid a##class = INSTANTIATE_BETTER_GUID(ld1 ,sd2 ,sd3 ,sd4 ,ll5) ;\ +EXTERN_C const GUID IID_##class = *((GUID*)&a##class) ; + +#define DEFINE_CLSID( ld1 ,sd2 ,sd3 ,sd4 ,sd5 ,ld6 ,class ) \ + __attribute__((weak)) betterguid a##class = INSTANTIATE_BETTER_GUID(ld1 ,sd2 ,sd3 ,sd4 ,ll5) ;\ +EXTERN_C const GUID CLSID_##class = *((GUID*)&a##class) ; + +// make uuidof and IID_ in one shot +#define MAKE_IID( ld1 ,sd2 ,sd3 ,sd4 ,ll5 ,class ) \ +DEFINE_IID( ld1 ,sd2 ,sd3 ,sd4 ,ll5 ,class ) \ +MAKE_UUIDOF(class) ; + +#define __declspec_uuid2(ld1 ,sd2 ,sd3 ,sd4 ,ll5 ,class) + +// below is used by pretty_com.pl +#define __info_uuid( uuid_string ) + + +#endif /*defined( __cplusplus ) && !defined ( _WINE_NO_UUIDOF_ ) && !defined (_MSC_VER)*/ + +#endif /*ndef WINE_UUIDOF_H_*/ --- /dev/null 1970-01-01 02:00:00.000000000 +0200 +++ tools/pretty_com.pl 2004-02-10 15:47:21.000000000 +0200 @@ -0,0 +1,182 @@ +#!/usr/bin/perl -w + +# pretty_com.pl will try to crudely parse Microsoft C++ COM header files and fix them for compilation +# under GCC and other standard C++ compilers. + +# pretty_com.pl will change any occurrence of _declspec( property (get=,put=) ) +# to the proper macro invocation. An #include directive will be added to pretty_com.h where +# these macros are defined. +# +# pretty_com.pl will also take care of __declspec( uuid(?hhh-hhh?)). It will distinguish between 2 cases: +# 1) when it is a class declaration. - +# It will than change it to a __declspec_uuid2( 0xhhh,0xhhh ) macro compatible with uuidof.h header file. +# 2) when it is just a forward declaration. - +# It will change it to a __info_uuid(?hhh-hhh?) which is declared to nothing. +# +# (see ?pretty_com.h? and ?uuidof.h? for details.) + +# Usage: all arguments are filenames to be processed. +# Contents of "filename" will change. The old file will be saved in "filename.old" +# any file parsed is reported to stdout with a comment "changed" or "nothing to do" +# in the second case no .old file was created. +# [example:]> perl -w pretty_com.pl header1 [header2] .. +# + +# FIXME: Below code is made to cope with code generated by the #import directive of +# MSVC. I am afraid my scripting skills are very limited and a more robust approach +# should be used to cope with all variations of the declspec(property()) syntax. +# mainly it will rely on exactly 1 new-line between the __declspec(property()) and the variable declaration. +# Please some one with better scripting skills, check the code and remove this FIXME +# Free Life boaz(a)electrozaur.com + + +use warnings; + +$class_decl = "" ; +$newuuid = "" ; + +# input is in $class_decl - it is the string from "struct" | "class" all the way up to the "{" or ";" +# output is in $newuuid - comma delimited and 0x appended to each hive. +# Example: +# __declspec(uuid("12345678-1234-1234-1234-123456789ABC") +# changes to +# 0x12345678,0x1234,0x1234,0x1234,0x123456789ABCLL +sub ExtractUuid +{ + $newuuid = $class_decl ; + + if( $newuuid =~ s/^.*__declspec[\s]*$[\s]*uuid[\s]*\([\s]*\"(.*)\"[\s]*$[\s]*\)[\s]*(\w*)[\s]*.*/0x$1LL,$2/ ) + { + $newuuid =~ s/-/,0x/g ; + $newuuid =~ s/\n//g ; + $newuuid =~ s/{//g ; + $newuuid =~ s/;//g ; +# $newuuid = "0x" . $newuuid ; + print $newuuid . "\n"; + } +} + +# input - reference to Input-File as first param, $_ contains the first line containing the keyword struct|class +# output - +# return: +# true - A class declaration was found +# false - A forward declaration ending with ";" +# $class_decl: +# will contain all the class declaration from the key word class|struct up to including +# the "{" or ";" +# InFile: is positioned pass the "{" | ";" + +sub readUntilB +{ + $InFile = shift ; + $read_lines = "" ; + do { + if ( $_ =~ /{/ ) { + $pos_of_B = index($_ ,"{") ; + $offset_from_end = $pos_of_B - length($_) + 1; # we need a negative number + seek( $InFile ,$offset_from_end ,1 ) ; + $read_lines .= substr $_ ,0 , ($pos_of_B) + 1; + $class_decl = $read_lines ; + return 1 ; + } elsif ( $_ =~ /;/ ) { + $class_decl = $read_lines . $_ ; + return 0 ; + } else { + $read_lines .= $_ ; + } + }while ( <$InFile> ) +} + +foreach $InFileName (@ARGV) +{ + open( InFile ,$InFileName) or die "Cant open $InFileName !"; + print "Proccessing $InFileName - " ; + + $LastInclude = 0 ; + $curLine = 0 ; + $Has_property = 0 ; + $Include_pretty_com = "#include <pretty_com.h>" ; + + #first pass see if anything to do and find a good place for the #include statment + # which is after any include but before any uuid or property + while( <InFile> ) + { + $curLine += 1 ; + if( ! $Has_property ) { + $LastInclude = $curLine if(/#include/) ; + } + $Has_property = 1 if( (/__declspec[\s]*$[\s]*property/) || (/__declspec[\s]*\([\s]*uuid/)) ; + } + + if( $Has_property ) + { + $OutFileName = "$InFileName.new" ; + open( OutFile,">$OutFileName") or die "Cant open $OutFileName !" ; + + $curLine = 0 ; + seek( InFile ,0 ,0 ) ; + while( <InFile> ) + { + # if we find class or struct fix that up + if( ($_ =~ /struct/) || ($_ =~ /class/) ) { + if( readUntilB(\*InFile) ) { + ExtractUuid() ; + print OutFile "__declspec_uuid2" . "(" . $newuuid . ")\n" ; + $class_decl =~ s/__declspec[\s]*\([\s]*uuid[\s]*\([\s]*"(.*)"[\s]*$[\s]*\)//; + @decl_ = split ':' , $class_decl ; + $BaseClassname = pop @decl_ ; + $Classpart = pop @decl_ ; + if( !$Classpart ) { + $Classpart = substr($BaseClassname ,0 ,length($BaseClassname) - 1); + } + @ClassNameToks = split ' ', $Classpart ; + $Classname = pop @ClassNameToks ; + + print OutFile $class_decl ; + print OutFile "\nDECLARE_PROP_CLASS($Classname)" ; + } else { + ExtractUuid() ; + $class_decl =~ s/__declspec[\s]*$[\s]*uuid\((.*)$\)/__info_uuid($1)/; + print OutFile $class_decl ; + } + # if we find __declspec\(property fix that up + } elsif ($_ =~ /__declspec\(property/) { + chomp; + $decl = $_; + chop ($nextline = <InFile>); + $nextline =~ s/;//g; + @words = split ' ', $nextline; + $id = pop @words; + $type = join ' ', @words; + if (($decl =~ /get=/) and ($decl =~ /put=/)) { + print OutFile ("\tALL_P( $type\t, $id );\n"); + } + elsif ($decl =~ /get=/) { + print OutFile ("\tGET_P( $type\t, $id );\n"); + } + elsif ($decl =~ /put=/) { + print OutFile ("\tPUT_P( $type\t, $id );\n"); + } + # default copy lines to new file - put include in place + } else { + print OutFile $_ ; + $curLine += 1 ; + if( $curLine == $LastInclude ){ + print OutFile $Include_pretty_com ; + } + } + } + close(InFile) ; + close(OutFile) ; + + # until now Output was done to FileName.new rename orignal file to .old and make new one the file +# rename( $InFileName ,"$InFileName.old" ) or print "Cant rename $InFileName to .old\n" ; +# rename( $OutFileName ,$InFileName ) or print "Cant rename $OutFileName to $InFileName\n" ; + + print "changed!\n" ; + } + else { + print "nothing to do\n"; + } + +}

1 0

Re: wineinstall hangs
by Ivan Leo Murray-Smith 11 Mar '04

11 Mar '04

> I don't know but I thought that ./configure would pick up everything I have > or not and react accordingly. It's bad if the install fails before it's even finished. > What's GLX? It's not mentioned in my XF86Config and locate GLX only > produced two man entries. My graphic card is a Diamond Stealth 64 PCI. I'm no graphics expert, but IIRC GLX is a X extension that SGI invented so that X could use openGL. If it's missing, chances are you don't a have 3D driver for your card, or it isn't configured properly. Look for a good driver for your video card, or check the configuration. If you don't need 3D graphics, you can ignore the Xlib: extension "GLX" missing on display ":1.0". message, or use mesa (But it's very slow). Ivan.

1 0

Is Wine CVS broken?
by Erik de Castro Lopo 11 Mar '04

11 Mar '04

Hi all, I've been following Wine CVS for about a week now. I just did and "cvs checkout" and the resulting source tree no longer configures/compiles. The problems seem to relate to the following directories: dlls/amstream dlls/dxerr8 dlls/dxerr9 which seem to have been added or removed very recently. I tried hacking around in the configure script but couldn't get it to work. Cheers, Erik -- +-----------------------------------------------------------+ Erik de Castro Lopo nospam(a)mega-nerd.com (Yes it's valid) +-----------------------------------------------------------+ I hack, therefore I am.

4 4

Contribution offer: Localization work
by Christian Britz 10 Mar '04

10 Mar '04

Hi, I am an enthusiastic wine user from Germany. You write on your website that you are looking for contributors that are willing to do localization work. I do have very good german language skills and I also have a good understanding of the english language. Although I do not have very good C programming skills I have good general understanding of general application development. I work as Java and ... VBA ... programmer and I also have some experience in the Unix environment and web development. Because I like writing, I offer to you to participate in the translation of wine documents to german. A good start would be the README I think. If you are interested in my help, please contact me! Regards and thank you for the good work! Christian Britz Germany

4 11

← Newer
1
...
17
18
19
20
21
22
23
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel March 2004