November 2006 - Wine-Commits

Michael Stefaniuc : rpcndr.h: Use ULONG/LONG/ DWORD for Win64 compatibility instead of unsigned long/long.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 9023bc0d131aa33ec79d89e3450fdd538d276f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9023bc0d131aa33ec79d89e34… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 8 23:44:33 2006 +0100 rpcndr.h: Use ULONG/LONG/DWORD for Win64 compatibility instead of unsigned long/long. --- include/rpcndr.h | 140 +++++++++++++++++++++++++++--------------------------- 1 files changed, 70 insertions(+), 70 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9023bc0d131aa33ec79d8…

1 0

Michael Stefaniuc : widl: Use ULONG instead of unsigned long when generating declarations for *_UserFree () functions. This is needed for Win64 compatibility.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: cc234847d05ee042a60354fc67e502298b9ff695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc234847d05ee042a60354fc6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 8 23:44:10 2006 +0100 widl: Use ULONG instead of unsigned long when generating declarations for *_UserFree() functions. This is needed for Win64 compatibility. --- dlls/ole32/usrmarshal.c | 24 ++++++++++++------------ dlls/oleaut32/usrmarshal.c | 16 ++++++++-------- tools/widl/header.c | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index ae23307..4d39775 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -234,7 +234,7 @@ unsigned char * __RPC_USER CLIPFORMAT_Us * structure, of which the first parameter is an unsigned long. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER CLIPFORMAT_UserFree(unsigned long *pFlags, CLIPFORMAT *pCF) +void __RPC_USER CLIPFORMAT_UserFree(ULONG *pFlags, CLIPFORMAT *pCF) { /* there is no inverse of the RegisterClipboardFormat function, * so nothing to do */ @@ -274,7 +274,7 @@ static unsigned char * __RPC_USER handle return pBuffer + sizeof(RemotableHandle); } -static void __RPC_USER handle_UserFree(unsigned long *pFlags, HANDLE *phMenu) +static void __RPC_USER handle_UserFree(ULONG *pFlags, HANDLE *phMenu) { /* nothing to do */ } @@ -298,7 +298,7 @@ #define IMPL_WIREM_HANDLE(type) \ return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \ } \ \ - void __RPC_USER type##_UserFree(unsigned long *pFlags, type *handle) \ + void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \ { \ TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *handle); \ return handle_UserFree(pFlags, (HANDLE *)handle); \ @@ -449,7 +449,7 @@ unsigned char * __RPC_USER HGLOBAL_UserU /****************************************************************************** * HGLOBAL_UserFree [OLE32.@] */ -void __RPC_USER HGLOBAL_UserFree(unsigned long *pFlags, HGLOBAL *phGlobal) +void __RPC_USER HGLOBAL_UserFree(ULONG *pFlags, HGLOBAL *phGlobal) { TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *phGlobal); @@ -475,7 +475,7 @@ unsigned char * __RPC_USER HBITMAP_UserU return pBuffer; } -void __RPC_USER HBITMAP_UserFree(unsigned long *pFlags, HBITMAP *phBmp) +void __RPC_USER HBITMAP_UserFree(ULONG *pFlags, HBITMAP *phBmp) { FIXME(":stub\n"); } @@ -498,7 +498,7 @@ unsigned char * __RPC_USER HDC_UserUnmar return pBuffer; } -void __RPC_USER HDC_UserFree(unsigned long *pFlags, HDC *phdc) +void __RPC_USER HDC_UserFree(ULONG *pFlags, HDC *phdc) { FIXME(":stub\n"); } @@ -521,7 +521,7 @@ unsigned char * __RPC_USER HPALETTE_User return pBuffer; } -void __RPC_USER HPALETTE_UserFree(unsigned long *pFlags, HPALETTE *phPal) +void __RPC_USER HPALETTE_UserFree(ULONG *pFlags, HPALETTE *phPal) { FIXME(":stub\n"); } @@ -635,7 +635,7 @@ unsigned char * __RPC_USER HENHMETAFILE_ return pBuffer; } -void __RPC_USER HENHMETAFILE_UserFree(unsigned long *pFlags, HENHMETAFILE *phEmf) +void __RPC_USER HENHMETAFILE_UserFree(ULONG *pFlags, HENHMETAFILE *phEmf) { TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *phEmf); @@ -805,7 +805,7 @@ unsigned char * __RPC_USER STGMEDIUM_Use return pBuffer; } -void __RPC_USER STGMEDIUM_UserFree(unsigned long *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) { TRACE("("); dump_user_flags(pFlags); TRACE(", %p\n", pStgMedium); @@ -830,7 +830,7 @@ unsigned char * __RPC_USER ASYNC_STGMEDI return pBuffer; } -void __RPC_USER ASYNC_STGMEDIUM_UserFree(unsigned long *pFlags, ASYNC_STGMEDIUM *pStgMedium) +void __RPC_USER ASYNC_STGMEDIUM_UserFree(ULONG *pFlags, ASYNC_STGMEDIUM *pStgMedium) { FIXME(":stub\n"); } @@ -853,7 +853,7 @@ unsigned char * __RPC_USER FLAG_STGMEDIU return pBuffer; } -void __RPC_USER FLAG_STGMEDIUM_UserFree(unsigned long *pFlags, FLAG_STGMEDIUM *pStgMedium) +void __RPC_USER FLAG_STGMEDIUM_UserFree(ULONG *pFlags, FLAG_STGMEDIUM *pStgMedium) { FIXME(":stub\n"); } @@ -876,7 +876,7 @@ unsigned char * __RPC_USER SNB_UserUnmar return pBuffer; } -void __RPC_USER SNB_UserFree(unsigned long *pFlags, SNB *pSnb) +void __RPC_USER SNB_UserFree(ULONG *pFlags, SNB *pSnb) { FIXME(":stub\n"); } diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index f8c56f1..07000a1 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -128,7 +128,7 @@ unsigned char * WINAPI CLEANLOCALSTORAGE return Buffer + sizeof(DWORD); } -void WINAPI CLEANLOCALSTORAGE_UserFree(unsigned long *pFlags, CLEANLOCALSTORAGE *pstr) +void WINAPI CLEANLOCALSTORAGE_UserFree(ULONG *pFlags, CLEANLOCALSTORAGE *pstr) { /* Nothing to do */ } @@ -197,7 +197,7 @@ unsigned char * WINAPI BSTR_UserUnmarsha return Buffer + sizeof(*header) + sizeof(OLECHAR) * header->len; } -void WINAPI BSTR_UserFree(unsigned long *pFlags, BSTR *pstr) +void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) { TRACE("(%lx,%p) => %p\n", *pFlags, pstr, *pstr); if (*pstr) @@ -277,7 +277,7 @@ static unsigned int get_type_alignment(U return 7; } -static unsigned interface_variant_size(unsigned long *pFlags, REFIID riid, VARIANT *pvar) +static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, VARIANT *pvar) { ULONG size; HRESULT hr; @@ -295,7 +295,7 @@ static unsigned interface_variant_size(u return size; } -static unsigned long wire_extra_user_size(unsigned long *pFlags, unsigned long Start, VARIANT *pvar) +static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) { if (V_ISARRAY(pvar)) { @@ -329,7 +329,7 @@ static unsigned long wire_extra_user_siz } /* helper: called for VT_DISPATCH variants to marshal the IDispatch* into the buffer. returns Buffer on failure, new position otherwise */ -static unsigned char* interface_variant_marshal(unsigned long *pFlags, unsigned char *Buffer, REFIID riid, VARIANT *pvar) +static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, VARIANT *pvar) { IStream *working; HGLOBAL working_mem; @@ -378,7 +378,7 @@ static unsigned char* interface_variant_ } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer. returns Buffer on failure, new position otherwise */ -static unsigned char *interface_variant_unmarshal(unsigned long *pFlags, unsigned char *Buffer, REFIID riid, VARIANT *pvar) +static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, VARIANT *pvar) { IStream *working; HGLOBAL working_mem; @@ -631,7 +631,7 @@ unsigned char * WINAPI VARIANT_UserUnmar return Pos; } -void WINAPI VARIANT_UserFree(unsigned long *pFlags, VARIANT *pvar) +void WINAPI VARIANT_UserFree(ULONG *pFlags, VARIANT *pvar) { VARTYPE vt = V_VT(pvar); PVOID ref = NULL; @@ -1070,7 +1070,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserU return Buffer; } -void WINAPI LPSAFEARRAY_UserFree(unsigned long *pFlags, LPSAFEARRAY *ppsa) +void WINAPI LPSAFEARRAY_UserFree(ULONG *pFlags, LPSAFEARRAY *ppsa) { TRACE("("); dump_user_flags(pFlags); TRACE(", &%p\n", *ppsa); diff --git a/tools/widl/header.c b/tools/widl/header.c index a1ef5ed..23731f7 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -335,7 +335,7 @@ void write_user_types(void) 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(ULONG *, unsigned char *, %s *);\n", name, name); - fprintf(header, "void __RPC_USER %s_UserFree (unsigned long *, %s *);\n", name, name); + fprintf(header, "void __RPC_USER %s_UserFree (ULONG *, %s *);\n", name, name); } }

