ChangeSet ID: 19417 CVSROOT: /opt/cvs-commit Module name: wine Changes by: julliard@wine.codeweavers.com 2005/08/10 04:53:47 Modified files: dlls/ole32 : storage.c ole2.spec ole2.c dlls/msxml3 : factory.c dlls/msi : msi.c dlls/mshtml : main.c dlls/mlang : mlang.c dlls/dswave : dswave_main.c dlls/dmusic : dmusic_main.c dlls/dmsynth : dmsynth_main.c dlls/dmscript : dmscript_main.c dlls/dmloader : dmloader_main.c dlls/dmband : dmband_main.c dlls/atl : registrar.c Log message: Vincent Béron Correct mismatches between spec files and comments about export number. Patch: http://cvs.winehq.org/patch.py?id=19417 Old revision New revision Changes Path 1.48 1.49 +2 -2 wine/dlls/ole32/storage.c 1.11 1.12 +1 -1 wine/dlls/ole32/ole2.spec 1.71 1.72 +1 -1 wine/dlls/ole32/ole2.c 1.3 1.4 +3 -0 wine/dlls/msxml3/factory.c 1.95 1.96 +1 -1 wine/dlls/msi/msi.c 1.19 1.20 +3 -0 wine/dlls/mshtml/main.c 1.21 1.22 +3 -0 wine/dlls/mlang/mlang.c 1.10 1.11 +1 -1 wine/dlls/dswave/dswave_main.c 1.20 1.21 +1 -1 wine/dlls/dmusic/dmusic_main.c 1.13 1.14 +1 -1 wine/dlls/dmsynth/dmsynth_main.c 1.13 1.14 +1 -1 wine/dlls/dmscript/dmscript_main.c 1.8 1.9 +1 -1 wine/dlls/dmloader/dmloader_main.c 1.15 1.16 +1 -1 wine/dlls/dmband/dmband_main.c 1.10 1.11 +1 -1 wine/dlls/atl/registrar.c Index: wine/dlls/ole32/storage.c diff -u -p wine/dlls/ole32/storage.c:1.48 wine/dlls/ole32/storage.c:1.49 --- wine/dlls/ole32/storage.c:1.48 Fri May 24 06:59:23 2013 +++ wine/dlls/ole32/storage.c Fri May 24 06:59:23 2013 @@ -2221,7 +2221,7 @@ HRESULT WINAPI StgOpenStorageOnILockByte } /*********************************************************************** - * ReadClassStg (OLE2.@) + * ReadClassStg (OLE2.18) * * This method reads the CLSID previously written to a storage object with the WriteClassStg. */ @@ -2266,7 +2266,7 @@ HRESULT WINAPI ReadClassStg16(SEGPTR /*I } /*********************************************************************** - * GetConvertStg (OLE2.@) + * GetConvertStg (OLE2.82) */ HRESULT WINAPI GetConvertStg16(IStorage *stg) { FIXME("unimplemented stub!\n"); Index: wine/dlls/ole32/ole2.spec diff -u -p wine/dlls/ole32/ole2.spec:1.11 wine/dlls/ole32/ole2.spec:1.12 --- wine/dlls/ole32/ole2.spec:1.11 Fri May 24 06:59:23 2013 +++ wine/dlls/ole32/ole2.spec Fri May 24 06:59:23 2013 @@ -77,7 +77,7 @@ 79 pascal OleDoAutoConvert(ptr ptr) OleDoAutoConvert16 80 stub OLEGETAUTOCONVERT 81 stub OLESETAUTOCONVERT -82 pascal GETCONVERTSTG(ptr) GetConvertStg16 +82 pascal GetConvertStg(ptr) GetConvertStg16 83 stub SETCONVERTSTG 84 stub CREATESTREAMONHGLOBAL 85 stub GETHGLOBALFROMSTREAM Index: wine/dlls/ole32/ole2.c diff -u -p wine/dlls/ole32/ole2.c:1.71 wine/dlls/ole32/ole2.c:1.72 --- wine/dlls/ole32/ole2.c:1.71 Fri May 24 06:59:23 2013 +++ wine/dlls/ole32/ole2.c Fri May 24 06:59:23 2013 @@ -2329,7 +2329,7 @@ HRESULT WINAPI OleDoAutoConvert(IStorage } /****************************************************************************** - * OleDoAutoConvert [OLE2.@] + * OleDoAutoConvert [OLE2.79] */ HRESULT WINAPI OleDoAutoConvert16(IStorage *pStg, LPCLSID pClsidNew) { Index: wine/dlls/msxml3/factory.c diff -u -p wine/dlls/msxml3/factory.c:1.3 wine/dlls/msxml3/factory.c:1.4 --- wine/dlls/msxml3/factory.c:1.3 Fri May 24 06:59:23 2013 +++ wine/dlls/msxml3/factory.c Fri May 24 06:59:23 2013 @@ -127,6 +127,9 @@ const struct IClassFactoryVtbl xmlcf_vtb static xmlcf domdoccf = { &xmlcf_vtbl, DOMDocument_create }; +/****************************************************************** + * DllGetClassObject (MSXML3.@) + */ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID iid, LPVOID *ppv ) { IClassFactory *cf = NULL; Index: wine/dlls/msi/msi.c diff -u -p wine/dlls/msi/msi.c:1.95 wine/dlls/msi/msi.c:1.96 --- wine/dlls/msi/msi.c:1.95 Fri May 24 06:59:23 2013 +++ wine/dlls/msi/msi.c Fri May 24 06:59:23 2013 @@ -1340,7 +1340,7 @@ static const IClassFactoryVtbl MsiCF_Vtb static IClassFactoryImpl Msi_CF = { &MsiCF_Vtbl }; /****************************************************************** - * DllGetClassObject [MSI.@] + * DllGetClassObject [MSI.2] */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { Index: wine/dlls/mshtml/main.c diff -u -p wine/dlls/mshtml/main.c:1.19 wine/dlls/mshtml/main.c:1.20 --- wine/dlls/mshtml/main.c:1.19 Fri May 24 06:59:23 2013 +++ wine/dlls/mshtml/main.c Fri May 24 06:59:23 2013 @@ -155,6 +155,9 @@ static HRESULT ClassFactory_Create(REFII return hres; } +/****************************************************************** + * DllGetClassObject (MSHTML.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { if(IsEqualGUID(&CLSID_HTMLDocument, rclsid)) { Index: wine/dlls/mlang/mlang.c diff -u -p wine/dlls/mlang/mlang.c:1.21 wine/dlls/mlang/mlang.c:1.22 --- wine/dlls/mlang/mlang.c:1.21 Fri May 24 06:59:23 2013 +++ wine/dlls/mlang/mlang.c Fri May 24 06:59:23 2013 @@ -745,6 +745,9 @@ static const IClassFactoryVtbl MLANGCF_V MLANGCF_LockServer }; +/****************************************************************** + * DllGetClassObject (MLANG.@) + */ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) { int i; Index: wine/dlls/dswave/dswave_main.c diff -u -p wine/dlls/dswave/dswave_main.c:1.10 wine/dlls/dswave/dswave_main.c:1.11 --- wine/dlls/dswave/dswave_main.c:1.10 Fri May 24 06:59:23 2013 +++ wine/dlls/dswave/dswave_main.c Fri May 24 06:59:23 2013 @@ -108,7 +108,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /****************************************************************** - * DllGetClassObject (DSWAVE.2) + * DllGetClassObject (DSWAVE.@) * * */ Index: wine/dlls/dmusic/dmusic_main.c diff -u -p wine/dlls/dmusic/dmusic_main.c:1.20 wine/dlls/dmusic/dmusic_main.c:1.21 --- wine/dlls/dmusic/dmusic_main.c:1.20 Fri May 24 06:59:23 2013 +++ wine/dlls/dmusic/dmusic_main.c Fri May 24 06:59:23 2013 @@ -156,7 +156,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /****************************************************************** - * DllGetClassObject (DMUSIC.2) + * DllGetClassObject (DMUSIC.@) * * */ Index: wine/dlls/dmsynth/dmsynth_main.c diff -u -p wine/dlls/dmsynth/dmsynth_main.c:1.13 wine/dlls/dmsynth/dmsynth_main.c:1.14 --- wine/dlls/dmsynth/dmsynth_main.c:1.13 Fri May 24 06:59:23 2013 +++ wine/dlls/dmsynth/dmsynth_main.c Fri May 24 06:59:23 2013 @@ -156,7 +156,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /****************************************************************** - * DllGetClassObject (DMSYNTH.2) + * DllGetClassObject (DMSYNTH.@) * * */ Index: wine/dlls/dmscript/dmscript_main.c diff -u -p wine/dlls/dmscript/dmscript_main.c:1.13 wine/dlls/dmscript/dmscript_main.c:1.14 --- wine/dlls/dmscript/dmscript_main.c:1.13 Fri May 24 06:59:23 2013 +++ wine/dlls/dmscript/dmscript_main.c Fri May 24 06:59:23 2013 @@ -571,7 +571,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /****************************************************************** - * DllGetClassObject (DMSCRIPT.2) + * DllGetClassObject (DMSCRIPT.@) * * */ Index: wine/dlls/dmloader/dmloader_main.c diff -u -p wine/dlls/dmloader/dmloader_main.c:1.8 wine/dlls/dmloader/dmloader_main.c:1.9 --- wine/dlls/dmloader/dmloader_main.c:1.8 Fri May 24 06:59:23 2013 +++ wine/dlls/dmloader/dmloader_main.c Fri May 24 06:59:23 2013 @@ -53,7 +53,7 @@ HRESULT WINAPI DllCanUnloadNow (void) /****************************************************************** - * DllGetClassObject (DMLOADER.2) + * DllGetClassObject (DMLOADER.@) */ HRESULT WINAPI DllGetClassObject (REFCLSID rclsid, REFIID riid, LPVOID *ppv) { Index: wine/dlls/dmband/dmband_main.c diff -u -p wine/dlls/dmband/dmband_main.c:1.15 wine/dlls/dmband/dmband_main.c:1.16 --- wine/dlls/dmband/dmband_main.c:1.15 Fri May 24 06:59:23 2013 +++ wine/dlls/dmband/dmband_main.c Fri May 24 06:59:23 2013 @@ -159,7 +159,7 @@ HRESULT WINAPI DllCanUnloadNow(void) /****************************************************************** - * DllGetClassObject (DMBAND.2) + * DllGetClassObject (DMBAND.@) * * */ Index: wine/dlls/atl/registrar.c diff -u -p wine/dlls/atl/registrar.c:1.10 wine/dlls/atl/registrar.c:1.11 --- wine/dlls/atl/registrar.c:1.10 Fri May 24 06:59:23 2013 +++ wine/dlls/atl/registrar.c Fri May 24 06:59:23 2013 @@ -737,7 +737,7 @@ static const IClassFactoryVtbl IRegistra static IClassFactory RegistrarCF = { &IRegistrarCFVtbl }; /************************************************************** - * DllGetClassObject implementation + * DllGetClassObject (ATL.2) */ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject) {