Module: wine Branch: master Commit: 63ee3fd52d8f580bd0a10466278ca57137d88e6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=63ee3fd52d8f580bd0a104662...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Jul 28 13:42:24 2020 +0300
combase: Move HDC marshalling functions.
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 | 4 ++++ dlls/combase/usrmarshal.c | 1 + dlls/ole32/ole32.spec | 8 ++++---- dlls/ole32/usrmarshal.c | 1 - 4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index 480f29d1d2..6c6441b307 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -181,6 +181,10 @@ @ stdcall GetHGlobalFromStream(ptr ptr) ole32.GetHGlobalFromStream @ stub GetHookInterface @ stdcall GetRestrictedErrorInfo(ptr) +@ stdcall HDC_UserFree(ptr ptr) +@ stdcall HDC_UserMarshal(ptr ptr ptr) +@ stdcall HDC_UserSize(ptr long ptr) +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree @ stub HSTRING_UserFree64 @ stub HSTRING_UserMarshal diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 91f389916f..632c06a5b2 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -134,6 +134,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) handle_UserFree(pFlags, (HANDLE *)handle); \ }
+IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HWND)
/****************************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index f41f010fdd..31be1c3e13 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -135,10 +135,10 @@ @ stdcall HBRUSH_UserMarshal(ptr ptr ptr) @ stdcall HBRUSH_UserSize(ptr long ptr) @ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) -@ stdcall HDC_UserFree(ptr ptr) -@ stdcall HDC_UserMarshal(ptr ptr ptr) -@ stdcall HDC_UserSize(ptr long ptr) -@ stdcall HDC_UserUnmarshal(ptr ptr ptr) +@ stdcall HDC_UserFree(ptr ptr) combase.HDC_UserFree +@ stdcall HDC_UserMarshal(ptr ptr ptr) combase.HDC_UserMarshal +@ stdcall HDC_UserSize(ptr long ptr) combase.HDC_UserSize +@ stdcall HDC_UserUnmarshal(ptr ptr ptr) combase.HDC_UserUnmarshal @ stdcall HENHMETAFILE_UserFree(ptr ptr) @ stdcall HENHMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HENHMETAFILE_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index add6ba759e..826c9b7cf7 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -356,7 +356,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle)
IMPL_WIREM_HANDLE(HACCEL) IMPL_WIREM_HANDLE(HMENU) -IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH)