[DXDIAG2] First Implementation

Alexandre Julliard julliard at winehq.org
Thu Apr 15 18:27:56 CDT 2004


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. 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 at winehq.org



More information about the wine-devel mailing list