combase: Move default memory stream implementation.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

combase: Move default memory stream implementation.
1a7dbcfd · Nikolay Sivov · Alexandre Julliard · 02301d8f · 1a7dbcfd · 1a7dbcfd
Commit 1a7dbcfd authored Sep 02, 2020 by Nikolay Sivov Committed by Alexandre Julliard Sep 02, 2020
6 changed files
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -9,6 +9,7 @@ C_SRCS = \
 	apartment.c \
 	combase.c \
 	errorinfo.c \
+	hglobalstream.c \
 	malloc.c \
 	marshal.c \
 	roapi.c \

--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -174,7 +174,7 @@
 @ stdcall CoWaitForMultipleHandles(long long long ptr ptr)
 @ stub CoWaitForMultipleObjects
 @ stdcall CreateErrorInfo(ptr)
-@ stdcall CreateStreamOnHGlobal(ptr long ptr) ole32.CreateStreamOnHGlobal
+@ stdcall CreateStreamOnHGlobal(ptr long ptr)
 @ stub DcomChannelSetHResult
 @ stdcall DllDebugObjectRPCHook(long ptr)
 @ stdcall DllGetActivationFactory(ptr ptr)
@@ -185,7 +185,7 @@
 @ stub GetCatalogHelper
 @ stdcall GetErrorInfo(long ptr)
 @ stub GetFuncDescs
-@ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream
+@ stdcall GetHGlobalFromStream(ptr ptr)
 @ stub GetHookInterface
 @ stdcall GetRestrictedErrorInfo(ptr)
 @ stdcall HACCEL_UserFree(ptr ptr)

--- a/dlls/combase/hglobalstream.c
+++ b/dlls/combase/hglobalstream.c
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -21,7 +21,6 @@ C_SRCS = \
 	filemoniker.c \
 	ftmarshal.c \
 	git.c \
-	hglobalstream.c \
 	itemmoniker.c \
 	marshal.c \
 	memlockbytes.c \

--- a/dlls/ole32/hglobalstream.c
+++ b/dlls/ole32/hglobalstream.c
--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -105,7 +105,7 @@
 @ stub CreateObjrefMoniker
 @ stdcall CreateOleAdviseHolder(ptr)
 @ stdcall CreatePointerMoniker(ptr ptr)
-@ stdcall CreateStreamOnHGlobal(ptr long ptr)
+@ stdcall CreateStreamOnHGlobal(ptr long ptr) combase.CreateStreamOnHGlobal
 @ stdcall DestroyRunningObjectTable()
 @ stdcall DllDebugObjectRPCHook(long ptr) combase.DllDebugObjectRPCHook
 @ stdcall -private DllGetClassObject (ptr ptr ptr)
@@ -121,7 +121,7 @@
 @ stub GetDocumentBitStg
 @ stdcall GetErrorInfo(long ptr) combase.GetErrorInfo
 @ stdcall GetHGlobalFromILockBytes(ptr ptr)
-@ stdcall GetHGlobalFromStream(ptr ptr)
+@ stdcall GetHGlobalFromStream(ptr ptr) combase.GetHGlobalFromStream
 @ stub GetHookInterface
 @ stdcall GetRunningObjectTable(long ptr)
 @ stdcall HACCEL_UserFree(ptr ptr) combase.HACCEL_UserFree