From: Fabian Maurer dark.shadow4@web.de
--- configure.ac | 1 + dlls/coml2/Makefile.in | 7 ++++++ dlls/coml2/coml2.spec | 33 ++++++++++++++++++++++++++++ dlls/{ole32 => coml2}/memlockbytes.c | 0 dlls/ole32/Makefile.in | 3 +-- dlls/ole32/ole32.spec | 4 ++-- 6 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 dlls/coml2/Makefile.in create mode 100644 dlls/coml2/coml2.spec rename dlls/{ole32 => coml2}/memlockbytes.c (100%)
diff --git a/configure.ac b/configure.ac index 8d92e4c8ab2..32fc89e97a8 100644 --- a/configure.ac +++ b/configure.ac @@ -2421,6 +2421,7 @@ WINE_CONFIG_MAKEFILE(dlls/comctl32) WINE_CONFIG_MAKEFILE(dlls/comctl32/tests) WINE_CONFIG_MAKEFILE(dlls/comdlg32) WINE_CONFIG_MAKEFILE(dlls/comdlg32/tests) +WINE_CONFIG_MAKEFILE(dlls/coml2) WINE_CONFIG_MAKEFILE(dlls/comm.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/commdlg.dll16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/compobj.dll16,enable_win16) diff --git a/dlls/coml2/Makefile.in b/dlls/coml2/Makefile.in new file mode 100644 index 00000000000..9887ccff873 --- /dev/null +++ b/dlls/coml2/Makefile.in @@ -0,0 +1,7 @@ +EXTRADEFS = -DWINOLE32API= +MODULE = coml2.dll +IMPORTLIB = coml2 +IMPORTS = uuid + +SOURCES = \ + memlockbytes.c diff --git a/dlls/coml2/coml2.spec b/dlls/coml2/coml2.spec new file mode 100644 index 00000000000..ea8eb7b5d9f --- /dev/null +++ b/dlls/coml2/coml2.spec @@ -0,0 +1,33 @@ +1 stub @ +2 stub @ +3 stub @ +4 stub @ +5 stub @ +6 stub @ +7 stub @ +8 stub @ +11 stub @ +12 stub @ +@ stub Coml2DllGetClassObject +@ stdcall CreateILockBytesOnHGlobal(ptr long ptr) +@ stub DllGetClassObject +@ stub FmtIdToPropStgName +@ stub GetConvertStg +@ stdcall GetHGlobalFromILockBytes(ptr ptr) +@ stub PropStgNameToFmtId +@ stub ReadClassStg +@ stub ReadClassStm +@ stub StgCreateDocfile +@ stub StgCreateDocfileOnILockBytes +@ stub StgCreatePropSetStg +@ stub StgCreatePropStg +@ stub StgCreateStorageEx +@ stub StgIsStorageFile +@ stub StgIsStorageILockBytes +@ stub StgOpenPropStg +@ stub StgOpenStorage +@ stub StgOpenStorageEx +@ stub StgOpenStorageOnILockBytes +@ stub StgSetTimes +@ stub WriteClassStg +@ stub WriteClassStm diff --git a/dlls/ole32/memlockbytes.c b/dlls/coml2/memlockbytes.c similarity index 100% rename from dlls/ole32/memlockbytes.c rename to dlls/coml2/memlockbytes.c diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in index b65de3bd68a..ee0fcc41f7d 100644 --- a/dlls/ole32/Makefile.in +++ b/dlls/ole32/Makefile.in @@ -1,7 +1,7 @@ EXTRADEFS = -D_OLE32_ MODULE = ole32.dll IMPORTLIB = ole32 -IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase +IMPORTS = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase coml2 DELAYIMPORTS = oleaut32
SOURCES = \ @@ -26,7 +26,6 @@ SOURCES = \ irot.idl \ itemmoniker.c \ marshal.c \ - memlockbytes.c \ moniker.c \ nodrop.svg \ ole2.c \ diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index e9982036eeb..944ff81b1b3 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -101,7 +101,7 @@ @ stdcall CreateErrorInfo(ptr) combase.CreateErrorInfo @ stdcall CreateFileMoniker(wstr ptr) @ stdcall CreateGenericComposite(ptr ptr ptr) -@ stdcall CreateILockBytesOnHGlobal(ptr long ptr) +@ stdcall CreateILockBytesOnHGlobal(ptr long ptr) coml2.CreateILockBytesOnHGlobal @ stdcall CreateItemMoniker(wstr wstr ptr) @ stdcall CreateObjrefMoniker(ptr ptr) @ stdcall CreateOleAdviseHolder(ptr) @@ -121,7 +121,7 @@ @ stdcall GetConvertStg(ptr) @ stub GetDocumentBitStg @ stdcall GetErrorInfo(long ptr) combase.GetErrorInfo -@ stdcall GetHGlobalFromILockBytes(ptr ptr) +@ stdcall GetHGlobalFromILockBytes(ptr ptr) coml2.GetHGlobalFromILockBytes @ stdcall GetHGlobalFromStream(ptr ptr) combase.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRunningObjectTable(long ptr)