Module: wine Branch: master Commit: 50d71bb7d2629173bb4597febbd6c3a9f70a101a URL: https://source.winehq.org/git/wine.git/?a=commit;h=50d71bb7d2629173bb4597feb...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Aug 11 08:43:15 2020 +0300
combase: Move CoUnmarshalHresult().
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Huw Davies huw@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/combase/combase.spec | 2 +- dlls/combase/marshal.c | 8 ++++++++ dlls/ole32/marshal.c | 21 --------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index f67d6f25e6..56dc63c4f7 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -164,7 +164,7 @@ @ stub CoTestCancel @ stdcall CoUninitialize() ole32.CoUninitialize @ stub CoUnloadingWOW -@ stdcall CoUnmarshalHresult(ptr ptr) ole32.CoUnmarshalHresult +@ stdcall CoUnmarshalHresult(ptr ptr) @ stdcall CoUnmarshalInterface(ptr ptr ptr) ole32.CoUnmarshalInterface @ stub CoVrfCheckThreadState @ stub CoVrfGetThreadState diff --git a/dlls/combase/marshal.c b/dlls/combase/marshal.c index b68efe8c95..dfe6426db9 100644 --- a/dlls/combase/marshal.c +++ b/dlls/combase/marshal.c @@ -28,3 +28,11 @@ HRESULT WINAPI CoMarshalHresult(IStream *stream, HRESULT hresult) { return IStream_Write(stream, &hresult, sizeof(hresult), NULL); } + +/*********************************************************************** + * CoUnmarshalHresult (combase.@) + */ +HRESULT WINAPI CoUnmarshalHresult(IStream *stream, HRESULT *phresult) +{ + return IStream_Read(stream, phresult, sizeof(*phresult), NULL); +} diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d79e86dec2..90d2480595 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -2207,24 +2207,3 @@ HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) *ppv = &StdMarshalCF; return S_OK; } - -/*********************************************************************** - * CoUnmarshalHresult [OLE32.@] - * - * Unmarshals an HRESULT value from a stream. - * - * PARAMS - * pStm [I] Stream that hresult will be unmarshalled from. - * phresult [I] Pointer to HRESULT where the value will be unmarshalled to. - * - * RETURNS - * Success: S_OK - * Failure: A COM error code - * - * SEE ALSO - * CoMarshalHresult(). - */ -HRESULT WINAPI CoUnmarshalHresult(LPSTREAM pStm, HRESULT * phresult) -{ - return IStream_Read(pStm, phresult, sizeof(*phresult), NULL); -} diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 85ea6dcc8c..001e7b7ad2 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -89,7 +89,7 @@ @ stdcall CoTreatAsClass(ptr ptr) @ stdcall CoUninitialize() @ stub CoUnloadingWOW -@ stdcall CoUnmarshalHresult(ptr ptr) +@ stdcall CoUnmarshalHresult(ptr ptr) combase.CoUnmarshalHresult @ stdcall CoUnmarshalInterface(ptr ptr ptr) @ stdcall CoWaitForMultipleHandles(long long long ptr ptr) @ stdcall CreateAntiMoniker(ptr)