*** g:\mssdk\INCLUDE\RpcNdr.h	Wed Jul 29 17:04:18 1998
--- RpcNdr.h	Sun Jan  3 13:24:02 1999
***************
*** 200,206 ****
  #define __MIDL_USER_DEFINED
  #endif
  
! void __RPC_FAR * __RPC_USER MIDL_user_allocate(size_t);
  void             __RPC_USER MIDL_user_free( void __RPC_FAR * );
  
  #ifdef __RPC_WIN16__
--- 200,206 ----
  #define __MIDL_USER_DEFINED
  #endif
  
! void __RPC_USER * MIDL_user_allocate(size_t);
  void             __RPC_USER MIDL_user_free( void __RPC_FAR * );
  
  #ifdef __RPC_WIN16__
***************
*** 241,250 ****
  
  #define cbNDRContext 20         /* size of context on WIRE */
  
! typedef void (__RPC_USER __RPC_FAR * NDR_RUNDOWN)(void __RPC_FAR * context);
  
! typedef void (__RPC_USER __RPC_FAR * NDR_NOTIFY_ROUTINE)(void);
! typedef void (__RPC_USER __RPC_FAR * NDR_NOTIFY2_ROUTINE)(boolean flag);
  
  typedef struct _SCONTEXT_QUEUE {
      unsigned long   NumberOfObjects;
--- 241,250 ----
  
  #define cbNDRContext 20         /* size of context on WIRE */
  
! typedef void __RPC_USER (*NDR_RUNDOWN)(void __RPC_FAR * context);
  
! typedef void __RPC_USER (*NDR_NOTIFY_ROUTINE)(void);
! typedef void __RPC_USER (*NDR_NOTIFY2_ROUTINE)(boolean flag);
  
  typedef struct _SCONTEXT_QUEUE {
      unsigned long   NumberOfObjects;
***************
*** 657,664 ****
      );
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  midl_allocate (
      size_t      size
      );
--- 657,664 ----
      );
  
  RPCRTAPI
! void
! RPC_ENTRY __RPC_FAR *
  midl_allocate (
      size_t      size
      );
***************
*** 759,765 ****
  typedef unsigned long             RPC_LENGTH;
  
  // Expression evaluation callback routine prototype.
! typedef void (__RPC_USER __RPC_FAR * EXPR_EVAL)( struct _MIDL_STUB_MESSAGE __RPC_FAR * );
  
  typedef const unsigned char __RPC_FAR * PFORMAT_STRING;
  
--- 759,765 ----
  typedef unsigned long             RPC_LENGTH;
  
  // Expression evaluation callback routine prototype.
! typedef void __RPC_USER (*EXPR_EVAL)( struct _MIDL_STUB_MESSAGE __RPC_FAR * );
  
  typedef const unsigned char __RPC_FAR * PFORMAT_STRING;
  
***************
*** 884,891 ****
      unsigned long               ActualCount;
  
      /* Allocation and Free routine to be used by the Ndr routines. */
!     void __RPC_FAR *    (__RPC_FAR __RPC_API * pfnAllocate)(size_t);
!     void                (__RPC_FAR __RPC_API * pfnFree)(void __RPC_FAR *);
  
      /*
       * Top of parameter stack.  Used for "single call" stubs during marshalling
--- 884,891 ----
      unsigned long               ActualCount;
  
      /* Allocation and Free routine to be used by the Ndr routines. */
!     void __RPC_FAR __RPC_API *    (* pfnAllocate)(size_t);
!     void                __RPC_API (* pfnFree)(void __RPC_FAR *);
  
      /*
       * Top of parameter stack.  Used for "single call" stubs during marshalling
***************
*** 992,1002 ****
  /*
   * Generic handle bind/unbind routine pair.
   */
! typedef void __RPC_FAR *
!         (__RPC_FAR __RPC_API * GENERIC_BINDING_ROUTINE)
          (void __RPC_FAR *);
! typedef void
!         (__RPC_FAR __RPC_API * GENERIC_UNBIND_ROUTINE)
          (void __RPC_FAR *, unsigned char __RPC_FAR *);
  
  typedef struct _GENERIC_BINDING_ROUTINE_PAIR
