Michael Stefaniuc : widl:
Use ULONG instead of unsigned long when generating declarations for
*_UserMarshal () functions. This is needed for Win64 compatibility.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 9 06:08:41 CST 2006
Module: wine
Branch: master
Commit: 05b1aac1005aaf8c5375c2af7459679917d8388d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b1aac1005aaf8c5375c2af7459679917d8388d
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Nov 8 23:43:45 2006 +0100
widl: Use ULONG instead of unsigned long when generating declarations for *_UserMarshal() functions. This is needed for Win64 compatibility.
---
dlls/ole32/usrmarshal.c | 24 ++++++++++++------------
dlls/oleaut32/usrmarshal.c | 10 +++++-----
tools/widl/header.c | 2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index fe5e474..5f5a35f 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -124,7 +124,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULO
* the first parameter is an unsigned long.
* This function is only intended to be called by the RPC runtime.
*/
-unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF)
+unsigned char * __RPC_USER CLIPFORMAT_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF)
{
wireCLIPFORMAT wirecf = (wireCLIPFORMAT)pBuffer;
@@ -251,7 +251,7 @@ static ULONG __RPC_USER handle_UserSize(
return StartingSize + sizeof(RemotableHandle);
}
-static unsigned char * __RPC_USER handle_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, HANDLE *handle)
+static unsigned char * __RPC_USER handle_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle)
{
RemotableHandle *remhandle = (RemotableHandle *)pBuffer;
if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE)
@@ -286,7 +286,7 @@ #define IMPL_WIREM_HANDLE(type) \
return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \
} \
\
- unsigned char * __RPC_USER type##_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, type *handle) \
+ unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \
{ \
TRACE("("); dump_user_flags(pFlags); TRACE(", %p, &%p\n", pBuffer, *handle); \
return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \
@@ -338,7 +338,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG
return size;
}
-unsigned char * __RPC_USER HGLOBAL_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal)
+unsigned char * __RPC_USER HGLOBAL_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal)
{
TRACE("("); dump_user_flags(pFlags); TRACE(", %p, &%p\n", pBuffer, *phGlobal);
@@ -463,7 +463,7 @@ ULONG __RPC_USER HBITMAP_UserSize(ULONG
return StartingSize;
}
-unsigned char * __RPC_USER HBITMAP_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, HBITMAP *phBmp)
+unsigned char * __RPC_USER HBITMAP_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp)
{
FIXME(":stub\n");
return pBuffer;
@@ -486,7 +486,7 @@ ULONG __RPC_USER HDC_UserSize(ULONG *pFl
return StartingSize;
}
-unsigned char * __RPC_USER HDC_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, HDC *phdc)
+unsigned char * __RPC_USER HDC_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HDC *phdc)
{
FIXME(":stub\n");
return pBuffer;
@@ -509,7 +509,7 @@ ULONG __RPC_USER HPALETTE_UserSize(ULONG
return StartingSize;
}
-unsigned char * __RPC_USER HPALETTE_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, HPALETTE *phPal)
+unsigned char * __RPC_USER HPALETTE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal)
{
FIXME(":stub\n");
return pBuffer;
@@ -553,7 +553,7 @@ ULONG __RPC_USER HENHMETAFILE_UserSize(U
return size;
}
-unsigned char * __RPC_USER HENHMETAFILE_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, HENHMETAFILE *phEmf)
+unsigned char * __RPC_USER HENHMETAFILE_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, HENHMETAFILE *phEmf)
{
TRACE("("); dump_user_flags(pFlags); TRACE(", %p, &%p\n", pBuffer, *phEmf);
@@ -693,7 +693,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULON
return size;
}
-unsigned char * __RPC_USER STGMEDIUM_UserMarshal(unsigned long *pFlags, unsigned char *pBuffer, STGMEDIUM *pStgMedium)
+unsigned char * __RPC_USER STGMEDIUM_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, STGMEDIUM *pStgMedium)
{
TRACE("("); dump_user_flags(pFlags); TRACE(", %p, %p\n", pBuffer, pStgMedium);
@@ -818,7 +818,7 @@ ULONG __RPC_USER ASYNC_STGMEDIUM_UserSiz
return StartingSize;
}
-unsigned char * __RPC_USER ASYNC_STGMEDIUM_UserMarshal( unsigned long *pFlags, unsigned char *pBuffer, ASYNC_STGMEDIUM *pStgMedium)
+unsigned char * __RPC_USER ASYNC_STGMEDIUM_UserMarshal( ULONG *pFlags, unsigned char *pBuffer, ASYNC_STGMEDIUM *pStgMedium)
{
FIXME(":stub\n");
return pBuffer;
@@ -841,7 +841,7 @@ ULONG __RPC_USER FLAG_STGMEDIUM_UserSize
return StartingSize;
}
-unsigned char * __RPC_USER FLAG_STGMEDIUM_UserMarshal( unsigned long *pFlags, unsigned char *pBuffer, FLAG_STGMEDIUM *pStgMedium)
+unsigned char * __RPC_USER FLAG_STGMEDIUM_UserMarshal( ULONG *pFlags, unsigned char *pBuffer, FLAG_STGMEDIUM *pStgMedium)
{
FIXME(":stub\n");
return pBuffer;
@@ -864,7 +864,7 @@ ULONG __RPC_USER SNB_UserSize(ULONG *pFl
return StartingSize;
}
-unsigned char * __RPC_USER SNB_UserMarshal( unsigned long *pFlags, unsigned char *pBuffer, SNB *pSnb)
+unsigned char * __RPC_USER SNB_UserMarshal( ULONG *pFlags, unsigned char *pBuffer, SNB *pSnb)
{
FIXME(":stub\n");
return pBuffer;
diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c
index 17e2479..db377da 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -91,7 +91,7 @@ ULONG WINAPI CLEANLOCALSTORAGE_UserSize(
return Start + sizeof(DWORD);
}
-unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, CLEANLOCALSTORAGE *pstg)
+unsigned char * WINAPI CLEANLOCALSTORAGE_UserMarshal(ULONG *pFlags, unsigned char *Buffer, CLEANLOCALSTORAGE *pstg)
{
ALIGN_POINTER(Buffer, 3);
*(DWORD*)Buffer = pstg->flags;
@@ -152,7 +152,7 @@ ULONG WINAPI BSTR_UserSize(ULONG *pFlags
return Start;
}
-unsigned char * WINAPI BSTR_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, BSTR *pstr)
+unsigned char * WINAPI BSTR_UserMarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr)
{
bstr_wire_t *header;
DWORD len = SysStringByteLen(*pstr);
@@ -447,10 +447,10 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFl
return Start;
}
-unsigned char * WINAPI VARIANT_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, VARIANT *pvar)
+unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, VARIANT *pvar)
{
variant_wire_t *header;
- unsigned long type_size;
+ ULONG type_size;
int align;
unsigned char *Pos;
@@ -820,7 +820,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG
return size;
}
-unsigned char * WINAPI LPSAFEARRAY_UserMarshal(unsigned long *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa)
+unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa)
{
HRESULT hr;
diff --git a/tools/widl/header.c b/tools/widl/header.c
index b149fb4..52db075 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -333,7 +333,7 @@ void write_user_types(void)
{
const char *name = ut->name;
fprintf(header, "ULONG __RPC_USER %s_UserSize (ULONG *, ULONG, %s *);\n", name, name);
- fprintf(header, "unsigned char * __RPC_USER %s_UserMarshal (unsigned long *, unsigned char *, %s *);\n", name, name);
+ fprintf(header, "unsigned char * __RPC_USER %s_UserMarshal (ULONG *, unsigned char *, %s *);\n", name, name);
fprintf(header, "unsigned char * __RPC_USER %s_UserUnmarshal(unsigned long *, unsigned char *, %s *);\n", name, name);
fprintf(header, "void __RPC_USER %s_UserFree (unsigned long *, %s *);\n", name, name);
}
More information about the wine-cvs
mailing list