Ros-diffs

ros-diffs@reactos.org

81390 discussions

[aandrejevic] 59739: [NTVDM] Fix VGA interleaved mode.
by aandrejevic＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: aandrejevic Date: Wed Aug 14 21:55:50 2013 New Revision: 59739 URL: http://svn.reactos.org/svn/reactos?rev=59739&view=rev Log: [NTVDM] Fix VGA interleaved mode. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Wed Aug 14 21:55:50 2013 @@ -575,13 +575,18 @@ /* Check if this is 16 or 256 color mode */ if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) { + // TODO: NOT IMPLEMENTED + DPRINT1("8-bit interleaved mode is not implemented!\n"); + } + else + { /* * 2 bits shifted from plane 0 and 2 for the first 4 pixels, * then 2 bits shifted from plane 1 and 3 for the next 4 */ BYTE LowPlaneData = VgaMemory[((j / 4) % 2) * VGA_BANK_SIZE + (Address + (j / 4)) * AddressSize]; - BYTE HighPlaneData = VgaMemory[(((j / 4) % 2) + 1) * VGA_BANK_SIZE + BYTE HighPlaneData = VgaMemory[(((j / 4) % 2) + 2) * VGA_BANK_SIZE + (Address + (j / 4)) * AddressSize]; /* Extract the two bits from each plane */ @@ -590,11 +595,6 @@ /* Combine them into the pixel */ PixelData = LowPlaneData | (HighPlaneData << 2); - } - else - { - // TODO: NOT IMPLEMENTED - DPRINT1("8-bit interleaved mode is not implemented!\n"); } } else

1 0

[aandrejevic] 59738: [NTVDM] Fix 16 color modes. Implement 4-bit interleaved shift mode.
by aandrejevic＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: aandrejevic Date: Wed Aug 14 17:17:43 2013 New Revision: 59738 URL: http://svn.reactos.org/svn/reactos?rev=59738&view=rev Log: [NTVDM] Fix 16 color modes. Implement 4-bit interleaved shift mode. Modified: branches/ntvdm/subsystems/ntvdm/vga.c Modified: branches/ntvdm/subsystems/ntvdm/vga.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/vga.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/vga.c [iso-8859-1] Wed Aug 14 17:17:43 2013 @@ -572,13 +572,30 @@ } else if (VgaGcRegisters[VGA_GC_MODE_REG] & VGA_GC_MODE_SHIFTREG) { - /* - * 2 bits shifted from plane 0 and 2 for the first 4 pixels, - * then 2 bits shifted from plane 1 and 3 for the next 4 - */ - - // TODO: NOT IMPLEMENTED! - DPRINT1("Interleaved shift mode is not implemented!\n"); + /* Check if this is 16 or 256 color mode */ + if (VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT) + { + /* + * 2 bits shifted from plane 0 and 2 for the first 4 pixels, + * then 2 bits shifted from plane 1 and 3 for the next 4 + */ + BYTE LowPlaneData = VgaMemory[((j / 4) % 2) * VGA_BANK_SIZE + + (Address + (j / 4)) * AddressSize]; + BYTE HighPlaneData = VgaMemory[(((j / 4) % 2) + 1) * VGA_BANK_SIZE + + (Address + (j / 4)) * AddressSize]; + + /* Extract the two bits from each plane */ + LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; + HighPlaneData = (HighPlaneData >> (6 - ((j % 4) * 2))) & 3; + + /* Combine them into the pixel */ + PixelData = LowPlaneData | (HighPlaneData << 2); + } + else + { + // TODO: NOT IMPLEMENTED + DPRINT1("8-bit interleaved mode is not implemented!\n"); + } } else { @@ -618,6 +635,12 @@ if (PlaneData & (1 << (7 - (j % 8)))) PixelData |= 1 << k; } } + } + + if (!(VgaAcRegisters[VGA_AC_CONTROL_REG] & VGA_AC_CONTROL_8BIT)) + { + /* In 16 color mode, the value is an index to the AC registers */ + PixelData = VgaAcRegisters[PixelData]; } /* Now check if the resulting pixel data has changed */

1 0

