Module: wine Branch: master Commit: f0a30d892968d7520ac19b93de36af7cf5ce82a1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0a30d892968d7520ac19b93d...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Aug 3 12:08:39 2020 +0300
combase: Move HPALETTE marshalling stubs.
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 | 99 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ole32/ole32.spec | 8 ++-- dlls/ole32/usrmarshal.c | 100 ---------------------------------------------- 4 files changed, 107 insertions(+), 104 deletions(-)
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index a612d250d1..9d0bad29f0 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -205,6 +205,10 @@ @ stdcall HMENU_UserMarshal(ptr ptr ptr) @ stdcall HMENU_UserSize(ptr long ptr) @ stdcall HMENU_UserUnmarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserFree(ptr ptr) +@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserSize(ptr long ptr) +@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) @ stub HSTRING_UserFree @ stub -arch=win64 HSTRING_UserFree64 @ stub HSTRING_UserMarshal diff --git a/dlls/combase/usrmarshal.c b/dlls/combase/usrmarshal.c index 5b3062f0c2..c88e8c57cd 100644 --- a/dlls/combase/usrmarshal.c +++ b/dlls/combase/usrmarshal.c @@ -541,6 +541,105 @@ void __RPC_USER HBITMAP_UserFree(ULONG *flags, HBITMAP *bmp) DeleteObject(*bmp); }
+/****************************************************************************** + * HPALETTE_UserSize (combase.@) + * + * Calculates the buffer size required to marshal a palette. + * + * PARAMS + * pFlags [I] Flags. See notes. + * StartingSize [I] Starting size of the buffer. This value is added on to + * the buffer size required for the clip format. + * phPal [I] Palette to size. + * + * RETURNS + * The buffer size required to marshal a palette plus the starting size. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +ULONG __RPC_USER HPALETTE_UserSize(ULONG *pFlags, ULONG StartingSize, HPALETTE *phPal) +{ + FIXME(":stub\n"); + return StartingSize; +} + +/****************************************************************************** + * HPALETTE_UserMarshal (combase.@) + * + * Marshals a palette into a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format into. + * phPal [I] Palette to marshal. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HPALETTE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HPALETTE_UserUnmarshal (combase.@) + * + * Unmarshals a palette from a buffer. + * + * PARAMS + * pFlags [I] Flags. See notes. + * pBuffer [I] Buffer to marshal the clip format from. + * phPal [O] Address that receive the unmarshaled palette. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to an ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which + * the first parameter is an ULONG. + * This function is only intended to be called by the RPC runtime. + */ +unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) +{ + FIXME(":stub\n"); + return pBuffer; +} + +/****************************************************************************** + * HPALETTE_UserFree (combase.@) + * + * Frees an unmarshaled palette. + * + * PARAMS + * pFlags [I] Flags. See notes. + * phPal [I] Palette to free. + * + * RETURNS + * The end of the marshaled data in the buffer. + * + * NOTES + * Even though the function is documented to take a pointer to a ULONG in + * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of + * which the first parameter is a ULONG. + * This function is only intended to be called by the RPC runtime. + */ +void __RPC_USER HPALETTE_UserFree(ULONG *pFlags, HPALETTE *phPal) +{ + FIXME(":stub\n"); +} + /****************************************************************************** * WdtpInterfacePointer_UserSize (combase.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index 9f13f12327..97618e0893 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -163,10 +163,10 @@ @ stdcall HMETAFILE_UserMarshal(ptr ptr ptr) @ stdcall HMETAFILE_UserSize(ptr long ptr) @ stdcall HMETAFILE_UserUnmarshal(ptr ptr ptr) -@ stdcall HPALETTE_UserFree(ptr ptr) -@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) -@ stdcall HPALETTE_UserSize(ptr long ptr) -@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) +@ stdcall HPALETTE_UserFree(ptr ptr) combase.HPALETTE_UserFree +@ stdcall HPALETTE_UserMarshal(ptr ptr ptr) combase.HPALETTE_UserMarshal +@ stdcall HPALETTE_UserSize(ptr long ptr) combase.HPALETTE_UserSize +@ stdcall HPALETTE_UserUnmarshal(ptr ptr ptr) combase.HPALETTE_UserUnmarshal @ stdcall HWND_UserFree(ptr ptr) combase.HWND_UserFree @ stdcall HWND_UserMarshal(ptr ptr ptr) combase.HWND_UserMarshal @ stdcall HWND_UserSize(ptr long ptr) combase.HWND_UserSize diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index d12f81f504..694ef60764 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -375,106 +375,6 @@ void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) GlobalFree(*phGlobal); }
-/****************************************************************************** - * HPALETTE_UserSize [OLE32.@] - * - * Calculates the buffer size required to marshal a palette. - * - * PARAMS - * pFlags [I] Flags. See notes. - * StartingSize [I] Starting size of the buffer. This value is added on to - * the buffer size required for the clip format. - * phPal [I] Palette to size. - * - * RETURNS - * The buffer size required to marshal a palette plus the starting size. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -ULONG __RPC_USER HPALETTE_UserSize(ULONG *pFlags, ULONG StartingSize, HPALETTE *phPal) -{ - FIXME(":stub\n"); - return StartingSize; -} - -/****************************************************************************** - * HPALETTE_UserMarshal [OLE32.@] - * - * Marshals a palette into a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format into. - * phPal [I] Palette to marshal. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HPALETTE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HPALETTE_UserUnmarshal [OLE32.@] - * - * Unmarshals a palette from a buffer. - * - * PARAMS - * pFlags [I] Flags. See notes. - * pBuffer [I] Buffer to marshal the clip format from. - * phPal [O] Address that receive the unmarshaled palette. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to an ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of which - * the first parameter is an ULONG. - * This function is only intended to be called by the RPC runtime. - */ -unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal) -{ - FIXME(":stub\n"); - return pBuffer; -} - -/****************************************************************************** - * HPALETTE_UserFree [OLE32.@] - * - * Frees an unmarshaled palette. - * - * PARAMS - * pFlags [I] Flags. See notes. - * phPal [I] Palette to free. - * - * RETURNS - * The end of the marshaled data in the buffer. - * - * NOTES - * Even though the function is documented to take a pointer to a ULONG in - * pFlags, it actually takes a pointer to a USER_MARSHAL_CB structure, of - * which the first parameter is a ULONG. - * This function is only intended to be called by the RPC runtime. - */ -void __RPC_USER HPALETTE_UserFree(ULONG *pFlags, HPALETTE *phPal) -{ - FIXME(":stub\n"); -} - - /****************************************************************************** * HMETAFILE_UserSize [OLE32.@] *