Michael Stefaniuc : widl: Use ULONG instead of unsigned long when generating declarations for *_UserUnMarshal () functions. This is needed for Win64 compatibility.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6f9504703419b0c778f3d9cfb59cae111d2eb908
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6f9504703419b0c778f3d9cfb5...

Author: Michael Stefaniuc 
Date:   Wed Nov  8 23:44:00 2006 +0100

widl: Use ULONG instead of unsigned long when generating declarations for *_UserUnMarshal() functions. This is needed for Win64 compatibility.

---

dlls/ole32/usrmarshal.c    |   26 +++++++++++++-------------
 dlls/oleaut32/usrmarshal.c |   16 ++++++++--------
 tools/widl/header.c        |    2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 5f5a35f..ae23307 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -43,7 +43,7 @@ #define ALIGNED_POINTER(_Ptr, _Align) ((
 #define ALIGN_LENGTH(_Len, _Align) _Len = ALIGNED_LENGTH(_Len, _Align)
 #define ALIGN_POINTER(_Ptr, _Align) _Ptr = ALIGNED_POINTER(_Ptr, _Align)

-static void dump_user_flags(unsigned long *pFlags)
+static void dump_user_flags(ULONG *pFlags)
 {
     if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION)
         TRACE("MAKELONG(NDR_LOCAL_REPRESENTATION, ");
@@ -181,7 +181,7 @@ unsigned char * __RPC_USER CLIPFORMAT_Us
  *  the first parameter is an unsigned long.
  *  This function is only intended to be called by the RPC runtime.
  */
-unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF)
+unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, CLIPFORMAT *pCF)
 {
     wireCLIPFORMAT wirecf = (wireCLIPFORMAT)pBuffer;

@@ -265,7 +265,7 @@ static unsigned char * __RPC_USER handle
     return pBuffer + sizeof(RemotableHandle);
 }

-static unsigned char * __RPC_USER handle_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, HANDLE *handle)
+static unsigned char * __RPC_USER handle_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HANDLE *handle)
 {
     RemotableHandle *remhandle = (RemotableHandle *)pBuffer;
     if (remhandle->fContext != WDT_INPROC_CALL)
@@ -292,7 +292,7 @@ #define IMPL_WIREM_HANDLE(type) \
         return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \
     } \
     \
-    unsigned char * __RPC_USER type##_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, type *handle) \
+    unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \
     { \
         TRACE("("); dump_user_flags(pFlags); TRACE(", %p, %p\n", pBuffer, handle); \
         return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \
@@ -381,7 +381,7 @@ unsigned char * __RPC_USER HGLOBAL_UserM
     return pBuffer;
 }

-unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal)
+unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HGLOBAL *phGlobal)
 {
     ULONG fContext;

@@ -469,7 +469,7 @@ unsigned char * __RPC_USER HBITMAP_UserM
     return pBuffer;
 }

-unsigned char * __RPC_USER HBITMAP_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, HBITMAP *phBmp)
+unsigned char * __RPC_USER HBITMAP_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HBITMAP *phBmp)
 {
     FIXME(":stub\n");
     return pBuffer;
@@ -492,7 +492,7 @@ unsigned char * __RPC_USER HDC_UserMarsh
     return pBuffer;
 }

-unsigned char * __RPC_USER HDC_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, HDC *phdc)
+unsigned char * __RPC_USER HDC_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HDC *phdc)
 {
     FIXME(":stub\n");
     return pBuffer;
@@ -515,7 +515,7 @@ unsigned char * __RPC_USER HPALETTE_User
     return pBuffer;
 }

-unsigned char * __RPC_USER HPALETTE_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, HPALETTE *phPal)
+unsigned char * __RPC_USER HPALETTE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HPALETTE *phPal)
 {
     FIXME(":stub\n");
     return pBuffer;
@@ -590,7 +590,7 @@ unsigned char * __RPC_USER HENHMETAFILE_
     return pBuffer;
 }

-unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, HENHMETAFILE *phEmf)
+unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, HENHMETAFILE *phEmf)
 {
     ULONG fContext;

@@ -747,7 +747,7 @@ unsigned char * __RPC_USER STGMEDIUM_Use
     return pBuffer;
 }

-unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, STGMEDIUM *pStgMedium)
+unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, STGMEDIUM *pStgMedium)
 {
     DWORD content;
     DWORD releaseunk;
@@ -824,7 +824,7 @@ unsigned char * __RPC_USER ASYNC_STGMEDI
     return pBuffer;
 }