[akhaldi] 59737: [PSDK] * Annotate ws2spi.h.
by akhaldi＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: akhaldi Date: Wed Aug 14 16:17:16 2013 New Revision: 59737 URL: http://svn.reactos.org/svn/reactos?rev=59737&view=rev Log: [PSDK] * Annotate ws2spi.h. Modified: trunk/reactos/include/psdk/ws2spi.h Modified: trunk/reactos/include/psdk/ws2spi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2spi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/ws2spi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2spi.h [iso-8859-1] Wed Aug 14 16:17:16 2013 @@ -15,6 +15,7 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * */ + #pragma once #define _WS2SPI_H @@ -52,14 +53,16 @@ (CALLBACK FAR *LPBLOCKINGCALLBACK)( DWORD_PTR dwContext); -typedef SOCKET +typedef +_Must_inspect_result_ +SOCKET (WSPAPI *LPWSPACCEPT)( - IN SOCKET s, - OUT struct sockaddr FAR *addr OPTIONAL, - IN OUT LPINT addrlen OPTIONAL, - IN LPCONDITIONPROC lpfnCondition OPTIONAL, - IN DWORD_PTR dwCallbackData OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_writes_bytes_to_opt_(*addrlen, *addrlen) struct sockaddr FAR *addr, + _Inout_opt_ LPINT addrlen, + _In_opt_ LPCONDITIONPROC lpfnCondition, + _In_opt_ DWORD_PTR dwCallbackData, + _Out_ LPINT lpErrno); typedef VOID (CALLBACK FAR *LPWSAUSERAPC)( @@ -67,387 +70,391 @@ typedef INT (WSPAPI *LPWSPADDRESSTOSTRING)( - IN LPSOCKADDR lpsaAddress, - IN DWORD dwAddressLength, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo OPTIONAL, - OUT LPWSTR lpszAddressString, - IN OUT LPDWORD lpdwAddressStringLength, - OUT LPINT lpErrno); + _In_reads_bytes_(dwAddressLength) LPSOCKADDR lpsaAddress, + _In_ DWORD dwAddressLength, + _In_opt_ LPWSAPROTOCOL_INFOW lpProtocolInfo, + _Out_writes_to_(*lpdwAddressStringLength, *lpdwAddressStringLength) LPWSTR lpszAddressString, + _Inout_ LPDWORD lpdwAddressStringLength, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPASYNCSELECT)( - IN SOCKET s, - IN HWND hWnd, - IN unsigned int wMsg, - IN long lEvent, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ HWND hWnd, + _In_ unsigned int wMsg, + _In_ long lEvent, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPBIND)( - IN SOCKET s, - IN const struct sockaddr FAR *name, - IN int namelen, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_reads_bytes_(namelen) const struct sockaddr FAR *name, + _In_ int namelen, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPCANCELBLOCKINGCALL)( - OUT LPINT lpErrno); + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPCLEANUP)( - OUT LPINT lpErrno); + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPCLOSESOCKET)( - IN SOCKET s, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPCONNECT)( - IN SOCKET s, - IN const struct sockaddr FAR *name, - IN int namelen, - IN LPWSABUF lpCallerData OPTIONAL, - OUT LPWSABUF lpCalleeData OPTIONAL, - IN LPQOS lpSQOS OPTIONAL, - IN LPQOS lpGQOS OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_reads_bytes_(namelen) const struct sockaddr FAR *name, + _In_ int namelen, + _In_opt_ LPWSABUF lpCallerData, + _Out_opt_ LPWSABUF lpCalleeData, + _In_opt_ LPQOS lpSQOS, + _In_opt_ LPQOS lpGQOS, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPDUPLICATESOCKET)( - IN SOCKET s, - IN DWORD dwProcessId, - OUT LPWSAPROTOCOL_INFOW lpProtocolInfo, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ DWORD dwProcessId, + _Out_ LPWSAPROTOCOL_INFOW lpProtocolInfo, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPENUMNETWORKEVENTS)( - IN SOCKET s, - IN WSAEVENT hEventObject, - OUT LPWSANETWORKEVENTS lpNetworkEvents, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ WSAEVENT hEventObject, + _Out_ LPWSANETWORKEVENTS lpNetworkEvents, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPEVENTSELECT)( - IN SOCKET s, - IN WSAEVENT hEventObject, - IN long lNetworkEvents, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_opt_ WSAEVENT hEventObject, + _In_ long lNetworkEvents, + _Out_ LPINT lpErrno); typedef BOOL (WSPAPI *LPWSPGETOVERLAPPEDRESULT)( - IN SOCKET s, - IN LPWSAOVERLAPPED lpOverlapped, - OUT LPDWORD lpcbTransfer, - IN BOOL fWait, - OUT LPDWORD lpdwFlags, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ LPWSAOVERLAPPED lpOverlapped, + _Out_ LPDWORD lpcbTransfer, + _In_ BOOL fWait, + _Out_ LPDWORD lpdwFlags, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPGETPEERNAME)( - IN SOCKET s, - OUT struct sockaddr FAR *name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_writes_bytes_to_(*namelen, *namelen) struct sockaddr FAR *name, + _Inout_ LPINT namelen, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPGETSOCKNAME)( - IN SOCKET s, - OUT struct sockaddr FAR *name, - IN OUT LPINT namelen, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_writes_bytes_to_(*namelen, *namelen) struct sockaddr FAR *name, + _Inout_ LPINT namelen, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPGETSOCKOPT)( - IN SOCKET s, - IN int level, - IN int optname, - OUT char FAR *optval, - IN OUT LPINT optlen, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ int level, + _In_ int optname, + _Out_writes_bytes_(*optlen) char FAR *optval, + _Inout_ LPINT optlen, + _Out_ LPINT lpErrno); typedef BOOL (WSPAPI *LPWSPGETQOSBYNAME)( - IN SOCKET s, - IN LPWSABUF lpQOSName, - OUT LPQOS lpQOS, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ LPWSABUF lpQOSName, + _Out_ LPQOS lpQOS, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPIOCTL)( - IN SOCKET s, - IN DWORD dwIoControlCode, - IN LPVOID lpvInBuffer OPTIONAL, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer OPTIONAL, - IN DWORD cbOutBuffer, - OUT LPDWORD lpcbBytesReturned, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - IN LPWSATHREADID lpThreadId OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ DWORD dwIoControlCode, + _In_reads_bytes_opt_(cbInBuffer) LPVOID lpvInBuffer, + _In_ DWORD cbInBuffer, + _Out_writes_bytes_to_opt_(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer, + _In_ DWORD cbOutBuffer, + _Out_ LPDWORD lpcbBytesReturned, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + _In_opt_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); typedef SOCKET (WSPAPI *LPWSPJOINLEAF)( - IN SOCKET s, - IN const struct sockaddr FAR *name, - IN int namelen, - IN LPWSABUF lpCallerData OPTIONAL, - OUT LPWSABUF lpCalleeData OPTIONAL, - IN LPQOS lpSQOS OPTIONAL, - IN LPQOS lpGQOS OPTIONAL, - IN DWORD dwFlags, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_reads_bytes_(namelen) const struct sockaddr FAR *name, + _In_ int namelen, + _In_opt_ LPWSABUF lpCallerData, + _Out_opt_ LPWSABUF lpCalleeData, + _In_opt_ LPQOS lpSQOS, + _In_opt_ LPQOS lpGQOS, + _In_ DWORD dwFlags, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPLISTEN)( - IN SOCKET s, - IN int backlog, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ int backlog, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPRECV)( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd OPTIONAL, - IN OUT LPDWORD lpFlags, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - IN LPWSATHREADID lpThreadId OPTIONAL, - IN LPINT lpErrno); + _In_ SOCKET s, + _In_reads_(dwBufferCount) LPWSABUF lpBuffers, + _In_ DWORD dwBufferCount, + _Out_opt_ LPDWORD lpNumberOfBytesRecvd, + _Inout_ LPDWORD lpFlags, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + _In_opt_ LPWSATHREADID lpThreadId, + _In_ LPINT lpErrno); typedef int (WSPAPI *LPWSPRECVDISCONNECT)( - IN SOCKET s, - IN LPWSABUF lpInboundDisconnectData OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_opt_ LPWSABUF lpInboundDisconnectData, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPRECVFROM)( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesRecvd OPTIONAL, - IN OUT LPDWORD lpFlags, - OUT struct sockaddr FAR *lpFrom OPTIONAL, - IN OUT LPINT lpFromlen OPTIONAL, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - IN LPWSATHREADID lpThreadId OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_reads_(dwBufferCount) LPWSABUF lpBuffers, + _In_ DWORD dwBufferCount, + _Out_opt_ LPDWORD lpNumberOfBytesRecvd, + _Inout_ LPDWORD lpFlags, + _Out_writes_bytes_to_opt_(*lpFromlen, *lpFromlen) struct sockaddr FAR *lpFrom, + _Inout_opt_ LPINT lpFromlen, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + _In_opt_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPSELECT)( - IN int nfds, - IN OUT fd_set FAR *readfds OPTIONAL, - IN OUT fd_set FAR *writefds OPTIONAL, - IN OUT fd_set FAR *exceptfds OPTIONAL, - IN const struct timeval FAR *timeout OPTIONAL, - OUT LPINT lpErrno); + _In_ int nfds, + _Inout_opt_ fd_set FAR *readfds, + _Inout_opt_ fd_set FAR *writefds, + _Inout_opt_ fd_set FAR *exceptfds, + _In_opt_ const struct timeval FAR *timeout, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPSEND)( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent OPTIONAL, - IN DWORD dwFlags, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - IN LPWSATHREADID lpThreadId OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_reads_(dwBufferCount) LPWSABUF lpBuffers, + _In_ DWORD dwBufferCount, + _Out_opt_ LPDWORD lpNumberOfBytesSent, + _In_ DWORD dwFlags, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + _In_opt_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPSENDDISCONNECT)( - IN SOCKET s, - IN LPWSABUF lpOutboundDisconnectData OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_opt_ LPWSABUF lpOutboundDisconnectData, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPSENDTO)( - IN SOCKET s, - IN LPWSABUF lpBuffers, - IN DWORD dwBufferCount, - OUT LPDWORD lpNumberOfBytesSent OPTIONAL, - IN DWORD dwFlags, - IN const struct sockaddr FAR *lpTo OPTIONAL, - IN int iTolen, - IN OUT LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - IN LPWSATHREADID lpThreadId OPTIONAL, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_reads_(dwBufferCount) LPWSABUF lpBuffers, + _In_ DWORD dwBufferCount, + _Out_opt_ LPDWORD lpNumberOfBytesSent, + _In_ DWORD dwFlags, + _In_reads_bytes_opt_(iTolen) const struct sockaddr FAR *lpTo, + _In_ int iTolen, + _Inout_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine, + _In_opt_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPSETSOCKOPT)( - IN SOCKET s, - IN int level, - IN int optname, - IN const char FAR *optval OPTIONAL, - IN int optlen, - OUT LPINT lpErrno); + _In_ SOCKET s, + _In_ int level, + _In_ int optname, + _In_reads_bytes_opt_(optlen) const char FAR *optval, + _In_ int optlen, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSPSHUTDOWN)( - IN SOCKET s, - IN int how, - OUT LPINT lpErrno); - -typedef SOCKET + _In_ SOCKET s, + _In_ int how, + _Out_ LPINT lpErrno); + +typedef +_Must_inspect_result_ +SOCKET (WSPAPI *LPWSPSOCKET)( - IN int af, - IN int type, - IN int protocol, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo OPTIONAL, - IN GROUP g, - IN DWORD dwFlags, - OUT LPINT lpErrno); + _In_ int af, + _In_ int type, + _In_ int protocol, + _In_opt_ LPWSAPROTOCOL_INFOW lpProtocolInfo, + _In_ GROUP g, + _In_ DWORD dwFlags, + _Out_ LPINT lpErrno); typedef INT (WSPAPI *LPWSPSTRINGTOADDRESS)( - IN LPWSTR AddressString, - IN INT AddressFamily, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo OPTIONAL, - OUT LPSOCKADDR lpAddress, - IN OUT LPINT lpAddressLength, - OUT LPINT lpErrno); + _In_ LPWSTR AddressString, + _In_ INT AddressFamily, + _In_opt_ LPWSAPROTOCOL_INFOW lpProtocolInfo, + _Out_writes_bytes_to_(*lpAddressLength, *lpAddressLength) LPSOCKADDR lpAddress, + _Inout_ LPINT lpAddressLength, + _Out_ LPINT lpErrno); typedef BOOL (WSPAPI *LPWPUCLOSEEVENT)( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); + _In_ WSAEVENT hEvent, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUCLOSESOCKETHANDLE)( - IN SOCKET s, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_ LPINT lpErrno); typedef WSAEVENT (WSPAPI *LPWPUCREATEEVENT)( - OUT LPINT lpErrno); - -typedef SOCKET + _Out_ LPINT lpErrno); + +typedef +_Must_inspect_result_ +SOCKET (WSPAPI *LPWPUCREATESOCKETHANDLE)( - IN DWORD dwCatalogEntryId, - IN DWORD_PTR dwContext, - OUT LPINT lpErrno); + _In_ DWORD dwCatalogEntryId, + _In_ DWORD_PTR dwContext, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUFDISSET)( - IN SOCKET s, - IN fd_set FAR *fdset); + _In_ SOCKET s, + _In_ fd_set FAR *fdset); typedef int (WSPAPI *LPWPUGETPROVIDERPATH)( - IN LPGUID lpProviderId, - OUT WCHAR FAR *lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_writes_(*lpProviderDllPathLen) WCHAR FAR *lpszProviderDllPath, + _Inout_ LPINT lpProviderDllPathLen, + _Out_ LPINT lpErrno); typedef SOCKET (WSPAPI *LPWPUMODIFYIFSHANDLE)( - IN DWORD dwCatalogEntryId, - IN SOCKET ProposedHandle, - OUT LPINT lpErrno); + _In_ DWORD dwCatalogEntryId, + _In_ SOCKET ProposedHandle, + _Out_ LPINT lpErrno); typedef BOOL (WSPAPI *LPWPUPOSTMESSAGE)( - IN HWND hWnd, - IN UINT Msg, - IN WPARAM wParam, - IN LPARAM lParam); + _In_ HWND hWnd, + _In_ UINT Msg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); typedef int (WSPAPI *LPWPUQUERYBLOCKINGCALLBACK)( - IN DWORD dwCatalogEntryId, - OUT LPBLOCKINGCALLBACK FAR *lplpfnCallback, - OUT PDWORD_PTR lpdwContext, - OUT LPINT lpErrno); + _In_ DWORD dwCatalogEntryId, + _Out_ LPBLOCKINGCALLBACK FAR *lplpfnCallback, + _Out_ PDWORD_PTR lpdwContext, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUQUERYSOCKETHANDLECONTEXT)( - IN SOCKET s, - OUT PDWORD_PTR lpContext, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_ PDWORD_PTR lpContext, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUQUEUEAPC)( - IN LPWSATHREADID lpThreadId, - IN LPWSAUSERAPC lpfnUserApc, - IN DWORD_PTR dwContext, - OUT LPINT lpErrno); + _In_ LPWSATHREADID lpThreadId, + _In_ LPWSAUSERAPC lpfnUserApc, + _In_ DWORD_PTR dwContext, + _Out_ LPINT lpErrno); typedef BOOL (WSPAPI *LPWPURESETEVENT)( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); + _In_ WSAEVENT hEvent, + _Out_ LPINT lpErrno); typedef BOOL (WSPAPI *LPWPUSETEVENT)( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); + _In_ WSAEVENT hEvent, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUOPENCURRENTTHREAD)( - OUT LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); + _Out_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUCLOSETHREAD)( - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); + _In_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWPUCOMPLETEOVERLAPPEDREQUEST)( - IN SOCKET s, - IN OUT LPWSAOVERLAPPED lpOverlapped, - IN DWORD dwError, - IN DWORD cbTransferred, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Inout_ LPWSAOVERLAPPED lpOverlapped, + _In_ DWORD dwError, + _In_ DWORD cbTransferred, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSCENUMPROTOCOLS)( - IN LPINT lpiProtocols OPTIONAL, - OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer OPTIONAL, - IN OUT LPDWORD lpdwBufferLength, - OUT LPINT lpErrno); + _In_opt_ LPINT lpiProtocols, + _Out_writes_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferlength) LPWSAPROTOCOL_INFOW lpProtocolBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSCDEINSTALLPROVIDER)( - IN LPGUID lpProviderId, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSCINSTALLPROVIDER)( - IN LPGUID lpProviderId, - IN const WCHAR FAR *lpszProviderDllPath, - IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_z_ const WCHAR FAR *lpszProviderDllPath, + _In_reads_(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSCGETPROVIDERPATH)( - IN LPGUID lpProviderId, - OUT WCHAR FAR *lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_writes_to_(*lpProviderDllPathLen, *lpProviderDllPathLen) WCHAR FAR *lpszProviderDllPath, + _Inout_ LPINT lpProviderDllPathLen, + _Out_ LPINT lpErrno); typedef INT (WSPAPI *LPWSCINSTALLNAMESPACE)( - IN LPWSTR lpszIdentifier, - IN LPWSTR lpszPathName, - IN DWORD dwNameSpace, - IN DWORD dwVersion, - IN LPGUID lpProviderId); + _In_ LPWSTR lpszIdentifier, + _In_ LPWSTR lpszPathName, + _In_ DWORD dwNameSpace, + _In_ DWORD dwVersion, + _In_ LPGUID lpProviderId); typedef INT (WSPAPI *LPWSCUNINSTALLNAMESPACE)( - IN LPGUID lpProviderId); + _In_ LPGUID lpProviderId); typedef INT (WSPAPI *LPWSCENABLENSPROVIDER)( - IN LPGUID lpProviderId, - IN BOOL fEnable); + _In_ LPGUID lpProviderId, + _In_ BOOL fEnable); /* Service provider procedure table */ typedef struct _WSPPROC_TABLE { @@ -485,108 +492,110 @@ typedef INT (WSAAPI *LPNSPCLEANUP)( - IN LPGUID lpProviderId); + _In_ LPGUID lpProviderId); typedef INT (WSAAPI *LPNSPLOOKUPSERVICEBEGIN)( - IN LPGUID lpProviderId, - IN LPWSAQUERYSETW lpqsRestrictions, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo, - IN DWORD dwControlFlags, - OUT LPHANDLE lphLookup); + _In_ LPGUID lpProviderId, + _In_ LPWSAQUERYSETW lpqsRestrictions, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, + _In_ DWORD dwControlFlags, + _Out_ LPHANDLE lphLookup); typedef INT (WSAAPI *LPNSPLOOKUPSERVICENEXT)( - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSETW lpqsResults); + _In_ HANDLE hLookup, + _In_ DWORD dwControlFlags, + _Inout_ LPDWORD lpdwBufferLength, + _Out_writes_bytes_to_(*lpdwBufferLength, *lpdwBufferLength) LPWSAQUERYSETW lpqsResults); #if(_WIN32_WINNT >= 0x0501) typedef INT (WSAAPI *LPNSPIOCTL)( - IN HANDLE hLookup, - IN DWORD dwControlCode, - IN LPVOID lpvInBuffer, - IN DWORD cbInBuffer, - OUT LPVOID lpvOutBuffer, - IN DWORD cbOutBuffer, - OUT LPDWORD lpcbBytesReturned, - IN LPWSACOMPLETION lpCompletion OPTIONAL, - IN LPWSATHREADID lpThreadId); + _In_ HANDLE hLookup, + _In_ DWORD dwControlCode, + _In_reads_bytes_(cbInBuffer) LPVOID lpvInBuffer, + _In_ DWORD cbInBuffer, + _Out_writes_bytes_to_(cbOutBuffer, *lpcbBytesReturned) LPVOID lpvOutBuffer, + _In_ DWORD cbOutBuffer, + _Out_ LPDWORD lpcbBytesReturned, + _In_opt_ LPWSACOMPLETION lpCompletion, + _In_ LPWSATHREADID lpThreadId); #endif typedef INT (WSAAPI *LPNSPLOOKUPSERVICEEND)( - IN HANDLE hLookup); + _In_ HANDLE hLookup); typedef INT (WSAAPI *LPNSPSETSERVICE)( - IN LPGUID lpProviderId, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo, - IN LPWSAQUERYSETW lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags); + _In_ LPGUID lpProviderId, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo, + _In_ LPWSAQUERYSETW lpqsRegInfo, + _In_ WSAESETSERVICEOP essOperation, + _In_ DWORD dwControlFlags); typedef INT (WSAAPI *LPNSPINSTALLSERVICECLASS)( - IN LPGUID lpProviderId, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo); + _In_ LPGUID lpProviderId, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo); typedef INT (WSAAPI *LPNSPREMOVESERVICECLASS)( - IN LPGUID lpProviderId, - IN LPGUID lpServiceClassId); + _In_ LPGUID lpProviderId, + _In_ LPGUID lpServiceClassId); typedef INT (WSAAPI *LPNSPGETSERVICECLASSINFO)( - IN LPGUID lpProviderId, - IN LPDWORD lpdwBufSize, - IN LPWSASERVICECLASSINFOW lpServiceClassInfo); - -typedef INT + _In_ LPGUID lpProviderId, + _In_ LPDWORD lpdwBufSize, + _In_ LPWSASERVICECLASSINFOW lpServiceClassInfo); + +typedef +_Must_inspect_result_ +INT (WSAAPI *LPNSPV2STARTUP)( - IN LPGUID lpProviderId, - OUT LPVOID *ppvClientSessionArg); + _In_ LPGUID lpProviderId, + _Outptr_ LPVOID *ppvClientSessionArg); typedef INT (WSAAPI *LPNSPV2CLEANUP)( - IN LPGUID lpProviderId, - IN LPVOID pvClientSessionArg); + _In_ LPGUID lpProviderId, + _In_ LPVOID pvClientSessionArg); typedef INT (WSAAPI *LPNSPV2LOOKUPSERVICEBEGIN)( - IN LPGUID lpProviderId, - IN LPWSAQUERYSET2W lpqsRestrictions, - IN DWORD dwControlFlags, - IN LPVOID lpvClientSessionArg, - OUT LPHANDLE lphLookup); + _In_ LPGUID lpProviderId, + _In_ LPWSAQUERYSET2W lpqsRestrictions, + _In_ DWORD dwControlFlags, + _In_ LPVOID lpvClientSessionArg, + _Out_ LPHANDLE lphLookup); typedef VOID (WSAAPI *LPNSPV2LOOKUPSERVICENEXTEX)( - IN HANDLE hAsyncCall, - IN HANDLE hLookup, - IN DWORD dwControlFlags, - IN LPDWORD lpdwBufferLength, - OUT LPWSAQUERYSET2W lpqsResults); + _In_ HANDLE hAsyncCall, + _In_ HANDLE hLookup, + _In_ DWORD dwControlFlags, + _In_ LPDWORD lpdwBufferLength, + _Out_ LPWSAQUERYSET2W lpqsResults); typedef INT (WSAAPI *LPNSPV2LOOKUPSERVICEEND)( - IN HANDLE hLookup); + _In_ HANDLE hLookup); typedef VOID (WSAAPI *LPNSPV2SETSERVICEEX)( - IN HANDLE hAsyncCall, - IN LPGUID lpProviderId, - IN LPWSAQUERYSET2W lpqsRegInfo, - IN WSAESETSERVICEOP essOperation, - IN DWORD dwControlFlags, - IN LPVOID lpvClientSessionArg); + _In_ HANDLE hAsyncCall, + _In_ LPGUID lpProviderId, + _In_ LPWSAQUERYSET2W lpqsRegInfo, + _In_ WSAESETSERVICEOP essOperation, + _In_ DWORD dwControlFlags, + _In_ LPVOID lpvClientSessionArg); typedef VOID (WSAAPI *LPNSPV2CLIENTSESSIONRUNDOWN)( - IN LPGUID lpProviderId, - IN LPVOID pvClientSessionArg); + _In_ LPGUID lpProviderId, + _In_ LPVOID pvClientSessionArg); /* Service Provider upcall table */ typedef struct _WSPUPCALLTABLE { @@ -607,13 +616,15 @@ LPWPUCLOSETHREAD lpWPUCloseThread; } WSPUPCALLTABLE, FAR* LPWSPUPCALLTABLE; -typedef int +typedef +_Must_inspect_result_ +int (WSPAPI *LPWSPSTARTUP)( - IN WORD wVersionRequested, - IN LPWSPDATA lpWSPData, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN WSPUPCALLTABLE UpcallTable, - OUT LPWSPPROC_TABLE lpProcTable); + _In_ WORD wVersionRequested, + _In_ LPWSPDATA lpWSPData, + _In_ LPWSAPROTOCOL_INFOW lpProtocolInfo, + _In_ WSPUPCALLTABLE UpcallTable, + _Out_ LPWSPPROC_TABLE lpProcTable); #if (_WIN32_WINNT >= 0x0600) @@ -654,10 +665,12 @@ LPNSPIOCTL NSPIoctl; } NSP_ROUTINE, *PNSP_ROUTINE, FAR* LPNSP_ROUTINE; -typedef INT +typedef +_Must_inspect_result_ +INT (WSAAPI *LPNSPSTARTUP)( - IN LPGUID lpProviderId, - IN OUT LPNSP_ROUTINE lpnspRoutines); + _In_ LPGUID lpProviderId, + _Inout_ LPNSP_ROUTINE lpnspRoutines); typedef struct _NSPV2_ROUTINE { DWORD cbSize; @@ -673,36 +686,37 @@ } NSPV2_ROUTINE, *PNSPV2_ROUTINE, *LPNSPV2_ROUTINE; typedef const NSPV2_ROUTINE *PCNSPV2_ROUTINE, *LPCNSPV2_ROUTINE; +_Must_inspect_result_ int WSPAPI WSPStartup( - IN WORD wVersionRequested, - IN LPWSPDATA lpWSPData, - IN LPWSAPROTOCOL_INFOW lpProtocolInfo, - IN WSPUPCALLTABLE UpcallTable, - OUT LPWSPPROC_TABLE lpProcTable); + _In_ WORD wVersionRequested, + _In_ LPWSPDATA lpWSPData, + _In_ LPWSAPROTOCOL_INFOW lpProtocolInfo, + _In_ WSPUPCALLTABLE UpcallTable, + _Out_ LPWSPPROC_TABLE lpProcTable); int WSPAPI WSCEnumProtocols( - IN LPINT lpiProtocols OPTIONAL, - OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer OPTIONAL, - IN OUT LPDWORD lpdwBufferLength, - OUT LPINT lpErrno); + _In_opt_ LPINT lpiProtocols, + _Out_writes_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) LPWSAPROTOCOL_INFOW lpProtocolBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _Out_ LPINT lpErrno); #if (_WIN32_WINNT >= 0x0501) int WSPAPI WPUOpenCurrentThread( - OUT LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); + _Out_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); int WSPAPI WPUCloseThread( - IN LPWSATHREADID lpThreadId, - OUT LPINT lpErrno); + _In_ LPWSATHREADID lpThreadId, + _Out_ LPINT lpErrno); #define WSCEnumNameSpaceProviders WSAEnumNameSpaceProvidersW #define LPFN_WSCENUMNAMESPACEPROVIDERS LPFN_WSAENUMNAMESPACEPROVIDERSW @@ -710,87 +724,88 @@ int WSPAPI WSCUpdateProvider( - IN LPGUID lpProviderId, - IN const WCHAR FAR *lpszProviderDllPath, - IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_z_ const WCHAR FAR *lpszProviderDllPath, + _In_reads_(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_ LPINT lpErrno); typedef int (WSPAPI *LPWSCUPDATEPROVIDER)( - IN LPGUID lpProviderId, - IN const WCHAR FAR *lpszProviderDllPath, - IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_z_ const WCHAR FAR *lpszProviderDllPath, + _In_reads_(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_ LPINT lpErrno); #if defined(_WIN64) int WSPAPI WSCEnumProtocols32( - IN LPINT lpiProtocols OPTIONAL, - OUT LPWSAPROTOCOL_INFOW lpProtocolBuffer, - IN OUT LPDWORD lpdwBufferLength, - OUT LPINT lpErrno); + _In_opt_ LPINT lpiProtocols, + _Out_writes_bytes_(*lpdwBufferLength) LPWSAPROTOCOL_INFOW lpProtocolBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _Out_ LPINT lpErrno); int WSPAPI WSCDeinstallProvider32( - IN LPGUID lpProviderId, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_ LPINT lpErrno); int WSPAPI WSCInstallProvider64_32( - IN LPGUID lpProviderId, - IN const WCHAR FAR *lpszProviderDllPath, - IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); - + _In_ LPGUID lpProviderId, + _In_z_ const WCHAR FAR *lpszProviderDllPath, + _In_reads_(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_ LPINT lpErrno); + +_Success_(return == 0) int WSPAPI WSCGetProviderPath32( - IN LPGUID lpProviderId, - OUT WCHAR FAR *lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_writes_to_(*lpProviderDllPathLen, *lpProviderDllPathLen) WCHAR FAR *lpszProviderDllPath, + _Inout_ LPINT lpProviderDllPathLen, + _Out_ LPINT lpErrno); int WSPAPI WSCUpdateProvider32( - IN LPGUID lpProviderId, - IN const WCHAR FAR *lpszProviderDllPath, - IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_z_ const WCHAR FAR *lpszProviderDllPath, + _In_reads_(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_ LPINT lpErrno); INT WSAAPI WSCEnumNameSpaceProviders32( - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSANAMESPACE_INFOW lpnspBuffer); + _Inout_ LPDWORD lpdwBufferLength, + _Out_writes_bytes_(*lpdwBufferLength) LPWSANAMESPACE_INFOW lpnspBuffer); INT WSPAPI WSCInstallNameSpace32( - IN LPWSTR lpszIdentifier, - IN LPWSTR lpszPathName, - IN DWORD dwNameSpace, - IN DWORD dwVersion, - IN LPGUID lpProviderId); + _In_ LPWSTR lpszIdentifier, + _In_ LPWSTR lpszPathName, + _In_ DWORD dwNameSpace, + _In_ DWORD dwVersion, + _In_ LPGUID lpProviderId); INT WSPAPI WSCUnInstallNameSpace32( - IN LPGUID lpProviderId); + _In_ LPGUID lpProviderId); INT WSPAPI WSCEnableNSProvider32( - IN LPGUID lpProviderId, - IN BOOL fEnable); + _In_ LPGUID lpProviderId, + _In_ BOOL fEnable); #endif /* defined(_WIN64) */ @@ -799,51 +814,51 @@ int WSPAPI WSCDeinstallProvider( - IN LPGUID lpProviderId, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_ LPINT lpErrno); int WSPAPI WSCInstallProvider( - IN LPGUID lpProviderId, - IN const WCHAR FAR *lpszProviderDllPath, - IN const LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_z_ const WCHAR FAR *lpszProviderDllPath, + _In_reads_(dwNumberOfEntries) const LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_ LPINT lpErrno); int WSPAPI WSCGetProviderPath( - IN LPGUID lpProviderId, - OUT WCHAR FAR *lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_writes_to_(*lpProviderDllPathLen, *lpProviderDllPathLen) WCHAR FAR *lpszProviderDllPath, + _Inout_ LPINT lpProviderDllPathLen, + _Out_ LPINT lpErrno); #if (_WIN32_WINNT < 0x0600) int WSPAPI WSCInstallQOSTemplate( - IN const LPGUID Guid, - IN LPWSABUF QosName, - IN LPQOS Qos); + _In_ const LPGUID Guid, + _In_ LPWSABUF QosName, + _In_ LPQOS Qos); typedef int (WSPAPI *LPWSCINSTALLQOSTEMPLATE)( - IN const LPGUID Guid, - IN LPWSABUF QosName, - IN LPQOS Qos); + _In_ const LPGUID Guid, + _In_ LPWSABUF QosName, + _In_ LPQOS Qos); int WSPAPI WSCRemoveQOSTemplate( - IN const LPGUID Guid, - IN LPWSABUF QosName); + _In_ const LPGUID Guid, + _In_ LPWSABUF QosName); typedef int (WSPAPI *LPWSCREMOVEQOSTEMPLATE)( - IN const LPGUID Guid, - IN LPWSABUF QosName); + _In_ const LPGUID Guid, + _In_ LPWSABUF QosName); #endif /* (_WIN32_WINNT < 0x0600) */ @@ -852,43 +867,43 @@ int WSPAPI WSCSetProviderInfo( - IN LPGUID lpProviderId, - IN WSC_PROVIDER_INFO_TYPE InfoType, - IN PBYTE Info, - IN size_t InfoSize, - IN DWORD Flags, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_ WSC_PROVIDER_INFO_TYPE InfoType, + _In_reads_bytes_(InfoSize) PBYTE Info, + _In_ size_t InfoSize, + _In_ DWORD Flags, + _Out_ LPINT lpErrno); int WSPAPI WSCGetProviderInfo( - IN LPGUID lpProviderId, - IN WSC_PROVIDER_INFO_TYPE InfoType, - OUT PBYTE Info, - IN OUT *InfoSize, - IN DWORD Flags, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_ WSC_PROVIDER_INFO_TYPE InfoType, + _Out_writes_bytes_to_(*InfoSize, *InfoSize) PBYTE Info, + _Inout_ *InfoSize, + _In_ DWORD Flags, + _Out_ LPINT lpErrno); int WSPAPI WSCSetApplicationCategory( - IN LPCWSTR Path, - IN DWORD PathLength, - IN LPCWSTR Extra OPTIONAL, - IN DWORD ExtraLength, - IN DWORD PermittedLspCategories, - OUT DWORD *pPrevPermLspCat OPTIONAL, - OUT LPINT lpErrno); + _In_reads_(PathLength) LPCWSTR Path, + _In_ DWORD PathLength, + _In_reads_opt_(ExtraLength) LPCWSTR Extra, + _In_ DWORD ExtraLength, + _In_ DWORD PermittedLspCategories, + _Out_opt_ DWORD *pPrevPermLspCat, + _Out_ LPINT lpErrno); int WSPAPI WSCGetApplicationCategory( - IN LPCWSTR Path, - IN DWORD PathLength, - IN LPCWSTR Extra OPTIONAL, - IN DWORD ExtraLength, - OUT DWORD *pPermittedLspCategories, - OUT LPINT lpErrno); + _In_reads_(PathLength) LPCWSTR Path, + _In_ DWORD PathLength, + _In_reads_opt_(ExtraLength) LPCWSTR Extra, + _In_ DWORD ExtraLength, + _Out_ DWORD *pPermittedLspCategories, + _Out_ LPINT lpErrno); #define WSCEnumNameSpaceProvidersEx WSAEnumNameSpaceProvidersExW #define LPFN_WSCENUMNAMESPACEPROVIDERSEX LPFN_WSAENUMNAMESPACEPROVIDERSEXW @@ -896,67 +911,67 @@ INT WSPAPI WSCInstallNameSpaceEx( - IN LPWSTR lpszIdentifier, - IN LPWSTR lpszPathName, - IN DWORD dwNameSpace, - IN DWORD dwVersion, - IN LPGUID lpProviderId, - IN LPBLOB lpProviderSpecific); + _In_ LPWSTR lpszIdentifier, + _In_ LPWSTR lpszPathName, + _In_ DWORD dwNameSpace, + _In_ DWORD dwVersion, + _In_ LPGUID lpProviderId, + _In_ LPBLOB lpProviderSpecific); INT WSAAPI WSAAdvertiseProvider( - IN const GUID *puuidProviderId, - IN const LPCNSPV2_ROUTINE pNSPv2Routine); + _In_ const GUID *puuidProviderId, + _In_ const LPCNSPV2_ROUTINE pNSPv2Routine); INT WSAAPI WSAUnadvertiseProvider( - IN const GUID *puuidProviderId); + _In_ const GUID *puuidProviderId); INT WSAAPI WSAProviderCompleteAsyncCall( - IN HANDLE hAsyncCall, - IN INT iRetCode); + _In_ HANDLE hAsyncCall, + _In_ INT iRetCode); #if defined(_WIN64) int WSPAPI WSCSetProviderInfo32( - IN LPGUID lpProviderId, - IN WSC_PROVIDER_INFO_TYPE InfoType, - IN PBYTE Info, - IN size_t InfoSize, - IN DWORD Flags, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_ WSC_PROVIDER_INFO_TYPE InfoType, + _In_reads_bytes_(InfoSize) PBYTE Info, + _In_ size_t InfoSize, + _In_ DWORD Flags, + _Out_ LPINT lpErrno); int WSPAPI WSCGetProviderInfo32( - IN LPGUID lpProviderId, - IN WSC_PROVIDER_INFO_TYPE InfoType, - OUT PBYTE Info, - IN OUT size_t *InfoSize, - IN DWORD Flags, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _In_ WSC_PROVIDER_INFO_TYPE InfoType, + _Out_writes_bytes_to_(*InfoSize, *InfoSize) PBYTE Info, + _Inout_ size_t *InfoSize, + _In_ DWORD Flags, + _Out_ LPINT lpErrno); INT WSAAPI WSCEnumNameSpaceProvidersEx32( - IN OUT LPDWORD lpdwBufferLength, - OUT LPWSANAMESPACE_INFOEXW lpnspBuffer); + _Inout_ LPDWORD lpdwBufferLength, + _Out_writes_bytes_(*lpdwBufferLength) LPWSANAMESPACE_INFOEXW lpnspBuffer); INT WSPAPI WSCInstallNameSpaceEx32( - IN LPWSTR lpszIdentifier, - IN LPWSTR lpszPathName, - IN DWORD dwNameSpace, - IN DWORD dwVersion, - IN LPGUID lpProviderId, - IN LPBLOB lpProviderSpecific); + _In_ LPWSTR lpszIdentifier, + _In_ LPWSTR lpszPathName, + _In_ DWORD dwNameSpace, + _In_ DWORD dwVersion, + _In_ LPGUID lpProviderId, + _In_ LPBLOB lpProviderSpecific); #endif /* (_WIN64) */ @@ -969,142 +984,143 @@ WSPAPI WSCInstallProviderAndChains( #endif - IN LPGUID lpProviderId, - IN const LPWSTR lpszProviderDllPath, + _In_ LPGUID lpProviderId, + _In_ const LPWSTR lpszProviderDllPath, #if defined(_WIN64) - IN const LPWSTR lpszProviderDllPath32, + _In_ const LPWSTR lpszProviderDllPath32, #endif - IN const LPWSTR lpszLspName, - IN DWORD dwServiceFlags, - IN OUT LPWSAPROTOCOL_INFOW lpProtocolInfoList, - IN DWORD dwNumberOfEntries, - OUT LPDWORD lpdwCatalogEntryId OPTIONAL, - OUT LPINT lpErrno); + _In_ const LPWSTR lpszLspName, + _In_ DWORD dwServiceFlags, + _Inout_updates_(dwNumberOfEntries) LPWSAPROTOCOL_INFOW lpProtocolInfoList, + _In_ DWORD dwNumberOfEntries, + _Out_opt_ LPDWORD lpdwCatalogEntryId, + _Out_ LPINT lpErrno); #endif /* (_WIN32_WINNT >= 0x0600) */ BOOL WSPAPI WPUCloseEvent( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); + _In_ WSAEVENT hEvent, + _Out_ LPINT lpErrno); int WSPAPI WPUCloseSocketHandle( - IN SOCKET s, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_ LPINT lpErrno); WSAEVENT WSPAPI WPUCreateEvent( - OUT LPINT lpErrno); + _Out_ LPINT lpErrno); SOCKET WSPAPI WPUCreateSocketHandle( - IN DWORD dwCatalogEntryId, - IN DWORD_PTR dwContext, - OUT LPINT lpErrno); + _In_ DWORD dwCatalogEntryId, + _In_ DWORD_PTR dwContext, + _Out_ LPINT lpErrno); int WSPAPI WPUFDIsSet( - IN SOCKET s, - IN fd_set FAR *fdset); + _In_ SOCKET s, + _In_ fd_set FAR *fdset); int WSPAPI WPUGetProviderPath( - IN LPGUID lpProviderId, - OUT WCHAR FAR *lpszProviderDllPath, - IN OUT LPINT lpProviderDllPathLen, - OUT LPINT lpErrno); + _In_ LPGUID lpProviderId, + _Out_writes_(*lpProviderDllPathLen) WCHAR FAR *lpszProviderDllPath, + _Inout_ LPINT lpProviderDllPathLen, + _Out_ LPINT lpErrno); SOCKET WSPAPI WPUModifyIFSHandle( - IN DWORD dwCatalogEntryId, - IN SOCKET ProposedHandle, - OUT LPINT lpErrno); + _In_ DWORD dwCatalogEntryId, + _In_ SOCKET ProposedHandle, + _Out_ LPINT lpErrno); BOOL WSPAPI WPUPostMessage( - IN HWND hWnd, - IN UINT Msg, - IN WPARAM wParam, - IN LPARAM lParam); + _In_ HWND hWnd, + _In_ UINT Msg, + _In_ WPARAM wParam, + _In_ LPARAM lParam); int WSPAPI WPUQueryBlockingCallback( - IN DWORD dwCatalogEntryId, - OUT LPBLOCKINGCALLBACK FAR *lplpfnCallback, - OUT PDWORD_PTR lpdwContext, - OUT LPINT lpErrno); + _In_ DWORD dwCatalogEntryId, + _Out_ LPBLOCKINGCALLBACK FAR *lplpfnCallback, + _Out_ PDWORD_PTR lpdwContext, + _Out_ LPINT lpErrno); int WSPAPI WPUQuerySocketHandleContext( - IN SOCKET s, - OUT PDWORD_PTR lpContext, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Out_ PDWORD_PTR lpContext, + _Out_ LPINT lpErrno); int WSPAPI WPUQueueApc( - IN LPWSATHREADID lpThreadId, - IN LPWSAUSERAPC lpfnUserApc, - IN DWORD_PTR dwContext, - OUT LPINT lpErrno); + _In_ LPWSATHREADID lpThreadId, + _In_ LPWSAUSERAPC lpfnUserApc, + _In_ DWORD_PTR dwContext, + _Out_ LPINT lpErrno); BOOL WSPAPI WPUResetEvent( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); + _In_ WSAEVENT hEvent, + _Out_ LPINT lpErrno); BOOL WSPAPI WPUSetEvent( - IN WSAEVENT hEvent, - OUT LPINT lpErrno); + _In_ WSAEVENT hEvent, + _Out_ LPINT lpErrno); int WSPAPI WPUCompleteOverlappedRequest( - IN SOCKET s, - IN OUT LPWSAOVERLAPPED lpOverlapped, - IN DWORD dwError, - IN DWORD cbTransferred, - OUT LPINT lpErrno); + _In_ SOCKET s, + _Inout_ LPWSAOVERLAPPED lpOverlapped, + _In_ DWORD dwError, + _In_ DWORD cbTransferred, + _Out_ LPINT lpErrno); INT WSPAPI WSCInstallNameSpace( - IN LPWSTR lpszIdentifier, - IN LPWSTR lpszPathName, - IN DWORD dwNameSpace, - IN DWORD dwVersion, - IN LPGUID lpProviderId); + _In_ LPWSTR lpszIdentifier, + _In_ LPWSTR lpszPathName, + _In_ DWORD dwNameSpace, + _In_ DWORD dwVersion, + _In_ LPGUID lpProviderId); INT WSPAPI WSCUnInstallNameSpace( - IN LPGUID lpProviderId); + _In_ LPGUID lpProviderId); INT WSPAPI WSCEnableNSProvider( - IN LPGUID lpProviderId, - IN BOOL fEnable); - + _In_ LPGUID lpProviderId, + _In_ BOOL fEnable); + +_Must_inspect_result_ INT WSAAPI NSPStartup( - IN LPGUID lpProviderId, - IN OUT LPNSP_ROUTINE lpnspRoutines); + _In_ LPGUID lpProviderId, + _Inout_ LPNSP_ROUTINE lpnspRoutines); #if !defined(_WIN64) #include <poppack.h>

