[mingw-Bugs-1424461]
*include/imagehlp.h: Comment out IN, OUT and OPTIONAL, throughout. *include/rpcdce.h: Don't define IN, OUT or OPTIONAL if _NO_W32_PSEUDO_MODIFIERS. *include/rpcnsi.h: Comment out IN, OUT and OPTIONAL, throughout. *include/rpcnsip.h: Likewise. *include/windef.h: Don't define IN, OUT or OPTIONAL if _NO_W32_PSEUDO_MODIFIERS. *include/ddk/batclass.h: Comment out IN, OUT and OPTIONAL, throughout. *include/ddk/cfgmgr32.h: Likewise. *include/ddk/ddkmapi.h: Likewise. *include/ddk/hidclass.h: Likewise. *include/ddk/hidpi.h: Likewise. *include/ddk/kbdmou.h: Likewise. *include/ddk/mcd.h: Likewise. *include/ddk/miniport.h: Likewise. *include/ddk/minitape.h: Likewise. *include/ddk/ndis.h: Likewise. *include/ddk/ndistapi.h: Likewise. *include/ddk/ndiswan.h: Likewise. *include/ddk/ntapi.h: Likewise. *include/ddk/ntdd8042.h: Likewise. *include/ddk/ntddpcm.h: Likewise. *include/ddk/ntifs.h: Likewise. *include/ddk/ntpoapi.h: Likewise. *include/ddk/parallel.h: Likewise. *include/ddk/pfhook.h: Likewise. *include/ddk/scsiwmi.h: Likewise. *include/ddk/smbus.h: Likewise. *include/ddk/srb.h: Likewise. *include/ddk/storport.h: Likewise. *include/ddk/tdikrnl.h: Likewise. *include/ddk/upssvc.h: Likewise. *include/ddk/usbcamdi.h: Likewise. *include/ddk/usbscan.h: Likewise. *include/ddk/video.h: Likewise. *include/ddk/videoagp.h: Likewise. *include/ddk/win2k.h: Likewise. *include/ddk/winddi.h: Likewise. *include/ddk/winddk.h: Don't define IN, OUT or OPTIONAL if _NO_W32_PSEUDO_MODIFIERS. Comment out IN, OUT and OPTIONAL, throughout. *include/ddk/winnt4.h: Comment out IN, OUT and OPTIONAL, throughout. *include/ddk/ws2san.h: Likewise.
This commit is contained in:
Danny Smith
@@ -69,47 +69,47 @@ typedef WSPUPCALLTABLEEX *LPWSPUPCALLTABLEEX;
|
||||
{0xE5DA4AF8, 0xD824, 0x48CD, {0xA7, 0x99, 0x63, 0x37, 0xA9, 0x8E, 0xD2, 0xAF}}
|
||||
|
||||
typedef struct _WSABUFEX {
|
||||
u_long len;
|
||||
char FAR *buf;
|
||||
HANDLE handle;
|
||||
u_long len;
|
||||
char FAR *buf;
|
||||
HANDLE handle;
|
||||
} WSABUFEX, FAR * LPWSABUFEX;
|
||||
|
||||
#if 0
|
||||
typedef struct _WSPUPCALLTABLEEX {
|
||||
LPWPUCLOSEEVENT lpWPUCloseEvent;
|
||||
LPWPUCLOSESOCKETHANDLE lpWPUCloseSocketHandle;
|
||||
LPWPUCREATEEVENT lpWPUCreateEvent;
|
||||
LPWPUCREATESOCKETHANDLE lpWPUCreateSocketHandle;
|
||||
LPWPUFDISSET lpWPUFDIsSet;
|
||||
LPWPUGETPROVIDERPATH lpWPUGetProviderPath;
|
||||
LPWPUMODIFYIFSHANDLE lpWPUModifyIFSHandle;
|
||||
LPWPUPOSTMESSAGE lpWPUPostMessage;
|
||||
LPWPUQUERYBLOCKINGCALLBACK lpWPUQueryBlockingCallback;
|
||||
LPWPUQUERYSOCKETHANDLECONTEXT lpWPUQuerySocketHandleContext;
|
||||
LPWPUQUEUEAPC lpWPUQueueApc;
|
||||
LPWPURESETEVENT lpWPUResetEvent;
|
||||
LPWPUSETEVENT lpWPUSetEvent;
|
||||
LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread;
|
||||
LPWPUCLOSETHREAD lpWPUCloseThread;
|
||||
LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
|
||||
LPWPUCLOSEEVENT lpWPUCloseEvent;
|
||||
LPWPUCLOSESOCKETHANDLE lpWPUCloseSocketHandle;
|
||||
LPWPUCREATEEVENT lpWPUCreateEvent;
|
||||
LPWPUCREATESOCKETHANDLE lpWPUCreateSocketHandle;
|
||||
LPWPUFDISSET lpWPUFDIsSet;
|
||||
LPWPUGETPROVIDERPATH lpWPUGetProviderPath;
|
||||
LPWPUMODIFYIFSHANDLE lpWPUModifyIFSHandle;
|
||||
LPWPUPOSTMESSAGE lpWPUPostMessage;
|
||||
LPWPUQUERYBLOCKINGCALLBACK lpWPUQueryBlockingCallback;
|
||||
LPWPUQUERYSOCKETHANDLECONTEXT lpWPUQuerySocketHandleContext;
|
||||
LPWPUQUEUEAPC lpWPUQueueApc;
|
||||
LPWPURESETEVENT lpWPUResetEvent;
|
||||
LPWPUSETEVENT lpWPUSetEvent;
|
||||
LPWPUOPENCURRENTTHREAD lpWPUOpenCurrentThread;
|
||||
LPWPUCLOSETHREAD lpWPUCloseThread;
|
||||
LPWPUCOMPLETEOVERLAPPEDREQUEST lpWPUCompleteOverlappedRequest;
|
||||
} WSPUPCALLTABLEEX, FAR * LPWSPUPCALLTABLEEX;
|
||||
#endif
|
||||
|
||||
int WSPAPI
|
||||
WSPStartupEx(
|
||||
IN WORD wVersionRequested,
|
||||
OUT LPWSPDATA lpWSPData,
|
||||
IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
|
||||
IN LPWSPUPCALLTABLEEX lpUpcallTable,
|
||||
OUT LPWSPPROC_TABLE lpProcTable);
|
||||
/*IN*/ WORD wVersionRequested,
|
||||
/*OUT*/ LPWSPDATA lpWSPData,
|
||||
/*IN*/ LPWSAPROTOCOL_INFOW lpProtocolInfo,
|
||||
/*IN*/ LPWSPUPCALLTABLEEX lpUpcallTable,
|
||||
/*OUT*/ LPWSPPROC_TABLE lpProcTable);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPWSPSTARTUPEX)(
|
||||
IN WORD wVersionRequested,
|
||||
OUT LPWSPDATA lpWSPData,
|
||||
IN LPWSAPROTOCOL_INFOW lpProtocolInfo,
|
||||
IN LPWSPUPCALLTABLEEX lpUpcallTable,
|
||||
OUT LPWSPPROC_TABLE lpProcTable);
|
||||
/*IN*/ WORD wVersionRequested,
|
||||
/*OUT*/ LPWSPDATA lpWSPData,
|
||||
/*IN*/ LPWSAPROTOCOL_INFOW lpProtocolInfo,
|
||||
/*IN*/ LPWSPUPCALLTABLEEX lpUpcallTable,
|
||||
/*OUT*/ LPWSPPROC_TABLE lpProcTable);
|
||||
|
||||
#define MEM_READ 1
|
||||
#define MEM_WRITE 2
|
||||
@@ -117,129 +117,129 @@ typedef int WSPAPI
|
||||
|
||||
int WSPAPI
|
||||
WSPDeregisterMemory(
|
||||
IN SOCKET s,
|
||||
IN HANDLE Handle,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ HANDLE Handle,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPFN_WSPDEREGISTERMEMORY)(
|
||||
IN SOCKET s,
|
||||
IN HANDLE Handle,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ HANDLE Handle,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
int WSPAPI
|
||||
WSPDeregisterRdmaMemory(
|
||||
IN SOCKET s,
|
||||
IN LPVOID lpRdmaBufferDescriptor,
|
||||
IN DWORD dwDescriptorLength,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ LPVOID lpRdmaBufferDescriptor,
|
||||
/*IN*/ DWORD dwDescriptorLength,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPFN_WSPDEREGISTERRDMAMEMORY)(
|
||||
IN SOCKET s,
|
||||
IN LPVOID lpRdmaBufferDescriptor,
|
||||
IN DWORD dwDescriptorLength,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ LPVOID lpRdmaBufferDescriptor,
|
||||
/*IN*/ DWORD dwDescriptorLength,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
int WSPAPI
|
||||
WSPMemoryRegistrationCacheCallback(
|
||||
IN PVOID lpvAddress,
|
||||
IN SIZE_T Size,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ PVOID lpvAddress,
|
||||
/*IN*/ SIZE_T Size,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPFN_WSPMEMORYREGISTRATIONCACHECALLBACK)(
|
||||
IN PVOID lpvAddress,
|
||||
IN SIZE_T Size,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ PVOID lpvAddress,
|
||||
/*IN*/ SIZE_T Size,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
int WSPAPI
|
||||
WSPRdmaRead(
|
||||
IN SOCKET s,
|
||||
IN LPWSABUFEX lpBuffers,
|
||||
IN DWORD dwBufferCount,
|
||||
IN LPVOID lpTargetBufferDescriptor,
|
||||
IN DWORD dwTargetDescriptorLength,
|
||||
IN DWORD dwTargetBufferOffset,
|
||||
OUT LPDWORD lpdwNumberOfBytesRead,
|
||||
IN DWORD dwFlags,
|
||||
IN LPWSAOVERLAPPED lpOverlapped,
|
||||
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
IN LPWSATHREADID lpThreadId,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ LPWSABUFEX lpBuffers,
|
||||
/*IN*/ DWORD dwBufferCount,
|
||||
/*IN*/ LPVOID lpTargetBufferDescriptor,
|
||||
/*IN*/ DWORD dwTargetDescriptorLength,
|
||||
/*IN*/ DWORD dwTargetBufferOffset,
|
||||
/*OUT*/ LPDWORD lpdwNumberOfBytesRead,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*IN*/ LPWSAOVERLAPPED lpOverlapped,
|
||||
/*IN*/ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
/*IN*/ LPWSATHREADID lpThreadId,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPFN_WSPRDMAREAD)(
|
||||
IN SOCKET s,
|
||||
IN LPWSABUFEX lpBuffers,
|
||||
IN DWORD dwBufferCount,
|
||||
IN LPVOID lpTargetBufferDescriptor,
|
||||
IN DWORD dwTargetDescriptorLength,
|
||||
IN DWORD dwTargetBufferOffset,
|
||||
OUT LPDWORD lpdwNumberOfBytesRead,
|
||||
IN DWORD dwFlags,
|
||||
IN LPWSAOVERLAPPED lpOverlapped,
|
||||
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
IN LPWSATHREADID lpThreadId,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ LPWSABUFEX lpBuffers,
|
||||
/*IN*/ DWORD dwBufferCount,
|
||||
/*IN*/ LPVOID lpTargetBufferDescriptor,
|
||||
/*IN*/ DWORD dwTargetDescriptorLength,
|
||||
/*IN*/ DWORD dwTargetBufferOffset,
|
||||
/*OUT*/ LPDWORD lpdwNumberOfBytesRead,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*IN*/ LPWSAOVERLAPPED lpOverlapped,
|
||||
/*IN*/ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
/*IN*/ LPWSATHREADID lpThreadId,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
int WSPAPI
|
||||
WSPRdmaWrite(
|
||||
IN SOCKET s,
|
||||
IN LPWSABUFEX lpBuffers,
|
||||
IN DWORD dwBufferCount,
|
||||
IN LPVOID lpTargetBufferDescriptor,
|
||||
IN DWORD dwTargetDescriptorLength,
|
||||
IN DWORD dwTargetBufferOffset,
|
||||
OUT LPDWORD lpdwNumberOfBytesWritten,
|
||||
IN DWORD dwFlags,
|
||||
IN LPWSAOVERLAPPED lpOverlapped,
|
||||
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
IN LPWSATHREADID lpThreadId,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ LPWSABUFEX lpBuffers,
|
||||
/*IN*/ DWORD dwBufferCount,
|
||||
/*IN*/ LPVOID lpTargetBufferDescriptor,
|
||||
/*IN*/ DWORD dwTargetDescriptorLength,
|
||||
/*IN*/ DWORD dwTargetBufferOffset,
|
||||
/*OUT*/ LPDWORD lpdwNumberOfBytesWritten,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*IN*/ LPWSAOVERLAPPED lpOverlapped,
|
||||
/*IN*/ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
/*IN*/ LPWSATHREADID lpThreadId,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPFN_WSPRDMAWRITE)(
|
||||
IN SOCKET s,
|
||||
IN LPWSABUFEX lpBuffers,
|
||||
IN DWORD dwBufferCount,
|
||||
IN LPVOID lpTargetBufferDescriptor,
|
||||
IN DWORD dwTargetDescriptorLength,
|
||||
IN DWORD dwTargetBufferOffset,
|
||||
OUT LPDWORD lpdwNumberOfBytesWritten,
|
||||
IN DWORD dwFlags,
|
||||
IN LPWSAOVERLAPPED lpOverlapped,
|
||||
IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
IN LPWSATHREADID lpThreadId,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ LPWSABUFEX lpBuffers,
|
||||
/*IN*/ DWORD dwBufferCount,
|
||||
/*IN*/ LPVOID lpTargetBufferDescriptor,
|
||||
/*IN*/ DWORD dwTargetDescriptorLength,
|
||||
/*IN*/ DWORD dwTargetBufferOffset,
|
||||
/*OUT*/ LPDWORD lpdwNumberOfBytesWritten,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*IN*/ LPWSAOVERLAPPED lpOverlapped,
|
||||
/*IN*/ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine,
|
||||
/*IN*/ LPWSATHREADID lpThreadId,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
HANDLE WSPAPI
|
||||
WSPRegisterMemory(
|
||||
IN SOCKET s,
|
||||
IN PVOID lpBuffer,
|
||||
IN DWORD dwBufferLength,
|
||||
IN DWORD dwFlags,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ PVOID lpBuffer,
|
||||
/*IN*/ DWORD dwBufferLength,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
int WSPAPI
|
||||
WSPRegisterRdmaMemory(
|
||||
IN SOCKET s,
|
||||
IN PVOID lpBuffer,
|
||||
IN DWORD dwBufferLength,
|
||||
IN DWORD dwFlags,
|
||||
OUT LPVOID lpRdmaBufferDescriptor,
|
||||
IN OUT LPDWORD lpdwDescriptorLength,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ PVOID lpBuffer,
|
||||
/*IN*/ DWORD dwBufferLength,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*OUT*/ LPVOID lpRdmaBufferDescriptor,
|
||||
/*IN OUT*/ LPDWORD lpdwDescriptorLength,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
typedef int WSPAPI
|
||||
(*LPFN_WSPREGISTERRDMAMEMORY)(
|
||||
IN SOCKET s,
|
||||
IN PVOID lpBuffer,
|
||||
IN DWORD dwBufferLength,
|
||||
IN DWORD dwFlags,
|
||||
OUT LPVOID lpRdmaBufferDescriptor,
|
||||
IN OUT LPDWORD lpdwDescriptorLength,
|
||||
OUT LPINT lpErrno);
|
||||
/*IN*/ SOCKET s,
|
||||
/*IN*/ PVOID lpBuffer,
|
||||
/*IN*/ DWORD dwBufferLength,
|
||||
/*IN*/ DWORD dwFlags,
|
||||
/*OUT*/ LPVOID lpRdmaBufferDescriptor,
|
||||
/*IN OUT*/ LPDWORD lpdwDescriptorLength,
|
||||
/*OUT*/ LPINT lpErrno);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user