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>

combase: Move HBRUSH marshalling functions.
0c7ecc89 · Nikolay Sivov · Alexandre Julliard · a2e3bbbf · 0c7ecc89 · 0c7ecc89
Commit 0c7ecc89 authored Aug 03, 2020 by Nikolay Sivov Committed by Alexandre Julliard Aug 03, 2020
Showing with 9 additions and 5 deletions

combase.spec dlls/combase/combase.spec +4 -0

usrmarshal.c dlls/combase/usrmarshal.c +1 -0

ole32.spec dlls/ole32/ole32.spec +4 -4

usrmarshal.c dlls/ole32/usrmarshal.c +0 -1

No files found.
--- 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)

--- 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)

--- 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

--- 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.@]