combase: Move HICON 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 HICON marshalling functions.
e29b5309 · Nikolay Sivov · Alexandre Julliard · 8ba5df9a · e29b5309 · e29b5309
Commit e29b5309 authored Jul 28, 2020 by Nikolay Sivov Committed by Alexandre Julliard Aug 01, 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
@@ -185,6 +185,10 @@
 @ stdcall HDC_UserMarshal(ptr ptr ptr)
 @ stdcall HDC_UserSize(ptr long ptr)
 @ stdcall HDC_UserUnmarshal(ptr ptr ptr)
+@ stdcall HICON_UserFree(ptr ptr)
+@ stdcall HICON_UserMarshal(ptr ptr ptr)
+@ stdcall HICON_UserSize(ptr long ptr)
+@ stdcall HICON_UserUnmarshal(ptr ptr ptr)
 @ stdcall HMENU_UserFree(ptr ptr)
 @ stdcall HMENU_UserMarshal(ptr ptr ptr)
 @ stdcall HMENU_UserSize(ptr long ptr)

--- a/dlls/combase/usrmarshal.c
+++ b/dlls/combase/usrmarshal.c
@@ -135,6 +135,7 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle)
    }

 IMPL_WIREM_HANDLE(HDC)
+IMPL_WIREM_HANDLE(HICON)
 IMPL_WIREM_HANDLE(HMENU)
 IMPL_WIREM_HANDLE(HWND)


--- a/dlls/ole32/ole32.spec
+++ b/dlls/ole32/ole32.spec
@@ -147,10 +147,10 @@
 @ stdcall HGLOBAL_UserMarshal(ptr ptr ptr)
 @ stdcall HGLOBAL_UserSize(ptr long ptr)
 @ stdcall HGLOBAL_UserUnmarshal(ptr ptr ptr)
-@ stdcall HICON_UserFree(ptr ptr)
-@ stdcall HICON_UserMarshal(ptr ptr ptr)
-@ stdcall HICON_UserSize(ptr long ptr)
-@ stdcall HICON_UserUnmarshal(ptr ptr ptr)
+@ stdcall HICON_UserFree(ptr ptr) combase.HICON_UserFree
+@ stdcall HICON_UserMarshal(ptr ptr ptr) combase.HICON_UserMarshal
+@ stdcall HICON_UserSize(ptr long ptr) combase.HICON_UserSize
+@ stdcall HICON_UserUnmarshal(ptr ptr ptr) combase.HICON_UserUnmarshal
 @ stdcall HMENU_UserFree(ptr ptr) combase.HMENU_UserFree
 @ stdcall HMENU_UserMarshal(ptr ptr ptr) combase.HMENU_UserMarshal
 @ stdcall HMENU_UserSize(ptr long ptr) combase.HMENU_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(HICON)
 IMPL_WIREM_HANDLE(HBRUSH)

 /******************************************************************************