rpc_H_PL6

[Greg Turner <gmturner007@ameritech.net>]

LICENSE: X11

CHANGELOG:

* dlls/rpcrt4:
    rpc_binding.c, rpc_server.c;
  include:
    rpcdcep.h:
  Greg Turner <gmturner007@ameritech.net>
- remove #ifdef WINNT conditionals; just use the NT definitions.

-- 
gmt

"The purpose of government is to rein in the rights of the people"
 --President Bill Clinton, MTV interview, 1993
diff -ur -x CVS -x 'bigdif*' ../wine.test/dlls/rpcrt4/rpc_binding.c ./dlls/rpcrt4/rpc_binding.c
--- ../wine.test/dlls/rpcrt4/rpc_binding.c	2002-10-29 14:12:21.000000000 -0600
+++ ./dlls/rpcrt4/rpc_binding.c	2002-10-30 19:51:54.000000000 -0600
@@ -865,21 +865,13 @@
  *  Exists in win9x and winNT, but with different number of arguments
  *  (9x version has 3 arguments, NT has 2).
  */
-#ifdef WINNT
 RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn)
-#else
-RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, unsigned long ServerTid )
-#endif
 {
   RpcBinding* bind = (RpcBinding*)Binding;
 
-  TRACE( "(%p,%p,%ld): stub\n", Binding, BlockingFn, ServerTid );
+  TRACE( "(%p,%p): stub\n", Binding, BlockingFn );
 
   bind->BlockingFn = BlockingFn;
 
-  #ifndef WINNT
-  bind->ServerTid = ServerTid;
-  #endif
-
   return RPC_S_OK;
 }
diff -ur -x CVS -x 'bigdif*' ../wine.test/dlls/rpcrt4/rpc_server.c ./dlls/rpcrt4/rpc_server.c
--- ../wine.test/dlls/rpcrt4/rpc_server.c	2002-10-29 16:41:59.000000000 -0600
+++ ./dlls/rpcrt4/rpc_server.c	2002-10-30 20:03:17.000000000 -0600
@@ -690,7 +690,7 @@
 /***********************************************************************
  *             I_RpcWindowProc (RPCRT4.@)
  */
-UINT WINAPI I_RpcWindowProc( void* hWnd, UINT Message, UINT wParam, ULONG lParam )
+LONG WINAPI I_RpcWindowProc( HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam )
 {
   FIXME( "(%p,%08x,%08x,%08lx): stub\n", hWnd, Message, wParam, lParam );
 
diff -ur -x CVS -x 'bigdif*' ../wine.test/include/rpcdcep.h ./include/rpcdcep.h
--- ../wine.test/include/rpcdcep.h	2002-08-28 18:42:35.000000000 -0500
+++ ./include/rpcdcep.h	2002-10-30 19:46:42.000000000 -0600
@@ -93,11 +93,7 @@
 #define TRANSPORT_TYPE_LPC  0x04
 #define TRANSPORT_TYPE_WMSG 0x08
 
-#ifdef WINNT
 typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, HANDLE hSyncEvent);
-#else
-typedef RPC_STATUS (*RPC_BLOCKING_FN)(void* hWnd, void* Context, void* hSyncEvent);
-#endif
 
 RPCRTAPI RPC_STATUS RPC_ENTRY
   I_RpcGetBuffer( RPC_MESSAGE* Message );
@@ -130,25 +126,15 @@
 RPCRTAPI RPC_STATUS RPC_ENTRY
   I_RpcAsyncSendReceive( RPC_MESSAGE* Message, void* Context, HWND hWnd );
 
-#ifdef WINNT
 RPCRTAPI RPC_STATUS RPC_ENTRY
   I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn );
-#else
-RPCRTAPI RPC_STATUS RPC_ENTRY
-  I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn, unsigned long ServerTid );
-#endif
 
 /* WIN9x */
 RPCRTAPI RPC_STATUS RPC_ENTRY
   I_RpcSetThreadParams( int fClientFree, void* Context, void* hWndClient );
 
-#ifdef WINNT
 RPCRTAPI LONG RPC_ENTRY
   I_RpcWindowProc( HWND hWnd, UINT Message, WPARAM wParam, LPARAM lParam );
-#else
-RPCRTAPI unsigned int RPC_ENTRY
-  I_RpcWindowProc( void* hWnd, unsigned int Message, unsigned int wParam, unsigned long lParam );
-#endif
 
 /* WINNT */
 RPCRTAPI RPC_STATUS RPC_ENTRY