Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 59749: [CRT] * Annotate conio_s.h.
by akhaldi＠svn.reactos.org 16 Aug '13

16 Aug '13

Author: akhaldi Date: Fri Aug 16 13:22:42 2013 New Revision: 59749 URL: http://svn.reactos.org/svn/reactos?rev=59749&view=rev Log: [CRT] * Annotate conio_s.h. Modified: trunk/reactos/include/crt/sec_api/conio_s.h Modified: trunk/reactos/include/crt/sec_api/conio_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/conio_… ============================================================================== --- trunk/reactos/include/crt/sec_api/conio_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/conio_s.h [iso-8859-1] Fri Aug 16 13:22:42 2013 @@ -15,28 +15,133 @@ extern "C" { #endif - _CRTIMP errno_t __cdecl _cgets_s(char *_Buffer,size_t _Size,size_t *_SizeRead); - _CRTIMP int __cdecl _cprintf_s(const char *_Format,...); - _CRTIMP int __cdecl _cscanf_s(const char *_Format,...); - _CRTIMP int __cdecl _cscanf_s_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcprintf_s(const char *_Format,va_list _ArgList); - _CRTIMP int __cdecl _cprintf_s_l(const char *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcprintf_s_l(const char *_Format,_locale_t _Locale,va_list _ArgList); + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _cgets_s( + _Out_writes_z_(_Size) char *_Buffer, + _In_ size_t _Size, + _Out_ size_t *_SizeRead); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cprintf_s( + _In_z_ _Printf_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cscanf_s( + _In_z_ _Scanf_s_format_string_ const char *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cscanf_s_l( + _In_z_ _Scanf_s_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcprintf_s( + _In_z_ _Printf_format_string_ const char *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cprintf_s_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcprintf_s_l( + _In_z_ _Printf_format_string_ const char *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); #ifndef _WCONIO_DEFINED_S #define _WCONIO_DEFINED_S - _CRTIMP errno_t __cdecl _cgetws_s(wchar_t *_Buffer,size_t _SizeInWords,size_t *_SizeRead); - _CRTIMP int __cdecl _cwprintf_s(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_s(const wchar_t *_Format,...); - _CRTIMP int __cdecl _cwscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_s(const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _cwprintf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vcwprintf_s_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _cgetws_s( + _Out_writes_to_(_SizeInWords, *_SizeRead) wchar_t *_Buffer, + _In_ size_t _SizeInWords, + _Out_ size_t *_SizeRead); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwprintf_s( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwscanf_s( + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _cwscanf_s_l( + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vcwprintf_s( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _CRTIMP + int + __cdecl + _cwprintf_s_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _CRTIMP + int + __cdecl + _vcwprintf_s_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + +#endif /* _WCONIO_DEFINED_S */ #ifdef __cplusplus } #endif -#endif -#endif +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _INC_CONIO_S */

1 0