1 0

Michael Stefaniuc : widl: Use ULONG instead of unsigned long when generating declarations for *_UserUnMarshal () functions. This is needed for Win64 compatibility.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 6f9504703419b0c778f3d9cfb59cae111d2eb908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9504703419b0c778f3d9cfb… Author: Michael Stefaniuc <mstefani(a)redhat.de> 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); } }

1 0

Michael Stefaniuc : widl: Use ULONG instead of unsigned long when generating declarations for *_UserMarshal () functions. This is needed for Win64 compatibility.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 05b1aac1005aaf8c5375c2af7459679917d8388d URL: http://source.winehq.org/git/wine.git/?a=commit;h=05b1aac1005aaf8c5375c2af7… Author: Michael Stefaniuc <mstefani(a)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); }

1 0

Michael Stefaniuc : widl: Use ULONG instead of unsigned long when generating declarations for *_UserSize () functions. This is needed for Win64 compatibility.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 177aaf67385fbfbaa1008f072a16e2181d6ab390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=177aaf67385fbfbaa1008f072… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 8 23:43:28 2006 +0100 widl: Use ULONG instead of unsigned long when generating declarations for *_UserSize() functions. This is needed for Win64 compatibility. --- dlls/ole32/usrmarshal.c | 34 +++++++++++++++++----------------- dlls/oleaut32/usrmarshal.c | 10 +++++----- tools/widl/header.c | 2 +- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 7555793..fe5e474 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -79,9 +79,9 @@ static void dump_user_flags(unsigned lon * the first parameter is an unsigned long. * This function is only intended to be called by the RPC runtime. */ -unsigned long __RPC_USER CLIPFORMAT_UserSize(unsigned long *pFlags, unsigned long StartingSize, CLIPFORMAT *pCF) +ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG StartingSize, CLIPFORMAT *pCF) { - unsigned long size = StartingSize; + ULONG size = StartingSize; TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, pCF); @@ -240,7 +240,7 @@ void __RPC_USER CLIPFORMAT_UserFree(unsi * so nothing to do */ } -static unsigned long __RPC_USER handle_UserSize(unsigned long *pFlags, unsigned long StartingSize, HANDLE *handle) +static ULONG __RPC_USER handle_UserSize(ULONG *pFlags, ULONG StartingSize, HANDLE *handle) { if (LOWORD(*pFlags) == MSHCTX_DIFFERENTMACHINE) { @@ -280,7 +280,7 @@ static void __RPC_USER handle_UserFree(u } #define IMPL_WIREM_HANDLE(type) \ - unsigned long __RPC_USER type##_UserSize(unsigned long *pFlags, unsigned long StartingSize, type *handle) \ + ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \ { \ TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, handle); \ return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \ @@ -311,9 +311,9 @@ IMPL_WIREM_HANDLE(HWND) /****************************************************************************** * HGLOBAL_UserSize [OLE32.@] */ -unsigned long __RPC_USER HGLOBAL_UserSize(unsigned long *pFlags, unsigned long StartingSize, HGLOBAL *phGlobal) +ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *phGlobal) { - unsigned long size = StartingSize; + ULONG size = StartingSize; TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, phGlobal); @@ -331,7 +331,7 @@ unsigned long __RPC_USER HGLOBAL_UserSiz SIZE_T ret; size += 3 * sizeof(ULONG); ret = GlobalSize(*phGlobal); - size += (unsigned long)ret; + size += (ULONG)ret; } } @@ -457,7 +457,7 @@ void __RPC_USER HGLOBAL_UserFree(unsigne GlobalFree(*phGlobal); } -unsigned long __RPC_USER HBITMAP_UserSize(unsigned long *pFlags, unsigned long StartingSize, HBITMAP *phBmp) +ULONG __RPC_USER HBITMAP_UserSize(ULONG *pFlags, ULONG StartingSize, HBITMAP *phBmp) { FIXME(":stub\n"); return StartingSize; @@ -480,7 +480,7 @@ void __RPC_USER HBITMAP_UserFree(unsigne FIXME(":stub\n"); } -unsigned long __RPC_USER HDC_UserSize(unsigned long *pFlags, unsigned long StartingSize, HDC *phdc) +ULONG __RPC_USER HDC_UserSize(ULONG *pFlags, ULONG StartingSize, HDC *phdc) { FIXME(":stub\n"); return StartingSize; @@ -503,7 +503,7 @@ void __RPC_USER HDC_UserFree(unsigned lo FIXME(":stub\n"); } -unsigned long __RPC_USER HPALETTE_UserSize(unsigned long *pFlags, unsigned long StartingSize, HPALETTE *phPal) +ULONG __RPC_USER HPALETTE_UserSize(ULONG *pFlags, ULONG StartingSize, HPALETTE *phPal) { FIXME(":stub\n"); return StartingSize; @@ -527,9 +527,9 @@ void __RPC_USER HPALETTE_UserFree(unsign } -unsigned long __RPC_USER HENHMETAFILE_UserSize(unsigned long *pFlags, unsigned long StartingSize, HENHMETAFILE *phEmf) +ULONG __RPC_USER HENHMETAFILE_UserSize(ULONG *pFlags, ULONG StartingSize, HENHMETAFILE *phEmf) { - unsigned long size = StartingSize; + ULONG size = StartingSize; TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *phEmf); @@ -643,9 +643,9 @@ void __RPC_USER HENHMETAFILE_UserFree(un DeleteEnhMetaFile(*phEmf); } -unsigned long __RPC_USER STGMEDIUM_UserSize(unsigned long *pFlags, unsigned long StartingSize, STGMEDIUM *pStgMedium) +ULONG __RPC_USER STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, STGMEDIUM *pStgMedium) { - unsigned long size = StartingSize; + ULONG size = StartingSize; TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, pStgMedium); @@ -812,7 +812,7 @@ void __RPC_USER STGMEDIUM_UserFree(unsig ReleaseStgMedium(pStgMedium); } -unsigned long __RPC_USER ASYNC_STGMEDIUM_UserSize(unsigned long *pFlags, unsigned long StartingSize, ASYNC_STGMEDIUM *pStgMedium) +ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) { FIXME(":stub\n"); return StartingSize; @@ -835,7 +835,7 @@ void __RPC_USER ASYNC_STGMEDIUM_UserFree FIXME(":stub\n"); } -unsigned long __RPC_USER FLAG_STGMEDIUM_UserSize(unsigned long *pFlags, unsigned long StartingSize, FLAG_STGMEDIUM *pStgMedium) +ULONG __RPC_USER FLAG_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, FLAG_STGMEDIUM *pStgMedium) { FIXME(":stub\n"); return StartingSize; @@ -858,7 +858,7 @@ void __RPC_USER FLAG_STGMEDIUM_UserFree( FIXME(":stub\n"); } -unsigned long __RPC_USER SNB_UserSize(unsigned long *pFlags, unsigned long StartingSize, SNB *pSnb) +ULONG __RPC_USER SNB_UserSize(ULONG *pFlags, ULONG StartingSize, SNB *pSnb) { FIXME(":stub\n"); return StartingSize; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index ddc55a2..17e2479 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -85,7 +85,7 @@ #define CLS_LIBATTR 'l' #define CLS_TYPEATTR 't' #define CLS_VARDESC 'v' -unsigned long WINAPI CLEANLOCALSTORAGE_UserSize(unsigned long *pFlags, unsigned long Start, CLEANLOCALSTORAGE *pstg) +ULONG WINAPI CLEANLOCALSTORAGE_UserSize(ULONG *pFlags, ULONG Start, CLEANLOCALSTORAGE *pstg) { ALIGN_LENGTH(Start, 3); return Start + sizeof(DWORD); @@ -142,7 +142,7 @@ typedef struct DWORD len2; /* == len */ } bstr_wire_t; -unsigned long WINAPI BSTR_UserSize(unsigned long *pFlags, unsigned long Start, BSTR *pstr) +ULONG WINAPI BSTR_UserSize(ULONG *pFlags, ULONG Start, BSTR *pstr) { TRACE("(%lx,%ld,%p) => %p\n", *pFlags, Start, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); @@ -424,7 +424,7 @@ static unsigned char *interface_variant_ } -unsigned long WINAPI VARIANT_UserSize(unsigned long *pFlags, unsigned long Start, VARIANT *pvar) +ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) { int align; TRACE("(%lx,%ld,%p)\n", *pFlags, Start, pvar); @@ -732,9 +732,9 @@ static inline SF_TYPE SAFEARRAY_GetUnion } } -unsigned long WINAPI LPSAFEARRAY_UserSize(unsigned long *pFlags, unsigned long StartingSize, LPSAFEARRAY *ppsa) +ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) { - unsigned long size = StartingSize; + ULONG size = StartingSize; TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); diff --git a/tools/widl/header.c b/tools/widl/header.c index 9d816ef..b149fb4 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -332,7 +332,7 @@ void write_user_types(void) for (ut = user_type_list; ut; ut = ut->next) { const char *name = ut->name; - fprintf(header, "unsigned long __RPC_USER %s_UserSize (unsigned long *, unsigned long, %s *);\n", name, 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_UserUnmarshal(unsigned long *, unsigned char *, %s *);\n", name, name); fprintf(header, "void __RPC_USER %s_UserFree (unsigned long *, %s *);\n", name, name);

1 0

Kai Blin : secur32: Implement ntlmv2 signing.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 13603394222dfb936447d6b6c5ca6bdf236aa1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=13603394222dfb936447d6b6c… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Nov 8 21:53:23 2006 +0100 secur32: Implement ntlmv2 signing. --- dlls/secur32/ntlm.c | 96 +++++++++++++++++++++++++++++++++++++++---- dlls/secur32/secur32_priv.h | 11 +++++ dlls/secur32/util.c | 62 +++++++++++++++++++++++++++ 3 files changed, 161 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=13603394222dfb936447d…

1 0

Kai Blin : secur32: MD5 functions are WINAPI.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 78bcfdfce691caafbfb8a1bcadaeb72f6b4ad7c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78bcfdfce691caafbfb8a1bca… Author: Kai Blin <kai.blin(a)gmail.com> Date: Wed Nov 8 21:52:05 2006 +0100 secur32: MD5 functions are WINAPI. --- dlls/secur32/hmac_md5.h | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/hmac_md5.h b/dlls/secur32/hmac_md5.h index 29e3a33..3a94bb0 100644 --- a/dlls/secur32/hmac_md5.h +++ b/dlls/secur32/hmac_md5.h @@ -22,6 +22,7 @@ #ifndef _HMAC_MD5_H_ #define _HMAC_MD5_H_ #include <string.h> +#include "windef.h" typedef struct { @@ -37,9 +38,9 @@ typedef struct unsigned char outer_padding[64]; } HMAC_MD5_CTX; -void MD5Init( MD5_CTX *ctx ); -void MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); -void MD5Final( MD5_CTX *ctx ); +void WINAPI MD5Init( MD5_CTX *ctx ); +void WINAPI MD5Update( MD5_CTX *ctx, const unsigned char *buf, unsigned int len ); +void WINAPI MD5Final( MD5_CTX *ctx ); void HMACMD5Init(HMAC_MD5_CTX *ctx, unsigned char *key, unsigned int key_len); void HMACMD5Update(HMAC_MD5_CTX *ctx, unsigned char *data, unsigned int data_len);

1 0

Rob Shearman : rpcrt4: For TCP endpoints, bind to all the address and ports that getaddrinfo for the machine.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 0345a578b560ffd427ee8b990cf01b8cfe08fd27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0345a578b560ffd427ee8b990… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 8 20:47:08 2006 +0000 rpcrt4: For TCP endpoints, bind to all the address and ports that getaddrinfo for the machine. --- dlls/rpcrt4/rpc_transport.c | 41 +++++++++++++++++++++++++++++------------ 1 files changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 66d2811..ac6c5c2 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -736,6 +736,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i struct addrinfo *ai; struct addrinfo *ai_cur; struct addrinfo hints; + RpcConnection *first_connection = NULL; TRACE("(%p, %s)\n", protseq, endpoint); @@ -761,6 +762,8 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i for (ai_cur = ai; ai_cur; ai_cur = ai_cur->ai_next) { RpcConnection_tcp *tcpc; + RPC_STATUS create_status; + if (TRACE_ON(rpc)) { char host[256]; @@ -790,20 +793,22 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i status = RPC_S_CANT_CREATE_ENDPOINT; continue; } - status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, - protseq->Protseq, NULL, endpoint, NULL, - NULL, NULL); - if (status != RPC_S_OK) + create_status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, + protseq->Protseq, NULL, + endpoint, NULL, NULL, NULL); + if (create_status != RPC_S_OK) { close(sock); + status = create_status; continue; } + tcpc->sock = sock; ret = listen(sock, protseq->MaxCalls); if (ret < 0) { WARN("listen failed: %s\n", strerror(errno)); - close(sock); + RPCRT4_DestroyConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } @@ -815,24 +820,36 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i if (ret < 0) { WARN("couldn't make socket non-blocking, error %d\n", ret); - close(sock); + RPCRT4_DestroyConnection(&tcpc->common); status = RPC_S_OUT_OF_RESOURCES; continue; } - tcpc->sock = sock; - freeaddrinfo(ai); + tcpc->common.Next = first_connection; + first_connection = &tcpc->common; + } + + freeaddrinfo(ai); + + /* if at least one connection was created for an endpoint then + * return success */ + if (first_connection) + { + RpcConnection *conn; + + /* find last element in list */ + for (conn = first_connection; conn->Next; conn = conn->Next) + ; EnterCriticalSection(&protseq->cs); - tcpc->common.Next = protseq->conn; - protseq->conn = &tcpc->common; + conn->Next = protseq->conn; + protseq->conn = first_connection; LeaveCriticalSection(&protseq->cs); - + TRACE("listening on %s\n", endpoint); return RPC_S_OK; } - freeaddrinfo(ai); ERR("couldn't listen on port %s\n", endpoint); return status; }

