Re: [DXDIAG2] First Implementation

[Alexandre Julliard]

Raphael <fenix(a)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. There's no reason to add #ifdefs though, it
should build just fine on Windows even with the extra includes.
> +#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.

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

-- 
Alexandre Julliard
julliard(a)winehq.org

[DXDIAG2] First Implementation

[Raphael]

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

Hi Alexandre,

On Friday 16 April 2004 01:27, Alexandre Julliard wrote:
> Raphael <fenix(a)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-----

[DXDIAG2] First Implementation

[Alexandre Julliard]

Raphael <fenix(a)club-internet.fr> writes:
> Yes i know that, but i only need objbase.h who doesn't include windows.h (with 
> ms vs headers).

Yes it does, objbase.h includes rpc.h which includes windows.h.
> And the GetProp #define clash doesn't exit at all on windows (not have to 
> include winbase/wingdi/winuser) :(

That's because our Unicode macros are different; I fixed that one.

-- 
Alexandre Julliard
julliard(a)winehq.org

[DXDIAG2] First Implementation

[Raphael]

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

On Friday 16 April 2004 02:14, Alexandre Julliard wrote:
> Raphael <fenix(a)club-internet.fr> writes:
> > Yes i know that, but i only need objbase.h who doesn't include windows.h
> > (with ms vs headers).
>
> Yes it does, objbase.h includes rpc.h which includes windows.h.

Yak, ok i haven't seen this ugly include in rpc
> > And the GetProp #define clash doesn't exit at all on windows (not have to
> > include winbase/wingdi/winuser) :(
>
> That's because our Unicode macros are different; I fixed that one.

Ok, thx

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

iD8DBQFAgTbFp7NA3AmQTU4RAs63AKCM0HsoA466eKAX25ObrrwoNTtqqQCfSbhQ
yFJQY9wQ94L+Xjn3vknLM14=
=gY0c
-----END PGP SIGNATURE-----