ChangeSet ID: 14079 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@wine.codeweavers.com 2004/10/06 22:06:51
Modified files: programs/winemenubuilder: winemenubuilder.c include : objbase.h dlls/urlmon : urlmon_main.c umon.c dlls/shlwapi : thread.c regstream.c istream.c clist.c dlls/shell32 : shv_item_cmenu.c shv_bg_cmenu.c shlmenu.c shlfsbind.c shlfolder.c shlexec.c shfldr_mycomp.c shfldr_fs.c shfldr_desktop.c shellord.c shellole.c shelllink.c shell32_main.c pidl.c memorystream.c iconcache.c folders.c enumidlist.c dragdrophelper.c dataobject.c cpanelfolder.c brsfolder.c autocomplete.c dlls/shdocvw : shdocvw_main.c dlls/rpcrt4 : ndr_ole.c ndr_midl.c cstub.c cpsf.c cproxy.c dlls/quartz : quartz_private.h filtergraph.c enummoniker.c dlls/oleaut32 : usrmarshal.c typelib2.c typelib.c tmarshal.c olepicture.c oleaut.c oaidl_p.c dispatch.c connpt.c dlls/ole32 : storage32.c stg_stream.c stg_bigblockfile.c rpc.c oleproxy.c oleobj.c ole2impl.c ole2.c moniker.c memlockbytes.c marshal.c itemmoniker.c ifs.c hglobalstream.c git.c ftmarshal.c filemoniker.c defaulthandler.c datacache.c compositemoniker.c compobj.c clipboard.c bindctx.c antimoniker.c dlls/msi : table.c suminfo.c msiquery.c msi.c action.c dlls/msdmo : dmort.c dlls/mlang : mlang.c dlls/mapi32 : util.c dlls/itss : storage.c moniker.c itss.c dlls/dsound : dsound_main.c dlls/dplayx : dpclassfactory.c dlls/dinput : dinput_main.c dlls/devenum : devenum_private.h dlls/ddraw/dsurface: main.c dlls/ddraw : main.c dlls/d3dxof : main.c d3dxof.c dlls/d3d9 : volume.c surface.c dlls/d3d8 : volume.c surface.c dlls/commdlg : filedlgbrowser.c filedlg.c dlls/comctl32 : imagelist.c comctl32undoc.c dlls/comcat : comcat_private.h dlls/avifil32 : factory.c api.c dlls/atl : atl_main.c dlls/amstream : main.c amstream.c
Log message: Francois Gouget fgouget@free.fr Don't define COBJMACROS in objbase.h. Update the Wine sources accordingly.
Patch: http://cvs.winehq.org/patch.py?id=14079
Old revision New revision Changes Path 1.19 1.20 +2 -0 wine/programs/winemenubuilder/winemenubuilder.c 1.49 1.50 +0 -2 wine/include/objbase.h 1.18 1.19 +2 -0 wine/dlls/urlmon/urlmon_main.c 1.43 1.44 +2 -0 wine/dlls/urlmon/umon.c 1.16 1.17 +2 -0 wine/dlls/shlwapi/thread.c 1.19 1.20 +2 -0 wine/dlls/shlwapi/regstream.c 1.14 1.15 +2 -0 wine/dlls/shlwapi/istream.c 1.8 1.9 +2 -0 wine/dlls/shlwapi/clist.c 1.27 1.28 +2 -0 wine/dlls/shell32/shv_item_cmenu.c 1.34 1.35 +2 -0 wine/dlls/shell32/shv_bg_cmenu.c 1.35 1.36 +2 -0 wine/dlls/shell32/shlmenu.c 1.9 1.10 +2 -0 wine/dlls/shell32/shlfsbind.c 1.91 1.92 +2 -0 wine/dlls/shell32/shlfolder.c 1.54 1.55 +2 -0 wine/dlls/shell32/shlexec.c 1.26 1.27 +2 -0 wine/dlls/shell32/shfldr_mycomp.c 1.27 1.28 +2 -0 wine/dlls/shell32/shfldr_fs.c 1.28 1.29 +2 -0 wine/dlls/shell32/shfldr_desktop.c 1.127 1.128 +3 -0 wine/dlls/shell32/shellord.c 1.70 1.71 +2 -0 wine/dlls/shell32/shellole.c 1.78 1.79 +3 -0 wine/dlls/shell32/shelllink.c 1.138 1.139 +2 -0 wine/dlls/shell32/shell32_main.c 1.118 1.119 +2 -0 wine/dlls/shell32/pidl.c 1.17 1.18 +2 -0 wine/dlls/shell32/memorystream.c 1.82 1.83 +3 -0 wine/dlls/shell32/iconcache.c 1.52 1.53 +2 -0 wine/dlls/shell32/folders.c 1.39 1.40 +3 -0 wine/dlls/shell32/enumidlist.c 1.12 1.13 +2 -0 wine/dlls/shell32/dragdrophelper.c 1.44 1.45 +2 -0 wine/dlls/shell32/dataobject.c 1.9 1.10 +2 -0 wine/dlls/shell32/cpanelfolder.c 1.52 1.53 +2 -0 wine/dlls/shell32/brsfolder.c 1.10 1.11 +3 -0 wine/dlls/shell32/autocomplete.c 1.20 1.21 +4 -1 wine/dlls/shdocvw/shdocvw_main.c 1.11 1.12 +2 -0 wine/dlls/rpcrt4/ndr_ole.c 1.17 1.18 +2 -0 wine/dlls/rpcrt4/ndr_midl.c 1.7 1.8 +2 -0 wine/dlls/rpcrt4/cstub.c 1.11 1.12 +2 -0 wine/dlls/rpcrt4/cpsf.c 1.11 1.12 +2 -0 wine/dlls/rpcrt4/cproxy.c 1.19 1.20 +2 -0 wine/dlls/quartz/quartz_private.h 1.15 1.16 +2 -0 wine/dlls/quartz/filtergraph.c 1.7 1.8 +3 -1 wine/dlls/quartz/enummoniker.c 1.5 1.6 +2 -0 wine/dlls/oleaut32/usrmarshal.c 1.24 1.25 +2 -0 wine/dlls/oleaut32/typelib2.c 1.124 1.125 +2 -0 wine/dlls/oleaut32/typelib.c 1.34 1.35 +2 -0 wine/dlls/oleaut32/tmarshal.c 1.45 1.46 +2 -0 wine/dlls/oleaut32/olepicture.c 1.40 1.41 +2 -0 wine/dlls/oleaut32/oleaut.c 1.3 1.4 +2 -0 wine/dlls/oleaut32/oaidl_p.c 1.22 1.23 +2 -0 wine/dlls/oleaut32/dispatch.c 1.13 1.14 +3 -0 wine/dlls/oleaut32/connpt.c 1.60 1.61 +2 -0 wine/dlls/ole32/storage32.c 1.22 1.23 +2 -0 wine/dlls/ole32/stg_stream.c 1.13 1.14 +2 -0 wine/dlls/ole32/stg_bigblockfile.c 1.27 1.28 +2 -0 wine/dlls/ole32/rpc.c 1.22 1.23 +2 -0 wine/dlls/ole32/oleproxy.c 1.19 1.20 +3 -0 wine/dlls/ole32/oleobj.c 1.11 1.12 +2 -0 wine/dlls/ole32/ole2impl.c 1.55 1.56 +2 -0 wine/dlls/ole32/ole2.c 1.36 1.37 +2 -0 wine/dlls/ole32/moniker.c 1.21 1.22 +2 -0 wine/dlls/ole32/memlockbytes.c 1.32 1.33 +2 -0 wine/dlls/ole32/marshal.c 1.29 1.30 +2 -0 wine/dlls/ole32/itemmoniker.c 1.44 1.45 +2 -0 wine/dlls/ole32/ifs.c 1.26 1.27 +2 -0 wine/dlls/ole32/hglobalstream.c 1.12 1.13 +4 -2 wine/dlls/ole32/git.c 1.11 1.12 +2 -0 wine/dlls/ole32/ftmarshal.c 1.39 1.40 +2 -0 wine/dlls/ole32/filemoniker.c 1.21 1.22 +2 -0 wine/dlls/ole32/defaulthandler.c 1.28 1.29 +2 -0 wine/dlls/ole32/datacache.c 1.32 1.33 +2 -0 wine/dlls/ole32/compositemoniker.c 1.103 1.104 +2 -0 wine/dlls/ole32/compobj.c 1.35 1.36 +2 -0 wine/dlls/ole32/clipboard.c 1.29 1.30 +3 -0 wine/dlls/ole32/bindctx.c 1.22 1.23 +2 -0 wine/dlls/ole32/antimoniker.c 1.21 1.22 +3 -2 wine/dlls/msi/table.c 1.8 1.9 +3 -2 wine/dlls/msi/suminfo.c 1.15 1.16 +2 -0 wine/dlls/msi/msiquery.c 1.41 1.42 +3 -2 wine/dlls/msi/msi.c 1.36 1.37 +2 -0 wine/dlls/msi/action.c 1.4 1.5 +3 -1 wine/dlls/msdmo/dmort.c 1.15 1.16 +2 -0 wine/dlls/mlang/mlang.c 1.4 1.5 +2 -0 wine/dlls/mapi32/util.c 1.3 1.4 +2 -0 wine/dlls/itss/storage.c 1.3 1.4 +2 -0 wine/dlls/itss/moniker.c 1.4 1.5 +2 -0 wine/dlls/itss/itss.c 1.109 1.110 +2 -0 wine/dlls/dsound/dsound_main.c 1.21 1.22 +3 -0 wine/dlls/dplayx/dpclassfactory.c 1.47 1.48 +2 -0 wine/dlls/dinput/dinput_main.c 1.5 1.6 +2 -0 wine/dlls/devenum/devenum_private.h 1.60 1.61 +2 -0 wine/dlls/ddraw/dsurface/main.c 1.46 1.47 +2 -0 wine/dlls/ddraw/main.c 1.6 1.7 +3 -2 wine/dlls/d3dxof/main.c 1.5 1.6 +2 -0 wine/dlls/d3dxof/d3dxof.c 1.5 1.6 +3 -1 wine/dlls/d3d9/volume.c 1.5 1.6 +2 -0 wine/dlls/d3d9/surface.c 1.13 1.14 +2 -0 wine/dlls/d3d8/volume.c 1.39 1.40 +2 -0 wine/dlls/d3d8/surface.c 1.46 1.47 +2 -0 wine/dlls/commdlg/filedlgbrowser.c 1.87 1.88 +2 -0 wine/dlls/commdlg/filedlg.c 1.89 1.90 +3 -0 wine/dlls/comctl32/imagelist.c 1.93 1.94 +2 -0 wine/dlls/comctl32/comctl32undoc.c 1.6 1.7 +3 -1 wine/dlls/comcat/comcat_private.h 1.16 1.17 +3 -1 wine/dlls/avifil32/factory.c 1.27 1.28 +3 -1 wine/dlls/avifil32/api.c 1.5 1.6 +2 -0 wine/dlls/atl/atl_main.c 1.5 1.6 +3 -2 wine/dlls/amstream/main.c 1.4 1.5 +2 -0 wine/dlls/amstream/amstream.c