[akhaldi] 59748: [PSDK] * Annotate shellapi.h.
by akhaldi＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: akhaldi Date: Thu Aug 15 21:43:06 2013 New Revision: 59748 URL: http://svn.reactos.org/svn/reactos?rev=59748&view=rev Log: [PSDK] * Annotate shellapi.h. Modified: trunk/reactos/include/psdk/shellapi.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shellapi.h [iso-8859-1] Thu Aug 15 21:43:06 2013 @@ -369,46 +369,223 @@ #define SHGNLI_NOUNIQUE 0x04 #define SHGNLI_NOLNK 0x08 -BOOL WINAPI SHGetNewLinkInfoA(LPCSTR,LPCSTR,LPSTR,BOOL*,UINT); -BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR,LPCWSTR,LPWSTR,BOOL*,UINT); - -LPWSTR * WINAPI CommandLineToArgvW(LPCWSTR,int*); -void WINAPI DragAcceptFiles(HWND,BOOL); -void WINAPI DragFinish(HDROP); -UINT WINAPI DragQueryFileA(HDROP,UINT,LPSTR,UINT); -UINT WINAPI DragQueryFileW(HDROP,UINT,LPWSTR,UINT); -BOOL WINAPI DragQueryPoint(HDROP,LPPOINT); -HICON WINAPI ExtractAssociatedIconA(HINSTANCE,LPSTR,PWORD); -HICON WINAPI ExtractAssociatedIconW(HINSTANCE,LPWSTR,PWORD); -HICON WINAPI ExtractIconA(HINSTANCE,LPCSTR,UINT); -HICON WINAPI ExtractIconW(HINSTANCE,LPCWSTR,UINT); -UINT WINAPI ExtractIconExA(LPCSTR,int,HICON*,HICON*,UINT); -UINT WINAPI ExtractIconExW(LPCWSTR,int,HICON*,HICON*,UINT); -HINSTANCE WINAPI FindExecutableA(LPCSTR,LPCSTR,LPSTR); -HINSTANCE WINAPI FindExecutableW(LPCWSTR,LPCWSTR,LPWSTR); -UINT_PTR WINAPI SHAppBarMessage(DWORD,PAPPBARDATA); -BOOL WINAPI Shell_NotifyIconA(DWORD,PNOTIFYICONDATAA); -BOOL WINAPI Shell_NotifyIconW(DWORD,PNOTIFYICONDATAW); -int WINAPI ShellAboutA(HWND,LPCSTR,LPCSTR,HICON); -int WINAPI ShellAboutW(HWND,LPCWSTR,LPCWSTR,HICON); -int WINAPI ShellMessageBoxA(HINSTANCE,HWND,LPCSTR,LPCSTR,UINT,...); -int WINAPI ShellMessageBoxW(HINSTANCE,HWND,LPCWSTR,LPCWSTR,UINT,...); -HINSTANCE WINAPI ShellExecuteA(HWND,LPCSTR,LPCSTR,LPCSTR,LPCSTR,INT); -HINSTANCE WINAPI ShellExecuteW(HWND,LPCWSTR,LPCWSTR,LPCWSTR,LPCWSTR,INT); -BOOL WINAPI ShellExecuteExA(LPSHELLEXECUTEINFOA); -BOOL WINAPI ShellExecuteExW(LPSHELLEXECUTEINFOW); -int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA); -int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW); -void WINAPI SHFreeNameMappings(HANDLE); -DWORD_PTR WINAPI SHGetFileInfoA(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT); -DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT); -BOOL WINAPI SHGetNewLinkInfoA(LPCSTR,LPCSTR,LPSTR,BOOL*,UINT); -BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR,LPCWSTR,LPWSTR,BOOL*,UINT); -HRESULT WINAPI SHQueryRecycleBinA(LPCSTR, LPSHQUERYRBINFO); -HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR, LPSHQUERYRBINFO); -HRESULT WINAPI SHEmptyRecycleBinA(HWND,LPCSTR,DWORD); -HRESULT WINAPI SHEmptyRecycleBinW(HWND,LPCWSTR,DWORD); -BOOL WINAPI SHCreateProcessAsUserW(PSHCREATEPROCESSINFOW); +LPWSTR * WINAPI CommandLineToArgvW(_In_ LPCWSTR, _Out_ int*); +void WINAPI DragAcceptFiles(_In_ HWND, _In_ BOOL); +void WINAPI DragFinish(_In_ HDROP); + +_Success_(return != 0) +UINT +WINAPI +DragQueryFileA( + _In_ HDROP hDrop, + _In_ UINT iFile, + _Out_writes_opt_(cch) LPSTR lpszFile, + _In_ UINT cch); + +_Success_(return != 0) +UINT +WINAPI +DragQueryFileW( + _In_ HDROP hDrop, + _In_ UINT iFile, + _Out_writes_opt_(cch) LPWSTR lpszFile, + _In_ UINT cch); + +BOOL WINAPI DragQueryPoint(_In_ HDROP, _Out_ LPPOINT); + +HICON +WINAPI +ExtractAssociatedIconA( + _Reserved_ HINSTANCE hInst, + _Inout_updates_(128) LPSTR pszIconPath, + _Inout_ WORD *piIcon); + +HICON +WINAPI +ExtractAssociatedIconW( + _Reserved_ HINSTANCE hInst, + _Inout_updates_(128) LPWSTR pszIconPath, + _Inout_ WORD *piIcon); + +HICON +WINAPI +ExtractIconA( + _Reserved_ HINSTANCE hInst, + _In_ LPCSTR pszExeFileName, + UINT nIconIndex); + +HICON +WINAPI +ExtractIconW( + _Reserved_ HINSTANCE hInst, + _In_ LPCWSTR pszExeFileName, + UINT nIconIndex); + +UINT +WINAPI +ExtractIconExA( + _In_ LPCSTR lpszFile, + _In_ int nIconIndex, + _Out_writes_opt_(nIcons) HICON *phiconLarge, + _Out_writes_opt_(nIcons) HICON *phiconSmall, + _In_ UINT nIcons); + +UINT +WINAPI +ExtractIconExW( + _In_ LPCWSTR lpszFile, + _In_ int nIconIndex, + _Out_writes_opt_(nIcons) HICON *phiconLarge, + _Out_writes_opt_(nIcons) HICON *phiconSmall, + _In_ UINT nIcons); + +_Success_(return > 32) +HINSTANCE +WINAPI +FindExecutableA( + _In_ LPCSTR lpFile, + _In_opt_ LPCSTR lpDirectory, + _Out_writes_(MAX_PATH) LPSTR lpResult); + +_Success_(return > 32) +HINSTANCE +WINAPI +FindExecutableW( + _In_ LPCWSTR lpFile, + _In_opt_ LPCWSTR lpDirectory, + _Out_writes_(MAX_PATH) LPWSTR lpResult); + +UINT_PTR WINAPI SHAppBarMessage(_In_ DWORD, _Inout_ PAPPBARDATA); +BOOL WINAPI Shell_NotifyIconA(_In_ DWORD, _In_ PNOTIFYICONDATAA); +BOOL WINAPI Shell_NotifyIconW(_In_ DWORD, _In_ PNOTIFYICONDATAW); + +int +WINAPI +ShellAboutA( + _In_opt_ HWND hWnd, + _In_ LPCSTR szApp, + _In_opt_ LPCSTR szOtherStuff, + _In_opt_ HICON hIcon); + +int +WINAPI +ShellAboutW( + _In_opt_ HWND hWnd, + _In_ LPCWSTR szApp, + _In_opt_ LPCWSTR szOtherStuff, + _In_opt_ HICON hIcon); + +int +WINAPI +ShellMessageBoxA( + _In_opt_ HINSTANCE hAppInst, + _In_opt_ HWND hWnd, + _In_ LPCSTR lpcText, + _In_opt_ LPCSTR lpcTitle, + _In_ UINT fuStyle, + ...); + +int +WINAPI +ShellMessageBoxW( + _In_opt_ HINSTANCE hAppInst, + _In_opt_ HWND hWnd, + _In_ LPCWSTR lpcText, + _In_opt_ LPCWSTR lpcTitle, + _In_ UINT fuStyle, + ...); + +HINSTANCE +WINAPI +ShellExecuteA( + _In_opt_ HWND hwnd, + _In_opt_ LPCSTR lpOperation, + _In_ LPCSTR lpFile, + _In_opt_ LPCSTR lpParameters, + _In_opt_ LPCSTR lpDirectory, + _In_ INT nShowCmd); + +HINSTANCE +WINAPI +ShellExecuteW( + _In_opt_ HWND hwnd, + _In_opt_ LPCWSTR lpOperation, + _In_ LPCWSTR lpFile, + _In_opt_ LPCWSTR lpParameters, + _In_opt_ LPCWSTR lpDirectory, + _In_ INT nShowCmd); + +BOOL WINAPI ShellExecuteExA(_Inout_ LPSHELLEXECUTEINFOA); +BOOL WINAPI ShellExecuteExW(_Inout_ LPSHELLEXECUTEINFOW); +int WINAPI SHFileOperationA(_Inout_ LPSHFILEOPSTRUCTA); +int WINAPI SHFileOperationW(_Inout_ LPSHFILEOPSTRUCTW); +void WINAPI SHFreeNameMappings(_In_opt_ HANDLE); + +DWORD_PTR +WINAPI +SHGetFileInfoA( + _In_ LPCSTR pszPath, + DWORD dwFileAttributes, + _Inout_updates_bytes_opt_(cbFileInfo) SHFILEINFOA *psfi, + UINT cbFileInfo, + UINT uFlags); + +DWORD_PTR +WINAPI +SHGetFileInfoW( + _In_ LPCWSTR pszPath, + DWORD dwFileAttributes, + _Inout_updates_bytes_opt_(cbFileInfo) SHFILEINFOW *psfi, + UINT cbFileInfo, + UINT uFlags); + +_Success_(return != 0) +BOOL +WINAPI +SHGetNewLinkInfoA( + _In_ LPCSTR pszLinkTo, + _In_ LPCSTR pszDir, + _Out_writes_(MAX_PATH) LPSTR pszName, + _Out_ BOOL *pfMustCopy, + _In_ UINT uFlags); + +_Success_(return != 0) +BOOL +WINAPI +SHGetNewLinkInfoW( + _In_ LPCWSTR pszLinkTo, + _In_ LPCWSTR pszDir, + _Out_writes_(MAX_PATH) LPWSTR pszName, + _Out_ BOOL *pfMustCopy, + _In_ UINT uFlags); + +HRESULT +WINAPI +SHQueryRecycleBinA( + _In_opt_ LPCSTR pszRootPath, + _Inout_ LPSHQUERYRBINFO pSHQueryRBInfo); + +HRESULT +WINAPI +SHQueryRecycleBinW( + _In_opt_ LPCWSTR pszRootPath, + _Inout_ LPSHQUERYRBINFO pSHQueryRBInfo); + +HRESULT +WINAPI +SHEmptyRecycleBinA( + _In_opt_ HWND hwnd, + _In_opt_ LPCSTR pszRootPath, + DWORD dwFlags); + +HRESULT +WINAPI +SHEmptyRecycleBinW( + _In_opt_ HWND hwnd, + _In_opt_ LPCWSTR pszRootPath, + DWORD dwFlags); + +BOOL WINAPI SHCreateProcessAsUserW(_Inout_ PSHCREATEPROCESSINFOW); DWORD WINAPI @@ -444,7 +621,6 @@ #define ShellMessageBox ShellMessageBoxW #define SHFileOperation SHFileOperationW #define SHGetFileInfo SHGetFileInfoW -#define SHGetNewLinkInfo SHGetNewLinkInfoW #define SHQueryRecycleBin SHQueryRecycleBinW #define SHEmptyRecycleBin SHEmptyRecycleBinW #define SHGetNewLinkInfo SHGetNewLinkInfoW @@ -472,7 +648,6 @@ #define ShellMessageBox ShellMessageBoxA #define SHFileOperation SHFileOperationA #define SHGetFileInfo SHGetFileInfoA -#define SHGetNewLinkInfo SHGetNewLinkInfoA #define SHQueryRecycleBin SHQueryRecycleBinA #define SHEmptyRecycleBin SHEmptyRecycleBinA #define SHGetNewLinkInfo SHGetNewLinkInfoA

1 0

[akhaldi] 59747: [SAL] * Add _Post_null_ annotation.
by akhaldi＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: akhaldi Date: Thu Aug 15 21:11:40 2013 New Revision: 59747 URL: http://svn.reactos.org/svn/reactos?rev=59747&view=rev Log: [SAL] * Add _Post_null_ 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] Thu Aug 15 21:11:40 2013 @@ -869,7 +869,7 @@ #define _Post_maybenull_ _SAL2_NAME(_Post_maybenull_) _Group_([SA_Post(Null=SA_Maybe)]) #define _Post_maybez_ _SAL11_NAME(_Post_maybez_) _Group_([SA_Post(NullTerminated=SA_Maybe)]) #define _Post_notnull_ _SAL2_NAME(_Post_notnull_) _Group_([SA_Post(Null=SA_No)]) -//#define _Post_null_ +#define _Post_null_ _SAL2_NAME(_Post_null_) _Group_([SA_Post(Null=SA_Yes)]) #define _Post_ptr_invalid_ _SAL2_NAME(_Post_ptr_invalid_) _Group_([SA_Post(Valid=SA_No)]) #define _Post_readable_byte_size_(size) _SAL2_NAME(_Post_readable_byte_size_) _Group_([SA_Post(ValidBytes="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)]) #define _Post_readable_size_(size) _SAL2_NAME(_Post_readable_size_) _Group_([SA_Post(ValidElements="\n" _SA_SPECSTRIZE(size))] [SA_Post(Valid=SA_Yes)])

