Nikolay Sivov : combase: Move HICON marshalling functions.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e29b5309212190e41df407bd2438dbd1d280a0ee
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e29b5309212190e41df407bd2438dbd1d280a0ee

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Tue Jul 28 13:42:26 2020 +0300

combase: Move HICON marshalling functions.

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 9d4888d005..c2342cc9f8 100644
--- 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)
diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c
index 6934e588a2..08328cc673 100644
--- 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)
 
diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec
index b0489cb0ce..03697c3e8d 100644
--- 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
diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 86793a8996..6898517568 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(HICON)
 IMPL_WIREM_HANDLE(HBRUSH)
 
 /******************************************************************************