Wine merge required: COM/OLE header changes - wine-devel

19 Nov 2002


      These patches are against ReWind and requires some merging work in order
to apply to Wine. Could someone (hm... Greg?) do that for me?
The fundamental idea here is to make sure that no files except unknwn.h
ever include wine/obj_base.h directly, because the IUnknown interface
definition will soon move to unknwn.h, and the API function prototypes
will move to objbase.h (which indirectly includes unknwn.h through
objidl.h).
While I was at it, I also made sure that a couple of common
to-be-IDL-generated files aren't included directly, as the headers in
question have wrapper headers that are supposed to contain related API
function prototypes - these prototypes will also be moved later, so I
thought I might as well ensure that the wrapper headers are used now.
The attached comhdr1.diff contains header changes and #ifdef guards that
force a compilation error if any of these "forbidden" headers are included
directly. It seems to apply to Wine as-is.
(And I think the #ifdef guards should be applied to Wine even if #ifdefs
aren't popular around here, because it protects against introduction of
new bad code in Wine while the conversion is in progress; and when a
particular header has been successfully converted, its respective #ifdef
guard will of course be removed again.)
The attached comhdr2.diff seems to fix all the resulting compilation
errors in ReWind, and is what needs "merging". Apply as much of it as you
can and fix the compilation errors that remain in Wine.
Thanks.