1 0

[fireball] 59736: [RTL] - Improve debug messages to include failure status.
by fireball＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: fireball Date: Wed Aug 14 14:08:40 2013 New Revision: 59736 URL: http://svn.reactos.org/svn/reactos?rev=59736&view=rev Log: [RTL] - Improve debug messages to include failure status. Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/process.c?rev=5973… ============================================================================== --- trunk/reactos/lib/rtl/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/process.c [iso-8859-1] Wed Aug 14 14:08:40 2013 @@ -42,7 +42,7 @@ FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to read image file from disk\n"); + DPRINT1("Failed to read image file from disk, Status = 0x%08X\n", Status); return Status; } @@ -56,7 +56,7 @@ hFile); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create section for image file\n"); + DPRINT1("Failed to create section for image file, Status = 0x%08X\n", Status); } ZwClose(hFile);

1 0

[akhaldi] 59735: [PSDK] * Annotate cfgmgr32.h.
by akhaldi＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: akhaldi Date: Wed Aug 14 13:23:37 2013 New Revision: 59735 URL: http://svn.reactos.org/svn/reactos?rev=59735&view=rev Log: [PSDK] * Annotate cfgmgr32.h. Modified: trunk/reactos/include/psdk/cfgmgr32.h Modified: trunk/reactos/include/psdk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/cfgmgr32.h?re… ============================================================================== --- trunk/reactos/include/psdk/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/cfgmgr32.h [iso-8859-1] Wed Aug 14 13:23:37 2013 @@ -22,6 +22,7 @@ #pragma once +#ifndef _CFGMGR32_H_ #define _CFGMGR32_H_ #include <cfg.h> @@ -69,14 +70,14 @@ #endif /* NT_INCLUDED */ -typedef DWORD RETURN_TYPE; +typedef _Return_type_success_(return == 0) DWORD RETURN_TYPE; typedef RETURN_TYPE CONFIGRET; typedef DWORD DEVNODE, DEVINST; typedef DEVNODE *PDEVNODE, *PDEVINST; -typedef CHAR *DEVNODEID_A, *DEVINSTID_A; -typedef WCHAR *DEVNODEID_W, *DEVINSTID_W; +typedef _Null_terminated_ CHAR *DEVNODEID_A, *DEVINSTID_A; +typedef _Null_terminated_ WCHAR *DEVNODEID_W, *DEVINSTID_W; #ifdef UNICODE typedef DEVNODEID_W DEVNODEID; @@ -953,54 +954,54 @@ CONFIGRET WINAPI CM_Add_Empty_Log_Conf( - OUT PLOG_CONF plcLogConf, - IN DEVINST dnDevInst, - IN PRIORITY Priority, - IN ULONG ulFlags); + _Out_ PLOG_CONF plcLogConf, + _In_ DEVINST dnDevInst, + _In_ PRIORITY Priority, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Add_Empty_Log_Conf_Ex( - OUT PLOG_CONF plcLogConf, - IN DEVINST dnDevInst, - IN PRIORITY Priority, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PLOG_CONF plcLogConf, + _In_ DEVINST dnDevInst, + _In_ PRIORITY Priority, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Add_IDA( - IN DEVINST dnDevInst, - IN PSTR pszID, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ PSTR pszID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Add_ID_ExA( - IN DEVINST dnDevInst, - IN PSTR pszID, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ PSTR pszID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Add_ID_ExW( - IN DEVINST dnDevInst, - IN PWSTR pszID, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ PWSTR pszID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Add_IDW( - IN DEVINST dnDevInst, - IN PWSTR pszID, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ PWSTR pszID, + _In_ ULONG ulFlags); #ifdef UNICODE #define CM_Add_ID CM_Add_IDW @@ -1014,47 +1015,47 @@ CONFIGRET WINAPI CM_Add_Range( - IN DWORDLONG ullStartValue, - IN DWORDLONG ullEndValue, - IN RANGE_LIST rlh, - IN ULONG ulFlags); + _In_ DWORDLONG ullStartValue, + _In_ DWORDLONG ullEndValue, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Add_Res_Des( - OUT PRES_DES prdResDes OPTIONAL, - IN LOG_CONF lcLogConf, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - IN ULONG ulFlags); + _Out_opt_ PRES_DES prdResDes, + _In_ LOG_CONF lcLogConf, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Add_Res_Des_Ex( - OUT PRES_DES prdResDes OPTIONAL, - IN LOG_CONF lcLogConf, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_opt_ PRES_DES prdResDes, + _In_ LOG_CONF lcLogConf, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Connect_MachineA( - IN PCSTR UNCServerName OPTIONAL, - OUT PHMACHINE phMachine); + _In_opt_ PCSTR UNCServerName, + _Out_ PHMACHINE phMachine); CMAPI CONFIGRET WINAPI CM_Connect_MachineW( - IN PCWSTR UNCServerName OPTIONAL, - OUT PHMACHINE phMachine); + _In_opt_ PCWSTR UNCServerName, + _Out_ PHMACHINE phMachine); #ifdef UNICODE #define CM_Connect_Machine CM_Connect_MachineW @@ -1066,39 +1067,39 @@ CONFIGRET WINAPI CM_Create_DevNodeA( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_A pDeviceID, - IN DEVINST dnParent, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINSTID_A pDeviceID, + _In_ DEVINST dnParent, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Create_DevNodeW( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_W pDeviceID, - IN DEVINST dnParent, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINSTID_W pDeviceID, + _In_ DEVINST dnParent, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Create_DevNode_ExA( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_A pDeviceID, - IN DEVINST dnParent, - IN ULONG ulFlags, - IN HANDLE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINSTID_A pDeviceID, + _In_ DEVINST dnParent, + _In_ ULONG ulFlags, + _In_opt_ HANDLE hMachine); CMAPI CONFIGRET WINAPI CM_Create_DevNode_ExW( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_W pDeviceID, - IN DEVINST dnParent, - IN ULONG ulFlags, - IN HANDLE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINSTID_W pDeviceID, + _In_ DEVINST dnParent, + _In_ ULONG ulFlags, + _In_opt_ HANDLE hMachine); #define CM_Create_DevInstW CM_Create_DevNodeW #define CM_Create_DevInstA CM_Create_DevNodeA @@ -1120,40 +1121,40 @@ CONFIGRET WINAPI CM_Create_Range_List( - OUT PRANGE_LIST prlh, - IN ULONG ulFlags); + _Out_ PRANGE_LIST prlh, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Delete_Class_Key( - IN LPGUID ClassGuid, - IN ULONG ulFlags); + _In_ LPGUID ClassGuid, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Delete_Class_Key_Ex( - IN LPGUID ClassGuid, - IN ULONG ulFlags, - IN HANDLE hMachine); + _In_ LPGUID ClassGuid, + _In_ ULONG ulFlags, + _In_opt_ HANDLE hMachine); CMAPI CONFIGRET WINAPI CM_Delete_DevNode_Key( - IN DEVNODE dnDevNode, - IN ULONG ulHardwareProfile, - IN ULONG ulFlags); + _In_ DEVNODE dnDevNode, + _In_ ULONG ulHardwareProfile, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Delete_DevNode_Key_Ex( - IN DEVNODE dnDevNode, - IN ULONG ulHardwareProfile, - IN ULONG ulFlags, - IN HANDLE hMachine); + _In_ DEVNODE dnDevNode, + _In_ ULONG ulHardwareProfile, + _In_ ULONG ulFlags, + _In_opt_ HANDLE hMachine); #define CM_Delete_DevInst_Key CM_Delete_DevNode_Key #define CM_Delete_DevInst_Key_Ex CM_Delete_DevNode_Key_Ex @@ -1162,48 +1163,48 @@ CONFIGRET WINAPI CM_Delete_Range( - IN DWORDLONG ullStartValue, - IN DWORDLONG ullEndValue, - IN RANGE_LIST rlh, - IN ULONG ulFlags); + _In_ DWORDLONG ullStartValue, + _In_ DWORDLONG ullEndValue, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Detect_Resource_Conflict( - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - OUT PBOOL pbConflictDetected, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _Out_ PBOOL pbConflictDetected, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Detect_Resource_Conflict_Ex( - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - OUT PBOOL pbConflictDetected, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _Out_ PBOOL pbConflictDetected, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Disable_DevNode( - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Disable_DevNode_Ex( - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Disable_DevInst CM_Disable_DevNode #define CM_Disable_DevInst_Ex CM_Disable_DevNode_Ex @@ -1212,30 +1213,30 @@ CONFIGRET WINAPI CM_Disconnect_Machine( - IN HMACHINE hMachine OPTIONAL); + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Dup_Range_List( - IN RANGE_LIST rlhOld, - IN RANGE_LIST rlhNew, - IN ULONG ulFlags); + _In_ RANGE_LIST rlhOld, + _In_ RANGE_LIST rlhNew, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Enable_DevNode( - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Enable_DevNode_Ex( - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Enable_DevInst CM_Enable_DevNode #define CM_Enable_DevInst_Ex CM_Enable_DevNode_Ex @@ -1244,56 +1245,56 @@ CONFIGRET WINAPI CM_Enumerate_Classes( - IN ULONG ulClassIndex, - OUT LPGUID ClassGuid, - IN ULONG ulFlags); + _In_ ULONG ulClassIndex, + _Out_ LPGUID ClassGuid, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Enumerate_Classes_Ex( - IN ULONG ulClassIndex, - OUT LPGUID ClassGuid, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ ULONG ulClassIndex, + _Out_ LPGUID ClassGuid, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Enumerate_EnumeratorsA( - IN ULONG ulEnumIndex, - OUT PCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ ULONG ulEnumIndex, + _Out_writes_(*pulLength) PCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Enumerate_Enumerators_ExA( - IN ULONG ulEnumIndex, - OUT PCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ ULONG ulEnumIndex, + _Out_writes_(*pulLength) PCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Enumerate_Enumerators_ExW( - IN ULONG ulEnumIndex, - OUT PWCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ ULONG ulEnumIndex, + _Out_writes_(*pulLength) PWCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Enumerate_EnumeratorsW( - IN ULONG ulEnumIndex, - OUT PWCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ ULONG ulEnumIndex, + _Out_writes_(*pulLength) PWCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); #ifdef UNICODE #define CM_Enumerate_Enumerators CM_Enumerate_EnumeratorsW @@ -1307,135 +1308,135 @@ CONFIGRET WINAPI CM_Find_Range( - OUT PDWORDLONG pullStart, - IN DWORDLONG ullStart, - IN ULONG ulLength, - IN DWORDLONG ullAlignment, - IN DWORDLONG ullEnd, - IN RANGE_LIST rlh, - IN ULONG ulFlags); + _Out_ PDWORDLONG pullStart, + _In_ DWORDLONG ullStart, + _In_ ULONG ulLength, + _In_ DWORDLONG ullAlignment, + _In_ DWORDLONG ullEnd, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_First_Range( - IN RANGE_LIST rlh, - OUT PDWORDLONG pullStart, - OUT PDWORDLONG pullEnd, - OUT PRANGE_ELEMENT preElement, - IN ULONG ulFlags); + _In_ RANGE_LIST rlh, + _Out_ PDWORDLONG pullStart, + _Out_ PDWORDLONG pullEnd, + _Out_ PRANGE_ELEMENT preElement, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Free_Log_Conf( - IN LOG_CONF lcLogConfToBeFreed, - IN ULONG ulFlags); + _In_ LOG_CONF lcLogConfToBeFreed, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Free_Log_Conf_Ex( - IN LOG_CONF lcLogConfToBeFreed, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ LOG_CONF lcLogConfToBeFreed, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Free_Log_Conf_Handle( - IN LOG_CONF lcLogConf); + _In_ LOG_CONF lcLogConf); CMAPI CONFIGRET WINAPI CM_Free_Range_List( - IN RANGE_LIST rlh, - IN ULONG ulFlags); + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Free_Res_Des( - OUT PRES_DES prdResDes, - IN RES_DES rdResDes, - IN ULONG ulFlags); + _Out_opt_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Free_Res_Des_Ex( - OUT PRES_DES prdResDes, - IN RES_DES rdResDes, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_opt_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Free_Res_Des_Handle( - IN RES_DES rdResDes); + _In_ RES_DES rdResDes); CMAPI CONFIGRET WINAPI CM_Free_Resource_Conflict_Handle( - IN CONFLICT_LIST clConflictList); + _In_ CONFLICT_LIST clConflictList); CMAPI CONFIGRET WINAPI CM_Get_Child( - OUT PDEVINST pdnDevInst, - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Child_Ex( - OUT PDEVINST pdnDevInst, - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Class_NameA( - IN LPGUID ClassGuid, - OUT PCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) PCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Class_NameW( - IN LPGUID ClassGuid, - OUT PWCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) PWCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Class_Name_ExA( - IN LPGUID ClassGuid, - OUT PCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) PCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Class_Name_ExW( - IN LPGUID ClassGuid, - OUT PWCHAR Buffer, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) PWCHAR Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Class_Name CM_Get_Class_NameW @@ -1449,39 +1450,39 @@ CONFIGRET WINAPI CM_Get_Class_Key_NameA( - IN LPGUID ClassGuid, - OUT LPSTR pszKeyName, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) LPSTR pszKeyName, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Class_Key_NameW( - IN LPGUID ClassGuid, - OUT LPWSTR pszKeyName, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) LPWSTR pszKeyName, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Class_Key_Name_ExA( - IN LPGUID ClassGuid, - OUT LPSTR pszKeyName, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) LPSTR pszKeyName, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Class_Key_Name_ExW( - IN LPGUID ClassGuid, - OUT LPWSTR pszKeyName, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ LPGUID ClassGuid, + _Out_writes_opt_(*pulLength) LPWSTR pszKeyName, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Class_Key_Name CM_Get_Class_Key_NameW @@ -1495,56 +1496,56 @@ CONFIGRET WINAPI CM_Get_Depth( - OUT PULONG pulDepth, - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _Out_ PULONG pulDepth, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Depth_Ex( - OUT PULONG pulDepth, - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulDepth, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_IDA( - IN DEVINST dnDevInst, - OUT PCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _Out_writes_(BufferLen) PCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ExA( - IN DEVINST dnDevInst, - OUT PCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _Out_writes_(BufferLen) PCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ExW( - IN DEVINST dnDevInst, - OUT PWCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _Out_writes_(BufferLen) PWCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_IDW( - IN DEVINST dnDevInst, - OUT PWCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _Out_writes_(BufferLen) PWCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); #ifdef UNICODE #define CM_Get_Device_ID CM_Get_Device_IDW @@ -1558,39 +1559,39 @@ CONFIGRET WINAPI CM_Get_Device_ID_ListA( - IN PCSTR pszFilter OPTIONAL, - OUT PCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_opt_ PCSTR pszFilter, + _Out_writes_(BufferLen) PCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExA( - IN PCSTR pszFilter OPTIONAL, - OUT PCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_opt_ PCSTR pszFilter, + _Out_writes_(BufferLen) PCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_ExW( - IN PCWSTR pszFilter OPTIONAL, - OUT PWCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_opt_ PCWSTR pszFilter, + _Out_writes_(BufferLen) PWCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_ListW( - IN PCWSTR pszFilter OPTIONAL, - OUT PWCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_opt_ PCWSTR pszFilter, + _Out_writes_(BufferLen) PWCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); #ifdef UNICODE #define CM_Get_Device_ID_List CM_Get_Device_ID_ListW @@ -1604,35 +1605,35 @@ CONFIGRET WINAPI CM_Get_Device_ID_List_SizeA( - OUT PULONG pulLen, - IN PCSTR pszFilter OPTIONAL, - IN ULONG ulFlags); + _Out_ PULONG pulLen, + _In_opt_ PCSTR pszFilter, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExA( - OUT PULONG pulLen, - IN PCSTR pszFilter OPTIONAL, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulLen, + _In_opt_ PCSTR pszFilter, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_Size_ExW( - OUT PULONG pulLen, - IN PCWSTR pszFilter OPTIONAL, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulLen, + _In_opt_ PCWSTR pszFilter, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_List_SizeW( - OUT PULONG pulLen, - IN PCWSTR pszFilter OPTIONAL, - IN ULONG ulFlags); + _Out_ PULONG pulLen, + _In_opt_ PCWSTR pszFilter, + _In_ ULONG ulFlags); #ifdef UNICODE #define CM_Get_Device_ID_List_Size CM_Get_Device_ID_List_SizeW @@ -1646,64 +1647,64 @@ CONFIGRET WINAPI CM_Get_Device_ID_Size( - OUT PULONG pulLen, - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _Out_ PULONG pulLen, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex( - OUT PULONG pulLen, - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulLen, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyA( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Registry_PropertyW( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExA( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Registry_Property_ExW( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Get_DevInst_Registry_PropertyW CM_Get_DevNode_Registry_PropertyW #define CM_Get_DevInst_Registry_PropertyA CM_Get_DevNode_Registry_PropertyA @@ -1728,47 +1729,47 @@ CONFIGRET WINAPI CM_Get_DevNode_Custom_PropertyA( - IN DEVINST dnDevInst, - IN PCSTR pszCustomPropertyName, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ PCSTR pszCustomPropertyName, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Custom_PropertyW( - IN DEVINST dnDevInst, - IN PCWSTR pszCustomPropertyName, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ PCWSTR pszCustomPropertyName, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Custom_Property_ExA( - IN DEVINST dnDevInst, - IN PCSTR pszCustomPropertyName, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ PCSTR pszCustomPropertyName, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Custom_Property_ExW( - IN DEVINST dnDevInst, - IN PCWSTR pszCustomPropertyName, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ PCWSTR pszCustomPropertyName, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Get_DevInst_Custom_PropertyW CM_Get_DevNode_Custom_PropertyW #define CM_Get_DevInst_Custom_PropertyA CM_Get_DevNode_Custom_PropertyA @@ -1792,20 +1793,20 @@ CONFIGRET WINAPI CM_Get_DevNode_Status( - OUT PULONG pulStatus, - OUT PULONG pulProblemNumber, - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _Out_ PULONG pulStatus, + _Out_ PULONG pulProblemNumber, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_DevNode_Status_Ex( - OUT PULONG pulStatus, - OUT PULONG pulProblemNumber, - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulStatus, + _Out_ PULONG pulProblemNumber, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Get_DevInst_Status CM_Get_DevNode_Status #define CM_Get_DevInst_Status_Ex CM_Get_DevNode_Status_Ex @@ -1814,67 +1815,67 @@ CONFIGRET WINAPI CM_Get_First_Log_Conf( - OUT PLOG_CONF plcLogConf OPTIONAL, - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _Out_opt_ PLOG_CONF plcLogConf, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_First_Log_Conf_Ex( - OUT PLOG_CONF plcLogConf OPTIONAL, - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _Out_opt_ PLOG_CONF plcLogConf, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Global_State( - OUT PULONG pulState, - IN ULONG ulFlags); + _Out_ PULONG pulState, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Global_State_Ex( - OUT PULONG pulState, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulState, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoA( - IN ULONG ulIndex, - OUT PHWPROFILEINFO_A pHWProfileInfo, - IN ULONG ulFlags); + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_A pHWProfileInfo, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExA( - IN ULONG ulIndex, - OUT PHWPROFILEINFO_A pHWProfileInfo, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_A pHWProfileInfo, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Hardware_Profile_InfoW( - IN ULONG ulIndex, - OUT PHWPROFILEINFO_W pHWProfileInfo, - IN ULONG ulFlags); + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_W pHWProfileInfo, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Hardware_Profile_Info_ExW( - IN ULONG ulIndex, - OUT PHWPROFILEINFO_W pHWProfileInfo, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ ULONG ulIndex, + _Out_ PHWPROFILEINFO_W pHWProfileInfo, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Hardware_Profile_Info CM_Get_Hardware_Profile_InfoW @@ -1888,39 +1889,39 @@ CONFIGRET WINAPI CM_Get_HW_Prof_FlagsA( - IN DEVINSTID_A szDevInstName, - IN ULONG ulHardwareProfile, - OUT PULONG pulValue, - IN ULONG ulFlags); + _In_ DEVINSTID_A szDevInstName, + _In_ ULONG ulHardwareProfile, + _Out_ PULONG pulValue, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_HW_Prof_FlagsW( - IN DEVINSTID_W szDevInstName, - IN ULONG ulHardwareProfile, - OUT PULONG pulValue, - IN ULONG ulFlags); + _In_ DEVINSTID_W szDevInstName, + _In_ ULONG ulHardwareProfile, + _Out_ PULONG pulValue, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExA( - IN DEVINSTID_A szDevInstName, - IN ULONG ulHardwareProfile, - OUT PULONG pulValue, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINSTID_A szDevInstName, + _In_ ULONG ulHardwareProfile, + _Out_ PULONG pulValue, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_HW_Prof_Flags_ExW( - IN DEVINSTID_W szDevInstName, - IN ULONG ulHardwareProfile, - OUT PULONG pulValue, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINSTID_W szDevInstName, + _In_ ULONG ulHardwareProfile, + _Out_ PULONG pulValue, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_HW_Prof_Flags CM_Get_HW_Prof_FlagsW @@ -1934,43 +1935,43 @@ CONFIGRET WINAPI CM_Get_Device_Interface_AliasA( - IN LPCSTR pszDeviceInterface, - IN LPGUID AliasInterfaceGuid, - OUT LPSTR pszAliasDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ LPCSTR pszDeviceInterface, + _In_ LPGUID AliasInterfaceGuid, + _Out_writes_(*pulLength) LPSTR pszAliasDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_AliasW( - IN LPCWSTR pszDeviceInterface, - IN LPGUID AliasInterfaceGuid, - OUT LPWSTR pszAliasDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ LPCWSTR pszDeviceInterface, + _In_ LPGUID AliasInterfaceGuid, + _Out_writes_(*pulLength) LPWSTR pszAliasDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_Alias_ExA( - IN LPCSTR pszDeviceInterface, - IN LPGUID AliasInterfaceGuid, - OUT LPSTR pszAliasDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCSTR pszDeviceInterface, + _In_ LPGUID AliasInterfaceGuid, + _Out_writes_(*pulLength) LPSTR pszAliasDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_Alias_ExW( - IN LPCWSTR pszDeviceInterface, - IN LPGUID AliasInterfaceGuid, - OUT LPWSTR pszAliasDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCWSTR pszDeviceInterface, + _In_ LPGUID AliasInterfaceGuid, + _Out_writes_(*pulLength) LPWSTR pszAliasDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Device_Interface_Alias CM_Get_Device_Interface_AliasW @@ -1984,43 +1985,43 @@ CONFIGRET WINAPI CM_Get_Device_Interface_ListA( - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_A pDeviceID OPTIONAL, - OUT PCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_A pDeviceID, + _Out_writes_(BufferLen) PCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_ListW( - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_W pDeviceID OPTIONAL, - OUT PWCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_W pDeviceID, + _Out_writes_(BufferLen) PWCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_ExA( - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_A pDeviceID OPTIONAL, - OUT PCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_A pDeviceID, + _Out_writes_(BufferLen) PCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_ExW( - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_W pDeviceID OPTIONAL, - OUT PWCHAR Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_W pDeviceID, + _Out_writes_(BufferLen) PWCHAR Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Device_Interface_List CM_Get_Device_Interface_ListW @@ -2034,39 +2035,39 @@ CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeA( - OUT PULONG pulLen, - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_A pDeviceID OPTIONAL, - IN ULONG ulFlags); + _Out_ PULONG pulLen, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_A pDeviceID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_SizeW( - OUT PULONG pulLen, - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_W pDeviceID OPTIONAL, - IN ULONG ulFlags); + _Out_ PULONG pulLen, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_W pDeviceID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExA( - OUT PULONG pulLen, - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_A pDeviceID OPTIONAL, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _Out_ PULONG pulLen, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_A pDeviceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Device_Interface_List_Size_ExW( - OUT PULONG pulLen, - IN LPGUID InterfaceClassGuid, - IN DEVINSTID_W pDeviceID OPTIONAL, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _Out_ PULONG pulLen, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ DEVINSTID_W pDeviceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Device_Interface_List_Size CM_Get_Device_Interface_List_SizeW @@ -2080,132 +2081,132 @@ CONFIGRET WINAPI CM_Get_Log_Conf_Priority( - IN LOG_CONF lcLogConf, - OUT PPRIORITY pPriority, - IN ULONG ulFlags); + _In_ LOG_CONF lcLogConf, + _Out_ PPRIORITY pPriority, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Log_Conf_Priority_Ex( - IN LOG_CONF lcLogConf, - OUT PPRIORITY pPriority, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ LOG_CONF lcLogConf, + _Out_ PPRIORITY pPriority, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Next_Log_Conf( - OUT PLOG_CONF plcLogConf OPTIONAL, - IN LOG_CONF lcLogConf, - IN ULONG ulFlags); + _Out_opt_ PLOG_CONF plcLogConf, + _In_ LOG_CONF lcLogConf, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Next_Log_Conf_Ex( - OUT PLOG_CONF plcLogConf OPTIONAL, - IN LOG_CONF lcLogConf, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_opt_ PLOG_CONF plcLogConf, + _In_ LOG_CONF lcLogConf, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Next_Res_Des( - OUT PRES_DES prdResDes, - IN RES_DES rdResDes, - IN RESOURCEID ForResource, - OUT PRESOURCEID pResourceID, - IN ULONG ulFlags); + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ RESOURCEID ForResource, + _Out_opt_ PRESOURCEID pResourceID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Next_Res_Des_Ex( - OUT PRES_DES prdResDes, - IN RES_DES rdResDes, - IN RESOURCEID ForResource, - OUT PRESOURCEID pResourceID, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ RESOURCEID ForResource, + _Out_opt_ PRESOURCEID pResourceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Parent( - OUT PDEVINST pdnDevInst, - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Parent_Ex( - OUT PDEVINST pdnDevInst, - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Res_Des_Data( - IN RES_DES rdResDes, - OUT PVOID Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags); + _In_ RES_DES rdResDes, + _Out_writes_bytes_(BufferLen) PVOID Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Res_Des_Data_Ex( - IN RES_DES rdResDes, - OUT PVOID Buffer, - IN ULONG BufferLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ RES_DES rdResDes, + _Out_writes_bytes_(BufferLen) PVOID Buffer, + _In_ ULONG BufferLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Res_Des_Data_Size( - OUT PULONG pulSize, - IN RES_DES rdResDes, - IN ULONG ulFlags); + _Out_ PULONG pulSize, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Res_Des_Data_Size_Ex( - OUT PULONG pulSize, - IN RES_DES rdResDes, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PULONG pulSize, + _In_ RES_DES rdResDes, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Resource_Conflict_Count( - IN CONFLICT_LIST clConflictList, - OUT PULONG pulCount); + _In_ CONFLICT_LIST clConflictList, + _Out_ PULONG pulCount); CMAPI CONFIGRET WINAPI CM_Get_Resource_Conflict_DetailsA( - IN CONFLICT_LIST clConflictList, - IN ULONG ulIndex, - IN OUT PCONFLICT_DETAILS_A pConflictDetails); + _In_ CONFLICT_LIST clConflictList, + _In_ ULONG ulIndex, + _Inout_ PCONFLICT_DETAILS_A pConflictDetails); CMAPI CONFIGRET WINAPI CM_Get_Resource_Conflict_DetailsW( - IN CONFLICT_LIST clConflictList, - IN ULONG ulIndex, - IN OUT PCONFLICT_DETAILS_W pConflictDetails); + _In_ CONFLICT_LIST clConflictList, + _In_ ULONG ulIndex, + _Inout_ PCONFLICT_DETAILS_W pConflictDetails); #ifdef UNICODE #define CM_Get_Resource_Conflict_Details CM_Get_Resource_Conflict_DetailsW @@ -2217,47 +2218,47 @@ CONFIGRET WINAPI CM_Get_Class_Registry_PropertyW( - IN LPGUID ClassGuid, - IN ULONG ulProperty, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPGUID ClassGuid, + _In_ ULONG ulProperty, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Set_Class_Registry_PropertyW( - IN LPGUID ClassGuid, - IN ULONG ulProperty, - IN PCVOID Buffer OPTIONAL, - IN ULONG ulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPGUID ClassGuid, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Get_Class_Registry_PropertyA( - IN LPGUID ClassGuid, - IN ULONG ulProperty, - OUT PULONG pulRegDataType OPTIONAL, - OUT PVOID Buffer OPTIONAL, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPGUID ClassGuid, + _In_ ULONG ulProperty, + _Out_opt_ PULONG pulRegDataType, + _Out_writes_bytes_opt_(*pulLength) PVOID Buffer, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Set_Class_Registry_PropertyA( - IN LPGUID ClassGuid, - IN ULONG ulProperty, - IN PCVOID Buffer OPTIONAL, - IN ULONG ulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPGUID ClassGuid, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Get_Class_Registry_Property CM_Get_Class_Registry_PropertyW @@ -2271,18 +2272,18 @@ CONFIGRET WINAPI CM_Get_Sibling( - OUT PDEVINST pdnDevInst, - IN DEVINST DevInst, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST DevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Get_Sibling_Ex( - OUT PDEVINST pdnDevInst, - IN DEVINST DevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_ DEVINST DevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI WORD @@ -2293,7 +2294,7 @@ WORD WINAPI CM_Get_Version_Ex( - IN HMACHINE hMachine); + _In_opt_ HMACHINE hMachine); #if (WINVER >= _WIN32_WINNT_WINXP) @@ -2301,14 +2302,14 @@ BOOL WINAPI CM_Is_Version_Available( - IN WORD wVersion); + _In_ WORD wVersion); CMAPI BOOL WINAPI CM_Is_Version_Available_Ex( - IN WORD wVersion, - IN HMACHINE hMachine OPTIONAL); + _In_ WORD wVersion, + _In_opt_ HMACHINE hMachine); #endif /* (WINVER >= _WIN32_WINNT_WINXP) */ @@ -2316,66 +2317,66 @@ CONFIGRET WINAPI CM_Intersect_Range_List( - IN RANGE_LIST rlhOld1, - IN RANGE_LIST rlhOld2, - IN RANGE_LIST rlhNew, - IN ULONG ulFlags); + _In_ RANGE_LIST rlhOld1, + _In_ RANGE_LIST rlhOld2, + _In_ RANGE_LIST rlhNew, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Invert_Range_List( - IN RANGE_LIST rlhOld, - IN RANGE_LIST rlhNew, - IN DWORDLONG ullMaxValue, - IN ULONG ulFlags); + _In_ RANGE_LIST rlhOld, + _In_ RANGE_LIST rlhNew, + _In_ DWORDLONG ullMaxValue, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Is_Dock_Station_Present( - OUT PBOOL pbPresent); + _Out_ PBOOL pbPresent); CMAPI CONFIGRET WINAPI CM_Is_Dock_Station_Present_Ex( - OUT PBOOL pbPresent, - IN HMACHINE hMachine OPTIONAL); + _Out_ PBOOL pbPresent, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeA( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_A pDeviceID OPTIONAL, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_opt_ DEVINSTID_A pDeviceID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Locate_DevNode_ExA( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_A pDeviceID OPTIONAL, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_opt_ DEVINSTID_A pDeviceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Locate_DevNode_ExW( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_W pDeviceID OPTIONAL, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PDEVINST pdnDevInst, + _In_opt_ DEVINSTID_W pDeviceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Locate_DevNodeW( - OUT PDEVINST pdnDevInst, - IN DEVINSTID_W pDeviceID OPTIONAL, - IN ULONG ulFlags); + _Out_ PDEVINST pdnDevInst, + _In_opt_ DEVINSTID_W pDeviceID, + _In_ ULONG ulFlags); #define CM_Locate_DevInstA CM_Locate_DevNodeA #define CM_Locate_DevInstW CM_Locate_DevNodeW @@ -2398,50 +2399,50 @@ CONFIGRET WINAPI CM_Merge_Range_List( - IN RANGE_LIST rlhOld1, - IN RANGE_LIST rlhOld2, - IN RANGE_LIST rlhNew, - IN ULONG ulFlags); + _In_ RANGE_LIST rlhOld1, + _In_ RANGE_LIST rlhOld2, + _In_ RANGE_LIST rlhNew, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Modify_Res_Des( - OUT PRES_DES prdResDes, - IN RES_DES rdResDes, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - IN ULONG ulFlags); + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Modify_Res_Des_Ex( - OUT PRES_DES prdResDes, - IN RES_DES rdResDes, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _Out_ PRES_DES prdResDes, + _In_ RES_DES rdResDes, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Move_DevNode( - IN DEVINST dnFromDevInst, - IN DEVINST dnToDevInst, - IN ULONG ulFlags); + _In_ DEVINST dnFromDevInst, + _In_ DEVINST dnToDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Move_DevNode_Ex( - IN DEVINST dnFromDevInst, - IN DEVINST dnToDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnFromDevInst, + _In_ DEVINST dnToDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Move_DevInst CM_Move_DevNode #define CM_Move_DevInst_Ex CM_Move_DevNode_Ex @@ -2450,56 +2451,56 @@ CONFIGRET WINAPI CM_Next_Range( - IN OUT PRANGE_ELEMENT preElement, - OUT PDWORDLONG pullStart, - OUT PDWORDLONG pullEnd, - IN ULONG ulFlags); + _Inout_ PRANGE_ELEMENT preElement, + _Out_ PDWORDLONG pullStart, + _Out_ PDWORDLONG pullEnd, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Open_Class_KeyA( - IN LPGUID ClassGuid OPTIONAL, - IN LPCSTR pszClassName OPTIONAL, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkClass, - IN ULONG ulFlags); + _In_opt_ LPGUID ClassGuid, + _In_opt_ LPCSTR pszClassName, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkClass, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Open_Class_KeyW( - IN LPGUID ClassGuid OPTIONAL, - IN LPCWSTR pszClassName OPTIONAL, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkClass, - IN ULONG ulFlags); + _In_opt_ LPGUID ClassGuid, + _In_opt_ LPCWSTR pszClassName, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkClass, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Open_Class_Key_ExA( - IN LPGUID pszClassGuid OPTIONAL, - IN LPCSTR pszClassName OPTIONAL, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkClass, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_opt_ LPGUID pszClassGuid, + _In_opt_ LPCSTR pszClassName, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkClass, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Open_Class_Key_ExW( - IN LPGUID pszClassGuid OPTIONAL, - IN LPCWSTR pszClassName OPTIONAL, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkClass, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_opt_ LPGUID pszClassGuid, + _In_opt_ LPCWSTR pszClassName, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkClass, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Open_Class_Key CM_Open_Class_KeyW @@ -2513,24 +2514,24 @@ CONFIGRET WINAPI CM_Open_DevNode_Key( - IN DEVINST dnDevNode, - IN REGSAM samDesired, - IN ULONG ulHardwareProfile, - IN REGDISPOSITION Disposition, - OUT PHKEY phkDevice, - IN ULONG ulFlags); + _In_ DEVINST dnDevNode, + _In_ REGSAM samDesired, + _In_ ULONG ulHardwareProfile, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkDevice, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Open_DevNode_Key_Ex( - IN DEVINST dnDevNode, - IN REGSAM samDesired, - IN ULONG ulHardwareProfile, - IN REGDISPOSITION Disposition, - OUT PHKEY phkDevice, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevNode, + _In_ REGSAM samDesired, + _In_ ULONG ulHardwareProfile, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkDevice, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Open_DevInst_Key CM_Open_DevNode_Key #define CM_Open_DevInst_Key_Ex CM_Open_DevNode_Key_Ex @@ -2541,43 +2542,43 @@ CONFIGRET WINAPI CM_Open_Device_Interface_KeyA( - IN LPCSTR pszDeviceInterface, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkDeviceInterface, - IN ULONG ulFlags); + _In_ LPCSTR pszDeviceInterface, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkDeviceInterface, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Open_Device_Interface_KeyW( - IN LPCWSTR pszDeviceInterface, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkDeviceInterface, - IN ULONG ulFlags); + _In_ LPCWSTR pszDeviceInterface, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkDeviceInterface, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Open_Device_Interface_Key_ExA( - IN LPCSTR pszDeviceInterface, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkDeviceInterface, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCSTR pszDeviceInterface, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Open_Device_Interface_Key_ExW( - IN LPCWSTR pszDeviceInterface, - IN REGSAM samDesired, - IN REGDISPOSITION Disposition, - OUT PHKEY phkDeviceInterface, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCWSTR pszDeviceInterface, + _In_ REGSAM samDesired, + _In_ REGDISPOSITION Disposition, + _Out_ PHKEY phkDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Open_Device_Interface_Key CM_Open_Device_Interface_KeyW @@ -2591,31 +2592,31 @@ CONFIGRET WINAPI CM_Delete_Device_Interface_KeyA( - IN LPCSTR pszDeviceInterface, - IN ULONG ulFlags); + _In_ LPCSTR pszDeviceInterface, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Delete_Device_Interface_KeyW( - IN LPCWSTR pszDeviceInterface, - IN ULONG ulFlags); + _In_ LPCWSTR pszDeviceInterface, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Delete_Device_Interface_Key_ExA( - IN LPCSTR pszDeviceInterface, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCSTR pszDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Delete_Device_Interface_Key_ExW( - IN LPCWSTR pszDeviceInterface, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCWSTR pszDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Delete_Device_Interface_Key CM_Delete_Device_Interface_KeyW @@ -2631,98 +2632,98 @@ CONFIGRET WINAPI CM_Query_Arbitrator_Free_Data( - OUT PVOID pData, - IN ULONG DataLen, - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN ULONG ulFlags); + _Out_writes_bytes_(DataLen) PVOID pData, + _In_ ULONG DataLen, + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Query_Arbitrator_Free_Data_Ex( - OUT PVOID pData, - IN ULONG DataLen, - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _Out_writes_bytes_(DataLen) PVOID pData, + _In_ ULONG DataLen, + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Query_Arbitrator_Free_Size( - OUT PULONG pulSize, - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN ULONG ulFlags); + _Out_ PULONG pulSize, + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Query_Arbitrator_Free_Size_Ex( - OUT PULONG pulSize, - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _Out_ PULONG pulSize, + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Query_Remove_SubTree( - IN DEVINST dnAncestor, - IN ULONG ulFlags); + _In_ DEVINST dnAncestor, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Query_Remove_SubTree_Ex( - IN DEVINST dnAncestor, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnAncestor, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Query_And_Remove_SubTreeA( - IN DEVINST dnAncestor, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags); + _In_ DEVINST dnAncestor, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Query_And_Remove_SubTreeW( - IN DEVINST dnAncestor, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPWSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags); + _In_ DEVINST dnAncestor, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPWSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Query_And_Remove_SubTree_ExA( - IN DEVINST dnAncestor, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnAncestor, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Query_And_Remove_SubTree_ExW( - IN DEVINST dnAncestor, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPWSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnAncestor, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPWSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Query_And_Remove_SubTree CM_Query_And_Remove_SubTreeW @@ -2736,28 +2737,28 @@ CONFIGRET WINAPI CM_Query_Resource_Conflict_List( - OUT PCONFLICT_LIST pclConflictList, - IN DEVINST dnDevInst, - IN RESOURCEID ResourceID, - IN PCVOID ResourceData, - IN ULONG ResourceLen, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _Out_ PCONFLICT_LIST pclConflictList, + _In_ DEVINST dnDevInst, + _In_ RESOURCEID ResourceID, + _In_reads_bytes_(ResourceLen) PCVOID ResourceData, + _In_ ULONG ResourceLen, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Reenumerate_DevNode( - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Reenumerate_DevNode_Ex( - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Reenumerate_DevInst CM_Reenumerate_DevNode #define CM_Reenumerate_DevInst_Ex CM_Reenumerate_DevNode_Ex @@ -2766,47 +2767,47 @@ CONFIGRET WINAPI CM_Register_Device_InterfaceA( - IN DEVINST dnDevInst, - IN LPGUID InterfaceClassGuid, - IN LPCSTR pszReference OPTIONAL, - OUT LPSTR pszDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCSTR pszReference, + _Out_writes_(*pulLength) LPSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Register_Device_InterfaceW( - IN DEVINST dnDevInst, - IN LPGUID InterfaceClassGuid, - IN LPCWSTR pszReference OPTIONAL, - OUT LPWSTR pszDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCWSTR pszReference, + _Out_writes_(*pulLength) LPWSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Register_Device_Interface_ExA( - IN DEVINST dnDevInst, - IN LPGUID InterfaceClassGuid, - IN LPCSTR pszReference OPTIONAL, - OUT LPSTR pszDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCSTR pszReference, + _Out_writes_(*pulLength) LPSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Register_Device_Interface_ExW( - IN DEVINST dnDevInst, - IN LPGUID InterfaceClassGuid, - IN LPCWSTR pszReference OPTIONAL, - OUT LPWSTR pszDeviceInterface, - IN OUT PULONG pulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ LPGUID InterfaceClassGuid, + _In_opt_ LPCWSTR pszReference, + _Out_writes_(*pulLength) LPWSTR pszDeviceInterface, + _Inout_ PULONG pulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Register_Device_Interface CM_Register_Device_InterfaceW @@ -2820,43 +2821,43 @@ CONFIGRET WINAPI CM_Request_Device_EjectA( - IN DEVINST dnDevInst, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Request_Device_Eject_ExW( - IN DEVINST dnDevInst, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPWSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPWSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Request_Device_Eject_ExA( - IN DEVINST dnDevInst, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Request_Device_EjectW( - IN DEVINST dnDevInst, - OUT PPNP_VETO_TYPE pVetoType, - OUT LPWSTR pszVetoName, - IN ULONG ulNameLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _Out_opt_ PPNP_VETO_TYPE pVetoType, + _Out_writes_opt_(ulNameLength) LPWSTR pszVetoName, + _In_ ULONG ulNameLength, + _In_ ULONG ulFlags); #ifdef UNICODE #define CM_Request_Device_Eject CM_Request_Device_EjectW @@ -2875,20 +2876,20 @@ CONFIGRET WINAPI CM_Request_Eject_PC_Ex( - IN HMACHINE hMachine OPTIONAL); + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Run_Detection( - IN ULONG ulFlags); + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Run_Detection_Ex( - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #if (WINVER >= _WIN32_WINNT_VISTA) @@ -2897,45 +2898,45 @@ CONFIGRET CM_Write_UserPowerKey( - IN CONST GUID *SchemeGuid OPTIONAL, - IN CONST GUID *SubGroupOfPowerSettingsGuid OPTIONAL, - IN CONST GUID *PowerSettingGuid OPTIONAL, - IN ULONG AccessFlags, - IN ULONG Type, - IN UCHAR *Buffer, - IN DWORD BufferSize, - OUT PDWORD Error); + _In_opt_ CONST GUID *SchemeGuid, + _In_opt_ CONST GUID *SubGroupOfPowerSettingsGuid, + _In_opt_ CONST GUID *PowerSettingGuid, + _In_ ULONG AccessFlags, + _In_ ULONG Type, + _In_reads_bytes_(BufferSize) UCHAR *Buffer, + _In_ DWORD BufferSize, + _Out_ PDWORD Error); CONFIGRET CM_Set_ActiveScheme( - IN CONST GUID *SchemeGuid, - OUT PDWORD Error); + _In_ CONST GUID *SchemeGuid, + _Out_ PDWORD Error); CONFIGRET CM_Restore_DefaultPowerScheme( - IN CONST GUID *SchemeGuid, - OUT PDWORD Error); + _In_ CONST GUID *SchemeGuid, + _Out_ PDWORD Error); CONFIGRET CM_RestoreAll_DefaultPowerSchemes( - OUT PDWORD Error); + _Out_ PDWORD Error); CONFIGRET CM_Duplicate_PowerScheme( - IN CONST GUID *SourceSchemeGuid, - IN GUID **DestinationSchemeGuid, - OUT PDWORD Error); + _In_ CONST GUID *SourceSchemeGuid, + _Inout_ GUID **DestinationSchemeGuid, + _Out_ PDWORD Error); CONFIGRET CM_Delete_PowerScheme( - IN CONST GUID *SchemeGuid, - OUT PDWORD Error); + _In_ CONST GUID *SchemeGuid, + _Out_ PDWORD Error); CONFIGRET CM_Import_PowerScheme( - IN LPCWSTR ImportFileNamePath, - IN OUT GUID **DestinationSchemeGuid, - OUT PDWORD Error); + _In_ LPCWSTR ImportFileNamePath, + _Inout_ GUID **DestinationSchemeGuid, + _Out_ PDWORD Error); #endif /* (WINVER >= _WIN32_WINNT_VISTA) */ @@ -2943,18 +2944,18 @@ CONFIGRET WINAPI CM_Set_DevNode_Problem( - IN DEVINST dnDevInst, - IN ULONG ulProblem, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProblem, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Set_DevNode_Problem_Ex( - IN DEVINST dnDevInst, - IN ULONG ulProblem, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProblem, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Set_DevInst_Problem CM_Set_DevNode_Problem #define CM_Set_DevInst_Problem_Ex CM_Set_DevNode_Problem_Ex @@ -2963,31 +2964,31 @@ CONFIGRET WINAPI CM_Unregister_Device_InterfaceA( - IN LPCSTR pszDeviceInterface, - IN ULONG ulFlags); + _In_ LPCSTR pszDeviceInterface, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Unregister_Device_InterfaceW( - IN LPCWSTR pszDeviceInterface, - IN ULONG ulFlags); + _In_ LPCWSTR pszDeviceInterface, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Unregister_Device_Interface_ExA( - IN LPCSTR pszDeviceInterface, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCSTR pszDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Unregister_Device_Interface_ExW( - IN LPCWSTR pszDeviceInterface, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ LPCWSTR pszDeviceInterface, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Unregister_Device_Interface CM_Unregister_Device_InterfaceW @@ -3001,73 +3002,73 @@ CONFIGRET WINAPI CM_Register_Device_Driver( - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Register_Device_Driver_Ex( - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Remove_SubTree( - IN DEVINST dnAncestor, - IN ULONG ulFlags); + _In_ DEVINST dnAncestor, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Remove_SubTree_Ex( - IN DEVINST dnAncestor, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnAncestor, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyA( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - IN PCVOID Buffer OPTIONAL, - IN ULONG ulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Set_DevNode_Registry_PropertyW( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - IN PCVOID Buffer OPTIONAL, - IN ULONG ulLength, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExA( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - IN PCVOID Buffer OPTIONAL, - IN ULONG ulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Set_DevNode_Registry_Property_ExW( - IN DEVINST dnDevInst, - IN ULONG ulProperty, - IN PCVOID Buffer OPTIONAL, - IN ULONG ulLength, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnDevInst, + _In_ ULONG ulProperty, + _In_reads_bytes_opt_(ulLength) PCVOID Buffer, + _In_ ULONG ulLength, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Set_DevInst_Registry_PropertyW CM_Set_DevNode_Registry_PropertyW #define CM_Set_DevInst_Registry_PropertyA CM_Set_DevNode_Registry_PropertyA @@ -3090,54 +3091,54 @@ CONFIGRET WINAPI CM_Set_HW_Prof( - IN ULONG ulHardwareProfile, - IN ULONG ulFlags); + _In_ ULONG ulHardwareProfile, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Set_HW_Prof_Ex( - IN ULONG ulHardwareProfile, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ ULONG ulHardwareProfile, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Set_HW_Prof_FlagsA( - IN DEVINSTID_A szDevInstName, - IN ULONG ulConfig, - IN ULONG ulValue, - IN ULONG ulFlags); + _In_ DEVINSTID_A szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Set_HW_Prof_FlagsW( - IN DEVINSTID_W szDevInstName, - IN ULONG ulConfig, - IN ULONG ulValue, - IN ULONG ulFlags); + _In_ DEVINSTID_W szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExA( - IN DEVINSTID_A szDevInstName, - IN ULONG ulConfig, - IN ULONG ulValue, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINSTID_A szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); CMAPI CONFIGRET WINAPI CM_Set_HW_Prof_Flags_ExW( - IN DEVINSTID_W szDevInstName, - IN ULONG ulConfig, - IN ULONG ulValue, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINSTID_W szDevInstName, + _In_ ULONG ulConfig, + _In_ ULONG ulValue, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #ifdef UNICODE #define CM_Set_HW_Prof_Flags CM_Set_HW_Prof_FlagsW @@ -3151,16 +3152,16 @@ CONFIGRET WINAPI CM_Setup_DevNode( - IN DEVINST dnDevInst, - IN ULONG ulFlags); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Setup_DevNode_Ex( - IN DEVINST dnDevInst, - IN ULONG ulFlags, - IN HMACHINE hMachine OPTIONAL); + _In_ DEVINST dnDevInst, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Setup_DevInst CM_Setup_DevNode #define CM_Setup_DevInst_Ex CM_Setup_DevNode_Ex @@ -3169,25 +3170,25 @@ CONFIGRET WINAPI CM_Test_Range_Available( - IN DWORDLONG ullStartValue, - IN DWORDLONG ullEndValue, - IN RANGE_LIST rlh, - IN ULONG ulFlags); + _In_ DWORDLONG ullStartValue, + _In_ DWORDLONG ullEndValue, + _In_ RANGE_LIST rlh, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Uninstall_DevNode( - IN DEVINST dnPhantom, - IN ULONG ulFlags); + _In_ DEVINST dnPhantom, + _In_ ULONG ulFlags); CMAPI CONFIGRET WINAPI CM_Uninstall_DevNode_Ex( - IN DEVINST dnPhantom, - IN ULONG ulFlags, - IN HMACHINE hMachine); + _In_ DEVINST dnPhantom, + _In_ ULONG ulFlags, + _In_opt_ HMACHINE hMachine); #define CM_Uninstall_DevInst CM_Uninstall_DevNode #define CM_Uninstall_DevInst_Ex CM_Uninstall_DevNode_Ex @@ -3201,10 +3202,12 @@ DWORD WINAPI CMP_WaitNoPendingInstallEvents( - IN DWORD dwTimeout); + _In_ DWORD dwTimeout); #endif /* (WINVER >= _WIN32_WINNT_WIN2K) */ #ifdef __cplusplus } #endif + +#endif /* _CFGMGR32_H_ */