--- 992,1002 ----
  /*
   * Generic handle bind/unbind routine pair.
   */
! typedef void __RPC_API *
!         (* GENERIC_BINDING_ROUTINE)
          (void __RPC_FAR *);
! typedef void __RPC_API * 
!         (* GENERIC_UNBIND_ROUTINE)
          (void __RPC_FAR *, unsigned char __RPC_FAR *);
  
  typedef struct _GENERIC_BINDING_ROUTINE_PAIR
***************
*** 1024,1030 ****
  #endif
  
  
! typedef void (__RPC_FAR __RPC_USER * XMIT_HELPER_ROUTINE)
      ( PMIDL_STUB_MESSAGE );
  
  typedef struct _XMIT_ROUTINE_QUINTUPLE
--- 1024,1030 ----
  #endif
  
  
! typedef void __RPC_FAR __RPC_USER (* XMIT_HELPER_ROUTINE)
      ( PMIDL_STUB_MESSAGE );
  
  typedef struct _XMIT_ROUTINE_QUINTUPLE
***************
*** 1036,1059 ****
      } XMIT_ROUTINE_QUINTUPLE, __RPC_FAR *PXMIT_ROUTINE_QUINTUPLE;
  
  typedef unsigned long
! (__RPC_FAR __RPC_USER * USER_MARSHAL_SIZING_ROUTINE)
      (unsigned long __RPC_FAR *,
       unsigned long,
       void __RPC_FAR * );
  
! typedef unsigned char __RPC_FAR *
! (__RPC_FAR __RPC_USER * USER_MARSHAL_MARSHALLING_ROUTINE)
      (unsigned long __RPC_FAR *,
       unsigned char  __RPC_FAR * ,
       void __RPC_FAR * );
  
! typedef unsigned char __RPC_FAR *
! (__RPC_FAR __RPC_USER * USER_MARSHAL_UNMARSHALLING_ROUTINE)
      (unsigned long __RPC_FAR *,
       unsigned char  __RPC_FAR * ,
       void __RPC_FAR * );
  
! typedef void (__RPC_FAR __RPC_USER * USER_MARSHAL_FREEING_ROUTINE)
      (unsigned long __RPC_FAR *,
       void __RPC_FAR * );
  
--- 1036,1059 ----
      } XMIT_ROUTINE_QUINTUPLE, __RPC_FAR *PXMIT_ROUTINE_QUINTUPLE;
  
  typedef unsigned long
! __RPC_FAR __RPC_USER (* USER_MARSHAL_SIZING_ROUTINE)
      (unsigned long __RPC_FAR *,
       unsigned long,
       void __RPC_FAR * );
  
! typedef unsigned char __RPC_FAR
! __RPC_FAR __RPC_USER * (* USER_MARSHAL_MARSHALLING_ROUTINE)
      (unsigned long __RPC_FAR *,
       unsigned char  __RPC_FAR * ,
       void __RPC_FAR * );
  
! typedef unsigned char __RPC_FAR
! __RPC_FAR __RPC_USER * (* USER_MARSHAL_UNMARSHALLING_ROUTINE)
      (unsigned long __RPC_FAR *,
       unsigned char  __RPC_FAR * ,
       void __RPC_FAR * );
  
! typedef void __RPC_FAR __RPC_USER (* USER_MARSHAL_FREEING_ROUTINE)
      (unsigned long __RPC_FAR *,
       void __RPC_FAR * );
  
***************
*** 1082,1089 ****
  
  typedef struct _MALLOC_FREE_STRUCT
      {
!     void __RPC_FAR *    (__RPC_FAR __RPC_USER * pfnAllocate)(size_t);
!     void                (__RPC_FAR __RPC_USER * pfnFree)(void __RPC_FAR *);
      } MALLOC_FREE_STRUCT;
  
  typedef struct _COMM_FAULT_OFFSETS
--- 1082,1089 ----
  
  typedef struct _MALLOC_FREE_STRUCT
      {
!     void  __RPC_USER * (* pfnAllocate)(size_t);
!     void __RPC_USER (* pfnFree)(void __RPC_FAR *);
      } MALLOC_FREE_STRUCT;
  
  typedef struct _COMM_FAULT_OFFSETS
