ChangeSet ID: 13242 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@wine.codeweavers.com 2004/08/11 14:43:47
Modified files: tools/widl : header.c include : urlmon.h unknwn.h strmif.h shobjidl.h shldisp.h servprov.h pstore.h oleidl.h ocidl.h objidl.h oaidl.h mmstream.h mlang.h exdisp.h docobj.h dispex.h ddstream.h comcat.h austream.h amvideo.h amstream.h activscp.h dlls/urlmon/tests: url.c dlls/shlwapi : ordinal.c dlls/shell32 : shlview.c dlls/oleaut32/tests: olefont.c dlls/oleaut32 : vartype.c variant.c safearray.c olefont.c dlls/ole32 : errorinfo.c dlls/msi : record.c dlls/dswave : dswave_private.h dlls/dmusic : dmusic_private.h dlls/dmsynth : dmsynth_private.h dlls/dmstyle : dmutils.c dmstyle_private.h dlls/dmscript : dmscript_private.h dlls/dmloader : dmloader_private.h dlls/dmime : dmutils.c dmime_private.h dlls/dmcompos : dmcompos_private.h dlls/dmband : dmutils.c dmband_private.h
Log message: Francois Gouget fgouget@free.fr Modify widl to put the C COM macros inside an #ifdef COBJMACROS block as is done in the Windows headers. Add #define COBJMACROS where needed in Wine. Fixes the compilation of the oleaut32/tests/olefont.c and urlmon/tests/url.c conformance tests with the Windows headers.
Patch: http://cvs.winehq.org/patch.py?id=13242
Old revision New revision Changes Path 1.22 1.23 +2 -0 wine/tools/widl/header.c 1.29 1.30 +16 -0 wine/include/urlmon.h 1.14 1.15 +4 -0 wine/include/unknwn.h 1.22 1.23 +90 -0 wine/include/strmif.h 1.3 1.4 +46 -0 wine/include/shobjidl.h 1.2 1.3 +6 -0 wine/include/shldisp.h 1.12 1.13 +2 -0 wine/include/servprov.h 1.2 1.3 +6 -0 wine/include/pstore.h 1.16 1.17 +44 -0 wine/include/oleidl.h 1.14 1.15 +74 -0 wine/include/ocidl.h 1.21 1.22 +104 -0 wine/include/objidl.h 1.19 1.20 +40 -0 wine/include/oaidl.h 1.1 1.2 +6 -0 wine/include/mmstream.h 1.4 1.5 +16 -0 wine/include/mlang.h 1.2 1.3 +6 -0 wine/include/exdisp.h 1.19 1.20 +14 -0 wine/include/docobj.h 1.1 1.2 +8 -0 wine/include/dispex.h 1.1 1.2 +4 -0 wine/include/ddstream.h 1.9 1.10 +8 -0 wine/include/comcat.h 1.1 1.2 +8 -0 wine/include/austream.h 1.6 1.7 +10 -0 wine/include/amvideo.h 1.1 1.2 +14 -0 wine/include/amstream.h 1.1 1.2 +20 -0 wine/include/activscp.h 1.1 1.2 +3 -0 wine/dlls/urlmon/tests/url.c 1.90 1.91 +2 -0 wine/dlls/shlwapi/ordinal.c 1.97 1.98 +2 -0 wine/dlls/shell32/shlview.c 1.4 1.5 +1 -0 wine/dlls/oleaut32/tests/olefont.c 1.9 1.10 +3 -0 wine/dlls/oleaut32/vartype.c 1.98 1.99 +2 -0 wine/dlls/oleaut32/variant.c 1.37 1.38 +3 -0 wine/dlls/oleaut32/safearray.c 1.26 1.27 +2 -0 wine/dlls/oleaut32/olefont.c 1.18 1.19 +2 -0 wine/dlls/ole32/errorinfo.c 1.13 1.14 +2 -0 wine/dlls/msi/record.c 1.2 1.3 +2 -0 wine/dlls/dswave/dswave_private.h 1.19 1.20 +2 -0 wine/dlls/dmusic/dmusic_private.h 1.4 1.5 +2 -0 wine/dlls/dmsynth/dmsynth_private.h 1.1 1.2 +2 -0 wine/dlls/dmstyle/dmutils.c 1.8 1.9 +2 -0 wine/dlls/dmstyle/dmstyle_private.h 1.7 1.8 +2 -0 wine/dlls/dmscript/dmscript_private.h 1.8 1.9 +2 -0 wine/dlls/dmloader/dmloader_private.h 1.1 1.2 +2 -0 wine/dlls/dmime/dmutils.c 1.17 1.18 +2 -0 wine/dlls/dmime/dmime_private.h 1.5 1.6 +2 -0 wine/dlls/dmcompos/dmcompos_private.h 1.1 1.2 +2 -0 wine/dlls/dmband/dmutils.c 1.9 1.10 +2 -0 wine/dlls/dmband/dmband_private.h
-
Alexandre Julliard