1 0

Rob Shearman : rpcrt4: The error code RPC_S_SERVER_UNAVAILABLE doesn' t make much sense on the server side
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 34577de406ffa9fa1ad9d27364c3defd3989b555 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34577de406ffa9fa1ad9d2736… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 8 20:45:55 2006 +0000 rpcrt4: The error code RPC_S_SERVER_UNAVAILABLE doesn't make much sense on the server side so replace it with some more appropriate endpoint error codes. --- dlls/rpcrt4/rpc_transport.c | 24 ++++++++++++++++++------ 1 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4679e71..20d318d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -125,7 +125,7 @@ static RPC_STATUS rpcrt4_conn_listen_pip return RPC_S_OK; } npc->listening = FALSE; - return RPC_S_SERVER_UNAVAILABLE; + return RPC_S_OUT_OF_RESOURCES; } static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) @@ -139,7 +139,10 @@ static RPC_STATUS rpcrt4_conn_create_pip RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); if (npc->pipe == INVALID_HANDLE_VALUE) { WARN("CreateNamedPipe failed with error %ld\n", GetLastError()); - return RPC_S_SERVER_UNAVAILABLE; + if (GetLastError() == ERROR_FILE_EXISTS) + return RPC_S_DUPLICATE_ENDPOINT; + else + return RPC_S_CANT_CREATE_ENDPOINT; } memset(&npc->ovl, 0, sizeof(npc->ovl)); @@ -727,7 +730,7 @@ static RPC_STATUS rpcrt4_ncacn_ip_tcp_op static RPC_STATUS rpcrt4_protseq_ncacn_ip_tcp_open_endpoint(RpcServerProtseq *protseq, LPSTR endpoint) { - RPC_STATUS status; + RPC_STATUS status = RPC_S_CANT_CREATE_ENDPOINT; int sock; int ret; struct addrinfo *ai; @@ -750,7 +753,9 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i { ERR("getaddrinfo for port %s failed: %s\n", endpoint, gai_strerror(ret)); - return RPC_S_SERVER_UNAVAILABLE; + if ((ret == EAI_SERVICE) || (ret == EAI_NONAME)) + return RPC_S_INVALID_ENDPOINT_FORMAT; + return RPC_S_CANT_CREATE_ENDPOINT; } for (ai_cur = ai; ai_cur; ai_cur = ai_cur->ai_next) @@ -770,6 +775,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i if (sock < 0) { WARN("socket() failed: %s\n", strerror(errno)); + status = RPC_S_CANT_CREATE_ENDPOINT; continue; } @@ -778,6 +784,10 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i { WARN("bind failed: %s\n", strerror(errno)); close(sock); + if (errno == EADDRINUSE) + status = RPC_S_DUPLICATE_ENDPOINT; + else + status = RPC_S_CANT_CREATE_ENDPOINT; continue; } status = RPCRT4_CreateConnection((RpcConnection **)&tcpc, TRUE, @@ -794,6 +804,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i { WARN("listen failed: %s\n", strerror(errno)); close(sock); + status = RPC_S_OUT_OF_RESOURCES; continue; } /* need a non-blocking socket, otherwise accept() has a potential @@ -805,6 +816,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i { WARN("couldn't make socket non-blocking, error %d\n", ret); close(sock); + status = RPC_S_OUT_OF_RESOURCES; continue; } tcpc->sock = sock; @@ -822,7 +834,7 @@ static RPC_STATUS rpcrt4_protseq_ncacn_i freeaddrinfo(ai); ERR("couldn't listen on port %s\n", endpoint); - return RPC_S_SERVER_UNAVAILABLE; + return status; } static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) @@ -838,7 +850,7 @@ static RPC_STATUS rpcrt4_conn_tcp_handof if (ret < 0) { ERR("Failed to accept a TCP connection: error %d\n", ret); - return RPC_S_SERVER_UNAVAILABLE; + return RPC_S_OUT_OF_RESOURCES; } /* reset to blocking behaviour */ fcntl(ret, F_SETFL, 0);

1 0

Rob Shearman : rpcrt4: Open the endpoint from the caller of RpcServerUseProtseq* instead of the protseq server thread .
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 8b6c30ab4b48a5f4c9a32920dd389d218b459540 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b6c30ab4b48a5f4c9a32920d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Nov 8 20:45:19 2006 +0000 rpcrt4: Open the endpoint from the caller of RpcServerUseProtseq* instead of the protseq server thread. This allows errors to be returned to the caller and to create more than one connection for an endpoint. --- dlls/rpcrt4/rpc_binding.c | 2 +- dlls/rpcrt4/rpc_binding.h | 4 +- dlls/rpcrt4/rpc_server.c | 3 +- dlls/rpcrt4/rpc_server.h | 2 + dlls/rpcrt4/rpc_transport.c | 302 ++++++++++++++++++++++++++++++++---------- 5 files changed, 236 insertions(+), 77 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b6c30ab4b48a5f4c9a32…

1 0