1 0

[aandrejevic] 59734: [NTVDM] Use the correct values for AC registers.
by aandrejevic＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: aandrejevic Date: Wed Aug 14 12:25:43 2013 New Revision: 59734 URL: http://svn.reactos.org/svn/reactos?rev=59734&view=rev Log: [NTVDM] Use the correct values for AC registers. Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Wed Aug 14 12:25:43 2013 @@ -46,8 +46,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x08, 0x04 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00 }; static BYTE VideoMode_80x25_text[] = @@ -67,8 +67,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x08, 0x04 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x0C, 0x00, 0x0F, 0x08, 0x00 }; static BYTE VideoMode_320x200_4color[] = @@ -88,8 +88,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x13, 0x02, 0x17, 0x04, 0x04, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, - 0x0C, 0x15, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x13, 0x15, 0x17, 0x02, 0x04, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x200_2color[] = @@ -109,8 +109,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x17, 0x02, 0x17, 0x04, 0x17, 0x06, 0x17, 0x08, 0x17, 0x0A, 0x17, - 0x0C, 0x17, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, + 0x17, 0x17, 0x17, 0x17, 0x01, 0x00, 0x01, 0x00, 0x00 }; static BYTE VideoMode_320x200_16color[] = @@ -130,8 +130,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, - 0x0C, 0x15, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x200_16color[] = @@ -151,8 +151,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x11, 0x0A, 0x13, - 0x0C, 0x15, 0x0E, 0x17, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x10, 0x11, 0x12, 0x13, + 0x14, 0x15, 0x16, 0x17, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x350_16color[] = @@ -172,8 +172,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x480_2color[] = @@ -193,8 +193,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x3F, 0x02, 0x3F, 0x04, 0x3F, 0x06, 0x3F, 0x08, 0x3F, 0x0A, 0x3F, - 0x0C, 0x3F, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, + 0x3F, 0x3F, 0x3F, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_640x480_16color[] = @@ -214,8 +214,8 @@ 0xFF, /* AC Registers */ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x39, 0x0A, 0x3B, - 0x0C, 0x3D, 0x0E, 0x3F, 0x01, 0x00, 0x12, 0x00, 0x04 + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x14, 0x07, 0x38, 0x39, 0x3A, 0x3B, + 0x3C, 0x3D, 0x3E, 0x3F, 0x01, 0x00, 0x0F, 0x00, 0x00 }; static BYTE VideoMode_320x200_256color[] = @@ -236,7 +236,7 @@ /* AC Registers */ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0A, 0x0B, - 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x12, 0x00, 0x04 + 0x0C, 0x0D, 0x0E, 0x0F, 0x41, 0x00, 0x0F, 0x00, 0x00 }; static LPBYTE VideoModes[] =

