[DXDIAG2] First Implementation

Raphael fenix at club-internet.fr
Thu Apr 15 19:03:27 CDT 2004


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi Alexandre,

On Friday 16 April 2004 01:27, Alexandre Julliard wrote:
> Raphael <fenix at club-internet.fr> writes:
> > + * @TODO: fix wine headers dependencies
> > + */
> > +#if !defined( _MSC_VER ) || defined( __WINE__ )
> > +# include "windef.h"
> > +# include "winbase.h"
> > +# include "wingdi.h"
> > +# include "winuser.h"
> > +/** GetProp is a define by user.h */
> > +# undef GetProp
> > +/* VARIANT */
> > +# include <oleauto.h>
> > +#endif
> > +/**
> > + * End Hack
> > + */
>
> This is because on Windows many headers include windows.h and we don't
> want to do that in Wine. 

Yes i know that, but i only need objbase.h who doesn't include windows.h (with 
ms vs headers).
And the GetProp #define clash doesn't exit at all on windows (not have to 
include winbase/wingdi/winuser) :(

> There's no reason to add #ifdefs though, it 
> should build just fine on Windows even with the extra includes.

No it doesn't build :(

> > +#undef  EXPORT_STDAPI
> > +#if defined( _MSC_VER )
> > +# define EXPORT_STDAPI __declspec(dllexport) extern HRESULT
> > +#else
> > +# define EXPORT_STDAPI extern HRESULT
> > +#endif
>
> We don't need that sort of thing in Wine dlls, and it confuses
> winapi_check, so please don't do it.

Ok, i'll not use it :)

> Also you forgot to include the spec file in your patch...

Oups, attached

Thx 

Regards,
Raphael
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAfyLPp7NA3AmQTU4RAnYfAJ9Z47neRLHrs56NOPKPcPv3iqgU4ACffonP
S72HFC8stgtGsc9eh2hhv+U=
=RIak
-----END PGP SIGNATURE-----
-------------- next part --------------
@ stdcall -private DllCanUnloadNow() DllCanUnloadNow
@ stdcall -private DllGetClassObject(ptr ptr ptr) DllGetClassObject
@ stdcall -private DllRegisterServer() DllRegisterServer
@ stdcall -private DllUnregisterServer() DllUnregisterServer


More information about the wine-devel mailing list