***************
*** 1101,1108 ****
  
      void __RPC_FAR *    RpcInterfaceInformation;
  
!     void __RPC_FAR *    (__RPC_FAR __RPC_API * pfnAllocate)(size_t);
!     void                (__RPC_FAR __RPC_API * pfnFree)(void __RPC_FAR *);
  
      union
          {
--- 1101,1108 ----
  
      void __RPC_FAR *    RpcInterfaceInformation;
  
!     void __RPC_API * (* pfnAllocate)(size_t);
!     void __RPC_API (* pfnFree)(void __RPC_FAR *);
  
      union
          {
***************
*** 1161,1167 ****
  typedef struct _MIDL_FORMAT_STRING
      {
      short               Pad;
!     unsigned char       Format[];
      } MIDL_FORMAT_STRING;
  #if !defined( RC_INVOKED )
  #pragma warning( default:4200 )
--- 1161,1167 ----
  typedef struct _MIDL_FORMAT_STRING
      {
      short               Pad;
!     unsigned char       Format[1];
      } MIDL_FORMAT_STRING;
  #if !defined( RC_INVOKED )
  #pragma warning( default:4200 )
***************
*** 1170,1178 ****
  /*
   * Stub thunk used for some interpreted server stubs.
   */
! typedef void (__RPC_FAR __RPC_API * STUB_THUNK)( PMIDL_STUB_MESSAGE );
  
! typedef long (__RPC_FAR __RPC_API * SERVER_ROUTINE)();
  
  /*
   * Server Interpreter's information strucuture.
--- 1170,1178 ----
  /*
   * Stub thunk used for some interpreted server stubs.
   */
! typedef void __RPC_FAR __RPC_API (* STUB_THUNK)( PMIDL_STUB_MESSAGE );
  
! typedef long __RPC_FAR __RPC_API (* SERVER_ROUTINE)();
  
  /*
   * Server Interpreter's information strucuture.
***************
*** 1294,1301 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrPointerMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1294,1301 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrPointerMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1305,1312 ****
  /* Structures */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrSimpleStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1305,1312 ----
  /* Structures */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrSimpleStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1314,1321 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1314,1321 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1323,1330 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantVaryingStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1323,1330 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantVaryingStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1332,1339 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrHardStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1332,1339 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrHardStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1341,1348 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrComplexStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1341,1348 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrComplexStructMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1352,1359 ****
  /* Arrays */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrFixedArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1352,1359 ----
  /* Arrays */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrFixedArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1361,1368 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1361,1368 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1370,1377 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantVaryingArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1370,1377 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantVaryingArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1379,1386 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrVaryingArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1379,1386 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrVaryingArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1388,1395 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrComplexArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1388,1395 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrComplexArrayMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1399,1406 ****
  /* Strings */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrNonConformantStringMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1399,1406 ----
  /* Strings */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrNonConformantStringMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1408,1415 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantStringMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1408,1415 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantStringMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1419,1426 ****
  /* Unions */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrEncapsulatedUnionMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1419,1426 ----
  /* Unions */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrEncapsulatedUnionMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1428,1435 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrNonEncapsulatedUnionMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1428,1435 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrNonEncapsulatedUnionMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1439,1446 ****
  /* Byte count pointer */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrByteCountPointerMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1439,1446 ----
  /* Byte count pointer */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrByteCountPointerMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1450,1457 ****
  /* Transmit as and represent as*/
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrXmitOrRepAsMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1450,1457 ----
  /* Transmit as and represent as*/
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrXmitOrRepAsMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1461,1468 ****
  /* User_marshal */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrUserMarshalMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1461,1468 ----
  /* User_marshal */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrUserMarshalMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1472,1479 ****
  /* Cairo interface pointer */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrInterfacePointerMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
--- 1472,1479 ----
  /* Cairo interface pointer */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrInterfacePointerMarshall(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pMemory,
***************
*** 1524,1530 ****
      );
  
  RPCRTAPI
! unsigned char * RPC_ENTRY
  NdrRangeUnmarshall(
      PMIDL_STUB_MESSAGE  pStubMsg,
      unsigned char **    ppMemory,
--- 1524,1530 ----
      );
  
  RPCRTAPI
! unsigned char RPC_ENTRY *
  NdrRangeUnmarshall(
      PMIDL_STUB_MESSAGE  pStubMsg,
      unsigned char **    ppMemory,
***************
*** 1557,1564 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrPointerUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1557,1564 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrPointerUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1569,1576 ****
  /* Structures */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrSimpleStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1569,1576 ----
  /* Structures */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrSimpleStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1579,1586 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1579,1586 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1589,1596 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantVaryingStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1589,1596 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantVaryingStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1599,1606 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrHardStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1599,1606 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrHardStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1609,1616 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrComplexStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1609,1616 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrComplexStructUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1621,1628 ****
  /* Arrays */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrFixedArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1621,1628 ----
  /* Arrays */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrFixedArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1631,1638 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1631,1638 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1641,1648 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantVaryingArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1641,1648 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantVaryingArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1651,1658 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrVaryingArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1651,1658 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrVaryingArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1661,1668 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrComplexArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1661,1668 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrComplexArrayUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1673,1680 ****
  /* Strings */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrNonConformantStringUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1673,1680 ----
  /* Strings */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrNonConformantStringUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1683,1690 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrConformantStringUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1683,1690 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrConformantStringUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1695,1702 ****
  /* Unions */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrEncapsulatedUnionUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1695,1702 ----
  /* Unions */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrEncapsulatedUnionUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1705,1712 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrNonEncapsulatedUnionUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1705,1712 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrNonEncapsulatedUnionUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1717,1724 ****
  /* Byte count pointer */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrByteCountPointerUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1717,1724 ----
  /* Byte count pointer */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrByteCountPointerUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1729,1736 ****
  /* Transmit as and represent as*/
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrXmitOrRepAsUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1729,1736 ----
  /* Transmit as and represent as*/
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrXmitOrRepAsUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1741,1748 ****
  /* User_marshal */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrUserMarshalUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1741,1748 ----
  /* User_marshal */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrUserMarshalUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 1753,1760 ****
  /* Cairo interface pointer */
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrInterfacePointerUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
--- 1753,1760 ----
  /* Cairo interface pointer */
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrInterfacePointerUnmarshall(
      PMIDL_STUB_MESSAGE                      pStubMsg,
      unsigned char __RPC_FAR * __RPC_FAR *   ppMemory,
***************
*** 2368,2375 ****
  #define USER_MARSHAL_FC_DOUBLE      12
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrUserMarshalSimpleTypeConvert(
      unsigned long * pFlags,
      unsigned char * pBuffer,
--- 2368,2375 ----
  #define USER_MARSHAL_FC_DOUBLE      12
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrUserMarshalSimpleTypeConvert(
      unsigned long * pFlags,
      unsigned char * pBuffer,
***************
*** 2391,2398 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrServerInitializeNew(
      PRPC_MESSAGE                        pRpcMsg,
      PMIDL_STUB_MESSAGE                  pStubMsg,
--- 2391,2398 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrServerInitializeNew(
      PRPC_MESSAGE                        pRpcMsg,
      PMIDL_STUB_MESSAGE                  pStubMsg,
***************
*** 2420,2427 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrServerInitialize(
      PRPC_MESSAGE                        pRpcMsg,
      PMIDL_STUB_MESSAGE                  pStubMsg,
--- 2420,2427 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrServerInitialize(
      PRPC_MESSAGE                        pRpcMsg,
      PMIDL_STUB_MESSAGE                  pStubMsg,
***************
*** 2429,2436 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrServerInitializeUnmarshall (
      PMIDL_STUB_MESSAGE                  pStubMsg,
      PMIDL_STUB_DESC                     pStubDescriptor,
--- 2429,2436 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrServerInitializeUnmarshall (
      PMIDL_STUB_MESSAGE                  pStubMsg,
      PMIDL_STUB_DESC                     pStubDescriptor,
***************
*** 2446,2453 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrGetBuffer(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned long                       BufferLength,
--- 2446,2453 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrGetBuffer(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned long                       BufferLength,
***************
*** 2455,2462 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrNsGetBuffer(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned long                       BufferLength,
--- 2455,2462 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrNsGetBuffer(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned long                       BufferLength,
***************
*** 2464,2471 ****
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrGetPipeBuffer(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned long                       BufferLength,
--- 2464,2471 ----
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrGetPipeBuffer(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned long                       BufferLength,
***************
*** 2478,2493 ****
      PMIDL_STUB_MESSAGE                  pStubMsg );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrSendReceive(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR*            pBufferEnd
      );
  
  RPCRTAPI
! unsigned char __RPC_FAR *
! RPC_ENTRY
  NdrNsSendReceive(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pBufferEnd,
--- 2478,2493 ----
      PMIDL_STUB_MESSAGE                  pStubMsg );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrSendReceive(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR*            pBufferEnd
      );
  
  RPCRTAPI
! unsigned char
! RPC_ENTRY __RPC_FAR *
  NdrNsSendReceive(
      PMIDL_STUB_MESSAGE                  pStubMsg,
      unsigned char __RPC_FAR *           pBufferEnd,
***************
*** 2826,2832 ****
  
  typedef void __RPC_FAR * RPC_SS_THREAD_HANDLE;
  
! typedef void __RPC_FAR * __RPC_API
  RPC_CLIENT_ALLOC (
      IN size_t Size
      );
--- 2826,2832 ----
  
  typedef void __RPC_FAR * RPC_SS_THREAD_HANDLE;
  
! typedef void __RPC_FAR __RPC_API * 
  RPC_CLIENT_ALLOC (
      IN size_t Size
      );
***************
*** 2841,2848 ****
  --*/
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  RpcSsAllocate (
      IN size_t Size
      );
--- 2841,2848 ----
  --*/
  
  RPCRTAPI
! void __RPC_FAR
! RPC_ENTRY *
  RpcSsAllocate (
      IN size_t Size
      );
***************
*** 2905,2912 ****
  --*/
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  RpcSmAllocate (
      IN  size_t          Size,
      OUT RPC_STATUS __RPC_FAR *    pStatus
--- 2905,2912 ----
  --*/
  
  RPCRTAPI
! void
! RPC_ENTRY __RPC_FAR *
  RpcSmAllocate (
      IN  size_t          Size,
      OUT RPC_STATUS __RPC_FAR *    pStatus
***************
*** 3002,3009 ****
      PMIDL_STUB_MESSAGE      pMessage );
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  NdrRpcSmClientAllocate (
      IN size_t Size
      );
--- 3002,3009 ----
      PMIDL_STUB_MESSAGE      pMessage );
  
  RPCRTAPI
! void
! RPC_ENTRY __RPC_FAR *
  NdrRpcSmClientAllocate (
      IN size_t Size
      );
***************
*** 3016,3023 ****
      );
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  NdrRpcSsDefaultAllocate (
      IN size_t Size
      );
--- 3016,3023 ----
      );
  
  RPCRTAPI
! void
! RPC_ENTRY __RPC_FAR *
  NdrRpcSsDefaultAllocate (
      IN size_t Size
      );
***************
*** 3090,3097 ****
      );
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  NdrAllocate(
      PMIDL_STUB_MESSAGE      pStubMsg,
      size_t                  Len
--- 3090,3097 ----
      );
  
  RPCRTAPI
! void
! RPC_ENTRY __RPC_FAR *
  NdrAllocate(
      PMIDL_STUB_MESSAGE      pStubMsg,
      size_t                  Len
***************
*** 3112,3119 ****
   ****************************************************************************/
  
  RPCRTAPI
! void __RPC_FAR *
! RPC_ENTRY
  NdrOleAllocate (
      IN size_t Size
      );
--- 3112,3119 ----
   ****************************************************************************/
  
  RPCRTAPI
! void
! RPC_ENTRY __RPC_FAR *
  NdrOleAllocate (
      IN size_t Size
      );