1 0

[fireball] 59733: [WIN32K] - Do not use a internal section object structure type, it's just not necessary and win32k should not ever need to access its fields directly.
by fireball＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: fireball Date: Wed Aug 14 11:02:08 2013 New Revision: 59733 URL: http://svn.reactos.org/svn/reactos?rev=59733&view=rev Log: [WIN32K] - Do not use a internal section object structure type, it's just not necessary and win32k should not ever need to access its fields directly. Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c trunk/reactos/win32ss/user/ntuser/desktop.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.h trunk/reactos/win32ss/user/ntuser/usrheap.c Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -307,7 +307,7 @@ FT_Face Face; ANSI_STRING AnsiFaceName; PFONT_ENTRY Entry; - PSECTION_OBJECT SectionObject; + PVOID SectionObject; ULONG ViewSize = 0; LARGE_INTEGER SectionSize; UNICODE_STRING FontRegPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\Machine\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"); @@ -330,7 +330,7 @@ } SectionSize.QuadPart = 0LL; - Status = MmCreateSection((PVOID)&SectionObject, SECTION_ALL_ACCESS, + Status = MmCreateSection(&SectionObject, SECTION_ALL_ACCESS, NULL, &SectionSize, PAGE_READONLY, SEC_COMMIT, FileHandle, NULL); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/win32ss/user/ntuser/desktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.h [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -11,7 +11,7 @@ PWND spwndTray; PWND spwndMessage; PWND spwndTooltip; - PSECTION_OBJECT hsectionDesktop; + PVOID hsectionDesktop; PWIN32HEAP pheapDesktop; ULONG_PTR ulHeapSize; LIST_ENTRY PtiList; Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -15,12 +15,12 @@ HANDLE hModuleWin; -PGDI_HANDLE_TABLE NTAPI GDIOBJ_iAllocHandleTable(OUT PSECTION_OBJECT *SectionObject); +PGDI_HANDLE_TABLE NTAPI GDIOBJ_iAllocHandleTable(OUT PVOID *SectionObject); BOOL NTAPI GDI_CleanupForProcess (struct _EPROCESS *Process); NTSTATUS NTAPI UserDestroyThreadInfo(struct _ETHREAD *Thread); HANDLE GlobalUserHeap = NULL; -PSECTION_OBJECT GlobalUserHeapSection = NULL; +PVOID GlobalUserHeapSection = NULL; PSERVERINFO gpsi = NULL; // Global User Server Information. Modified: trunk/reactos/win32ss/user/ntuser/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.h [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -30,7 +30,7 @@ extern HANDLE GlobalUserHeap; PWIN32HEAP -UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, +UserCreateHeap(OUT PVOID *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize); Modified: trunk/reactos/win32ss/user/ntuser/usrheap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/usrhea… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/usrheap.c [iso-8859-1] Wed Aug 14 11:02:08 2013 @@ -63,7 +63,7 @@ { SIZE_T ViewSize = 0; LARGE_INTEGER Offset; - extern PSECTION_OBJECT GlobalUserHeapSection; + extern PVOID GlobalUserHeapSection; /* HACK: This needs to be handled during startup only... */ ASSERT(Base == (PVOID)GlobalUserHeap); @@ -114,7 +114,7 @@ } static PWIN32HEAP -IntUserHeapCreate(IN PSECTION_OBJECT SectionObject, +IntUserHeapCreate(IN PVOID SectionObject, IN PVOID *SystemMappedBase, IN ULONG HeapSize) { @@ -172,7 +172,7 @@ } PWIN32HEAP -UserCreateHeap(OUT PSECTION_OBJECT *SectionObject, +UserCreateHeap(OUT PVOID *SectionObject, IN OUT PVOID *SystemBase, IN SIZE_T HeapSize) {

