[PATCH] msvcmaker: added COM_NO_WINDOWS_H to support midl-generated headers for __WINESRC__ components.

Reece Dunn msclrhd at googlemail.com
Thu Oct 23 12:15:05 CDT 2008


2008/10/23 Alexandre Julliard <julliard at winehq.org>:
> "Rob Shearman" <robertshearman at gmail.com> writes:
>
>> 2008/10/18 Reece Dunn <msclrhd at googlemail.com>:
>>> The midl generated code allows you to define COM_NO_WINDOWS_H to
>>> prevent the inclusion of windows.h. That define is thus added to those
>>> provided by msvcmaker.
>>
>> Any reason why this hasn't been applied yet?
>>
>> I've been testing with this applied and I believe it is an improvement
>> and gets more DLLs compiling.
>
> I don't think it's the right approach. If midl-generated code uses
> windows.h then widl-generated code should too, and we should ensure that
> it works in both cases, for instance by disabling the check when it's
> included from generated files or something along those lines.

I was planning on adding COM_NO_WINDOWS_H explicitly to all source
files in the dlls folder that require it. Once this is complete, the
widl code generator can then be updated to support this behaviour
(otherwise the widl change will break the Wine build).

This will also prevent the "symbol already defined" warning on the
files that already define this when building with midl generated files
using the VC compiler.

- Reece



More information about the wine-devel mailing list