-unsigned char * __RPC_USER ASYNC_STGMEDIUM_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, ASYNC_STGMEDIUM *pStgMedium)
+unsigned char * __RPC_USER ASYNC_STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, ASYNC_STGMEDIUM *pStgMedium)
 {
     FIXME(":stub\n");
     return pBuffer;
@@ -847,7 +847,7 @@ unsigned char * __RPC_USER FLAG_STGMEDIU
     return pBuffer;
 }

-unsigned char * __RPC_USER FLAG_STGMEDIUM_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, FLAG_STGMEDIUM *pStgMedium)
+unsigned char * __RPC_USER FLAG_STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, FLAG_STGMEDIUM *pStgMedium)
 {
     FIXME(":stub\n");
     return pBuffer;
@@ -870,7 +870,7 @@ unsigned char * __RPC_USER SNB_UserMarsh
     return pBuffer;
 }

-unsigned char * __RPC_USER SNB_UserUnmarshal(unsigned long *pFlags, unsigned char *pBuffer, SNB *pSnb)
+unsigned char * __RPC_USER SNB_UserUnmarshal(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 db377da..f8c56f1 100644
--- a/dlls/oleaut32/usrmarshal.c
+++ b/dlls/oleaut32/usrmarshal.c
@@ -62,7 +62,7 @@ HRESULT OLEAUTPS_DllGetClassObject(REFCL
                               &CLSID_PSDispatch, &PSFactoryBuffer);
 }

-static void dump_user_flags(unsigned long *pFlags)
+static void dump_user_flags(ULONG *pFlags)
 {
     if (HIWORD(*pFlags) == NDR_LOCAL_DATA_REPRESENTATION)
         TRACE("MAKELONG(NDR_LOCAL_REPRESENTATION, ");
@@ -121,7 +121,7 @@ unsigned char * WINAPI CLEANLOCALSTORAGE
     return Buffer + sizeof(DWORD);
 }

-unsigned char * WINAPI CLEANLOCALSTORAGE_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, CLEANLOCALSTORAGE *pstr)
+unsigned char * WINAPI CLEANLOCALSTORAGE_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, CLEANLOCALSTORAGE *pstr)
 {
     ALIGN_POINTER(Buffer, 3);
     pstr->flags = *(DWORD*)Buffer;
@@ -174,7 +174,7 @@ unsigned char * WINAPI BSTR_UserMarshal(
     return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len;
 }

-unsigned char * WINAPI BSTR_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, BSTR *pstr)
+unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr)
 {
     bstr_wire_t *header;
     TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr);
@@ -220,7 +220,7 @@ typedef struct
     DWORD switch_is;
 } variant_wire_t;

-static unsigned int get_type_size(unsigned long *pFlags, VARIANT *pvar)
+static unsigned int get_type_size(ULONG *pFlags, VARIANT *pvar)
 {
     if (V_VT(pvar) & VT_ARRAY) return 4;

@@ -268,7 +268,7 @@ static unsigned int get_type_size(unsign
     }
 }

-static unsigned int get_type_alignment(unsigned long *pFlags, VARIANT *pvar)
+static unsigned int get_type_alignment(ULONG *pFlags, VARIANT *pvar)
 {
     unsigned int size = get_type_size(pFlags, pvar);
     if(V_VT(pvar) & VT_BYREF) return 3;
@@ -544,10 +544,10 @@ unsigned char * WINAPI VARIANT_UserMarsh
     return Pos;
 }

-unsigned char * WINAPI VARIANT_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, VARIANT *pvar)
+unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, VARIANT *pvar)
 {
     variant_wire_t *header;
-    unsigned long type_size;
+    ULONG type_size;
     int align;
     unsigned char *Pos;

@@ -940,7 +940,7 @@ #define FADF_AUTOSETFLAGS (FADF_HAVEIID
                            FADF_BSTR | FADF_UNKNOWN | FADF_DISPATCH | \
                            FADF_VARIANT | FADF_CREATEVECTOR)

-unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(unsigned long *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa)
+unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, LPSAFEARRAY *ppsa)
 {
     ULONG_PTR ptr;
     wireSAFEARRAY wiresa;
diff --git a/tools/widl/header.c b/tools/widl/header.c
index 52db075..a1ef5ed 100644
--- a/tools/widl/header.c
+++ b/tools/widl/header.c
@@ -334,7 +334,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  (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, "unsigned char * __RPC_USER %s_UserUnmarshal(ULONG *, unsigned char *, %s *);\n", name, name);
     fprintf(header, "void            __RPC_USER %s_UserFree     (unsigned long *, %s *);\n", name, name);
   }
 }