1 0

[ion] 59732: [SACDRV]: fix a bug in ChannelReferenceToOneByIndexwithLock and ChanMgrCreateChannel. [SACDRV]: implement SacTranslateUnicodeToUtf8. [NTOSKRNL]: implement HadlessCmdPutData. EMS bringu...
by ion＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: ion Date: Wed Aug 14 04:20:17 2013 New Revision: 59732 URL: http://svn.reactos.org/svn/reactos?rev=59732&view=rev Log: [SACDRV]: fix a bug in ChannelReferenceToOneByIndexwithLock and ChanMgrCreateChannel. [SACDRV]: implement SacTranslateUnicodeToUtf8. [NTOSKRNL]: implement HadlessCmdPutData. EMS bringup is now functional: " Computer is booting, SAC started and initialized.\n\nUse the \"ch -?\" command for information about using channels.\nUse the \"?\" command for general help. SAC>%0 " Modified: trunk/reactos/drivers/sac/driver/chanmgr.c trunk/reactos/drivers/sac/driver/util.c trunk/reactos/ntoskrnl/ex/hdlsterm.c Modified: trunk/reactos/drivers/sac/driver/chanmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/chanmgr… ============================================================================== --- trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/chanmgr.c [iso-8859-1] Wed Aug 14 04:20:17 2013 @@ -111,8 +111,7 @@ ChannelReferenceToOneByIndexWithLock(IN LONG Index) { ChannelSlotLock(Index); - ASSERT(ChannelGetReferenceCount((Index)) == 1); - _InterlockedExchange(&ChannelRefCount[Index], 1); + ChannelReferenceToOneByIndex(Index); ChannelSlotUnlock(Index); } @@ -359,7 +358,7 @@ ChannelLockCreates(); /* Is the channel manager initialized? */ - if (ChannelCreateEnabled) + if (!ChannelCreateEnabled) { /* Nope, bail out */ Status = STATUS_UNSUCCESSFUL; @@ -405,7 +404,7 @@ if (i == SAC_MAX_CHANNELS) { /* Bail out */ - Status = STATUS_UNSUCCESSFUL; + SAC_DBG(SAC_DBG_INIT, "failing here: %d %lx\n", __LINE__, Status); goto ReturnStatus; } @@ -439,6 +438,7 @@ else { /* We couldn't create it, free the buffer */ + SAC_DBG(SAC_DBG_INIT, "failing here: %d %lx\n", __LINE__, Status); SacFreePool(NewChannel); } Modified: trunk/reactos/drivers/sac/driver/util.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/util.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/util.c [iso-8859-1] Wed Aug 14 04:20:17 2013 @@ -41,8 +41,43 @@ OUT PULONG UTF8Count, OUT PULONG ProcessedCount) { - ASSERT(FALSE); - return FALSE; + *UTF8Count = 0; + *ProcessedCount = 0; + + while ((*SourceBuffer) && + (*UTF8Count < DestinationBufferSize) && + (*ProcessedCount < SourceBufferLength)) + { + if (*SourceBuffer & 0xFF80) + { + if (*SourceBuffer & 0xF800) + { + if ((*UTF8Count + 3) >= DestinationBufferSize) break; + DestinationBuffer[*UTF8Count] = ((*SourceBuffer >> 12) & 0xF) | 0xE0; + ++*UTF8Count; + DestinationBuffer[*UTF8Count] = ((*SourceBuffer >> 6) & 0x3F) | 0x80; + } + else + { + if ((*UTF8Count + 2) >= DestinationBufferSize) break; + DestinationBuffer[*UTF8Count] = ((*SourceBuffer >> 6) & 31) | 0xC0; + } + ++*UTF8Count; + DestinationBuffer[*UTF8Count] = (*SourceBuffer & 0x3F) | 0x80; + } + else + { + DestinationBuffer[*UTF8Count] = (*SourceBuffer & 0x7F); + } + + ++*UTF8Count; + ++*ProcessedCount; + ++SourceBuffer; + } + + ASSERT(*ProcessedCount <= SourceBufferLength); + ASSERT(*UTF8Count <= DestinationBufferSize); + return TRUE; } PWCHAR Modified: trunk/reactos/ntoskrnl/ex/hdlsterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/hdlsterm.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/hdlsterm.c [iso-8859-1] Wed Aug 14 04:20:17 2013 @@ -171,9 +171,19 @@ VOID NTAPI -HdlspPutString( - IN PUCHAR String - ) +HdlspPutData(IN PUCHAR Data, + IN ULONG DataSize) +{ + ULONG i; + for (i = 0; i < DataSize; i++) + { + InbvPortPutByte(HeadlessGlobals->TerminalPort, Data[i]++); + } +} + +VOID +NTAPI +HdlspPutString(IN PUCHAR String) { PUCHAR Dest = HeadlessGlobals->TmpBuffer; UCHAR Char = 0; @@ -306,17 +316,18 @@ break; } - /* Terminal should be on */ - if (HeadlessGlobals->TerminalEnabled) - { - /* Print each byte in the string making sure VT100 chars are used */ - PutString = InputBuffer; - HdlspPutString(PutString->String); - } - - /* Return success either way */ - Status = STATUS_SUCCESS; - break; + /* Terminal should be on */ + if (HeadlessGlobals->TerminalEnabled) + { + /* Print each byte in the string making sure VT100 chars are used */ + PutString = InputBuffer; + HdlspPutString(PutString->String); + } + + /* Return success either way */ + Status = STATUS_SUCCESS; + break; + case HeadlessCmdClearDisplay: break; case HeadlessCmdClearToEndOfDisplay: @@ -403,10 +414,29 @@ case HeadlessCmdQueryGUID: break; case HeadlessCmdPutData: - break; - default: - break; - } + + /* Validate the existence of an input buffer */ + if (!(InputBuffer) || !(InputBufferSize)) + { + Status = STATUS_INVALID_PARAMETER; + break; + } + + /* Terminal should be on */ + if (HeadlessGlobals->TerminalEnabled) + { + /* Print each byte in the string making sure VT100 chars are used */ + PutString = InputBuffer; + HdlspPutData(PutString->String, InputBufferSize); + } + + /* Return success either way */ + Status = STATUS_SUCCESS; + break; + + default: + break; + } /* Unset processing state */ if ((Command != HeadlessCmdAddLogEntry) &&