1 0

[hbelusca] 59746: [NTVDM] Do not rely on the internal format for console handles. Instead, use a more reliable way, by checking for success when calling a simple console function acting on in/out c...
by hbelusca＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: hbelusca Date: Thu Aug 15 21:10:09 2013 New Revision: 59746 URL: http://svn.reactos.org/svn/reactos?rev=59746&view=rev Log: [NTVDM] Do not rely on the internal format for console handles. Instead, use a more reliable way, by checking for success when calling a simple console function acting on in/out console handles. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/ntvdm.h Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Thu Aug 15 21:10:09 2013 @@ -28,6 +28,30 @@ static BOOLEAN DosUmbLinked = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ + +/* Taken from base/shell/cmd/console.c */ +static BOOL IsConsoleHandle(HANDLE hHandle) +{ + DWORD dwMode; + + /* Check whether the handle may be that of a console... */ + if ((GetFileType(hHandle) & FILE_TYPE_CHAR) == 0) return FALSE; + + /* + * It may be. Perform another test... The idea comes from the + * MSDN description of the WriteConsole API: + * + * "WriteConsole fails if it is used with a standard handle + * that is redirected to a file. If an application processes + * multilingual output that can be redirected, determine whether + * the output handle is a console handle (one method is to call + * the GetConsoleMode function and check whether it succeeds). + * If the handle is a console handle, call WriteConsole. If the + * handle is not a console handle, the output is redirected and + * you should call WriteFile to perform the I/O." + */ + return GetConsoleMode(hHandle, &dwMode); +} static VOID DosCombineFreeBlocks(WORD StartBlock) { Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Thu Aug 15 21:10:09 2013 @@ -26,7 +26,6 @@ #define MAX_ADDRESS TO_LINEAR(MAX_SEGMENT, MAX_OFFSET) #define FAR_POINTER(x) ((ULONG_PTR)BaseAddress + TO_LINEAR(HIWORD(x), LOWORD(x))) #define STEPS_PER_CYCLE 256 -#define IsConsoleHandle(h) (((((ULONG_PTR)h) & 0x10000003) == 3) ? TRUE : FALSE) /* FUNCTIONS ******************************************************************/

1 0

