Sync to Wine-20041019:

Mike McCormack <mike@codeweavers.com>
- Add stub implementation for CreateProxyFromTypeInfo.
Francois Gouget <fgouget@free.fr>
- Don't define COBJMACROS in objbase.h.
- Update the Wine sources accordingly.
Vincent Beron <vberon@mecano.gme.usherb.ca>
- Fix various function prototypes.
Hans Leidekker <hans@it.vu.nl>
- Fix signed/unsigned comparison warnings.

svn path=/trunk/; revision=11346

diff --git a/reactos/lib/rpcrt4/cproxy.c b/reactos/lib/rpcrt4/cproxy.c
index 7c4ed55..35bf868 100644 (file)
--- a/reactos/lib/rpcrt4/cproxy.c
+++ b/reactos/lib/rpcrt4/cproxy.c
@@ -23,6 +23,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
@@ -330,3 +332,11 @@ ULONG WINAPI IUnknown_Release_Proxy(LPUNKNOWN iface)
   return IUnknown_Release(This->pUnkOuter);
 #endif
 }
+
+HRESULT WINAPI
+CreateProxyFromTypeInfo( LPTYPEINFO pTypeInfo, LPUNKNOWN pUnkOuter, REFIID riid,
+                         LPRPCPROXYBUFFER *ppProxy, LPVOID *ppv )
+{
+    FIXME("%p %p %s %p %p\n", pTypeInfo, pUnkOuter, debugstr_guid(riid), ppProxy, ppv);
+    return E_NOTIMPL;
+}

diff --git a/reactos/lib/rpcrt4/cpsf.c b/reactos/lib/rpcrt4/cpsf.c
index 4e5c0cb..55af27c 100644 (file)
--- a/reactos/lib/rpcrt4/cpsf.c
+++ b/reactos/lib/rpcrt4/cpsf.c
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

diff --git a/reactos/lib/rpcrt4/cstub.c b/reactos/lib/rpcrt4/cstub.c
index 83b61f2..574f63b 100644 (file)
--- a/reactos/lib/rpcrt4/cstub.c
+++ b/reactos/lib/rpcrt4/cstub.c
@@ -20,6 +20,8 @@
 
 #include <stdarg.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

diff --git a/reactos/lib/rpcrt4/ndr_midl.c b/reactos/lib/rpcrt4/ndr_midl.c
index d938c41..a1822f5 100644 (file)
--- a/reactos/lib/rpcrt4/ndr_midl.c
+++ b/reactos/lib/rpcrt4/ndr_midl.c
@@ -27,6 +27,8 @@
 #include <string.h>
 #include <assert.h>
 
+#define COBJMACROS
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

diff --git a/reactos/lib/rpcrt4/ndr_ole.c b/reactos/lib/rpcrt4/ndr_ole.c
index 3774a85..cda3dc1 100644 (file)
--- a/reactos/lib/rpcrt4/ndr_ole.c
+++ b/reactos/lib/rpcrt4/ndr_ole.c
@@ -28,8 +28,10 @@
 #include <stdio.h>
 #include <string.h>
 
+#define COBJMACROS
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"

diff --git a/reactos/lib/rpcrt4/rpc_server.c b/reactos/lib/rpcrt4/rpc_server.c
index 7f03aa8..39a0086 100644 (file)
--- a/reactos/lib/rpcrt4/rpc_server.c
+++ b/reactos/lib/rpcrt4/rpc_server.c
@@ -767,7 +767,7 @@ RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid,
 {
   PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec;
   RpcServerInterface* sif;
-  int i;
+  unsigned int i;
 
   TRACE("(%p,%s,%p,%u,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls,
          MaxRpcSize, IfCallbackFn);
@@ -905,7 +905,7 @@ RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid )
 /***********************************************************************
  *             RpcServerRegisterAuthInfoA (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
+RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
                             LPVOID Arg )
 {
   FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg );
@@ -916,7 +916,7 @@ RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, UL
 /***********************************************************************
  *             RpcServerRegisterAuthInfoW (RPCRT4.@)
  */
-RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, ULONG AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
+RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn,
                             LPVOID Arg )
 {
   FIXME( "(%s,%lu,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc, GetKeyFn, Arg );

diff --git a/reactos/lib/rpcrt4/rpcrt4.spec b/reactos/lib/rpcrt4/rpcrt4.spec
index f22e49b..b228501 100644 (file)
--- a/reactos/lib/rpcrt4/rpcrt4.spec
+++ b/reactos/lib/rpcrt4/rpcrt4.spec
@@ -573,7 +573,7 @@
 @ stub I_RpcltDebugSetPDUFilter
 @ stub I_UuidCreate
 
-@ stub CreateProxyFromTypeInfo
+@ stdcall CreateProxyFromTypeInfo(ptr ptr ptr ptr ptr)
 @ stub CreateStubFromTypeInfo
 @ stub PerformRpcInitialization
 @ stub StartServiceIfNecessary # win9x

diff --git a/reactos/lib/rpcrt4/rpcrt4_main.c b/reactos/lib/rpcrt4/rpcrt4_main.c
index 15cbabc..d223400 100644 (file)
--- a/reactos/lib/rpcrt4/rpcrt4_main.c
+++ b/reactos/lib/rpcrt4/rpcrt4_main.c
@@ -475,7 +475,7 @@ unsigned short WINAPI UuidHash(UUID *uuid, RPC_STATUS *Status)
 {
   BYTE *data = (BYTE*)uuid;
   short c0 = 0, c1 = 0, x, y;
-  int i;
+  unsigned int i;
 
   if (!uuid) data = (BYTE*)(uuid = &uuid_nil);