1 0

[akhaldi] 59731: [SAL] * Add _Ret_writes_maybenull_z_ annotation.
by akhaldi＠svn.reactos.org 13 Aug '13

13 Aug '13

Author: akhaldi Date: Tue Aug 13 21:21:08 2013 New Revision: 59731 URL: http://svn.reactos.org/svn/reactos?rev=59731&view=rev Log: [SAL] * Add _Ret_writes_maybenull_z_ annotation. Modified: trunk/reactos/include/psdk/sal.h Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=597… ============================================================================== --- trunk/reactos/include/psdk/sal.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/sal.h [iso-8859-1] Tue Aug 13 21:21:08 2013 @@ -1030,7 +1030,7 @@ //#define _Ret_writes_bytes_to_(size,count) //#define _Ret_writes_bytes_to_maybenull_(size,count) //#define _Ret_writes_maybenull_(size) -//#define _Ret_writes_maybenull_z_(size) +#define _Ret_writes_maybenull_z_(size) _SAL2_NAME(_Ret_writes_maybenull_z_) _Group_([SA_Post(Null=SA_Maybe,ValidElements="\n" _SA_SPECSTRIZE(size),NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)]) //#define _Ret_writes_to_(size,count) //#define _Ret_writes_to_maybenull_(size,count) //#define _Ret_writes_z_(size)

