Module: wine Branch: master Commit: 8ba5df9a569be4c454c6be62c043ce1a7acda6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ba5df9a569be4c454c6be62c...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Jul 28 13:42:25 2020 +0300
combase: Move HMENU 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 6c6441b307..9d4888d005 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 HMENU_UserFree(ptr ptr) +@ stdcall HMENU_UserMarshal(ptr ptr ptr) +@ stdcall HMENU_UserSize(ptr long ptr) +@ stdcall HMENU_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 632c06a5b2..6934e588a2 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(HMENU) IMPL_WIREM_HANDLE(HWND)
/****************************************************************************** diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 31be1c3e13..b0489cb0ce 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -151,10 +151,10 @@ @ 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) -@ stdcall HMENU_UserUnmarshal(ptr ptr ptr) +@ 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 +@ stdcall HMENU_UserUnmarshal(ptr ptr ptr) combase.HMENU_UserUnmarshal @ stdcall HMETAFILEPICT_UserFree(ptr ptr) @ stdcall HMETAFILEPICT_UserMarshal(ptr ptr ptr) @ stdcall HMETAFILEPICT_UserSize(ptr long ptr) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 826c9b7cf7..86793a8996 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(HMENU) IMPL_WIREM_HANDLE(HICON) IMPL_WIREM_HANDLE(HBRUSH)