COBJMACROS patch 6

[Francois Gouget]

This patch is the last of the series. It removes the COBJMACROS define 
in objbase.h and updates the sources accordingly. With that done we 
should match the Platform and DirectX headers precisely, i.e. code that 
does not compile on Windows should fail to compile in Wine too 
(especially tests), and reciprocally.

If a more progressive approach is desired, simply ignore the objbase.h 
hunk and commit some or all of the rest. Then I'll submit another 
(smaller) patch with the missing parts.


Changelog:

  * include/objbase.h
    dlls/amstream/amstream.c
    dlls/amstream/main.c
    dlls/atl/atl_main.c
    dlls/avifil32/api.c
    dlls/avifil32/factory.c
    dlls/comcat/comcat_private.h
    dlls/comctl32/comctl32undoc.c
    dlls/comctl32/imagelist.c
    dlls/commdlg/filedlg.c
    dlls/commdlg/filedlgbrowser.c
    dlls/d3d8/surface.c
    dlls/d3d8/volume.c
    dlls/d3d9/surface.c
    dlls/d3d9/volume.c
    dlls/d3dxof/d3dxof.c
    dlls/d3dxof/main.c
    dlls/ddraw/main.c
    dlls/ddraw/dsurface/main.c
    dlls/devenum/devenum_private.h
    dlls/dinput/dinput_main.c
    dlls/dplayx/dpclassfactory.c
    dlls/dsound/dsound_main.c
    dlls/itss/itss.c
    dlls/itss/moniker.c
    dlls/itss/storage.c
    dlls/mapi32/util.c
    dlls/mlang/mlang.c
    dlls/msdmo/dmort.c
    dlls/msi/action.c
    dlls/msi/msi.c
    dlls/msi/msiquery.c
    dlls/msi/suminfo.c
    dlls/msi/table.c
    dlls/ole32/antimoniker.c
    dlls/ole32/bindctx.c
    dlls/ole32/clipboard.c
    dlls/ole32/compobj.c
    dlls/ole32/compositemoniker.c
    dlls/ole32/datacache.c
    dlls/ole32/defaulthandler.c
    dlls/ole32/filemoniker.c
    dlls/ole32/ftmarshal.c
    dlls/ole32/git.c
    dlls/ole32/hglobalstream.c
    dlls/ole32/ifs.c
    dlls/ole32/itemmoniker.c
    dlls/ole32/marshal.c
    dlls/ole32/memlockbytes.c
    dlls/ole32/moniker.c
    dlls/ole32/ole2.c
    dlls/ole32/ole2impl.c
    dlls/ole32/oleobj.c
    dlls/ole32/oleproxy.c
    dlls/ole32/rpc.c
    dlls/ole32/stg_bigblockfile.c
    dlls/ole32/stg_stream.c
    dlls/ole32/storage32.c
    dlls/oleaut32/connpt.c
    dlls/oleaut32/dispatch.c
    dlls/oleaut32/oaidl_p.c
    dlls/oleaut32/oleaut.c
    dlls/oleaut32/olepicture.c
    dlls/oleaut32/tmarshal.c
    dlls/oleaut32/typelib.c
    dlls/oleaut32/typelib2.c
    dlls/oleaut32/usrmarshal.c
    dlls/quartz/enummoniker.c
    dlls/quartz/filtergraph.c
    dlls/quartz/quartz_private.h
    dlls/rpcrt4/cproxy.c
    dlls/rpcrt4/cpsf.c
    dlls/rpcrt4/cstub.c
    dlls/rpcrt4/ndr_midl.c
    dlls/rpcrt4/ndr_ole.c
    dlls/shdocvw/shdocvw_main.c
    dlls/shell32/autocomplete.c
    dlls/shell32/brsfolder.c
    dlls/shell32/cpanelfolder.c
    dlls/shell32/dataobject.c
    dlls/shell32/dragdrophelper.c
    dlls/shell32/enumidlist.c
    dlls/shell32/folders.c
    dlls/shell32/iconcache.c
    dlls/shell32/memorystream.c
    dlls/shell32/pidl.c
    dlls/shell32/shell32_main.c
    dlls/shell32/shelllink.c
    dlls/shell32/shellole.c
    dlls/shell32/shellord.c
    dlls/shell32/shfldr_desktop.c
    dlls/shell32/shfldr_fs.c
    dlls/shell32/shfldr_mycomp.c
    dlls/shell32/shlexec.c
    dlls/shell32/shlfolder.c
    dlls/shell32/shlfsbind.c
    dlls/shell32/shlmenu.c
    dlls/shell32/shv_bg_cmenu.c
    dlls/shell32/shv_item_cmenu.c
    dlls/shell32/tests/shlfolder.c
    dlls/shlwapi/clist.c
    dlls/shlwapi/istream.c
    dlls/shlwapi/regstream.c
    dlls/shlwapi/thread.c
    dlls/urlmon/umon.c
    dlls/urlmon/urlmon_main.c
    programs/winemenubuilder/winemenubuilder.c

    Don't define COBJMACROS in 'include/objbase.h'.
    Update the Wine sources accordingly.


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
A particle is an irreducible representation of the Poincar\xE9 Group - Eugene Wigner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: p20041006-cobjmacros6.diff.gz
Type: application/octet-stream
Size: 5883 bytes
Desc: p20041006-cobjmacros6.diff.gz
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20041006/bb6c9e26/p20041006-cobjmacros6.diff.obj