1 0

[hbelusca] 59730: [NTVDM] Simplify the code
by hbelusca＠svn.reactos.org 13 Aug '13

13 Aug '13

Author: hbelusca Date: Tue Aug 13 20:15:24 2013 New Revision: 59730 URL: http://svn.reactos.org/svn/reactos?rev=59730&view=rev Log: [NTVDM] Simplify the code Modified: branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Tue Aug 13 20:15:24 2013 @@ -429,7 +429,11 @@ BOOLEAN BiosSetVideoPage(BYTE PageNumber) { + /* Check if the page exists */ if (PageNumber >= BIOS_MAX_PAGES) return FALSE; + + /* Check if this is the same page */ + if (PageNumber == Bda->VideoPage) return TRUE; /* Set the values in the BDA */ Bda->VideoPage = PageNumber; @@ -744,7 +748,6 @@ { BiosSetVideoMode(LOBYTE(Eax)); VgaClearMemory(); - break; } @@ -800,15 +803,7 @@ /* Select Active Display Page */ case 0x05: { - /* Check if the page exists */ - if (LOBYTE(Eax) >= BIOS_MAX_PAGES) break; - - /* Check if this is the same page */ - if (LOBYTE(Eax) == Bda->VideoPage) break; - - /* Change the video page */ BiosSetVideoPage(LOBYTE(Eax)); - break; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs