Module: wine Branch: master Commit: 0c7ecc899f9daf61cca5e98418fdfb1dee396961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c7ecc899f9daf61cca5e9841...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Aug 3 12:08:36 2020 +0300
combase: Move HBRUSH 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 115a5ecc56..c005782a81 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 HBRUSH_UserFree(ptr ptr) +@ 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) diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 08328cc673..ef5228a513 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(HBRUSH) IMPL_WIREM_HANDLE(HDC) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HMENU) diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 03697c3e8d..3d56a8bcbf 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -131,10 +131,10 @@ @ stdcall HBITMAP_UserMarshal(ptr ptr ptr) @ stdcall HBITMAP_UserSize(ptr long ptr) @ stdcall HBITMAP_UserUnmarshal(ptr ptr ptr) -@ stdcall HBRUSH_UserFree(ptr ptr) -@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) -@ stdcall HBRUSH_UserSize(ptr long ptr) -@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) +@ stdcall HBRUSH_UserFree(ptr ptr) combase.HBRUSH_UserFree +@ stdcall HBRUSH_UserMarshal(ptr ptr ptr) combase.HBRUSH_UserMarshal +@ stdcall HBRUSH_UserSize(ptr long ptr) combase.HBRUSH_UserSize +@ stdcall HBRUSH_UserUnmarshal(ptr ptr ptr) combase.HBRUSH_UserUnmarshal @ 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 diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 6898517568..8456bd20ee 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -355,7 +355,6 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle) }
IMPL_WIREM_HANDLE(HACCEL) -IMPL_WIREM_HANDLE(HBRUSH)
/****************************************************************************** * HGLOBAL_UserSize [OLE32.@]