[akhaldi] 59745: [PSDK] * Annotate winsock.h.
by akhaldi＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: akhaldi Date: Thu Aug 15 14:32:37 2013 New Revision: 59745 URL: http://svn.reactos.org/svn/reactos?rev=59745&view=rev Log: [PSDK] * Annotate winsock.h. Modified: trunk/reactos/include/psdk/winsock.h Modified: trunk/reactos/include/psdk/winsock.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winsock.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winsock.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winsock.h [iso-8859-1] Thu Aug 15 14:32:37 2013 @@ -546,207 +546,207 @@ SOCKET PASCAL FAR accept( - IN SOCKET s, - OUT struct sockaddr FAR *addr OPTIONAL, - IN OUT int FAR *addrlen OPTIONAL); + _In_ SOCKET s, + _Out_writes_bytes_opt_(*addrlen) struct sockaddr FAR *addr, + _Inout_opt_ int FAR *addrlen); int PASCAL FAR bind( - IN SOCKET s, - IN const struct sockaddr FAR *addr, - IN int namelen); + _In_ SOCKET s, + _In_reads_bytes_(namelen) const struct sockaddr FAR *addr, + _In_ int namelen); int PASCAL FAR closesocket( - IN SOCKET s); + _In_ SOCKET s); int PASCAL FAR connect( - IN SOCKET s, - IN const struct sockaddr FAR *name, - IN int namelen); + _In_ SOCKET s, + _In_reads_bytes_(namelen) const struct sockaddr FAR *name, + _In_ int namelen); int PASCAL FAR ioctlsocket( - IN SOCKET s, - IN long cmd, - IN OUT u_long FAR *argp); + _In_ SOCKET s, + _In_ long cmd, + _Inout_ u_long FAR *argp); int PASCAL FAR getpeername( - IN SOCKET s, - OUT struct sockaddr FAR *name, - IN OUT int FAR *namelen); + _In_ SOCKET s, + _Out_writes_bytes_to_(*namelen, *namelen) struct sockaddr FAR *name, + _Inout_ int FAR *namelen); int PASCAL FAR getsockname( - IN SOCKET s, - OUT struct sockaddr FAR *name, - IN OUT int FAR *namelen); + _In_ SOCKET s, + _Out_writes_bytes_to_(*namelen, *namelen) struct sockaddr FAR *name, + _Inout_ int FAR *namelen); int PASCAL FAR getsockopt( - IN SOCKET s, - IN int level, - IN int optname, - OUT char FAR *optval, - IN OUT int FAR *optlen); + _In_ SOCKET s, + _In_ int level, + _In_ int optname, + _Out_writes_bytes_(*optlen) char FAR *optval, + _Inout_ int FAR *optlen); u_long PASCAL FAR htonl( - IN u_long hostlong); + _In_ u_long hostlong); u_short PASCAL FAR htons( - IN u_short hostshort); + _In_ u_short hostshort); unsigned long PASCAL FAR inet_addr( - IN const char FAR *cp); + _In_z_ const char FAR *cp); char FAR *PASCAL FAR inet_ntoa( - IN struct in_addr in); + _In_ struct in_addr in); int PASCAL FAR listen( - IN SOCKET s, - IN int backlog); + _In_ SOCKET s, + _In_ int backlog); u_long PASCAL FAR ntohl( - IN u_long netlong); + _In_ u_long netlong); u_short PASCAL FAR ntohs( - IN u_short netshort); + _In_ u_short netshort); int PASCAL FAR recv( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN int flags); + _In_ SOCKET s, + _Out_writes_bytes_to_(len, return) __out_data_source(NETWORK) char FAR *buf, + _In_ int len, + _In_ int flags); int PASCAL FAR recvfrom( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN int flags, - OUT struct sockaddr FAR *from OPTIONAL, - IN OUT int FAR * fromlen OPTIONAL); + _In_ SOCKET s, + _Out_writes_bytes_to_(len, return) __out_data_source(NETWORK) char FAR *buf, + _In_ int len, + _In_ int flags, + _Out_writes_bytes_to_opt_(*fromlen, *fromlen) struct sockaddr FAR *from, + _Inout_opt_ int FAR * fromlen); int PASCAL FAR select( - 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); + _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); int PASCAL FAR send( - IN SOCKET s, - IN const char FAR *buf, - IN int len, - IN int flags); + _In_ SOCKET s, + _In_reads_bytes_(len) const char FAR *buf, + _In_ int len, + _In_ int flags); int PASCAL FAR sendto( - IN SOCKET s, - IN const char FAR *buf, - IN int len, - IN int flags, - IN const struct sockaddr FAR *to OPTIONAL, - IN int tolen); + _In_ SOCKET s, + _In_reads_bytes_(len) const char FAR *buf, + _In_ int len, + _In_ int flags, + _In_reads_bytes_opt_(tolen) const struct sockaddr FAR *to, + _In_ int tolen); int PASCAL FAR setsockopt( - IN SOCKET s, - IN int level, - IN int optname, - IN const char FAR *optval OPTIONAL, - IN int optlen); + _In_ SOCKET s, + _In_ int level, + _In_ int optname, + _In_reads_bytes_opt_(optlen) const char FAR *optval, + _In_ int optlen); int PASCAL FAR shutdown( - IN SOCKET s, - IN int how); + _In_ SOCKET s, + _In_ int how); SOCKET PASCAL FAR socket( - IN int af, - IN int type, - IN int protocol); + _In_ int af, + _In_ int type, + _In_ int protocol); struct hostent FAR *PASCAL FAR gethostbyaddr( - IN const char FAR *addr, - IN int len, - IN int type); + _In_reads_bytes_(len) const char FAR *addr, + _In_ int len, + _In_ int type); struct hostent FAR *PASCAL FAR gethostbyname( - IN const char FAR *name); + _In_z_ const char FAR *name); int PASCAL FAR gethostname( - OUT char FAR *name, - IN int namelen); + _Out_writes_bytes_to_(namelen, return) char FAR *name, + _In_ int namelen); struct servent FAR *PASCAL FAR getservbyport( - IN int port, - IN const char FAR *proto); + _In_ int port, + _In_z_ const char FAR *proto); struct servent FAR *PASCAL FAR getservbyname( - IN const char FAR *name, - IN const char FAR *proto); + _In_z_ const char FAR *name, + _In_z_ const char FAR *proto); struct protoent FAR *PASCAL FAR getprotobynumber( - IN int number); + _In_ int number); struct protoent FAR *PASCAL FAR getprotobyname( - IN const char FAR *name); + _In_z_ const char FAR *name); int PASCAL FAR WSAStartup( - IN WORD wVersionRequired, - OUT LPWSADATA lpWSAData); + _In_ WORD wVersionRequired, + _Out_ LPWSADATA lpWSAData); int PASCAL FAR @@ -755,7 +755,7 @@ void PASCAL FAR WSASetLastError( - IN int iError); + _In_ int iError); int PASCAL FAR @@ -772,7 +772,7 @@ FARPROC PASCAL FAR WSASetBlockingHook( - IN FARPROC lpBlockFunc); + _In_ FARPROC lpBlockFunc); int PASCAL FAR @@ -781,81 +781,81 @@ HANDLE PASCAL FAR WSAAsyncGetServByName( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *name, - IN const char FAR *proto, - OUT char FAR *buf, - IN int buflen); + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_z_ const char FAR *name, + _In_z_ const char FAR *proto, + _Out_writes_bytes_(buflen) char FAR *buf, + _In_ int buflen); HANDLE PASCAL FAR WSAAsyncGetServByPort( - IN HWND hWnd, - IN u_int wMsg, - IN int port, - IN const char FAR *proto, - OUT char FAR *buf, - IN int buflen); + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_ int port, + _In_ const char FAR *proto, + _Out_writes_bytes_(buflen) char FAR *buf, + _In_ int buflen); HANDLE PASCAL FAR WSAAsyncGetProtoByName( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *name, - OUT char FAR *buf, - IN int buflen); + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_z_ const char FAR *name, + _Out_writes_bytes_(buflen) char FAR *buf, + _In_ int buflen); HANDLE PASCAL FAR WSAAsyncGetProtoByNumber( - IN HWND hWnd, - IN u_int wMsg, - IN int number, - OUT char FAR *buf, - IN int buflen); + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_ int number, + _Out_writes_bytes_(buflen) char FAR *buf, + _In_ int buflen); HANDLE PASCAL FAR WSAAsyncGetHostByName( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *name, - OUT char FAR *buf, - IN int buflen); + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_z_ const char FAR *name, + _Out_writes_bytes_(buflen) char FAR *buf, + _In_ int buflen); HANDLE PASCAL FAR WSAAsyncGetHostByAddr( - IN HWND hWnd, - IN u_int wMsg, - IN const char FAR *addr, - IN int len, - IN int type, - OUT char FAR *buf, - IN int buflen); + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_ const char FAR *addr, + _In_ int len, + _In_ int type, + _Out_writes_bytes_(buflen) char FAR *buf, + _In_ int buflen); int PASCAL FAR WSACancelAsyncRequest( - IN HANDLE hAsyncTaskHandle); + _In_ HANDLE hAsyncTaskHandle); int PASCAL FAR WSAAsyncSelect( - IN SOCKET s, - IN HWND hWnd, - IN u_int wMsg, - IN long lEvent); + _In_ SOCKET s, + _In_ HWND hWnd, + _In_ u_int wMsg, + _In_ long lEvent); int PASCAL FAR WSARecvEx( - IN SOCKET s, - OUT char FAR *buf, - IN int len, - IN OUT int FAR *flags); + _In_ SOCKET s, + _Out_writes_bytes_to_(len, return) __out_data_source(NETWORK) char FAR *buf, + _In_ int len, + _Inout_ int FAR *flags); typedef struct _TRANSMIT_FILE_BUFFERS { PVOID Head; @@ -867,37 +867,37 @@ BOOL PASCAL FAR TransmitFile( - IN SOCKET hSocket, - IN HANDLE hFile, - IN DWORD nNumberOfBytesToWrite, - IN DWORD nNumberOfBytesPerSend, - IN OUT LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers OPTIONAL, - IN DWORD dwReserved); + _In_ SOCKET hSocket, + _In_ HANDLE hFile, + _In_ DWORD nNumberOfBytesToWrite, + _In_ DWORD nNumberOfBytesPerSend, + _Inout_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPTRANSMIT_FILE_BUFFERS lpTransmitBuffers, + _In_ DWORD dwReserved); BOOL PASCAL FAR AcceptEx( - IN SOCKET sListenSocket, - IN SOCKET sAcceptSocket, - OUT PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT LPDWORD lpdwBytesReceived, - IN OUT LPOVERLAPPED lpOverlapped); + _In_ SOCKET sListenSocket, + _In_ SOCKET sAcceptSocket, + _Out_writes_bytes_to_(dwReceiveDataLength + dwLocalAddressLength + dwRemoteAddressLength, *lpdwBytesReceived) PVOID lpOutputBuffer, + _In_ DWORD dwReceiveDataLength, + _In_ DWORD dwLocalAddressLength, + _In_ DWORD dwRemoteAddressLength, + _Out_ LPDWORD lpdwBytesReceived, + _Inout_ LPOVERLAPPED lpOverlapped); VOID PASCAL FAR GetAcceptExSockaddrs( - IN PVOID lpOutputBuffer, - IN DWORD dwReceiveDataLength, - IN DWORD dwLocalAddressLength, - IN DWORD dwRemoteAddressLength, - OUT struct sockaddr **LocalSockaddr, - OUT LPINT LocalSockaddrLength, - OUT struct sockaddr **RemoteSockaddr, - OUT LPINT RemoteSockaddrLength); + _In_reads_bytes_(dwReceiveDataLength + dwLocalAddressLength + dwRemoteAddressLength) PVOID lpOutputBuffer, + _In_ DWORD dwReceiveDataLength, + _In_ DWORD dwLocalAddressLength, + _In_ DWORD dwRemoteAddressLength, + _Outptr_result_bytebuffer_(*LocalSockaddrLength) struct sockaddr **LocalSockaddr, + _Out_ LPINT LocalSockaddrLength, + _Outptr_result_bytebuffer_(*RemoteSockaddrLength) struct sockaddr **RemoteSockaddr, + _Out_ LPINT RemoteSockaddrLength); #if(_WIN32_WINNT >= 0x0501)

1 0

[akhaldi] 59744: [SAL] * Add _Inout_updates_to_() annotation.
by akhaldi＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: akhaldi Date: Thu Aug 15 13:57:16 2013 New Revision: 59744 URL: http://svn.reactos.org/svn/reactos?rev=59744&view=rev Log: [SAL] * Add _Inout_updates_to_() 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] Thu Aug 15 13:57:16 2013 @@ -704,7 +704,7 @@ #define _Inout_updates_bytes_to_opt_(size,count) _SAL2_NAME(_Inout_updates_bytes_to_opt_) _Group_(_Out_writes_bytes_to_opt_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidBytes="\n" _SA_SPECSTRIZE(count))]) #define _Inout_updates_opt_(size) _SAL2_NAME(_Inout_updates_opt_) _Group_(_Pre_opt_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)]) #define _Inout_updates_opt_z_(size) _SAL2_NAME(_Inout_updates_opt_z_) _Group_(_Pre_opt_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) -//#define _Inout_updates_to_(size,count) +#define _Inout_updates_to_(size,count) _SAL2_NAME(_Inout_updates_to_) _Group_(_Out_writes_to_(size,count) [SA_Pre(Valid=SA_Yes)] [SA_Pre(ValidElements="\n" _SA_SPECSTRIZE(count))]) //#define _Inout_updates_to_opt_(size,count) #define _Inout_updates_z_(size) _SAL2_NAME(_Inout_updates_z_) _Group_(_Pre_cap_(size) [SA_Pre(Valid=SA_Yes)] [SA_Post(Valid=SA_Yes)] [SA_Pre(NullTerminated=SA_Yes)] [SA_Post(NullTerminated=SA_Yes)]) #define _Inout_z_ _SAL2_NAME(_Inout_z_) _Group_(_Prepost_z_)

