From 7930ada8516fba38eaad61cf32d6b48fd40ddef2 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Mon, 19 Apr 2004 23:03:58 +0000 Subject: [PATCH] Fix some RPC prototypes to get it compiling with W32API. --- dlls/rpcrt4/rpc_binding.c | 20 ++++++++++---------- dlls/rpcrt4/rpc_epmap.c | 8 ++++---- dlls/rpcrt4/rpc_server.c | 9 ++++----- include/rpcdce.h | 28 ++++++++++++++-------------- 4 files changed, 32 insertions(+), 33 deletions(-) diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index fb927c276de..857c921ec16 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -553,9 +553,9 @@ static LPWSTR RPCRT4_strconcatW(LPWSTR dst, LPCWSTR src) /*********************************************************************** * RpcStringBindingComposeA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingComposeA( LPSTR ObjUuid, LPSTR Protseq, - LPSTR NetworkAddr, LPSTR Endpoint, - LPSTR Options, LPSTR* StringBinding ) +RPC_STATUS WINAPI RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char *Protseq, + unsigned char *NetworkAddr, unsigned char *Endpoint, + unsigned char *Options, unsigned char** StringBinding ) { DWORD len = 1; LPSTR data; @@ -658,9 +658,9 @@ RPC_STATUS WINAPI RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, /*********************************************************************** * RpcStringBindingParseA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingParseA( LPSTR StringBinding, LPSTR *ObjUuid, - LPSTR *Protseq, LPSTR *NetworkAddr, - LPSTR *Endpoint, LPSTR *Options) +RPC_STATUS WINAPI RpcStringBindingParseA( unsigned char *StringBinding, unsigned char **ObjUuid, + unsigned char **Protseq, unsigned char **NetworkAddr, + unsigned char **Endpoint, unsigned char **Options) { CHAR *data, *next; static const char ep_opt[] = "endpoint="; @@ -892,11 +892,11 @@ RPC_STATUS WINAPI RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectU /*********************************************************************** * RpcBindingFromStringBindingA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFromStringBindingA( LPSTR StringBinding, RPC_BINDING_HANDLE* Binding ) +RPC_STATUS WINAPI RpcBindingFromStringBindingA( unsigned char *StringBinding, RPC_BINDING_HANDLE* Binding ) { RPC_STATUS ret; RpcBinding* bind = NULL; - LPSTR ObjectUuid, Protseq, NetworkAddr, Endpoint, Options; + unsigned char *ObjectUuid, *Protseq, *NetworkAddr, *Endpoint, *Options; UUID Uuid; TRACE("(%s,%p)\n", debugstr_a(StringBinding), Binding); @@ -970,7 +970,7 @@ RPC_STATUS WINAPI RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDIN /*********************************************************************** * RpcBindingToStringBindingA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, LPSTR* StringBinding ) +RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char** StringBinding ) { RPC_STATUS ret; RpcBinding* bind = (RpcBinding*)Binding; @@ -995,7 +995,7 @@ RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, LPSTR* RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, LPWSTR* StringBinding ) { RPC_STATUS ret; - LPSTR str = NULL; + unsigned char *str = NULL; TRACE("(%p,%p)\n", Binding, StringBinding); ret = RpcBindingToStringBindingA(Binding, &str); *StringBinding = RPCRT4_strdupAtoW(str); diff --git a/dlls/rpcrt4/rpc_epmap.c b/dlls/rpcrt4/rpc_epmap.c index c560495954d..1d8eeb2b00a 100644 --- a/dlls/rpcrt4/rpc_epmap.c +++ b/dlls/rpcrt4/rpc_epmap.c @@ -66,8 +66,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); /*********************************************************************** * RpcEpRegisterA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, PRPC_BINDING_VECTOR BindingVector, - PUUID_VECTOR UuidVector, LPSTR Annotation ) +RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector, unsigned char *Annotation ) { RPCSS_NP_MESSAGE msg; RPCSS_NP_REPLY reply; @@ -139,8 +139,8 @@ RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, PRPC_BINDING_VECTOR Bind /*********************************************************************** * RpcEpUnregister (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, PRPC_BINDING_VECTOR BindingVector, - PUUID_VECTOR UuidVector ) +RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, + UUID_VECTOR *UuidVector ) { RPCSS_NP_MESSAGE msg; RPCSS_NP_REPLY reply; diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 5a9bfa1d614..4b45123e9d7 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -612,7 +612,7 @@ RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) /*********************************************************************** * RpcServerUseProtseqEpA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpA( LPSTR Protseq, UINT MaxCalls, LPSTR Endpoint, LPVOID SecurityDescriptor ) +RPC_STATUS WINAPI RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor ) { RPC_POLICY policy; @@ -646,7 +646,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR /*********************************************************************** * RpcServerUseProtseqEpExA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpExA( LPSTR Protseq, UINT MaxCalls, LPSTR Endpoint, LPVOID SecurityDescriptor, +RPC_STATUS WINAPI RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { RpcServerProtseq* ps; @@ -686,7 +686,7 @@ RPC_STATUS WINAPI RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWST /*********************************************************************** * RpcServerUseProtseqA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqA(LPSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) +RPC_STATUS WINAPI RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a(Protseq), MaxCalls, SecurityDescriptor); return RpcServerUseProtseqEpA(Protseq, MaxCalls, NULL, SecurityDescriptor); @@ -749,7 +749,6 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, TRACE(" protseq endpoint count: %d\n", If->RpcProtseqEndpointCount); TRACE(" default manager epv: %p\n", If->DefaultManagerEpv); TRACE(" interpreter info: %p\n", If->InterpreterInfo); - TRACE(" flags: %08x\n", If->Flags); sif = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(RpcServerInterface)); sif->If = If; @@ -867,7 +866,7 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) /*********************************************************************** * RpcServerRegisterAuthInfoA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( LPSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, +RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg ); diff --git a/include/rpcdce.h b/include/rpcdce.h index 6f926237a7f..606bcf64344 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -118,13 +118,13 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ); RPCRTAPI RPC_STATUS RPC_ENTRY - RpcBindingFromStringBindingA( LPSTR StringBinding, RPC_BINDING_HANDLE* Binding ); + RpcBindingFromStringBindingA( unsigned char *StringBinding, RPC_BINDING_HANDLE* Binding ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDING_HANDLE* Binding ); #define RpcBindingFromStringBinding WINELIB_NAME_AW(RpcBindingFromStringBinding) RPCRTAPI RPC_STATUS RPC_ENTRY - RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, LPSTR* StringBinding ); + RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char **StringBinding ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, LPWSTR* StringBinding ); #define RpcBindingFromStringBinding WINELIB_NAME_AW(RpcBindingFromStringBinding) @@ -133,16 +133,16 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ); RPCRTAPI RPC_STATUS RPC_ENTRY - RpcStringBindingComposeA( LPSTR ObjUuid, LPSTR Protseq, LPSTR NetworkAddr, - LPSTR Endpoint, LPSTR Options, LPSTR* StringBinding ); + RpcStringBindingComposeA( unsigned char *ObjUuid, unsigned char *Protseq, unsigned char *NetworkAddr, + unsigned char *Endpoint, unsigned char *Options, unsigned char **StringBinding ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, LPWSTR NetworkAddr, LPWSTR Endpoint, LPWSTR Options, LPWSTR* StringBinding ); #define RpcStringBindingCompose WINELIB_NAME_AW(RpcStringBindingCompose) RPCRTAPI RPC_STATUS RPC_ENTRY - RpcStringBindingParseA( LPSTR StringBinding, LPSTR* ObjUuid, LPSTR* Protseq, - LPSTR* NetworkAddr, LPSTR* Endpoint, LPSTR* NetworkOptions ); + RpcStringBindingParseA( unsigned char *StringBinding, unsigned char **ObjUuid, unsigned char **Protseq, + unsigned char **NetworkAddr, unsigned char **Endpoint, unsigned char **NetworkOptions ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR* ObjUuid, LPWSTR* Protseq, LPWSTR* NetworkAddr, LPWSTR* Endpoint, LPWSTR* NetworkOptions ); @@ -153,7 +153,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcEpRegisterA( RPC_IF_HANDLE IfSpec, PRPC_BINDING_VECTOR BindingVector, - PUUID_VECTOR UuidVector, LPSTR Annotation ); + PUUID_VECTOR UuidVector, unsigned char *Annotation ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcEpRegisterW( RPC_IF_HANDLE IfSpec, PRPC_BINDING_VECTOR BindingVector, PUUID_VECTOR UuidVector, LPWSTR Annotation ); @@ -161,7 +161,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcEpRegisterNoReplaceA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR* BindingVector, - UUID_VECTOR* UuidVector, LPSTR Annotation ); + UUID_VECTOR* UuidVector, unsigned char *Annotation ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcEpRegisterNoReplaceW( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR* BindingVector, UUID_VECTOR* UuidVector, LPWSTR Annotation ); @@ -202,19 +202,19 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY - RpcServerUseProtseqA(LPSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor); + RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor); RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor); #define RpcServerUseProtseq WINELIB_NAME_AW(RpcServerUseProtseq) RPCRTAPI RPC_STATUS RPC_ENTRY - RpcServerUseProtseqEpA( LPSTR Protseq, UINT MaxCalls, LPSTR Endpoint, LPVOID SecurityDescriptor ); + RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor ); #define RpcServerUseProtseqEp WINELIB_NAME_AW(RpcServerUseProtseqEp) RPCRTAPI RPC_STATUS RPC_ENTRY - RpcServerUseProtseqEpExA( LPSTR Protseq, UINT MaxCalls, LPSTR Endpoint, LPVOID SecurityDescriptor, + RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY Policy ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor, @@ -222,7 +222,7 @@ RPCRTAPI RPC_STATUS RPC_ENTRY #define RpcServerUseProtseqEpEx WINELIB_NAME_AW(RpcServerUseProtseqEpEx) RPCRTAPI RPC_STATUS RPC_ENTRY - RpcServerRegisterAuthInfoA( LPSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, + RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, @@ -230,8 +230,8 @@ RPCRTAPI RPC_STATUS RPC_ENTRY #define RpcServerRegisterAuthInfo WINELIB_NAME_AW(RpcServerRegisterAuthInfo) RPCRTAPI RPC_STATUS RPC_ENTRY - RpcStringBindingComposeA( LPSTR ObjUuid, LPSTR Protseq, LPSTR NetworkAddr, LPSTR Endpoint, - LPSTR Options, LPSTR* StringBinding ); + RpcStringBindingComposeA( unsigned char *ObjUuid, unsigned char *Protseq, unsigned char *NetworkAddr, unsigned char *Endpoint, + unsigned char *Options, unsigned char **StringBinding ); RPCRTAPI RPC_STATUS RPC_ENTRY RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, LPWSTR NetworkAddr, LPWSTR Endpoint, LPWSTR Options, LPWSTR* StringBinding );