1 0

[akhaldi] 59743: [PSDK] * Annotate ws2tcpip.h.
by akhaldi＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: akhaldi Date: Thu Aug 15 12:59:02 2013 New Revision: 59743 URL: http://svn.reactos.org/svn/reactos?rev=59743&view=rev Log: [PSDK] * Annotate ws2tcpip.h. Modified: trunk/reactos/include/psdk/ws2tcpip.h Modified: trunk/reactos/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ws2tcpip.h?re… ============================================================================== --- trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ws2tcpip.h [iso-8859-1] Thu Aug 15 12:59:02 2013 @@ -62,10 +62,10 @@ INT WSAAPI getaddrinfo( - IN PCSTR pNodeName OPTIONAL, - IN PCSTR pServiceName OPTIONAL, - IN const ADDRINFOA *pHints OPTIONAL, - OUT PADDRINFOA *ppResult); + _In_opt_ PCSTR pNodeName, + _In_opt_ PCSTR pServiceName, + _In_opt_ const ADDRINFOA *pHints, + _Outptr_ PADDRINFOA *ppResult); #if (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) @@ -73,10 +73,10 @@ INT WSAAPI GetAddrInfoW( - IN PCWSTR pNodeName OPTIONAL, - IN PCWSTR pServiceName OPTIONAL, - IN const ADDRINFOW *pHints OPTIONAL, - OUT PADDRINFOW *ppResult); + _In_opt_ PCWSTR pNodeName, + _In_opt_ PCWSTR pServiceName, + _In_opt_ const ADDRINFOW *pHints, + _Outptr_ PADDRINFOW *ppResult); #define GetAddrInfoA getaddrinfo @@ -92,17 +92,17 @@ typedef INT (WSAAPI *LPFN_GETADDRINFO)( - IN PCSTR pNodeName OPTIONAL, - IN PCSTR pServiceName OPTIONAL, - IN const ADDRINFOA *pHints OPTIONAL, - OUT PADDRINFOA *ppResult); + _In_opt_ PCSTR pNodeName, + _In_opt_ PCSTR pServiceName, + _In_opt_ const ADDRINFOA *pHints, + _Outptr_ PADDRINFOA *ppResult); typedef INT (WSAAPI *LPFN_GETADDRINFOW)( - IN PCWSTR pNodeName OPTIONAL, - IN PCWSTR pServiceName OPTIONAL, - IN const ADDRINFOW *pHints OPTIONAL, - OUT PADDRINFOW *ppResult); + _In_opt_ PCWSTR pNodeName, + _In_opt_ PCWSTR pServiceName, + _In_opt_ const ADDRINFOW *pHints, + _Outptr_ PADDRINFOW *ppResult); #define LPFN_GETADDRINFOA LPFN_GETADDRINFO @@ -118,39 +118,39 @@ typedef void (CALLBACK *LPLOOKUPSERVICE_COMPLETION_ROUTINE)( - IN DWORD dwError, - IN DWORD dwBytes, - IN LPWSAOVERLAPPED lpOverlapped); + _In_ DWORD dwError, + _In_ DWORD dwBytes, + _In_ LPWSAOVERLAPPED lpOverlapped); WINSOCK_API_LINKAGE INT WSAAPI GetAddrInfoExA( - IN PCSTR pName OPTIONAL, - IN PCSTR pServiceName OPTIONAL, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN const ADDRINFOEXA *hints, - OUT PADDRINFOEXA *ppResult, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpNameHandle OPTIONAL); + _In_opt_ PCSTR pName, + _In_opt_ PCSTR pServiceName, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ const ADDRINFOEXA *hints, + _Outptr_ PADDRINFOEXA *ppResult, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpNameHandle); WINSOCK_API_LINKAGE INT WSAAPI GetAddrInfoExW( - IN PCWSTR pName OPTIONAL, - IN PCWSTR pServiceName OPTIONAL, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN const ADDRINFOEXW *hints OPTIONAL, - OUT PADDRINFOEXW *ppResult, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpHandle OPTIONAL); + _In_opt_ PCWSTR pName, + _In_opt_ PCWSTR pServiceName, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ const ADDRINFOEXW *hints, + _Outptr_ PADDRINFOEXW *ppResult, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpHandle); #ifdef UNICODE #define GetAddrInfoEx GetAddrInfoExW @@ -162,29 +162,29 @@ typedef INT (WSAAPI *LPFN_GETADDRINFOEXA)( - IN PCSTR pName, - IN PCSTR pServiceName OPTIONAL, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN const ADDRINFOEXA *hints OPTIONAL, - OUT PADDRINFOEXA *ppResult, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpNameHandle OPTIONAL); + _In_ PCSTR pName, + _In_opt_ PCSTR pServiceName, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ const ADDRINFOEXA *hints, + _Outptr_ PADDRINFOEXA *ppResult, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpNameHandle); typedef INT (WSAAPI *LPFN_GETADDRINFOEXW)( - IN PCWSTR pName, - IN PCWSTR pServiceName OPTIONAL, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN const ADDRINFOEXW *hints OPTIONAL, - OUT PADDRINFOEXW *ppResult, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpHandle OPTIONAL); + _In_ PCWSTR pName, + _In_opt_ PCWSTR pServiceName, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ const ADDRINFOEXW *hints, + _Outptr_ PADDRINFOEXW *ppResult, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpHandle); #ifdef UNICODE #define LPFN_GETADDRINFOEX LPFN_GETADDRINFOEXW @@ -201,35 +201,35 @@ INT WSAAPI SetAddrInfoExA( - IN PCSTR pName, - IN PCSTR pServiceName OPTIONAL, - IN SOCKET_ADDRESS *pAddresses OPTIONAL, - IN DWORD dwAddressCount, - IN LPBLOB lpBlob OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpNameHandle OPTIONAL); + _In_ PCSTR pName, + _In_opt_ PCSTR pServiceName, + _In_opt_ SOCKET_ADDRESS *pAddresses, + _In_ DWORD dwAddressCount, + _In_opt_ LPBLOB lpBlob, + _In_ DWORD dwFlags, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpNameHandle); WINSOCK_API_LINKAGE INT WSAAPI SetAddrInfoExW( - IN PCWSTR pName, - IN PCWSTR pServiceName OPTIONAL, - IN SOCKET_ADDRESS *pAddresses OPTIONAL, - IN DWORD dwAddressCount, - IN LPBLOB lpBlob OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpNameHandle OPTIONAL); + _In_ PCWSTR pName, + _In_opt_ PCWSTR pServiceName, + _In_opt_ SOCKET_ADDRESS *pAddresses, + _In_ DWORD dwAddressCount, + _In_opt_ LPBLOB lpBlob, + _In_ DWORD dwFlags, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpNameHandle); #ifdef UNICODE #define SetAddrInfoEx SetAddrInfoExW @@ -241,33 +241,33 @@ typedef INT (WSAAPI *LPFN_SETADDRINFOEXA)( - IN PCSTR pName, - IN PCSTR pServiceName OPTIONAL, - IN SOCKET_ADDRESS *pAddresses OPTIONAL, - IN DWORD dwAddressCount, - IN LPBLOB lpBlob OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpNameHandle OPTIONAL); + _In_ PCSTR pName, + _In_opt_ PCSTR pServiceName, + _In_opt_ SOCKET_ADDRESS *pAddresses, + _In_ DWORD dwAddressCount, + _In_opt_ LPBLOB lpBlob, + _In_ DWORD dwFlags, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpNameHandle); typedef INT (WSAAPI *LPFN_SETADDRINFOEXW)( - IN PCWSTR pName, - IN PCWSTR pServiceName OPTIONAL, - IN SOCKET_ADDRESS *pAddresses OPTIONAL, - IN DWORD dwAddressCount, - IN LPBLOB lpBlob OPTIONAL, - IN DWORD dwFlags, - IN DWORD dwNameSpace, - IN LPGUID lpNspId OPTIONAL, - IN struct timeval *timeout OPTIONAL, - IN LPOVERLAPPED lpOverlapped OPTIONAL, - IN LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL, - OUT LPHANDLE lpNameHandle OPTIONAL); + _In_ PCWSTR pName, + _In_opt_ PCWSTR pServiceName, + _In_opt_ SOCKET_ADDRESS *pAddresses, + _In_ DWORD dwAddressCount, + _In_opt_ LPBLOB lpBlob, + _In_ DWORD dwFlags, + _In_ DWORD dwNameSpace, + _In_opt_ LPGUID lpNspId, + _In_opt_ struct timeval *timeout, + _In_opt_ LPOVERLAPPED lpOverlapped, + _In_opt_ LPLOOKUPSERVICE_COMPLETION_ROUTINE lpCompletionRoutine, + _Out_opt_ LPHANDLE lpNameHandle); #ifdef UNICODE #define LPFN_SETADDRINFOEX LPFN_SETADDRINFOEXW @@ -282,7 +282,7 @@ VOID WSAAPI freeaddrinfo( - IN PADDRINFOA pAddrInfo OPTIONAL); + _In_opt_ PADDRINFOA pAddrInfo); #if (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) @@ -290,7 +290,7 @@ VOID WSAAPI FreeAddrInfoW( - IN PADDRINFOW pAddrInfo OPTIONAL); + _In_opt_ PADDRINFOW pAddrInfo); #define FreeAddrInfoA freeaddrinfo @@ -305,11 +305,11 @@ typedef VOID (WSAAPI *LPFN_FREEADDRINFO)( - IN PADDRINFOA pAddrInfo OPTIONAL); + _In_opt_ PADDRINFOA pAddrInfo); typedef VOID (WSAAPI *LPFN_FREEADDRINFOW)( - IN PADDRINFOW pAddrInfo OPTIONAL); + _In_opt_ PADDRINFOW pAddrInfo); #define LPFN_FREEADDRINFOA LPFN_FREEADDRINFO @@ -327,13 +327,13 @@ void WSAAPI FreeAddrInfoEx( - IN PADDRINFOEXA pAddrInfoEx OPTIONAL); + _In_opt_ PADDRINFOEXA pAddrInfoEx); WINSOCK_API_LINKAGE void WSAAPI FreeAddrInfoExW( - IN PADDRINFOEXW pAddrInfoEx OPTIONAL); + _In_opt_ PADDRINFOEXW pAddrInfoEx); #define FreeAddrInfoExA FreeAddrInfoEx @@ -345,11 +345,11 @@ typedef void (WSAAPI *LPFN_FREEADDRINFOEXA)( - IN PADDRINFOEXA pAddrInfoEx); + _In_ PADDRINFOEXA pAddrInfoEx); typedef void (WSAAPI *LPFN_FREEADDRINFOEXW)( - IN PADDRINFOEXW pAddrInfoEx); + _In_ PADDRINFOEXW pAddrInfoEx); #ifdef UNICODE @@ -367,13 +367,13 @@ INT WSAAPI getnameinfo( - IN const SOCKADDR *pSockaddr, - IN socklen_t SockaddrLength, - OUT PCHAR pNodeBuffer OPTIONAL, - IN DWORD NodeBufferSize, - OUT PCHAR pServiceBuffer, - IN DWORD ServiceBufferSize, - IN INT Flags); + _In_reads_bytes_(SockaddrLength) const SOCKADDR *pSockaddr, + _In_ socklen_t SockaddrLength, + _Out_writes_opt_(NodeBufferSize) PCHAR pNodeBuffer, + _In_ DWORD NodeBufferSize, + _Out_writes_opt_(ServiceBufferSize) PCHAR pServiceBuffer, + _In_ DWORD ServiceBufferSize, + _In_ INT Flags); #if (NTDDI_VERSION >= NTDDI_WINXPSP2) || (_WIN32_WINNT >= 0x0502) @@ -381,13 +381,13 @@ INT WSAAPI GetNameInfoW( - IN const SOCKADDR *pSockaddr, - IN socklen_t SockaddrLength, - OUT PWCHAR pNodeBuffer, - IN DWORD NodeBufferSize, - OUT PWCHAR pServiceBuffer OPTIONAL, - IN DWORD ServiceBufferSize, - IN INT Flags); + _In_reads_bytes_(SockaddrLength) const SOCKADDR *pSockaddr, + _In_ socklen_t SockaddrLength, + _Out_writes_opt_(NodeBufferSize) PWCHAR pNodeBuffer, + _In_ DWORD NodeBufferSize, + _Out_writes_opt_(ServiceBufferSize) PWCHAR pServiceBuffer, + _In_ DWORD ServiceBufferSize, + _In_ INT Flags); #define GetNameInfoA getnameinfo @@ -403,23 +403,23 @@ typedef int (WSAAPI *LPFN_GETNAMEINFO)( - IN const SOCKADDR *pSockaddr, - IN socklen_t SockaddrLength, - OUT PCHAR pNodeBuffer, - IN DWORD NodeBufferSize, - OUT PCHAR pServiceBuffer OPTIONAL, - IN DWORD ServiceBufferSize, - IN INT Flags); + _In_reads_bytes_(SockaddrLength) const SOCKADDR *pSockaddr, + _In_ socklen_t SockaddrLength, + _Out_writes_opt_(NodeBufferSize) PCHAR pNodeBuffer, + _In_ DWORD NodeBufferSize, + _Out_writes_opt_(ServiceBufferSize) PCHAR pServiceBuffer, + _In_ DWORD ServiceBufferSize, + _In_ INT Flags); typedef INT (WSAAPI *LPFN_GETNAMEINFOW)( - IN const SOCKADDR *pSockaddr, - IN socklen_t SockaddrLength, - OUT PWCHAR pNodeBuffer, - IN DWORD NodeBufferSize, - OUT PWCHAR pServiceBuffer OPTIONAL, - IN DWORD ServiceBufferSize, - IN INT Flags); + _In_reads_bytes_(SockaddrLength) const SOCKADDR *pSockaddr, + _In_ socklen_t SockaddrLength, + _Out_writes_opt_(NodeBufferSize) PWCHAR pNodeBuffer, + _In_ DWORD NodeBufferSize, + _Out_writes_opt_(ServiceBufferSize) PWCHAR pServiceBuffer, + _In_ DWORD ServiceBufferSize, + _In_ INT Flags); #define LPFN_GETNAMEINFOA LPFN_GETNAMEINFO @@ -436,32 +436,32 @@ INT WSAAPI inet_pton( - IN INT Family, - IN PCSTR pszAddrString, - OUT PVOID pAddrBuf); + _In_ INT Family, + _In_ PCSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN6_ADDR)) PVOID pAddrBuf); INT WSAAPI InetPtonW( - IN INT Family, - IN PCWSTR pszAddrString, - OUT PVOID pAddrBuf); + _In_ INT Family, + _In_ PCWSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN6_ADDR)) PVOID pAddrBuf); PCSTR WSAAPI inet_ntop( - IN INT Family, - IN PVOID pAddr, - OUT PSTR pStringBuf, - IN size_t StringBufSize); + _In_ INT Family, + _In_ PVOID pAddr, + _Out_writes_(StringBufSize) PSTR pStringBuf, + _In_ size_t StringBufSize); PCWSTR WSAAPI InetNtopW( - IN INT Family, - IN PVOID pAddr, - OUT PWSTR pStringBuf, - IN size_t StringBufSize); + _In_ INT Family, + _In_ PVOID pAddr, + _Out_writes_(StringBufSize) PWSTR pStringBuf, + _In_ size_t StringBufSize); #define InetPtonA inet_pton #define InetNtopA inet_ntop @@ -478,29 +478,29 @@ typedef INT (WSAAPI *LPFN_INET_PTONA)( - IN INT Family, - IN PCSTR pszAddrString, - OUT PVOID pAddrBuf); + _In_ INT Family, + _In_ PCSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN6_ADDR)) PVOID pAddrBuf); typedef INT (WSAAPI *LPFN_INET_PTONW)( - IN INT Family, - IN PCWSTR pszAddrString, - OUT PVOID pAddrBuf); + _In_ INT Family, + _In_ PCWSTR pszAddrString, + _Out_writes_bytes_(sizeof(IN6_ADDR)) PVOID pAddrBuf); typedef PCSTR (WSAAPI *LPFN_INET_NTOPA)( - IN INT Family, - IN PVOID pAddr, - OUT PSTR pStringBuf, - IN size_t StringBufSize); + _In_ INT Family, + _In_ PVOID pAddr, + _Out_writes_(StringBufSize) PSTR pStringBuf, + _In_ size_t StringBufSize); typedef PCWSTR (WSAAPI *LPFN_INET_NTOPW)( - IN INT Family, - IN PVOID pAddr, - OUT PWSTR pStringBuf, - IN size_t StringBufSize); + _In_ INT Family, + _In_ PVOID pAddr, + _Out_writes_(StringBufSize) PWSTR pStringBuf, + _In_ size_t StringBufSize); #ifdef UNICODE #define LPFN_INET_PTON LPFN_INET_PTONW @@ -526,7 +526,7 @@ static __inline char * gai_strerrorA( - IN int ecode) + _In_ int ecode) { static char buff[GAI_STRERROR_BUFFER_SIZE + 1]; @@ -546,7 +546,7 @@ static __inline WCHAR * gai_strerrorW( - IN int ecode) + _In_ int ecode) { static WCHAR buff[GAI_STRERROR_BUFFER_SIZE + 1]; @@ -568,12 +568,12 @@ WS2TCPIP_INLINE int setipv4sourcefilter( - IN SOCKET Socket, - IN IN_ADDR Interface, - IN IN_ADDR Group, - IN MULTICAST_MODE_TYPE FilterMode, - IN ULONG SourceCount, - IN CONST IN_ADDR *SourceList) + _In_ SOCKET Socket, + _In_ IN_ADDR Interface, + _In_ IN_ADDR Group, + _In_ MULTICAST_MODE_TYPE FilterMode, + _In_ ULONG SourceCount, + _In_reads_(SourceCount) CONST IN_ADDR *SourceList) { int Error; DWORD Size, Returned; @@ -609,15 +609,16 @@ return Error; } +_Success_(return == 0) WS2TCPIP_INLINE int getipv4sourcefilter( - IN SOCKET Socket, - IN IN_ADDR Interface, - IN IN_ADDR Group, - OUT MULTICAST_MODE_TYPE *FilterMode, - IN OUT ULONG *SourceCount, - OUT IN_ADDR *SourceList) + _In_ SOCKET Socket, + _In_ IN_ADDR Interface, + _In_ IN_ADDR Group, + _Out_ MULTICAST_MODE_TYPE *FilterMode, + _Inout_ ULONG *SourceCount, + _Out_writes_(*SourceCount) IN_ADDR *SourceList) { int Error; DWORD Size, Returned; @@ -662,13 +663,13 @@ WS2TCPIP_INLINE int setsourcefilter( - IN SOCKET Socket, - IN ULONG Interface, - IN CONST SOCKADDR *Group, - IN int GroupLength, - IN MULTICAST_MODE_TYPE FilterMode, - IN ULONG SourceCount, - IN CONST SOCKADDR_STORAGE *SourceList) + _In_ SOCKET Socket, + _In_ ULONG Interface, + _In_ CONST SOCKADDR *Group, + _In_ int GroupLength, + _In_ MULTICAST_MODE_TYPE FilterMode, + _In_ ULONG SourceCount, + _In_reads_(SourceCount) CONST SOCKADDR_STORAGE *SourceList) { int Error; DWORD Size, Returned; @@ -701,16 +702,17 @@ return Error; } +_Success_(return == 0) WS2TCPIP_INLINE int getsourcefilter( - IN SOCKET Socket, - IN ULONG Interface, - IN CONST SOCKADDR *Group, - IN int GroupLength, - OUT MULTICAST_MODE_TYPE *FilterMode, - IN OUT ULONG *SourceCount, - OUT SOCKADDR_STORAGE *SourceList) + _In_ SOCKET Socket, + _In_ ULONG Interface, + _In_ CONST SOCKADDR *Group, + _In_ int GroupLength, + _Out_ MULTICAST_MODE_TYPE *FilterMode, + _Inout_ ULONG *SourceCount, + _Out_writes_(*SourceCount) SOCKADDR_STORAGE *SourceList) { int Error; DWORD Size, Returned; @@ -753,8 +755,8 @@ WS2TCPIP_INLINE int idealsendbacklogquery( - IN SOCKET s, - OUT ULONG *pISB) + _In_ SOCKET s, + _Out_ ULONG *pISB) { DWORD bytes; @@ -765,9 +767,9 @@ WS2TCPIP_INLINE int idealsendbacklognotify( - IN SOCKET s, - IN LPWSAOVERLAPPED lpOverlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine OPTIONAL) + _In_ SOCKET s, + _In_opt_ LPWSAOVERLAPPED lpOverlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE lpCompletionRoutine) { DWORD bytes; @@ -786,51 +788,51 @@ INT WSAAPI WSASetSocketSecurity( - IN SOCKET Socket, - IN const SOCKET_SECURITY_SETTINGS *SecuritySettings OPTIONAL, - IN ULONG SecuritySettingsLen, - IN LPWSAOVERLAPPED Overlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + _In_ SOCKET Socket, + _In_reads_bytes_opt_(SecuritySettingsLen) const SOCKET_SECURITY_SETTINGS *SecuritySettings, + _In_ ULONG SecuritySettingsLen, + _In_opt_ LPWSAOVERLAPPED Overlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); WINSOCK_API_LINKAGE INT WSAAPI WSAQuerySocketSecurity( - IN SOCKET Socket, - IN const SOCKET_SECURITY_QUERY_TEMPLATE *SecurityQueryTemplate OPTIONAL, - IN ULONG SecurityQueryTemplateLen, - OUT SOCKET_SECURITY_QUERY_INFO* SecurityQueryInfo OPTIONAL, - IN OUT ULONG *SecurityQueryInfoLen, - IN LPWSAOVERLAPPED Overlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + _In_ SOCKET Socket, + _In_reads_bytes_opt_(SecurityQueryTemplateLen) const SOCKET_SECURITY_QUERY_TEMPLATE *SecurityQueryTemplate, + _In_ ULONG SecurityQueryTemplateLen, + _Out_writes_bytes_to_opt_(*SecurityQueryInfoLen, *SecurityQueryInfoLen) SOCKET_SECURITY_QUERY_INFO* SecurityQueryInfo, + _Inout_ ULONG *SecurityQueryInfoLen, + _In_opt_ LPWSAOVERLAPPED Overlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); WINSOCK_API_LINKAGE INT WSAAPI WSASetSocketPeerTargetName( - IN SOCKET Socket, - IN const SOCKET_PEER_TARGET_NAME *PeerTargetName, - IN ULONG PeerTargetNameLen, - IN LPWSAOVERLAPPED Overlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + _In_ SOCKET Socket, + _In_reads_bytes_(PeerTargetNameLen) const SOCKET_PEER_TARGET_NAME *PeerTargetName, + _In_ ULONG PeerTargetNameLen, + _In_opt_ LPWSAOVERLAPPED Overlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); WINSOCK_API_LINKAGE INT WSAAPI WSADeleteSocketPeerTargetName( - IN SOCKET Socket, - IN const struct sockaddr *PeerAddr, - IN ULONG PeerAddrLen, - IN LPWSAOVERLAPPED Overlapped OPTIONAL, - IN LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine OPTIONAL); + _In_ SOCKET Socket, + _In_reads_bytes_(PeerAddrLen) const struct sockaddr *PeerAddr, + _In_ ULONG PeerAddrLen, + _In_opt_ LPWSAOVERLAPPED Overlapped, + _In_opt_ LPWSAOVERLAPPED_COMPLETION_ROUTINE CompletionRoutine); WINSOCK_API_LINKAGE INT WSAAPI WSAImpersonateSocketPeer( - IN SOCKET Socket, - IN const struct sockaddr *PeerAddr OPTIONAL, - IN ULONG PeerAddrLen); + _In_ SOCKET Socket, + _In_reads_bytes_opt_(PeerAddrLen) const struct sockaddr *PeerAddr, + _In_ ULONG PeerAddrLen); WINSOCK_API_LINKAGE INT

1 0

[akhaldi] 59742: [SAL] * Add _Ret_opt_ and _Ret_opt_valid_ annotations.
by akhaldi＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: akhaldi Date: Thu Aug 15 11:41:53 2013 New Revision: 59742 URL: http://svn.reactos.org/svn/reactos?rev=59742&view=rev Log: [SAL] * Add _Ret_opt_ and _Ret_opt_valid_ annotations. 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] Thu Aug 15 11:41:53 2013 @@ -1003,7 +1003,7 @@ //#define _Ret_maybenull_z_ #define _Ret_notnull_ _SAL2_NAME(_Ret_notnull_) _Group_([SA_Post(Null=SA_No)]) //#define _Ret_null_ -//#define _Ret_opt_ +#define _Ret_opt_ _Ret_opt_valid_ #define _Ret_opt_bytecap_(size) _SAL11_NAME(_Ret_opt_bytecap_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(WritableBytes="\n" _SA_SPECSTRIZE(size))]) //#define _Ret_opt_bytecap_c_(size) //#define _Ret_opt_bytecap_x_(size) @@ -1016,7 +1016,7 @@ //#define _Ret_opt_count_(size) //#define _Ret_opt_count_c_(size) //#define _Ret_opt_count_x_(size) -//#define _Ret_opt_valid_ +#define _Ret_opt_valid_ _SAL11_NAME(_Ret_opt_valid_) _Group_([SA_Post(Null=SA_Maybe,Notref=1)] [SA_Post(Valid=SA_Yes)]) #define _Ret_opt_z_ _SAL11_NAME(_Ret_opt_z_) _Group_([SA_Post(Null=SA_Maybe,NullTerminated=SA_Yes)] [SA_Post(Valid=SA_Yes)] ) //#define _Ret_opt_z_bytecap_(size) //#define _Ret_opt_z_bytecount_(size)

1 0

[aandrejevic] 59741: [NTVDM] Make the BIOS Data Area accessible to other parts of ntvdm. Properly redirect read/write access to the console to the keyboard and VGA systems, respectively.
by aandrejevic＠svn.reactos.org 15 Aug '13

15 Aug '13

Author: aandrejevic Date: Thu Aug 15 01:40:50 2013 New Revision: 59741 URL: http://svn.reactos.org/svn/reactos?rev=59741&view=rev Log: [NTVDM] Make the BIOS Data Area accessible to other parts of ntvdm. Properly redirect read/write access to the console to the keyboard and VGA systems, respectively. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/bios.h branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/dos.h branches/ntvdm/subsystems/ntvdm/ntvdm.h 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] Thu Aug 15 01:40:50 2013 @@ -19,7 +19,7 @@ /* PRIVATE VARIABLES **********************************************************/ -static PBIOS_DATA_AREA Bda; +PBIOS_DATA_AREA Bda; static BYTE BiosKeyboardMap[256]; static HANDLE BiosConsoleInput = INVALID_HANDLE_VALUE; static HANDLE BiosConsoleOutput = INVALID_HANDLE_VALUE; Modified: branches/ntvdm/subsystems/ntvdm/bios.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.h?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.h [iso-8859-1] Thu Aug 15 01:40:50 2013 @@ -99,6 +99,8 @@ /* FUNCTIONS ******************************************************************/ +extern PBIOS_DATA_AREA Bda; + BOOLEAN BiosInitialize(VOID); VOID BiosCleanup(VOID); BYTE BiosGetVideoMode(VOID); @@ -112,6 +114,7 @@ VOID BiosTimeService(LPWORD Stack); VOID BiosHandleIrq(BYTE IrqNumber, LPWORD Stack); VOID BiosSystemTimerInterrupt(LPWORD Stack); +VOID BiosPrintCharacter(CHAR Character, BYTE Attribute, BYTE Page); BOOLEAN BiosScrollWindow( INT Direction, DWORD Amount, Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Thu Aug 15 01:40:50 2013 @@ -660,17 +660,30 @@ WORD Result = ERROR_SUCCESS; DWORD BytesRead32 = 0; HANDLE Handle = DosGetRealHandle(FileHandle); + WORD i; DPRINT("DosReadFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); /* Make sure the handle is valid */ if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; - /* Read the file */ - if (!ReadFile(Handle, Buffer, Count, &BytesRead32, NULL)) - { - /* Store the error code */ - Result = (WORD)GetLastError(); + if (IsConsoleHandle(Handle)) + { + for (i = 0; i < Count; i++) + { + /* Call the BIOS function to read the character */ + ((LPBYTE)Buffer)[i] = LOBYTE(BiosGetCharacter()); + BytesRead32++; + } + } + else + { + /* Read the file */ + if (!ReadFile(Handle, Buffer, Count, &BytesRead32, NULL)) + { + /* Store the error code */ + Result = (WORD)GetLastError(); + } } /* The number of bytes read is always 16-bit */ @@ -685,6 +698,7 @@ WORD Result = ERROR_SUCCESS; DWORD BytesWritten32 = 0; HANDLE Handle = DosGetRealHandle(FileHandle); + WORD i; DPRINT("DosWriteFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, @@ -693,11 +707,23 @@ /* Make sure the handle is valid */ if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; - /* Write the file */ - if (!WriteFile(Handle, Buffer, Count, &BytesWritten32, NULL)) - { - /* Store the error code */ - Result = (WORD)GetLastError(); + if (IsConsoleHandle(Handle)) + { + for (i = 0; i < Count; i++) + { + /* Call the BIOS to print the character */ + BiosPrintCharacter(((LPBYTE)Buffer)[i], DOS_CHAR_ATTRIBUTE, Bda->VideoPage); + BytesWritten32++; + } + } + else + { + /* Write the file */ + if (!WriteFile(Handle, Buffer, Count, &BytesWritten32, NULL)) + { + /* Store the error code */ + Result = (WORD)GetLastError(); + } } /* The number of bytes written is always 16-bit */ Modified: branches/ntvdm/subsystems/ntvdm/dos.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.h?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.h [iso-8859-1] Thu Aug 15 01:40:50 2013 @@ -36,6 +36,7 @@ #define DOS_CMDLINE_LENGTH 127 #define DOS_DIR_LENGTH 64 #define NUM_DRIVES ('Z' - 'A' + 1) +#define DOS_CHAR_ATTRIBUTE 0x07 enum DOS_ALLOC_STRATEGY { Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.h?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.h [iso-8859-1] Thu Aug 15 01:40:50 2013 @@ -26,6 +26,7 @@ #define MAX_ADDRESS TO_LINEAR(MAX_SEGMENT, MAX_OFFSET) #define FAR_POINTER(x) ((ULONG_PTR)BaseAddress + TO_LINEAR(HIWORD(x), LOWORD(x))) #define STEPS_PER_CYCLE 256 +#define IsConsoleHandle(h) (((((ULONG_PTR)h) & 0x10000003) == 3) ? TRUE : FALSE) /* FUNCTIONS ******************************************************************/

1 0

[aandrejevic] 59740: [NTVDM] Fix bug in DosTerminateProcess.
by aandrejevic＠svn.reactos.org 14 Aug '13

14 Aug '13

Author: aandrejevic Date: Wed Aug 14 23:28:45 2013 New Revision: 59740 URL: http://svn.reactos.org/svn/reactos?rev=59740&view=rev Log: [NTVDM] Fix bug in DosTerminateProcess. Modified: branches/ntvdm/subsystems/ntvdm/dos.c Modified: branches/ntvdm/subsystems/ntvdm/dos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/dos.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/dos.c [iso-8859-1] Wed Aug 14 23:28:45 2013 @@ -1201,7 +1201,7 @@ if (CurrentMcb->BlockType != 'M' && CurrentMcb->BlockType !='Z') break; /* If this block was allocated by the process, free it */ - if (CurrentMcb->OwnerPsp == Psp) DosFreeMemory(McbSegment); + if (CurrentMcb->OwnerPsp == Psp) DosFreeMemory(McbSegment + 1); /* If this was the last block, quit */ if (CurrentMcb->BlockType == 'Z') 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