Ros-diffs August 2013

ros-diffs@reactos.org

10 participants
327 discussions

[aandrejevic] 59672: [NTVDM] Fix the default cursor size and cursor size calculation.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 7 21:57:07 2013 New Revision: 59672 URL: http://svn.reactos.org/svn/reactos?rev=59672&view=rev Log: [NTVDM] Fix the default cursor size and cursor size calculation. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/vga.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 7 21:57:07 2013 @@ -37,7 +37,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, /* CRTC Registers */ - 0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0E, 0x0F, + 0x2D, 0x27, 0x28, 0x90, 0x2B, 0xA0, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x14, 0x1F, 0x96, 0xB9, 0xA3, 0xFF, @@ -58,7 +58,7 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0E, 0x0F, 0xFF, /* CRTC Registers */ - 0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0E, 0x0F, + 0x5F, 0x4F, 0x50, 0x82, 0x55, 0x81, 0xBF, 0x1F, 0x00, 0x4F, 0x0D, 0x0F, 0x00, 0x00, 0x00, 0x00, 0x9C, 0x8E, 0x8F, 0x28, 0x1F, 0x96, 0xB9, 0xA3, 0xFF, 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 7 21:57:07 2013 @@ -502,6 +502,7 @@ BYTE CursorStart = VgaCrtcRegisters[VGA_CRTC_CURSOR_START_REG] & 0x3F; BYTE CursorEnd = VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] & 0x1F; DWORD ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; + BYTE TextSize = 1 + (VgaCrtcRegisters[VGA_CRTC_MAX_SCAN_LINE_REG] & 0x1F); WORD Location = MAKEWORD(VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_LOW_REG], VgaCrtcRegisters[VGA_CRTC_CURSOR_LOC_HIGH_REG]); @@ -509,7 +510,7 @@ { /* Visible cursor */ CursorInfo.bVisible = TRUE; - CursorInfo.dwSize = (100 * (CursorEnd - CursorStart)) >> 5; + CursorInfo.dwSize = (100 * (CursorEnd - CursorStart)) / TextSize; } else {

11 years, 3 months

[aandrejevic] 59671: [NTVDM] Clear the VGA memory during initialization. Clear the graphics framebuffer when switching to graphics mode.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 7 21:15:02 2013 New Revision: 59671 URL: http://svn.reactos.org/svn/reactos?rev=59671&view=rev Log: [NTVDM] Clear the VGA memory during initialization. Clear the graphics framebuffer when switching to graphics 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 7 21:15:02 2013 @@ -254,6 +254,9 @@ ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; ConsoleMutex = GraphicsBufferInfo.hMutex; + /* Clear the framebuffer */ + ZeroMemory(ConsoleFramebuffer, BitmapInfo->bmiHeader.biSizeImage); + /* Set the active buffer */ SetConsoleActiveScreenBuffer(GraphicsConsoleBuffer); @@ -946,6 +949,9 @@ /* Set the global handle */ TextConsoleBuffer = TextHandle; + /* Clear the VGA memory */ + ZeroMemory(VgaMemory, VGA_NUM_BANKS * VGA_BANK_SIZE); + /* Set the default video mode */ BiosSetVideoMode(BIOS_DEFAULT_VIDEO_MODE); VgaUpdateMode();

11 years, 3 months

[akhaldi] 59670: [PSDK] * Annotate wininet.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 7 21:03:03 2013 New Revision: 59670 URL: http://svn.reactos.org/svn/reactos?rev=59670&view=rev Log: [PSDK] * Annotate wininet.h. Modified: trunk/reactos/include/psdk/wininet.h Modified: trunk/reactos/include/psdk/wininet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wininet.h?rev… ============================================================================== --- trunk/reactos/include/psdk/wininet.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wininet.h [iso-8859-1] Wed Aug 7 21:03:03 2013 @@ -24,7 +24,7 @@ #endif #define INTERNETAPI -#define BOOLAPI INTERNETAPI BOOL WINAPI +#define BOOLAPI _Success_(return != 0) INTERNETAPI BOOL WINAPI typedef LPVOID HINTERNET; typedef HINTERNET * LPHINTERNET; @@ -387,32 +387,104 @@ #define IDSI_FLAG_PROXY 0x00000004 #define IDSI_FLAG_TUNNEL 0x00000008 -BOOLAPI InternetTimeFromSystemTimeA(CONST SYSTEMTIME *,DWORD ,LPSTR ,DWORD); -BOOLAPI InternetTimeFromSystemTimeW(CONST SYSTEMTIME *,DWORD ,LPWSTR ,DWORD); +BOOLAPI +InternetTimeFromSystemTimeA( + _In_ CONST SYSTEMTIME *pst, + _In_ DWORD dwRFC, + _Out_writes_bytes_(cbTime) LPSTR lpszTime, + _In_ DWORD cbTime); + +BOOLAPI +InternetTimeFromSystemTimeW( + _In_ CONST SYSTEMTIME *pst, + _In_ DWORD dwRFC, + _Out_writes_bytes_(cbTime) LPWSTR lpszTime, + _In_ DWORD cbTime); + #define InternetTimeFromSystemTime WINELIB_NAME_AW(InternetTimeFromSystemTime) #define INTERNET_RFC1123_FORMAT 0 #define INTERNET_RFC1123_BUFSIZE 30 -BOOLAPI InternetTimeToSystemTimeA(LPCSTR ,SYSTEMTIME *,DWORD); -BOOLAPI InternetTimeToSystemTimeW(LPCWSTR ,SYSTEMTIME *,DWORD); +BOOLAPI +InternetTimeToSystemTimeA( + _In_ LPCSTR, + _Out_ SYSTEMTIME *, + _Reserved_ DWORD); + +BOOLAPI +InternetTimeToSystemTimeW( + _In_ LPCWSTR, + _Out_ SYSTEMTIME *, + _Reserved_ DWORD); + #define InternetTimeToSystemTime WINELIB_NAME_AW(InternetTimeToSystemTime) -BOOLAPI InternetCrackUrlA(LPCSTR ,DWORD ,DWORD ,LPURL_COMPONENTSA); -BOOLAPI InternetCrackUrlW(LPCWSTR ,DWORD ,DWORD ,LPURL_COMPONENTSW); -#define InternetCrackUrl WINELIB_NAME_AW(InternetCrackUrl) - -BOOLAPI InternetCreateUrlA(LPURL_COMPONENTSA ,DWORD ,LPSTR ,LPDWORD); -BOOLAPI InternetCreateUrlW(LPURL_COMPONENTSW ,DWORD ,LPWSTR ,LPDWORD); +BOOLAPI +InternetCrackUrlA( + _In_reads_(dwUrlLength) LPCSTR lpszUrl, + _In_ DWORD dwUrlLength, + _In_ DWORD dwFlags, + _Inout_ LPURL_COMPONENTSA lpUrlComponents); + +BOOLAPI +InternetCrackUrlW( + _In_reads_(dwUrlLength) LPCWSTR lpszUrl, + _In_ DWORD dwUrlLength, + _In_ DWORD dwFlags, + _Inout_ LPURL_COMPONENTSW lpUrlComponents); + +#define InternetCrackUrl WINELIB_NAME_AW(InternetCrackUrl) + +BOOLAPI +InternetCreateUrlA( + _In_ LPURL_COMPONENTSA lpUrlComponents, + _In_ DWORD dwFlags, + _Out_writes_opt_(*lpdwUrlLength) LPSTR lpszUrl, + _Inout_ LPDWORD lpdwUrlLength); + +BOOLAPI +InternetCreateUrlW( + _In_ LPURL_COMPONENTSW lpUrlComponents, + _In_ DWORD dwFlags, + _Out_writes_opt_(*lpdwUrlLength) LPWSTR lpszUrl, + _Inout_ LPDWORD lpdwUrlLength); + #define InternetCreateUrl WINELIB_NAME_AW(InternetCreateUrl) -BOOLAPI InternetCanonicalizeUrlA(LPCSTR ,LPSTR ,LPDWORD ,DWORD); -BOOLAPI InternetCanonicalizeUrlW(LPCWSTR ,LPWSTR ,LPDWORD ,DWORD); -#define InternetCanonicalizeUrl WINELIB_NAME_AW(InternetCanonicalizeUrl) - -BOOLAPI InternetCombineUrlA(LPCSTR ,LPCSTR ,LPSTR ,LPDWORD ,DWORD); -BOOLAPI InternetCombineUrlW(LPCWSTR ,LPCWSTR ,LPWSTR ,LPDWORD ,DWORD); -#define InternetCombineUrl WINELIB_NAME_AW(InternetCombineUrl) +BOOLAPI +InternetCanonicalizeUrlA( + _In_ LPCSTR lpszUrl, + _Out_writes_(*lpdwBufferLength) LPSTR lpszBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _In_ DWORD dwFlags); + +BOOLAPI +InternetCanonicalizeUrlW( + _In_ LPCWSTR lpszUrl, + _Out_writes_(*lpdwBufferLength) LPWSTR lpszBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _In_ DWORD dwFlags); + +#define InternetCanonicalizeUrl WINELIB_NAME_AW(InternetCanonicalizeUrl) + +BOOLAPI +InternetCombineUrlA( + _In_ LPCSTR lpszBaseUrl, + _In_ LPCSTR lpszRelativeUrl, + _Out_writes_(*lpdwBufferLength) LPSTR lpszBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _In_ DWORD dwFlags); + +BOOLAPI +InternetCombineUrlW( + _In_ LPCWSTR lpszBaseUrl, + _In_ LPCWSTR lpszRelativeUrl, + _Out_writes_(*lpdwBufferLength) LPWSTR lpszBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _In_ DWORD dwFlags); + +#define InternetCombineUrl WINELIB_NAME_AW(InternetCombineUrl) #define ICU_ESCAPE 0x80000000 #define ICU_USERNAME 0x40000000 @@ -423,9 +495,27 @@ #define ICU_BROWSER_MODE 0x02000000 #define ICU_ENCODE_PERCENT 0x00001000 -INTERNETAPI HINTERNET WINAPI InternetOpenA(LPCSTR ,DWORD ,LPCSTR ,LPCSTR ,DWORD); -INTERNETAPI HINTERNET WINAPI InternetOpenW(LPCWSTR ,DWORD ,LPCWSTR ,LPCWSTR ,DWORD); -#define InternetOpen WINELIB_NAME_AW(InternetOpen) +INTERNETAPI +HINTERNET +WINAPI +InternetOpenA( + _In_opt_ LPCSTR, + _In_ DWORD, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD); + +INTERNETAPI +HINTERNET +WINAPI +InternetOpenW( + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD); + +#define InternetOpen WINELIB_NAME_AW(InternetOpen) #define INTERNET_OPEN_TYPE_PRECONFIG 0 #define INTERNET_OPEN_TYPE_DIRECT 1 @@ -435,13 +525,35 @@ #define LOCAL_INTERNET_ACCESS INTERNET_OPEN_TYPE_DIRECT #define CERN_PROXY_INTERNET_ACCESS INTERNET_OPEN_TYPE_PROXY -BOOLAPI InternetCloseHandle(HINTERNET); - -INTERNETAPI HINTERNET WINAPI InternetConnectA(HINTERNET ,LPCSTR ,INTERNET_PORT , - LPCSTR ,LPCSTR ,DWORD ,DWORD ,DWORD_PTR ); -INTERNETAPI HINTERNET WINAPI InternetConnectW(HINTERNET ,LPCWSTR ,INTERNET_PORT , - LPCWSTR ,LPCWSTR ,DWORD ,DWORD ,DWORD_PTR ); -#define InternetConnect WINELIB_NAME_AW(InternetConnect) +BOOLAPI InternetCloseHandle(_In_ HINTERNET); + +INTERNETAPI +HINTERNET +WINAPI +InternetConnectA( + _In_ HINTERNET, + _In_ LPCSTR, + _In_ INTERNET_PORT, + _In_opt_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +INTERNETAPI +HINTERNET +WINAPI +InternetConnectW( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ INTERNET_PORT, + _In_opt_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define InternetConnect WINELIB_NAME_AW(InternetConnect) #define INTERNET_SERVICE_URL 0 #define INTERNET_SERVICE_FTP 1 @@ -459,41 +571,126 @@ dwContext \ ) -INTERNETAPI HINTERNET WINAPI InternetOpenUrlA(HINTERNET ,LPCSTR ,LPCSTR ,DWORD ,DWORD ,DWORD_PTR); -INTERNETAPI HINTERNET WINAPI InternetOpenUrlW(HINTERNET ,LPCWSTR ,LPCWSTR ,DWORD ,DWORD ,DWORD_PTR); -#define InternetOpenUrl WINELIB_NAME_AW(InternetOpenUrl) - -BOOLAPI InternetReadFile( HINTERNET ,LPVOID ,DWORD ,LPDWORD ); -INTERNETAPI BOOL WINAPI InternetReadFileExA( HINTERNET ,LPINTERNET_BUFFERSA ,DWORD ,DWORD_PTR ); -INTERNETAPI BOOL WINAPI InternetReadFileExW( HINTERNET ,LPINTERNET_BUFFERSW ,DWORD ,DWORD_PTR ); -#define InternetReadFileEx WINELIB_NAME_AW(InternetReadFileEx) +INTERNETAPI +HINTERNET +WINAPI +InternetOpenUrlA( + _In_ HINTERNET hInternet, + _In_ LPCSTR lpszUrl, + _In_reads_opt_(dwHeadersLength) LPCSTR lpszHeaders, + _In_ DWORD dwHeadersLength, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +INTERNETAPI +HINTERNET +WINAPI +InternetOpenUrlW( + _In_ HINTERNET hInternet, + _In_ LPCWSTR lpszUrl, + _In_reads_opt_(dwHeadersLength) LPCWSTR lpszHeaders, + _In_ DWORD dwHeadersLength, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +#define InternetOpenUrl WINELIB_NAME_AW(InternetOpenUrl) + +BOOLAPI +InternetReadFile( + _In_ HINTERNET hFile, + _Out_writes_bytes_(dwNumberOfBytesToRead) __out_data_source(NETWORK) LPVOID lpBuffer, + _In_ DWORD dwNumberOfBytesToRead, + _Out_ LPDWORD lpdwNumberOfBytesRead); + +BOOLAPI +InternetReadFileExA( + _In_ HINTERNET hFile, + _Out_ __out_data_source(NETWORK) LPINTERNET_BUFFERSA lpBuffersOut, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +BOOLAPI +InternetReadFileExW( + _In_ HINTERNET hFile, + _Out_ __out_data_source(NETWORK) LPINTERNET_BUFFERSW lpBuffersOut, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +#define InternetReadFileEx WINELIB_NAME_AW(InternetReadFileEx) #define IRF_ASYNC WININET_API_FLAG_ASYNC #define IRF_SYNC WININET_API_FLAG_SYNC #define IRF_USE_CONTEXT WININET_API_FLAG_USE_CONTEXT #define IRF_NO_WAIT 0x00000008 -INTERNETAPI DWORD WINAPI InternetSetFilePointer(HINTERNET ,LONG ,PVOID ,DWORD ,DWORD_PTR); -BOOLAPI InternetWriteFile(HINTERNET ,LPCVOID ,DWORD ,LPDWORD); -BOOLAPI InternetQueryDataAvailable(HINTERNET ,LPDWORD ,DWORD ,DWORD_PTR); -BOOLAPI InternetFindNextFileA(HINTERNET ,LPVOID); -BOOLAPI InternetFindNextFileW(HINTERNET ,LPVOID); +INTERNETAPI +DWORD +WINAPI +InternetSetFilePointer( + _In_ HINTERNET, + _In_ LONG, + _Inout_opt_ PVOID, + _In_ DWORD, + _Reserved_ DWORD_PTR); + +BOOLAPI +InternetWriteFile( + _In_ HINTERNET hFile, + _In_reads_bytes_(dwNumberOfBytesToWrite) LPCVOID lpBuffer, + _In_ DWORD dwNumberOfBytesToWrite, + _Out_ LPDWORD lpdwNumberOfBytesWritten); + +BOOLAPI +InternetQueryDataAvailable( + _In_ HINTERNET hFile, + _Out_opt_ __out_data_source(NETWORK) LPDWORD lpdwNumberOfBytesAvailable, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +BOOLAPI InternetFindNextFileA(_In_ HINTERNET, _Out_ LPVOID); +BOOLAPI InternetFindNextFileW(_In_ HINTERNET, _Out_ LPVOID); #define InternetFindNextFile WINELIB_NAME_AW(InternetFindNextFile) -BOOLAPI InternetQueryOptionA(HINTERNET ,DWORD ,LPVOID ,LPDWORD); -BOOLAPI InternetQueryOptionW(HINTERNET ,DWORD ,LPVOID ,LPDWORD); -#define InternetQueryOption WINELIB_NAME_AW(InternetQueryOption) - -BOOLAPI InternetSetOptionA(HINTERNET ,DWORD ,LPVOID ,DWORD); -BOOLAPI InternetSetOptionW(HINTERNET ,DWORD ,LPVOID ,DWORD); +BOOLAPI +InternetQueryOptionA( + _In_opt_ HINTERNET hInternet, + _In_ DWORD dwOption, + _Out_writes_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBuffer, + _Inout_ LPDWORD lpdwBufferLength); + +BOOLAPI +InternetQueryOptionW( + _In_opt_ HINTERNET hInternet, + _In_ DWORD dwOption, + _Out_writes_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBuffer, + _Inout_ LPDWORD lpdwBufferLength); + +#define InternetQueryOption WINELIB_NAME_AW(InternetQueryOption) + +BOOLAPI InternetSetOptionA(_In_opt_ HINTERNET, _In_ DWORD, _In_opt_ LPVOID, _In_ DWORD); +BOOLAPI InternetSetOptionW(_In_opt_ HINTERNET, _In_ DWORD, _In_opt_ LPVOID, _In_ DWORD); #define InternetSetOption WINELIB_NAME_AW(InternetSetOption) -BOOLAPI InternetSetOptionExA(HINTERNET ,DWORD ,LPVOID ,DWORD ,DWORD); -BOOLAPI InternetSetOptionExW(HINTERNET ,DWORD ,LPVOID ,DWORD ,DWORD); -#define InternetSetOptionEx WINELIB_NAME_AW(InternetSetOptionEx) - -BOOLAPI InternetLockRequestFile(HINTERNET ,HANDLE *); -BOOLAPI InternetUnlockRequestFile(HANDLE); +BOOLAPI +InternetSetOptionExA( + _In_opt_ HINTERNET, + _In_ DWORD, + _In_opt_ LPVOID, + _In_ DWORD, + _In_ DWORD); + +BOOLAPI +InternetSetOptionExW( + _In_opt_ HINTERNET, + _In_ DWORD, + _In_opt_ LPVOID, + _In_ DWORD, + _In_ DWORD); + +#define InternetSetOptionEx WINELIB_NAME_AW(InternetSetOptionEx) + +BOOLAPI InternetLockRequestFile(_In_ HINTERNET, _Out_ HANDLE *); +BOOLAPI InternetUnlockRequestFile(_Inout_ HANDLE); #define ISO_GLOBAL 0x00000001 #define ISO_REGISTRY 0x00000002 @@ -643,17 +840,43 @@ -BOOLAPI InternetGetLastResponseInfoA(LPDWORD ,LPSTR ,LPDWORD); -BOOLAPI InternetGetLastResponseInfoW(LPDWORD ,LPWSTR ,LPDWORD); -#define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo) - -typedef VOID (CALLBACK *INTERNET_STATUS_CALLBACK)(HINTERNET ,DWORD_PTR ,DWORD , - LPVOID ,DWORD); - +BOOLAPI +InternetGetLastResponseInfoA( + _Out_ LPDWORD lpdwError, + _Out_writes_opt_(*lpdwBufferLength) LPSTR lpszBuffer, + _Inout_ LPDWORD lpdwBufferLength); + +BOOLAPI +InternetGetLastResponseInfoW( + _Out_ LPDWORD lpdwError, + _Out_writes_opt_(*lpdwBufferLength) LPWSTR lpszBuffer, + _Inout_ LPDWORD lpdwBufferLength); + +#define InternetGetLastResponseInfo WINELIB_NAME_AW(InternetGetLastResponseInfo) + +typedef VOID +(CALLBACK *INTERNET_STATUS_CALLBACK)( + _In_ HINTERNET, + _In_opt_ DWORD_PTR, + _In_ DWORD, + _In_opt_ LPVOID, + _In_ DWORD); typedef INTERNET_STATUS_CALLBACK * LPINTERNET_STATUS_CALLBACK; -INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackA(HINTERNET ,INTERNET_STATUS_CALLBACK); -INTERNETAPI INTERNET_STATUS_CALLBACK WINAPI InternetSetStatusCallbackW(HINTERNET ,INTERNET_STATUS_CALLBACK); +INTERNETAPI +INTERNET_STATUS_CALLBACK +WINAPI +InternetSetStatusCallbackA( + _In_ HINTERNET, + _In_opt_ INTERNET_STATUS_CALLBACK); + +INTERNETAPI +INTERNET_STATUS_CALLBACK +WINAPI +InternetSetStatusCallbackW( + _In_ HINTERNET, + _In_opt_ INTERNET_STATUS_CALLBACK); + #define InternetSetStatusCallback WINELIB_NAME_AW(InternetSetStatusCallback) #define INTERNET_STATUS_RESOLVING_NAME 10 @@ -695,53 +918,145 @@ #define FTP_TRANSFER_TYPE_BINARY 0x00000002 #define FTP_TRANSFER_TYPE_MASK (FTP_TRANSFER_TYPE_ASCII | FTP_TRANSFER_TYPE_BINARY) -BOOLAPI FtpCommandA(HINTERNET, BOOL, DWORD, LPCSTR, DWORD_PTR, HINTERNET *); -BOOLAPI FtpCommandW(HINTERNET, BOOL, DWORD, LPCWSTR, DWORD_PTR, HINTERNET *); -#define FtpCommand WINELIB_NAME_AW(FtpCommand) - -INTERNETAPI HINTERNET WINAPI FtpFindFirstFileA(HINTERNET ,LPCSTR , - LPWIN32_FIND_DATAA ,DWORD ,DWORD_PTR); -INTERNETAPI HINTERNET WINAPI FtpFindFirstFileW(HINTERNET ,LPCWSTR , - LPWIN32_FIND_DATAW ,DWORD ,DWORD_PTR); -#define FtpFindFirstFile WINELIB_NAME_AW(FtpFindFirstFile) - -BOOLAPI FtpGetFileA(HINTERNET ,LPCSTR ,LPCSTR ,BOOL ,DWORD ,DWORD ,DWORD_PTR); -BOOLAPI FtpGetFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,BOOL ,DWORD ,DWORD ,DWORD_PTR); -#define FtpGetFile WINELIB_NAME_AW(FtpGetFile) - -DWORD WINAPI FtpGetFileSize(HINTERNET, LPDWORD); - -BOOLAPI FtpPutFileA(HINTERNET ,LPCSTR ,LPCSTR ,DWORD ,DWORD_PTR); -BOOLAPI FtpPutFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,DWORD ,DWORD_PTR); -#define FtpPutFile WINELIB_NAME_AW(FtpPutFile) - -BOOLAPI FtpDeleteFileA(HINTERNET ,LPCSTR); -BOOLAPI FtpDeleteFileW(HINTERNET ,LPCWSTR); +BOOLAPI +FtpCommandA( + _In_ HINTERNET, + _In_ BOOL, + _In_ DWORD, + _In_ LPCSTR, + _In_opt_ DWORD_PTR, + _Out_opt_ HINTERNET *); + +BOOLAPI +FtpCommandW( + _In_ HINTERNET, + _In_ BOOL, + _In_ DWORD, + _In_ LPCWSTR, + _In_opt_ DWORD_PTR, + _Out_opt_ HINTERNET *); + +#define FtpCommand WINELIB_NAME_AW(FtpCommand) + +INTERNETAPI +HINTERNET +WINAPI +FtpFindFirstFileA( + _In_ HINTERNET, + _In_opt_ LPCSTR, + _Out_opt_ LPWIN32_FIND_DATAA, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +INTERNETAPI +HINTERNET +WINAPI +FtpFindFirstFileW( + _In_ HINTERNET, + _In_opt_ LPCWSTR, + _Out_opt_ LPWIN32_FIND_DATAW, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define FtpFindFirstFile WINELIB_NAME_AW(FtpFindFirstFile) + +BOOLAPI +FtpGetFileA( + _In_ HINTERNET, + _In_ LPCSTR, + _In_ LPCSTR, + _In_ BOOL, + _In_ DWORD, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +BOOLAPI +FtpGetFileW( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ BOOL, + _In_ DWORD, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define FtpGetFile WINELIB_NAME_AW(FtpGetFile) + +DWORD WINAPI FtpGetFileSize(_In_ HINTERNET, _Out_opt_ LPDWORD); + +BOOLAPI +FtpPutFileA( + _In_ HINTERNET, + _In_ LPCSTR, + _In_ LPCSTR, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +BOOLAPI +FtpPutFileW( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ LPCWSTR, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define FtpPutFile WINELIB_NAME_AW(FtpPutFile) + +BOOLAPI FtpDeleteFileA(_In_ HINTERNET, _In_ LPCSTR); +BOOLAPI FtpDeleteFileW(_In_ HINTERNET, _In_ LPCWSTR); #define FtpDeleteFile WINELIB_NAME_AW(FtpDeleteFile) -BOOLAPI FtpRenameFileA(HINTERNET ,LPCSTR ,LPCSTR); -BOOLAPI FtpRenameFileW(HINTERNET ,LPCWSTR ,LPCWSTR); +BOOLAPI FtpRenameFileA(_In_ HINTERNET, _In_ LPCSTR, _In_ LPCSTR); +BOOLAPI FtpRenameFileW(_In_ HINTERNET, _In_ LPCWSTR, _In_ LPCWSTR); #define FtpRenameFile WINELIB_NAME_AW(FtpRenameFile) -INTERNETAPI HINTERNET WINAPI FtpOpenFileA(HINTERNET ,LPCSTR ,DWORD ,DWORD ,DWORD_PTR); -INTERNETAPI HINTERNET WINAPI FtpOpenFileW(HINTERNET ,LPCWSTR ,DWORD ,DWORD ,DWORD_PTR); -#define FtpOpenFile WINELIB_NAME_AW(FtpOpenFile) - -BOOLAPI FtpCreateDirectoryA(HINTERNET ,LPCSTR); -BOOLAPI FtpCreateDirectoryW(HINTERNET ,LPCWSTR); +INTERNETAPI +HINTERNET +WINAPI +FtpOpenFileA( + _In_ HINTERNET, + _In_ LPCSTR, + _In_ DWORD, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +INTERNETAPI +HINTERNET +WINAPI +FtpOpenFileW( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_ DWORD, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define FtpOpenFile WINELIB_NAME_AW(FtpOpenFile) + +BOOLAPI FtpCreateDirectoryA(_In_ HINTERNET, _In_ LPCSTR); +BOOLAPI FtpCreateDirectoryW(_In_ HINTERNET, _In_ LPCWSTR); #define FtpCreateDirectory WINELIB_NAME_AW(FtpCreateDirectory) -BOOLAPI FtpRemoveDirectoryA(HINTERNET ,LPCSTR); -BOOLAPI FtpRemoveDirectoryW(HINTERNET ,LPCWSTR); +BOOLAPI FtpRemoveDirectoryA(_In_ HINTERNET, _In_ LPCSTR); +BOOLAPI FtpRemoveDirectoryW(_In_ HINTERNET, _In_ LPCWSTR); #define FtpRemoveDirectory WINELIB_NAME_AW(FtpRemoveDirectory) -BOOLAPI FtpSetCurrentDirectoryA(HINTERNET ,LPCSTR); -BOOLAPI FtpSetCurrentDirectoryW(HINTERNET ,LPCWSTR); +BOOLAPI FtpSetCurrentDirectoryA(_In_ HINTERNET, _In_ LPCSTR); +BOOLAPI FtpSetCurrentDirectoryW(_In_ HINTERNET, _In_ LPCWSTR); #define FtpSetCurrentDirectory WINELIB_NAME_AW(FtpSetCurrentDirectory) -BOOLAPI FtpGetCurrentDirectoryA(HINTERNET ,LPSTR ,LPDWORD); -BOOLAPI FtpGetCurrentDirectoryW(HINTERNET ,LPWSTR ,LPDWORD); -#define FtpGetCurrentDirectory WINELIB_NAME_AW(FtpGetCurrentDirectory) +BOOLAPI +FtpGetCurrentDirectoryA( + _In_ HINTERNET hConnect, + _Out_writes_(*lpdwCurrentDirectory) LPSTR lpszCurrentDirectory, + _Inout_ LPDWORD lpdwCurrentDirectory); + +BOOLAPI +FtpGetCurrentDirectoryW( + _In_ HINTERNET hConnect, + _Out_writes_(*lpdwCurrentDirectory) LPWSTR lpszCurrentDirectory, + _Inout_ LPDWORD lpdwCurrentDirectory); + +#define FtpGetCurrentDirectory WINELIB_NAME_AW(FtpGetCurrentDirectory) #define MAX_GOPHER_DISPLAY_TEXT 128 #define MAX_GOPHER_SELECTOR_TEXT 256 @@ -1093,36 +1408,113 @@ #define GOPHER_ATTRIBUTE_ID_TREEWALK (GOPHER_ATTRIBUTE_ID_BASE + 24) #define GOPHER_ATTRIBUTE_ID_UNKNOWN (GOPHER_ATTRIBUTE_ID_BASE + 25) -BOOLAPI GopherCreateLocatorA(LPCSTR ,INTERNET_PORT ,LPCSTR , - LPCSTR ,DWORD ,LPSTR ,LPDWORD); -BOOLAPI GopherCreateLocatorW(LPCWSTR ,INTERNET_PORT ,LPCWSTR , - LPCWSTR ,DWORD ,LPWSTR ,LPDWORD); -#define GopherCreateLocator WINELIB_NAME_AW(GopherCreateLocator) - -BOOLAPI GopherGetLocatorTypeA(LPCSTR ,LPDWORD); -BOOLAPI GopherGetLocatorTypeW(LPCWSTR ,LPDWORD); -#define GopherGetLocatorType WINELIB_NAME_AW(GopherGetLocatorType) - -INTERNETAPI HINTERNET WINAPI GopherFindFirstFileA(HINTERNET ,LPCSTR , - LPCSTR ,LPGOPHER_FIND_DATAA ,DWORD ,DWORD_PTR); -INTERNETAPI HINTERNET WINAPI GopherFindFirstFileW(HINTERNET ,LPCWSTR , - LPCWSTR ,LPGOPHER_FIND_DATAW ,DWORD ,DWORD_PTR); -#define GopherFindFirstFile WINELIB_NAME_AW(GopherFindFirstFile) - -INTERNETAPI HINTERNET WINAPI GopherOpenFileA(HINTERNET ,LPCSTR ,LPCSTR ,DWORD ,DWORD_PTR); -INTERNETAPI HINTERNET WINAPI GopherOpenFileW(HINTERNET ,LPCWSTR ,LPCWSTR ,DWORD ,DWORD_PTR); -#define GopherOpenFile WINELIB_NAME_AW(GopherOpenFile) - -typedef BOOL (CALLBACK *GOPHER_ATTRIBUTE_ENUMERATORA)(LPGOPHER_ATTRIBUTE_TYPEA ,DWORD); -typedef BOOL (CALLBACK *GOPHER_ATTRIBUTE_ENUMERATORW)(LPGOPHER_ATTRIBUTE_TYPEW ,DWORD); +BOOLAPI +GopherCreateLocatorA( + _In_ LPCSTR lpszHost, + _In_ INTERNET_PORT nServerPort, + _In_opt_ LPCSTR lpszDisplayString, + _In_opt_ LPCSTR lpszSelectorString, + _In_ DWORD dwGopherType, + _Out_writes_opt_(*lpdwBufferLength) LPSTR lpszLocator, + _Inout_ LPDWORD lpdwBufferLength); + +BOOLAPI +GopherCreateLocatorW( + _In_ LPCWSTR lpszHost, + _In_ INTERNET_PORT nServerPort, + _In_opt_ LPCWSTR lpszDisplayString, + _In_opt_ LPCWSTR lpszSelectorString, + _In_ DWORD dwGopherType, + _Out_writes_opt_(*lpdwBufferLength) LPWSTR lpszLocator, + _Inout_ LPDWORD lpdwBufferLength); + +#define GopherCreateLocator WINELIB_NAME_AW(GopherCreateLocator) + +BOOLAPI GopherGetLocatorTypeA(_In_ LPCSTR, _Out_ LPDWORD); +BOOLAPI GopherGetLocatorTypeW(_In_ LPCWSTR, _Out_ LPDWORD); +#define GopherGetLocatorType WINELIB_NAME_AW(GopherGetLocatorType) + +INTERNETAPI +HINTERNET +WINAPI +GopherFindFirstFileA( + _In_ HINTERNET hConnect, + _In_opt_ LPCSTR lpszLocator, + _In_opt_ LPCSTR lpszSearchString, + _Out_opt_ LPGOPHER_FIND_DATAA lpFindData, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +INTERNETAPI +HINTERNET +WINAPI +GopherFindFirstFileW( + _In_ HINTERNET hConnect, + _In_opt_ LPCWSTR lpszLocator, + _In_opt_ LPCWSTR lpszSearchString, + _Out_opt_ LPGOPHER_FIND_DATAW lpFindData, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +#define GopherFindFirstFile WINELIB_NAME_AW(GopherFindFirstFile) + +INTERNETAPI +HINTERNET +WINAPI +GopherOpenFileA( + _In_ HINTERNET, + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +INTERNETAPI +HINTERNET +WINAPI +GopherOpenFileW( + _In_ HINTERNET, + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define GopherOpenFile WINELIB_NAME_AW(GopherOpenFile) + +typedef BOOL +(CALLBACK *GOPHER_ATTRIBUTE_ENUMERATORA)( + _In_ LPGOPHER_ATTRIBUTE_TYPEA, + _In_ DWORD); + +typedef BOOL +(CALLBACK *GOPHER_ATTRIBUTE_ENUMERATORW)( + _In_ LPGOPHER_ATTRIBUTE_TYPEW, + _In_ DWORD); DECL_WINELIB_TYPE_AW(GOPHER_ATTRIBUTE_ENUMERATOR) -BOOLAPI GopherGetAttributeA(HINTERNET ,LPCSTR ,LPCSTR ,LPBYTE , - DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORA ,DWORD_PTR); -BOOLAPI GopherGetAttributeW(HINTERNET ,LPCWSTR ,LPCWSTR ,LPBYTE , - DWORD ,LPDWORD ,GOPHER_ATTRIBUTE_ENUMERATORW ,DWORD_PTR); -#define GopherGetAttribute WINELIB_NAME_AW(GopherGetAttribute) +BOOLAPI +GopherGetAttributeA( + _In_ HINTERNET hConnect, + _In_ LPCSTR lpszLocator, + _In_opt_ LPCSTR lpszAttributeName, + _At_((LPSTR) lpBuffer, _Out_writes_(dwBufferLength)) LPBYTE lpBuffer, + _In_ DWORD dwBufferLength, + _Out_ LPDWORD lpdwCharactersReturned, + _In_opt_ GOPHER_ATTRIBUTE_ENUMERATORA lpfnEnumerator, + _In_opt_ DWORD_PTR dwContext); + +BOOLAPI +GopherGetAttributeW( + _In_ HINTERNET hConnect, + _In_ LPCWSTR lpszLocator, + _In_opt_ LPCWSTR lpszAttributeName, + _At_((LPWSTR) lpBuffer, _Out_writes_(dwBufferLength)) LPBYTE lpBuffer, + _In_ DWORD dwBufferLength, + _Out_ LPDWORD lpdwCharactersReturned, + _In_opt_ GOPHER_ATTRIBUTE_ENUMERATORW lpfnEnumerator, + _In_opt_ DWORD_PTR dwContext); + +#define GopherGetAttribute WINELIB_NAME_AW(GopherGetAttribute) #define HTTP_MAJOR_VERSION 1 #define HTTP_MINOR_VERSION 0 @@ -1261,15 +1653,52 @@ #define HTTP_STATUS_LAST HTTP_STATUS_VERSION_NOT_SUP -INTERNETAPI HINTERNET WINAPI HttpOpenRequestA(HINTERNET ,LPCSTR ,LPCSTR ,LPCSTR , - LPCSTR ,LPCSTR * ,DWORD ,DWORD_PTR); -INTERNETAPI HINTERNET WINAPI HttpOpenRequestW(HINTERNET ,LPCWSTR ,LPCWSTR ,LPCWSTR , - LPCWSTR ,LPCWSTR * ,DWORD ,DWORD_PTR); -#define HttpOpenRequest WINELIB_NAME_AW(HttpOpenRequest) - -BOOLAPI HttpAddRequestHeadersA(HINTERNET ,LPCSTR ,DWORD ,DWORD); -BOOLAPI HttpAddRequestHeadersW(HINTERNET ,LPCWSTR ,DWORD ,DWORD); -#define HttpAddRequestHeaders WINELIB_NAME_AW(HttpAddRequestHeaders) +INTERNETAPI +HINTERNET +WINAPI +HttpOpenRequestA( + _In_ HINTERNET hConnect, + _In_opt_ LPCSTR lpszVerb, + _In_opt_ LPCSTR lpszObjectName, + _In_opt_ LPCSTR lpszVersion, + _In_opt_ LPCSTR lpszReferrer, + _In_opt_z_ LPCSTR FAR * lplpszAcceptTypes, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +INTERNETAPI +HINTERNET +WINAPI HttpOpenRequestW( + _In_ HINTERNET hConnect, + _In_opt_ LPCWSTR lpszVerb, + _In_opt_ LPCWSTR lpszObjectName, + _In_opt_ LPCWSTR lpszVersion, + _In_opt_ LPCWSTR lpszReferrer, + _In_opt_z_ LPCWSTR FAR * lplpszAcceptTypes, + _In_ DWORD dwFlags, + _In_opt_ DWORD_PTR dwContext); + +#define HttpOpenRequest WINELIB_NAME_AW(HttpOpenRequest) + +BOOLAPI +HttpAddRequestHeadersA( + _In_ HINTERNET hRequest, + _When_(dwHeadersLength == (DWORD) - 1, _In_z_) + _When_(dwHeadersLength != (DWORD) - 1, _In_reads_(dwHeadersLength)) + LPCSTR lpszHeaders, + _In_ DWORD dwHeadersLength, + _In_ DWORD dwModifiers); + +BOOLAPI +HttpAddRequestHeadersW( + _In_ HINTERNET hRequest, + _When_(dwHeadersLength == (DWORD) - 1, _In_z_) + _When_(dwHeadersLength != (DWORD) - 1, _In_reads_(dwHeadersLength)) + LPCWSTR lpszHeaders, + _In_ DWORD dwHeadersLength, + _In_ DWORD dwModifiers); + +#define HttpAddRequestHeaders WINELIB_NAME_AW(HttpAddRequestHeaders) #define HTTP_ADDREQ_INDEX_MASK 0x0000FFFF #define HTTP_ADDREQ_FLAGS_MASK 0xFFFF0000 @@ -1280,15 +1709,41 @@ #define HTTP_ADDREQ_FLAG_COALESCE HTTP_ADDREQ_FLAG_COALESCE_WITH_COMMA #define HTTP_ADDREQ_FLAG_REPLACE 0x80000000 -BOOLAPI HttpSendRequestA(HINTERNET ,LPCSTR ,DWORD ,LPVOID ,DWORD); -BOOLAPI HttpSendRequestW(HINTERNET ,LPCWSTR ,DWORD ,LPVOID ,DWORD); -#define HttpSendRequest WINELIB_NAME_AW(HttpSendRequest) - -INTERNETAPI BOOL WINAPI HttpSendRequestExA(HINTERNET ,LPINTERNET_BUFFERSA , - LPINTERNET_BUFFERSA ,DWORD ,DWORD_PTR); -INTERNETAPI BOOL WINAPI HttpSendRequestExW(HINTERNET ,LPINTERNET_BUFFERSW , - LPINTERNET_BUFFERSW ,DWORD ,DWORD_PTR); -#define HttpSendRequestEx WINELIB_NAME_AW(HttpSendRequestEx) +BOOLAPI +HttpSendRequestA( + _In_ HINTERNET hRequest, + _In_reads_opt_(dwHeadersLength) LPCSTR lpszHeaders, + _In_ DWORD dwHeadersLength, + _In_reads_bytes_opt_(dwOptionalLength) LPVOID lpOptional, + _In_ DWORD dwOptionalLength); + +BOOLAPI +HttpSendRequestW( + _In_ HINTERNET hRequest, + _In_reads_opt_(dwHeadersLength) LPCWSTR lpszHeaders, + _In_ DWORD dwHeadersLength, + _In_reads_bytes_opt_(dwOptionalLength) LPVOID lpOptional, + _In_ DWORD dwOptionalLength); + +#define HttpSendRequest WINELIB_NAME_AW(HttpSendRequest) + +BOOLAPI +HttpSendRequestExA( + _In_ HINTERNET, + _In_opt_ LPINTERNET_BUFFERSA, + _Out_opt_ LPINTERNET_BUFFERSA, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +BOOLAPI +HttpSendRequestExW( + _In_ HINTERNET, + _In_opt_ LPINTERNET_BUFFERSW, + _Out_opt_ LPINTERNET_BUFFERSW, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define HttpSendRequestEx WINELIB_NAME_AW(HttpSendRequestEx) #define HSR_ASYNC WININET_API_FLAG_ASYNC #define HSR_SYNC WININET_API_FLAG_SYNC @@ -1297,18 +1752,56 @@ #define HSR_DOWNLOAD 0x00000010 #define HSR_CHUNKED 0x00000020 -INTERNETAPI BOOL WINAPI HttpEndRequestA(HINTERNET ,LPINTERNET_BUFFERSA ,DWORD ,DWORD_PTR); -INTERNETAPI BOOL WINAPI HttpEndRequestW(HINTERNET ,LPINTERNET_BUFFERSW ,DWORD ,DWORD_PTR); -#define HttpEndRequest WINELIB_NAME_AW(HttpEndRequest) - -BOOLAPI HttpQueryInfoA(HINTERNET ,DWORD ,LPVOID ,LPDWORD ,LPDWORD); -BOOLAPI HttpQueryInfoW(HINTERNET ,DWORD ,LPVOID ,LPDWORD ,LPDWORD); -#define HttpQueryInfo WINELIB_NAME_AW(HttpQueryInfo) +BOOLAPI +HttpEndRequestA( + _In_ HINTERNET, + _Out_opt_ LPINTERNET_BUFFERSA, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +BOOLAPI +HttpEndRequestW( + _In_ HINTERNET, + _Out_opt_ LPINTERNET_BUFFERSW, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +#define HttpEndRequest WINELIB_NAME_AW(HttpEndRequest) + +BOOLAPI +HttpQueryInfoA( + _In_ HINTERNET hRequest, + _In_ DWORD dwInfoLevel, + _Inout_updates_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _Inout_opt_ LPDWORD lpdwIndex); + +BOOLAPI +HttpQueryInfoW( + _In_ HINTERNET hRequest, + _In_ DWORD dwInfoLevel, + _Inout_updates_bytes_to_opt_(*lpdwBufferLength, *lpdwBufferLength) __out_data_source(NETWORK) LPVOID lpBuffer, + _Inout_ LPDWORD lpdwBufferLength, + _Inout_opt_ LPDWORD lpdwIndex); + +#define HttpQueryInfo WINELIB_NAME_AW(HttpQueryInfo) BOOLAPI InternetClearAllPerSiteCookieDecisions(VOID); -BOOLAPI InternetEnumPerSiteCookieDecisionA(LPSTR,ULONG *,ULONG *,ULONG); -BOOLAPI InternetEnumPerSiteCookieDecisionW(LPWSTR,ULONG *,ULONG *,ULONG); +BOOLAPI +InternetEnumPerSiteCookieDecisionA( + _Out_writes_to_(*pcSiteNameSize, *pcSiteNameSize) LPSTR pszSiteName, + _Inout_ ULONG *pcSiteNameSize, + _Out_ ULONG *pdwDecision, + _In_ ULONG dwIndex); + +BOOLAPI +InternetEnumPerSiteCookieDecisionW( + _Out_writes_to_(*pcSiteNameSize, *pcSiteNameSize) LPWSTR pszSiteName, + _Inout_ ULONG *pcSiteNameSize, + _Out_ ULONG *pdwDecision, + _In_ ULONG dwIndex); + #define InternetEnumPerSiteCookieDecision WINELIB_NAME_AW(InternetEnumPerSiteCookieDecision) #define INTERNET_COOKIE_IS_SECURE 0x00000001 @@ -1322,33 +1815,78 @@ #define INTERNET_COOKIE_IE6 0x00000400 #define INTERNET_COOKIE_IS_LEGACY 0x00000800 -BOOLAPI InternetGetCookieExA(LPCSTR,LPCSTR,LPSTR,LPDWORD,DWORD,LPVOID); -BOOLAPI InternetGetCookieExW(LPCWSTR,LPCWSTR,LPWSTR,LPDWORD,DWORD,LPVOID); +BOOLAPI +InternetGetCookieExA( + _In_ LPCSTR lpszUrl, + _In_opt_ LPCSTR lpszCookieName, + _In_reads_opt_(*lpdwSize) LPSTR lpszCookieData, + _Inout_ LPDWORD lpdwSize, + _In_ DWORD dwFlags, + _Reserved_ LPVOID lpReserved); + +BOOLAPI +InternetGetCookieExW( + _In_ LPCWSTR lpszUrl, + _In_opt_ LPCWSTR lpszCookieName, + _In_reads_opt_(*lpdwSize) LPWSTR lpszCookieData, + _Inout_ LPDWORD lpdwSize, + _In_ DWORD dwFlags, + _Reserved_ LPVOID lpReserved); + #define InternetGetCookieEx WINELIB_NAME_AW(InternetGetCookieEx) -DWORD WINAPI InternetSetCookieExA(LPCSTR,LPCSTR,LPCSTR,DWORD,DWORD_PTR); -DWORD WINAPI InternetSetCookieExW(LPCWSTR,LPCWSTR,LPCWSTR,DWORD,DWORD_PTR); +DWORD +WINAPI +InternetSetCookieExA( + _In_ LPCSTR, + _In_opt_ LPCSTR, + _In_ LPCSTR, + _In_ DWORD, + _In_opt_ DWORD_PTR); + +DWORD +WINAPI +InternetSetCookieExW( + _In_ LPCWSTR, + _In_opt_ LPCWSTR, + _In_ LPCWSTR, + _In_ DWORD, + _In_opt_ DWORD_PTR); + #define InternetSetCookieEx WINELIB_NAME_AW(InternetSetCookieEx) -BOOLAPI InternetGetPerSiteCookieDecisionA(LPCSTR,ULONG *); -BOOLAPI InternetGetPerSiteCookieDecisionW(LPCWSTR,ULONG *); +BOOLAPI InternetGetPerSiteCookieDecisionA(_In_ LPCSTR, _Out_ ULONG *); +BOOLAPI InternetGetPerSiteCookieDecisionW(_In_ LPCWSTR, _Out_ ULONG *); #define InternetGetPerSiteCookieDecision WINELIB_NAME_AW(InternetGetPerSiteCookieDecision) -BOOLAPI InternetSetPerSiteCookieDecisionA(LPCSTR,DWORD); -BOOLAPI InternetSetPerSiteCookieDecisionW(LPCWSTR,DWORD); +BOOLAPI InternetSetPerSiteCookieDecisionA(_In_ LPCSTR, _In_ DWORD); +BOOLAPI InternetSetPerSiteCookieDecisionW(_In_ LPCWSTR, _In_ DWORD); #define InternetSetPerSiteCookieDecision WINELIB_NAME_AW(InternetSetPerSiteCookieDecision) -BOOLAPI InternetSetCookieA(LPCSTR ,LPCSTR ,LPCSTR); -BOOLAPI InternetSetCookieW(LPCWSTR ,LPCWSTR ,LPCWSTR); +BOOLAPI InternetSetCookieA(_In_ LPCSTR, _In_opt_ LPCSTR, _In_ LPCSTR); +BOOLAPI InternetSetCookieW(_In_ LPCWSTR, _In_opt_ LPCWSTR, _In_ LPCWSTR); #define InternetSetCookie WINELIB_NAME_AW(InternetSetCookie) -BOOLAPI InternetGetCookieA(LPCSTR ,LPCSTR ,LPSTR ,LPDWORD); -BOOLAPI InternetGetCookieW(LPCWSTR ,LPCWSTR ,LPWSTR ,LPDWORD); -#define InternetGetCookie WINELIB_NAME_AW(InternetGetCookie) - -INTERNETAPI DWORD WINAPI InternetAttemptConnect(DWORD); -BOOLAPI InternetCheckConnectionA(LPCSTR ,DWORD ,DWORD); -BOOLAPI InternetCheckConnectionW(LPCWSTR ,DWORD ,DWORD); +BOOLAPI +InternetGetCookieA( + _In_ LPCSTR lpszUrl, + _In_opt_ LPCSTR lpszCookieName, + _Out_writes_opt_(*lpdwSize) LPSTR lpszCookieData, + _Inout_ LPDWORD lpdwSize); + +BOOLAPI +InternetGetCookieW( + _In_ LPCWSTR lpszUrl, + _In_opt_ LPCWSTR lpszCookieName, + _Out_writes_opt_(*lpdwSize) LPWSTR lpszCookieData, + _Inout_ LPDWORD lpdwSize); + +#define InternetGetCookie WINELIB_NAME_AW(InternetGetCookie) + +INTERNETAPI DWORD WINAPI InternetAttemptConnect(_In_ DWORD); + +BOOLAPI InternetCheckConnectionA(_In_ LPCSTR, _In_ DWORD, _In_ DWORD); +BOOLAPI InternetCheckConnectionW(_In_ LPCWSTR, _In_ DWORD, _In_ DWORD); #define InternetCheckConnection WINELIB_NAME_AW(InternetCheckConnection) #define FLAG_ICC_FORCE_CONNECTION 0x00000001 @@ -1372,9 +1910,34 @@ INTERNET_AUTH_NOTIFY_DATA; -INTERNETAPI DWORD WINAPI InternetErrorDlg(HWND ,HINTERNET ,DWORD ,DWORD ,LPVOID *); -INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingA(HWND ,LPSTR ,LPSTR ,BOOL); -INTERNETAPI DWORD WINAPI InternetConfirmZoneCrossingW(HWND ,LPWSTR ,LPWSTR ,BOOL); +INTERNETAPI +DWORD +WINAPI +InternetErrorDlg( + _In_ HWND, + _Inout_opt_ HINTERNET, + _In_ DWORD, + _In_ DWORD, + _Inout_opt_ LPVOID *); + +INTERNETAPI +DWORD +WINAPI +InternetConfirmZoneCrossingA( + _In_ HWND, + _In_ LPSTR, + _In_ LPSTR, + _In_ BOOL); + +INTERNETAPI +DWORD +WINAPI +InternetConfirmZoneCrossingW( + _In_ HWND, + _In_ LPWSTR, + _In_ LPWSTR, + _In_ BOOL); + #define InternetConfirmZoneCrossing WINELIB_NAME_AW(InternetConfirmZoneCrossing) #define PRIVACY_TEMPLATE_NO_COOKIES 0 @@ -1391,8 +1954,24 @@ #define PRIVACY_TYPE_FIRST_PARTY 0 #define PRIVACY_TYPE_THIRD_PARTY 1 -INTERNETAPI DWORD WINAPI PrivacySetZonePreferenceW(DWORD,DWORD,DWORD,LPCWSTR); -INTERNETAPI DWORD WINAPI PrivacyGetZonePreferenceW(DWORD,DWORD,LPDWORD,LPWSTR,LPDWORD); +INTERNETAPI +DWORD +WINAPI +PrivacySetZonePreferenceW( + _In_ DWORD, + _In_ DWORD, + _In_ DWORD, + _In_opt_ LPCWSTR); + +INTERNETAPI +DWORD +WINAPI +PrivacyGetZonePreferenceW( + _In_ DWORD dwZone, + _In_ DWORD dwType, + _Out_opt_ LPDWORD pdwTemplate, + _Out_writes_opt_(*pdwBufferLength) LPWSTR pszBuffer, + _Inout_opt_ LPDWORD pdwBufferLength); #define INTERNET_ERROR_BASE 12000 @@ -1564,41 +2143,139 @@ FILETIME ftLastModified; } INTERNET_CACHE_TIMESTAMPS, *LPINTERNET_CACHE_TIMESTAMPS; -BOOLAPI CreateUrlCacheEntryA(LPCSTR ,DWORD ,LPCSTR ,LPSTR ,DWORD); -BOOLAPI CreateUrlCacheEntryW(LPCWSTR ,DWORD ,LPCWSTR ,LPWSTR ,DWORD); -#define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry) - -BOOLAPI CommitUrlCacheEntryA(LPCSTR,LPCSTR,FILETIME,FILETIME,DWORD,LPBYTE,DWORD,LPCSTR,LPCSTR); -BOOLAPI CommitUrlCacheEntryW(LPCWSTR,LPCWSTR,FILETIME,FILETIME,DWORD,LPWSTR,DWORD,LPCWSTR,LPCWSTR); -#define CommitUrlCacheEntry WINELIB_NAME_AW(CommitUrlCacheEntry) - -BOOLAPI ResumeSuspendedDownload(HINTERNET, DWORD); - -BOOLAPI RetrieveUrlCacheEntryFileA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,DWORD); -BOOLAPI RetrieveUrlCacheEntryFileW(LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD ,DWORD); -#define RetrieveUrlCacheEntryFile WINELIB_NAME_AW(RetrieveUrlCacheEntryFile) - -BOOLAPI UnlockUrlCacheEntryFileA(LPCSTR ,DWORD); -BOOLAPI UnlockUrlCacheEntryFileW(LPCWSTR ,DWORD); +BOOLAPI +CreateUrlCacheEntryA( + _In_ LPCSTR lpszUrlName, + _In_ DWORD dwExpectedFileSize, + _In_opt_ LPCSTR lpszFileExtension, + _Inout_updates_(MAX_PATH) LPSTR lpszFileName, + _In_ DWORD dwReserved); + +BOOLAPI +CreateUrlCacheEntryW( + _In_ LPCWSTR lpszUrlName, + _In_ DWORD dwExpectedFileSize, + _In_opt_ LPCWSTR lpszFileExtension, + _Inout_updates_(MAX_PATH) LPWSTR lpszFileName, + _In_ DWORD dwReserved); + +#define CreateUrlCacheEntry WINELIB_NAME_AW(CreateUrlCacheEntry) + +BOOLAPI +CommitUrlCacheEntryA( + _In_ LPCSTR lpszUrlName, + _In_opt_ LPCSTR lpszLocalFileName, + _In_ FILETIME ExpireTime, + _In_ FILETIME LastModifiedTime, + _In_ DWORD CacheEntryType, + _In_reads_opt_(cchHeaderInfo) LPBYTE lpHeaderInfo, + _In_ DWORD cchHeaderInfo, + _Reserved_ LPCSTR lpszFileExtension, + _In_opt_ LPCSTR lpszOriginalUrl); + +BOOLAPI +CommitUrlCacheEntryW( + _In_ LPCWSTR lpszUrlName, + _In_opt_ LPCWSTR lpszLocalFileName, + _In_ FILETIME ExpireTime, + _In_ FILETIME LastModifiedTime, + _In_ DWORD CacheEntryType, + _In_reads_opt_(cchHeaderInfo) LPWSTR lpszHeaderInfo, + _In_ DWORD cchHeaderInfo, + _Reserved_ LPCWSTR lpszFileExtension, + _In_opt_ LPCWSTR lpszOriginalUrl); + +#define CommitUrlCacheEntry WINELIB_NAME_AW(CommitUrlCacheEntry) + +BOOLAPI ResumeSuspendedDownload(_In_ HINTERNET, _In_ DWORD); + +BOOLAPI +RetrieveUrlCacheEntryFileA( + _In_ LPCSTR lpszUrlName, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ DWORD dwReserved); + +BOOLAPI +RetrieveUrlCacheEntryFileW( + _In_ LPCWSTR lpszUrlName, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ DWORD dwReserved); + +#define RetrieveUrlCacheEntryFile WINELIB_NAME_AW(RetrieveUrlCacheEntryFile) + +BOOLAPI UnlockUrlCacheEntryFileA(_In_ LPCSTR, _Reserved_ DWORD); +BOOLAPI UnlockUrlCacheEntryFileW(_In_ LPCWSTR, _Reserved_ DWORD); #define UnlockUrlCacheEntryFile WINELIB_NAME_AW(UnlockUrlCacheEntryFile) -INTERNETAPI HANDLE WINAPI RetrieveUrlCacheEntryStreamA(LPCSTR , - LPINTERNET_CACHE_ENTRY_INFOA , LPDWORD ,BOOL ,DWORD); -INTERNETAPI HANDLE WINAPI RetrieveUrlCacheEntryStreamW(LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW , - LPDWORD ,BOOL ,DWORD); -#define RetrieveUrlCacheEntryStream WINELIB_NAME_AW(RetrieveUrlCacheEntryStream) - -BOOLAPI ReadUrlCacheEntryStream( HANDLE ,DWORD ,LPVOID ,LPDWORD ,DWORD ); -BOOLAPI UnlockUrlCacheEntryStream( HANDLE ,DWORD ); -BOOLAPI GetUrlCacheEntryInfoA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD); -BOOLAPI GetUrlCacheEntryInfoW(LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD); -#define GetUrlCacheEntryInfo WINELIB_NAME_AW(GetUrlCacheEntryInfo) - -BOOLAPI GetUrlCacheEntryInfoExA( - LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,LPSTR ,LPDWORD ,LPVOID ,DWORD); -BOOLAPI GetUrlCacheEntryInfoExW( - LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD ,LPWSTR ,LPDWORD ,LPVOID ,DWORD); -#define GetUrlCacheEntryInfoEx WINELIB_NAME_AW(GetUrlCacheEntryInfoEx) +INTERNETAPI +HANDLE +WINAPI +RetrieveUrlCacheEntryStreamA( + _In_ LPCSTR lpszUrlName, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _In_ BOOL fRandomRead, + _Reserved_ DWORD dwReserved); + +INTERNETAPI +HANDLE +WINAPI +RetrieveUrlCacheEntryStreamW( + _In_ LPCWSTR lpszUrlName, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _In_ BOOL fRandomRead, + _Reserved_ DWORD dwReserved); + +#define RetrieveUrlCacheEntryStream WINELIB_NAME_AW(RetrieveUrlCacheEntryStream) + +BOOLAPI +ReadUrlCacheEntryStream( + _In_ HANDLE hUrlCacheStream, + _In_ DWORD dwLocation, + _Out_writes_bytes_(*lpdwLen) __out_data_source(NETWORK) LPVOID lpBuffer, + _Inout_ LPDWORD lpdwLen, + _Reserved_ DWORD Reserved); + +BOOLAPI UnlockUrlCacheEntryStream(_In_ HANDLE, _Reserved_ DWORD); + +BOOLAPI +GetUrlCacheEntryInfoA( + _In_ LPCSTR lpszUrlName, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + _Inout_opt_ LPDWORD lpcbCacheEntryInfo); + +BOOLAPI +GetUrlCacheEntryInfoW( + _In_ LPCWSTR lpszUrlName, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + _Inout_opt_ LPDWORD lpcbCacheEntryInfo); + +#define GetUrlCacheEntryInfo WINELIB_NAME_AW(GetUrlCacheEntryInfo) + +BOOLAPI +GetUrlCacheEntryInfoExA( + _In_ LPCSTR lpszUrl, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpCacheEntryInfo, + _Inout_opt_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ LPSTR lpszRedirectUrl, + _Reserved_ LPDWORD lpcbRedirectUrl, + _Reserved_ LPVOID lpReserved, + _In_ DWORD dwFlags); + +BOOLAPI +GetUrlCacheEntryInfoExW( + _In_ LPCWSTR lpszUrl, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpCacheEntryInfo, + _Inout_opt_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ LPWSTR lpszRedirectUrl, + _Reserved_ LPDWORD lpcbRedirectUrl, + _Reserved_ LPVOID lpReserved, + _In_ DWORD dwFlags); + +#define GetUrlCacheEntryInfoEx WINELIB_NAME_AW(GetUrlCacheEntryInfoEx) #define CACHE_ENTRY_ATTRIBUTE_FC 0x00000004 #define CACHE_ENTRY_HITRATE_FC 0x00000010 @@ -1610,55 +2287,185 @@ #define CACHE_ENTRY_EXEMPT_DELTA_FC 0x00000800 -BOOLAPI SetUrlCacheEntryInfoA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,DWORD); -BOOLAPI SetUrlCacheEntryInfoW(LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW ,DWORD); -#define SetUrlCacheEntryInfo WINELIB_NAME_AW(SetUrlCacheEntryInfo) +BOOLAPI +SetUrlCacheEntryInfoA( + _In_ LPCSTR, + _In_ LPINTERNET_CACHE_ENTRY_INFOA, + _In_ DWORD); + +BOOLAPI +SetUrlCacheEntryInfoW( + _In_ LPCWSTR, + _In_ LPINTERNET_CACHE_ENTRY_INFOW, + _In_ DWORD); + +#define SetUrlCacheEntryInfo WINELIB_NAME_AW(SetUrlCacheEntryInfo) typedef LONGLONG GROUPID; -INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(DWORD,LPVOID); -BOOLAPI DeleteUrlCacheGroup(GROUPID ,DWORD ,LPVOID); - -INTERNETAPI HANDLE WINAPI FindFirstUrlCacheGroup(DWORD,DWORD,LPVOID,DWORD,GROUPID*,LPVOID); -BOOLAPI FindNextUrlCacheGroup(HANDLE,GROUPID*,LPVOID); - -BOOLAPI GetUrlCacheGroupAttributeA(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOA,LPDWORD,LPVOID); -BOOLAPI GetUrlCacheGroupAttributeW(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOW,LPDWORD,LPVOID); -#define GetUrlCacheGroupAttribute WINELIB_NAME_AW(GetUrlCacheGroupAttribute) +INTERNETAPI GROUPID WINAPI CreateUrlCacheGroup(_In_ DWORD, _Reserved_ LPVOID); +BOOLAPI DeleteUrlCacheGroup(_In_ GROUPID, _In_ DWORD, _Reserved_ LPVOID); + +INTERNETAPI +HANDLE +WINAPI +FindFirstUrlCacheGroup( + _In_ DWORD, + _In_ DWORD, + _Reserved_ LPVOID, + _Reserved_ DWORD, + _Out_ GROUPID*, + _Reserved_ LPVOID); + +BOOLAPI FindNextUrlCacheGroup(_In_ HANDLE, _Out_ GROUPID*, _Reserved_ LPVOID); + +BOOLAPI +GetUrlCacheGroupAttributeA( + _In_ GROUPID gid, + _Reserved_ DWORD dwFlags, + _In_ DWORD dwAttributes, + _Out_writes_bytes_(*lpcbGroupInfo) LPINTERNET_CACHE_GROUP_INFOA lpGroupInfo, + _Inout_ LPDWORD lpcbGroupInfo, + _Reserved_ LPVOID lpReserved); + +BOOLAPI +GetUrlCacheGroupAttributeW( + _In_ GROUPID gid, + _Reserved_ DWORD dwFlags, + _In_ DWORD dwAttributes, + _Out_writes_bytes_(*lpcbGroupInfo) LPINTERNET_CACHE_GROUP_INFOW lpGroupInfo, + _Inout_ LPDWORD lpcbGroupInfo, + _Reserved_ LPVOID lpReserved); + +#define GetUrlCacheGroupAttribute WINELIB_NAME_AW(GetUrlCacheGroupAttribute) #define INTERNET_CACHE_GROUP_ADD 0 #define INTERNET_CACHE_GROUP_REMOVE 1 -BOOLAPI SetUrlCacheEntryGroupA(LPCSTR,DWORD,GROUPID,LPBYTE,DWORD,LPVOID); -BOOLAPI SetUrlCacheEntryGroupW(LPCWSTR,DWORD,GROUPID,LPBYTE,DWORD,LPVOID); -#define SetUrlCacheEntryGroup WINELIB_NAME_AW(SetUrlCacheEntryGroup) - -BOOLAPI SetUrlCacheGroupAttributeA(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOA,LPVOID); -BOOLAPI SetUrlCacheGroupAttributeW(GROUPID,DWORD,DWORD,LPINTERNET_CACHE_GROUP_INFOW,LPVOID); -#define SetUrlCacheGroupAttribute WINELIB_NAME_AW(SetUrlCacheGroupAttribute) - -INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryExA( - LPCSTR ,DWORD ,DWORD ,GROUPID ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,LPVOID ,LPDWORD ,LPVOID ); -INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryExW( - LPCWSTR ,DWORD ,DWORD ,GROUPID ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD ,LPVOID ,LPDWORD ,LPVOID ); -#define FindFirstUrlCacheEntryEx WINELIB_NAME_AW(FindFirstUrlCacheEntryEx) - -BOOLAPI FindNextUrlCacheEntryExA(HANDLE ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD ,LPVOID ,LPDWORD ,LPVOID); -BOOLAPI FindNextUrlCacheEntryExW(HANDLE ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD ,LPVOID ,LPDWORD ,LPVOID); -#define FindNextUrlCacheEntryEx WINELIB_NAME_AW(FindNextUrlCacheEntryEx) - -INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryA(LPCSTR ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD); -INTERNETAPI HANDLE WINAPI FindFirstUrlCacheEntryW(LPCWSTR ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD); -#define FindFirstUrlCacheEntry WINELIB_NAME_AW(FindFirstUrlCacheEntry) - -BOOLAPI FindNextUrlCacheEntryA(HANDLE ,LPINTERNET_CACHE_ENTRY_INFOA ,LPDWORD); -BOOLAPI FindNextUrlCacheEntryW(HANDLE ,LPINTERNET_CACHE_ENTRY_INFOW ,LPDWORD); -#define FindNextUrlCacheEntry WINELIB_NAME_AW(FindNextUrlCacheEntry) - -BOOLAPI FindCloseUrlCache(HANDLE); - -BOOLAPI DeleteUrlCacheEntryA(LPCSTR); -BOOLAPI DeleteUrlCacheEntryW(LPCWSTR); +BOOLAPI +SetUrlCacheEntryGroupA( + _In_ LPCSTR, + _In_ DWORD, + _In_ GROUPID, + _Reserved_ LPBYTE, + _Reserved_ DWORD, + _Reserved_ LPVOID); + +BOOLAPI +SetUrlCacheEntryGroupW( + _In_ LPCWSTR, + _In_ DWORD, + _In_ GROUPID, + _Reserved_ LPBYTE, + _Reserved_ DWORD, + _Reserved_ LPVOID); + +#define SetUrlCacheEntryGroup WINELIB_NAME_AW(SetUrlCacheEntryGroup) + +BOOLAPI +SetUrlCacheGroupAttributeA( + _In_ GROUPID, + _Reserved_ DWORD, + _In_ DWORD, + _In_ LPINTERNET_CACHE_GROUP_INFOA, + _Reserved_ LPVOID); + +BOOLAPI +SetUrlCacheGroupAttributeW( + _In_ GROUPID, + _Reserved_ DWORD, + _In_ DWORD, + _In_ LPINTERNET_CACHE_GROUP_INFOW, + _Reserved_ LPVOID); + +#define SetUrlCacheGroupAttribute WINELIB_NAME_AW(SetUrlCacheGroupAttribute) + +INTERNETAPI +HANDLE +WINAPI +FindFirstUrlCacheEntryExA( + _In_opt_ LPCSTR lpszUrlSearchPattern, + _In_ DWORD dwFlags, + _In_ DWORD dwFilter, + _In_ GROUPID GroupId, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpFirstCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ LPVOID lpGroupAttributes, + _Reserved_ LPDWORD lpcbGroupAttributes, + _Reserved_ LPVOID lpReserved); + +INTERNETAPI +HANDLE +WINAPI +FindFirstUrlCacheEntryExW( + _In_opt_ LPCWSTR lpszUrlSearchPattern, + _In_ DWORD dwFlags, + _In_ DWORD dwFilter, + _In_ GROUPID GroupId, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ LPVOID lpGroupAttributes, + _Reserved_ LPDWORD lpcbGroupAttributes, + _Reserved_ LPVOID lpReserved); + +#define FindFirstUrlCacheEntryEx WINELIB_NAME_AW(FindFirstUrlCacheEntryEx) + +BOOLAPI +FindNextUrlCacheEntryExA( + _In_ HANDLE hEnumHandle, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ LPVOID lpGroupAttributes, + _Reserved_ LPDWORD lpcbGroupAttributes, + _Reserved_ LPVOID lpReserved); + +BOOLAPI +FindNextUrlCacheEntryExW( + _In_ HANDLE hEnumHandle, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpNextCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo, + _Reserved_ LPVOID lpGroupAttributes, + _Reserved_ LPDWORD lpcbGroupAttributes, + _Reserved_ LPVOID lpReserved); + +#define FindNextUrlCacheEntryEx WINELIB_NAME_AW(FindNextUrlCacheEntryEx) + +INTERNETAPI +HANDLE +WINAPI +FindFirstUrlCacheEntryA( + _In_opt_ LPCSTR lpszUrlSearchPattern, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpFirstCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo); + +INTERNETAPI +HANDLE +WINAPI +FindFirstUrlCacheEntryW( + _In_opt_ LPCWSTR lpszUrlSearchPattern, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpFirstCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo); + +#define FindFirstUrlCacheEntry WINELIB_NAME_AW(FindFirstUrlCacheEntry) + +BOOLAPI +FindNextUrlCacheEntryA( + _In_ HANDLE hEnumHandle, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOA lpNextCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo); + +BOOLAPI +FindNextUrlCacheEntryW( + _In_ HANDLE hEnumHandle, + _Inout_updates_bytes_opt_(*lpcbCacheEntryInfo) LPINTERNET_CACHE_ENTRY_INFOW lpNextCacheEntryInfo, + _Inout_ LPDWORD lpcbCacheEntryInfo); + +#define FindNextUrlCacheEntry WINELIB_NAME_AW(FindNextUrlCacheEntry) + +BOOLAPI FindCloseUrlCache(_In_ HANDLE); + +BOOLAPI DeleteUrlCacheEntryA(_In_ LPCSTR); +BOOLAPI DeleteUrlCacheEntryW(_In_ LPCWSTR); #define DeleteUrlCacheEntry WINELIB_NAME_AW(DeleteUrlCacheEntry) /* FCS_ flags and FreeUrlCacheSpace are no longer documented */ @@ -1670,31 +2477,50 @@ BOOLAPI FreeUrlCacheSpaceW(LPCWSTR ,DWORD ,DWORD); #define FreeUrlCacheSpace WINELIB_NAME_AW(FreeUrlCacheSpace) - -INTERNETAPI DWORD WINAPI InternetDialA(HWND ,LPSTR ,DWORD ,DWORD_PTR* ,DWORD); -INTERNETAPI DWORD WINAPI InternetDialW(HWND ,LPWSTR ,DWORD ,DWORD_PTR* ,DWORD); +INTERNETAPI +DWORD +WINAPI +InternetDialA( + _In_ HWND, + _In_opt_ LPSTR, + _In_ DWORD, + _Out_ DWORD_PTR*, + _Reserved_ DWORD); + +INTERNETAPI +DWORD +WINAPI +InternetDialW( + _In_ HWND, + _In_opt_ LPWSTR, + _In_ DWORD, + _Out_ DWORD_PTR*, + _Reserved_ DWORD); + #define InternetDial WINELIB_NAME_AW(InternetDial) - #define INTERNET_DIAL_UNATTENDED 0x8000 -INTERNETAPI DWORD WINAPI InternetHangUp(DWORD_PTR ,DWORD); -BOOLAPI CreateMD5SSOHash(PWSTR,PWSTR,PWSTR,PBYTE); +INTERNETAPI DWORD WINAPI InternetHangUp(_In_ DWORD_PTR, _Reserved_ DWORD); +BOOLAPI CreateMD5SSOHash(_In_ PWSTR, _In_ PWSTR, _In_ PWSTR, _Out_ PBYTE); #define INTERENT_GOONLINE_REFRESH 0x00000001 #define INTERENT_GOONLINE_MASK 0x00000001 -INTERNETAPI BOOL WINAPI InternetGoOnlineA(LPSTR ,HWND ,DWORD); -INTERNETAPI BOOL WINAPI InternetGoOnlineW(LPWSTR ,HWND ,DWORD); + +BOOLAPI InternetGoOnlineA(_In_opt_ LPSTR, _In_ HWND, _In_ DWORD); +BOOLAPI InternetGoOnlineW(_In_opt_ LPWSTR, _In_ HWND, _In_ DWORD); #define InternetGoOnline WINELIB_NAME_AW(InternetGoOnline) -INTERNETAPI BOOL WINAPI InternetAutodial(DWORD,HWND); + +BOOLAPI InternetAutodial(_In_ DWORD, _In_opt_ HWND); #define INTERNET_AUTODIAL_FORCE_ONLINE 1 #define INTERNET_AUTODIAL_FORCE_UNATTENDED 2 #define INTERNET_AUTODIAL_FAILIFSECURITYCHECK 4 #define INTERNET_AUTODIAL_FLAGS_MASK (INTERNET_AUTODIAL_FORCE_ONLINE | INTERNET_AUTODIAL_FORCE_UNATTENDED | INTERNET_AUTODIAL_FAILIFSECURITYCHECK) -INTERNETAPI BOOL WINAPI InternetAutodialHangup(DWORD); -INTERNETAPI BOOL WINAPI InternetGetConnectedState(LPDWORD ,DWORD); + +BOOLAPI InternetAutodialHangup(_Reserved_ DWORD); +BOOLAPI InternetGetConnectedState(_Out_ LPDWORD, _Reserved_ DWORD); #define INTERNET_CONNECTION_MODEM 1 #define INTERNET_CONNECTION_LAN 2 @@ -1711,20 +2537,38 @@ #define INTERNET_CUSTOMDIAL_WILL_SUPPLY_STATE 2 #define INTERNET_CUSTOMDIAL_CAN_HANGUP 4 -INTERNETAPI BOOL WINAPI InternetSetDialStateA(LPCSTR ,DWORD ,DWORD); -INTERNETAPI BOOL WINAPI InternetSetDialStateW(LPCWSTR ,DWORD ,DWORD); +BOOLAPI InternetSetDialStateA(_In_opt_ LPCSTR, _In_ DWORD, _Reserved_ DWORD); +BOOLAPI InternetSetDialStateW(_In_opt_ LPCWSTR, _In_ DWORD, _Reserved_ DWORD); #define InternetSetDialState WINELIB_NAME_AW(InternetSetDialState) + #define INTERNET_DIALSTATE_DISCONNECTED 1 -BOOL WINAPI InternetGetConnectedStateExA(LPDWORD, LPSTR, DWORD, DWORD); -BOOL WINAPI InternetGetConnectedStateExW(LPDWORD, LPWSTR, DWORD, DWORD); +BOOLAPI +InternetGetConnectedStateExA( + _Out_opt_ LPDWORD lpdwFlags, + _Out_writes_opt_(cchNameLen) LPSTR lpszConnectionName, + _In_ DWORD cchNameLen, + _Reserved_ DWORD dwReserved); + +BOOLAPI +InternetGetConnectedStateExW( + _Out_opt_ LPDWORD lpdwFlags, + _Out_writes_opt_(cchNameLen) LPWSTR lpszConnectionName, + _In_ DWORD cchNameLen, + _Reserved_ DWORD dwReserved); + #define InternetGetConnectedStateEx WINELIB_NAME_AW(InternetGetConnectedStateEx) -BOOL WINAPI InternetInitializeAutoProxyDll(DWORD); -BOOL WINAPI DetectAutoProxyUrl(LPSTR, DWORD, DWORD); +BOOLAPI InternetInitializeAutoProxyDll(_In_ DWORD); + +BOOLAPI +DetectAutoProxyUrl( + _Out_writes_(cchAutoProxyUrl) PSTR pszAutoProxyUrl, + _In_ DWORD cchAutoProxyUrl, + _In_ DWORD dwDetectFlags); #ifdef __cplusplus } #endif -#endif +#endif /* _WINE_WININET_H_ */

11 years, 3 months

[aandrejevic] 59669: [NTVDM] Fix coding style. Fix initial cursor position bug. Fix memory limit constant for VGA memory modes 0 and 1 (64 KB not 32 KB).

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 7 19:56:28 2013 New Revision: 59669 URL: http://svn.reactos.org/svn/reactos?rev=59669&view=rev Log: [NTVDM] Fix coding style. Fix initial cursor position bug. Fix memory limit constant for VGA memory modes 0 and 1 (64 KB not 32 KB). 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/emulator.c branches/ntvdm/subsystems/ntvdm/ntvdm.c branches/ntvdm/subsystems/ntvdm/ntvdm.h branches/ntvdm/subsystems/ntvdm/vga.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 7 19:56:28 2013 @@ -404,11 +404,13 @@ return FALSE; } - /* Store the cursor position */ - Bda->CursorPosition[0] = MAKEWORD(BiosSavedBufferInfo.dwCursorPosition.X, - BiosSavedBufferInfo.dwCursorPosition.Y); - + /* Initialize VGA */ VgaInitialize(BiosConsoleOutput); + + /* Update the cursor position */ + BiosSetCursorPosition(BiosSavedBufferInfo.dwCursorPosition.Y, + BiosSavedBufferInfo.dwCursorPosition.Y, + 0); /* Set the console input mode */ SetConsoleMode(BiosConsoleInput, ENABLE_MOUSE_INPUT | ENABLE_PROCESSED_INPUT); 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] Wed Aug 7 19:56:28 2013 @@ -105,6 +105,7 @@ BOOLEAN BiosSetVideoMode(BYTE ModeNumber); WORD BiosPeekCharacter(VOID); WORD BiosGetCharacter(VOID); +VOID BiosSetCursorPosition(BYTE Row, BYTE Column, BYTE Page); VOID BiosVideoService(LPWORD Stack); VOID BiosEquipmentService(LPWORD Stack); VOID BiosKeyboardService(LPWORD Stack); 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 7 19:56:28 2013 @@ -205,7 +205,7 @@ for (i = 0; i <= 2; i++) { /* Set the index in the SFT */ - DestinationTable[i] = i; + DestinationTable[i] = (BYTE)i; /* Increase the reference count */ DosSftRefCount[i]++; @@ -864,7 +864,7 @@ PspBlock->FarCall[2] = 0xCB; // retf /* Set the command line */ - PspBlock->CommandLineSize = strlen(CommandLine); + PspBlock->CommandLineSize = (BYTE)min(strlen(CommandLine), DOS_CMDLINE_LENGTH); RtlCopyMemory(PspBlock->CommandLine, CommandLine, PspBlock->CommandLineSize); PspBlock->CommandLine[PspBlock->CommandLineSize] = '\r'; } @@ -1936,6 +1936,8 @@ VOID DosBreakInterrupt(LPWORD Stack) { + UNREFERENCED_PARAMETER(Stack); + VdmRunning = FALSE; } 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] Wed Aug 7 19:56:28 2013 @@ -33,6 +33,7 @@ #define UMB_END_SEGMENT 0xDFFF #define DOS_ALLOC_HIGH 0x40 #define DOS_ALLOC_HIGH_LOW 0x80 +#define DOS_CMDLINE_LENGTH 127 enum DOS_ALLOC_STRATEGY { @@ -89,7 +90,7 @@ BYTE Reserved3[9]; DOS_FCB Fcb; BYTE CommandLineSize; - CHAR CommandLine[127]; + CHAR CommandLine[DOS_CMDLINE_LENGTH]; } DOS_PSP, *PDOS_PSP; typedef struct _DOS_INPUT_BUFFER Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Wed Aug 7 19:56:28 2013 @@ -35,6 +35,8 @@ static VOID EmulatorReadMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { + UNREFERENCED_PARAMETER(Context); + /* If the A20 line is disabled, mask bit 20 */ if (!A20Line) Address &= ~(1 << 20); @@ -58,6 +60,8 @@ static VOID EmulatorWriteMemory(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { + UNREFERENCED_PARAMETER(Context); + /* If the A20 line is disabled, mask bit 20 */ if (!A20Line) Address &= ~(1 << 20); @@ -84,6 +88,9 @@ static VOID EmulatorReadIo(PVOID Context, UINT Address, LPBYTE Buffer, INT Size) { + UNREFERENCED_PARAMETER(Context); + UNREFERENCED_PARAMETER(Size); + switch (Address) { case PIC_MASTER_CMD: @@ -151,6 +158,9 @@ { BYTE Byte = *Buffer; + UNREFERENCED_PARAMETER(Context); + UNREFERENCED_PARAMETER(Size); + switch (Address) { case PIT_COMMAND_PORT: @@ -333,16 +343,25 @@ static VOID EmulatorSoftwareInt(PVOID Context, BYTE Number) { + UNREFERENCED_PARAMETER(Context); + UNREFERENCED_PARAMETER(Number); + /* Do nothing */ } static VOID EmulatorHardwareInt(PVOID Context, BYTE Number) { + UNREFERENCED_PARAMETER(Context); + UNREFERENCED_PARAMETER(Number); + /* Do nothing */ } static VOID EmulatorHardwareIntAck(PVOID Context, BYTE Number) { + UNREFERENCED_PARAMETER(Context); + UNREFERENCED_PARAMETER(Number); + /* Do nothing */ } Modified: branches/ntvdm/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ntvdm.c?… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ntvdm.c [iso-8859-1] Wed Aug 7 19:56:28 2013 @@ -90,6 +90,9 @@ SetConsoleCtrlHandler(ConsoleCtrlHandler, TRUE); #ifndef TESTING + UNREFERENCED_PARAMETER(argc); + UNREFERENCED_PARAMETER(argv); + /* The DOS command line must be ASCII */ WideCharToMultiByte(CP_ACP, 0, GetCommandLine(), -1, CommandLine, 128, NULL, NULL); #else @@ -185,7 +188,7 @@ if ((CurrentTickCount - LastCyclePrintout) >= 1000) { - DPRINT1("NTVDM: %d Instructions Per Second\n", Cycles); + DPRINT1("NTVDM: %lu Instructions Per Second\n", Cycles); LastCyclePrintout = CurrentTickCount; Cycles = 0; } 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] Wed Aug 7 19:56:28 2013 @@ -16,6 +16,7 @@ #include <conio.h> #include <stdarg.h> #include <debug.h> +#include <limits.h> /* DEFINES ********************************************************************/ 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 7 19:56:28 2013 @@ -15,8 +15,8 @@ /* PRIVATE VARIABLES **********************************************************/ -static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; -static CONST DWORD MemoryLimit[] = { 0xA7FFF, 0xA7FFF, 0xB7FFF, 0xBFFFF }; +static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; +static CONST DWORD MemoryLimit[] = { 0xAFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; static BYTE VgaMemory[VGA_NUM_BANKS * VGA_BANK_SIZE]; static BYTE VgaMiscRegister; @@ -124,8 +124,8 @@ /* Check if this is the first time the rectangle is updated */ if (!NeedsUpdate) { - UpdateRectangle.Left = UpdateRectangle.Top = (SHORT)0x7FFF; - UpdateRectangle.Right = UpdateRectangle.Bottom = (SHORT)0x8000; + UpdateRectangle.Left = UpdateRectangle.Top = SHRT_MAX; + UpdateRectangle.Right = UpdateRectangle.Bottom = SHRT_MIN; } /* Expand the rectangle to include the point */ @@ -216,7 +216,7 @@ VgaAcRegisters[VgaAcIndex] = Data; } -static BOOL VgaEnterGraphicsMode(PCOORD Resolution, UINT BitDepth) +static BOOL VgaEnterGraphicsMode(PCOORD Resolution) { DWORD i; CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; @@ -227,16 +227,15 @@ /* Fill the bitmap info header */ ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = Resolution->X; + BitmapInfo->bmiHeader.biWidth = Resolution->X; BitmapInfo->bmiHeader.biHeight = Resolution->Y; BitmapInfo->bmiHeader.biBitCount = 8; - BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biPlanes = 1; BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biSizeImage = Resolution->X * Resolution->Y - * (BitDepth / 8); + BitmapInfo->bmiHeader.biSizeImage = Resolution->X * Resolution->Y; /* Fill the palette data */ - for (i = 0; i < BitDepth; i++) PaletteIndex[i] = (WORD)i; + for (i = 0; i < (VGA_PALETTE_SIZE / 3); i++) PaletteIndex[i] = (WORD)i; /* Fill the console graphics buffer info */ GraphicsBufferInfo.dwBitMapInfoLength = VGA_BITMAP_INFO_SIZE; @@ -281,7 +280,7 @@ ConsoleFramebuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Resolution->X * Resolution->Y - * sizeof(CHAR_INFO)); + * sizeof(CHAR_INFO)); if (ConsoleFramebuffer == NULL) { DisplayMessage(L"An unexpected error occurred!\n"); @@ -305,7 +304,7 @@ if (!TextMode) { - /* Switching from graphics mode to text mode */ + /* Leave the current graphics mode */ VgaLeaveGraphicsMode(); } else @@ -326,7 +325,7 @@ else { /* Enter 8-bit graphics mode */ - if (!VgaEnterGraphicsMode(&Resolution, 8)) return; + if (!VgaEnterGraphicsMode(&Resolution)) return; /* Clear the text mode flag */ TextMode = FALSE; @@ -334,9 +333,9 @@ /* Perform a full update */ NeedsUpdate = TRUE; - UpdateRectangle.Left = 0; - UpdateRectangle.Top = 0; - UpdateRectangle.Right = Resolution.X; + UpdateRectangle.Left = 0; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = Resolution.X; UpdateRectangle.Bottom = Resolution.Y; } @@ -441,7 +440,7 @@ { BYTE PlaneData = VgaMemory[k * VGA_BANK_SIZE + (Address + (j / 8)) * AddressSize]; - + /* If the bit on that plane is set, set it */ if (PlaneData & (1 << (7 - (j % 8)))) PixelData |= 1 << k; } @@ -953,11 +952,11 @@ ModeChanged = FALSE; /* Get the data */ - Resolution = VgaGetDisplayResolution(); - CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; + Resolution = VgaGetDisplayResolution(); + CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; AddressSize = VgaGetAddressSize(); - ScreenRect.Left = ScreenRect.Top = 0; - ScreenRect.Right = Resolution.X; + ScreenRect.Left = ScreenRect.Top = 0; + ScreenRect.Right = Resolution.X; ScreenRect.Bottom = Resolution.Y; ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2;

11 years, 3 months

[hbelusca] 59668: [NTVDM] - Check return value of VgaEnterGraphicsMode (because CreateConsoleScreenBuffer can fail), and create VgaEnterTextMode and VgaLeaveTextMode helpers. - Don't declare variab...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 7 17:41:54 2013 New Revision: 59668 URL: http://svn.reactos.org/svn/reactos?rev=59668&view=rev Log: [NTVDM] - Check return value of VgaEnterGraphicsMode (because CreateConsoleScreenBuffer can fail), and create VgaEnterTextMode and VgaLeaveTextMode helpers. - Don't declare variables inside loops. 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 7 17:41:54 2013 @@ -216,7 +216,7 @@ VgaAcRegisters[VgaAcIndex] = Data; } -static VOID VgaEnterGraphicsMode(UINT Width, UINT Height, UINT BitDepth) +static BOOL VgaEnterGraphicsMode(PCOORD Resolution, UINT BitDepth) { DWORD i; CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; @@ -227,12 +227,13 @@ /* Fill the bitmap info header */ ZeroMemory(&BitmapInfo->bmiHeader, sizeof(BITMAPINFOHEADER)); BitmapInfo->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - BitmapInfo->bmiHeader.biWidth = Width; - BitmapInfo->bmiHeader.biHeight = Height; + BitmapInfo->bmiHeader.biWidth = Resolution->X; + BitmapInfo->bmiHeader.biHeight = Resolution->Y; BitmapInfo->bmiHeader.biBitCount = 8; - BitmapInfo->bmiHeader.biPlanes = 1; + BitmapInfo->bmiHeader.biPlanes = 1; BitmapInfo->bmiHeader.biCompression = BI_RGB; - BitmapInfo->bmiHeader.biSizeImage = Width * Height * (BitDepth / 8); + BitmapInfo->bmiHeader.biSizeImage = Resolution->X * Resolution->Y + * (BitDepth / 8); /* Fill the palette data */ for (i = 0; i < BitDepth; i++) PaletteIndex[i] = (WORD)i; @@ -248,6 +249,7 @@ NULL, CONSOLE_GRAPHICS_BUFFER, &GraphicsBufferInfo); + if (GraphicsConsoleBuffer == INVALID_HANDLE_VALUE) return FALSE; /* Save the framebuffer address and mutex */ ConsoleFramebuffer = GraphicsBufferInfo.lpBitMap; @@ -255,10 +257,12 @@ /* Set the active buffer */ SetConsoleActiveScreenBuffer(GraphicsConsoleBuffer); -} - -static VOID VgaLeaveGraphicsMode() -{ + + return TRUE; +} + +static VOID VgaLeaveGraphicsMode(VOID) +{ /* Switch back to the text buffer */ SetConsoleActiveScreenBuffer(TextConsoleBuffer); @@ -268,6 +272,33 @@ GraphicsConsoleBuffer = NULL; } +static BOOL VgaEnterTextMode(PCOORD Resolution) +{ + /* Resize the console */ + SetConsoleScreenBufferSize(TextConsoleBuffer, *Resolution); + + /* Allocate a framebuffer */ + ConsoleFramebuffer = HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + Resolution->X * Resolution->Y + * sizeof(CHAR_INFO)); + if (ConsoleFramebuffer == NULL) + { + DisplayMessage(L"An unexpected error occurred!\n"); + VdmRunning = FALSE; + return FALSE; + } + + return TRUE; +} + +static VOID VgaLeaveTextMode(VOID) +{ + /* Free the old framebuffer */ + HeapFree(GetProcessHeap(), 0, ConsoleFramebuffer); + ConsoleFramebuffer = NULL; +} + static VOID VgaUpdateMode(VOID) { COORD Resolution = VgaGetDisplayResolution(); @@ -279,29 +310,15 @@ } else { - /* Free the old framebuffer */ - HeapFree(GetProcessHeap(), 0, ConsoleFramebuffer); - ConsoleFramebuffer = NULL; + /* Leave the current text mode */ + VgaLeaveTextMode(); } /* Check if the new mode is alphanumeric */ if (!(VgaGcRegisters[VGA_GC_MISC_REG] & VGA_GC_MISC_NOALPHA)) { - /* Resize the console */ - SetConsoleScreenBufferSize(TextConsoleBuffer, Resolution); - - /* Allocate a framebuffer */ - ConsoleFramebuffer = HeapAlloc(GetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(CHAR_INFO) - * Resolution.X - * Resolution.Y); - if (ConsoleFramebuffer == NULL) - { - DisplayMessage(L"An unexpected error occurred!\n"); - VdmRunning = FALSE; - return; - } + /* Enter new text mode */ + if (!VgaEnterTextMode(&Resolution)) return; /* Set the text mode flag */ TextMode = TRUE; @@ -309,7 +326,7 @@ else { /* Enter 8-bit graphics mode */ - VgaEnterGraphicsMode(Resolution.X, Resolution.Y, 8); + if (!VgaEnterGraphicsMode(&Resolution, 8)) return; /* Clear the text mode flag */ TextMode = FALSE; @@ -317,9 +334,9 @@ /* Perform a full update */ NeedsUpdate = TRUE; - UpdateRectangle.Left = 0; - UpdateRectangle.Top = 0; - UpdateRectangle.Right = Resolution.X; + UpdateRectangle.Left = 0; + UpdateRectangle.Top = 0; + UpdateRectangle.Right = Resolution.X; UpdateRectangle.Bottom = Resolution.Y; } @@ -641,6 +658,7 @@ VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size) { DWORD i; + DWORD VideoAddress; DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, @@ -652,7 +670,7 @@ /* Loop through each byte */ for (i = 0; i < Size; i++) { - DWORD VideoAddress = VgaTranslateReadAddress(Address + i); + VideoAddress = VgaTranslateReadAddress(Address + i); /* Copy the value to the buffer */ Buffer[i] = VgaMemory[VideoAddress]; @@ -662,6 +680,7 @@ VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size) { DWORD i, j; + DWORD VideoAddress; DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, @@ -676,7 +695,7 @@ /* Loop through each byte */ for (i = 0; i < Size; i++) { - DWORD VideoAddress = VgaTranslateWriteAddress(Address + i); + VideoAddress = VgaTranslateWriteAddress(Address + i); for (j = 0; j < VGA_NUM_BANKS; j++) { @@ -923,6 +942,7 @@ SMALL_RECT ScreenRect; PCHAR_INFO CharBuffer; DWORD Address = 0; + DWORD CurrentAddr; /* Set the global handle */ TextConsoleBuffer = TextHandle; @@ -933,29 +953,28 @@ ModeChanged = FALSE; /* Get the data */ - Resolution = VgaGetDisplayResolution(); - CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; + Resolution = VgaGetDisplayResolution(); + CharBuffer = (PCHAR_INFO)ConsoleFramebuffer; AddressSize = VgaGetAddressSize(); - ScreenRect.Left = ScreenRect.Top = 0; - ScreenRect.Right = Resolution.X; + ScreenRect.Left = ScreenRect.Top = 0; + ScreenRect.Right = Resolution.X; ScreenRect.Bottom = Resolution.Y; ScanlineSize = (DWORD)VgaCrtcRegisters[VGA_CRTC_OFFSET_REG] * 2; /* Read the data from the console into the framebuffer */ ReadConsoleOutputA(TextConsoleBuffer, - ConsoleFramebuffer, + CharBuffer, Resolution, Origin, &ScreenRect); - /* Loop through the scanlines */ for (i = 0; i < Resolution.Y; i++) { /* Loop through the characters */ for (j = 0; j < Resolution.X; j++) { - DWORD CurrentAddr = LOWORD((Address + j) * AddressSize); + CurrentAddr = LOWORD((Address + j) * AddressSize); /* Store the character in plane 0 */ VgaMemory[CurrentAddr] = CharBuffer[i * Resolution.X + j].Char.AsciiChar; @@ -970,4 +989,3 @@ } /* EOF */ -

11 years, 3 months

[aandrejevic] 59667: [NTVDM] Fix more MSVC warnings.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 7 15:42:32 2013 New Revision: 59667 URL: http://svn.reactos.org/svn/reactos?rev=59667&view=rev Log: [NTVDM] Fix more MSVC warnings. Modified: branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/vga.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 7 15:42:32 2013 @@ -964,7 +964,7 @@ for (i = Header->e_maxalloc; i >= Header->e_minalloc; i--, ExeSize--) { /* Try to allocate that much memory */ - Segment = DosAllocateMemory(ExeSize, NULL); + Segment = DosAllocateMemory((WORD)ExeSize, NULL); if (Segment != 0) break; } @@ -974,7 +974,7 @@ /* Initialize the PSP */ DosInitializePsp(Segment, CommandLine, - ExeSize, + (WORD)ExeSize, EnvBlock); /* The process owns its own memory */ @@ -1046,7 +1046,7 @@ /* Initialize the PSP */ DosInitializePsp(Segment, CommandLine, - (FileSize + sizeof(DOS_PSP)) >> 4, + (WORD)((FileSize + sizeof(DOS_PSP)) >> 4), EnvBlock); /* Set the initial segment registers */ @@ -1227,8 +1227,8 @@ DWORD Ecx = EmulatorGetRegister(EMULATOR_REG_CX); DWORD Edx = EmulatorGetRegister(EMULATOR_REG_DX); DWORD Ebx = EmulatorGetRegister(EMULATOR_REG_BX); - WORD DataSegment = EmulatorGetRegister(EMULATOR_REG_DS); - WORD ExtSegment = EmulatorGetRegister(EMULATOR_REG_ES); + WORD DataSegment = (WORD)EmulatorGetRegister(EMULATOR_REG_DS); + WORD ExtSegment = (WORD)EmulatorGetRegister(EMULATOR_REG_ES); /* Check the value in the AH register */ switch (HIBYTE(Eax)) 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 7 15:42:32 2013 @@ -235,7 +235,7 @@ BitmapInfo->bmiHeader.biSizeImage = Width * Height * (BitDepth / 8); /* Fill the palette data */ - for (i = 0; i < BitDepth; i++) PaletteIndex[i] = i; + for (i = 0; i < BitDepth; i++) PaletteIndex[i] = (WORD)i; /* Fill the console graphics buffer info */ GraphicsBufferInfo.dwBitMapInfoLength = VGA_BITMAP_INFO_SIZE; @@ -503,8 +503,8 @@ Location += (VgaCrtcRegisters[VGA_CRTC_CURSOR_END_REG] >> 5) & 3; /* Find the coordinates of the new position */ - Position.X = Location % ScanlineSize; - Position.Y = Location / ScanlineSize; + Position.X = (WORD)(Location % ScanlineSize); + Position.Y = (WORD)(Location / ScanlineSize); /* Update the physical cursor */ SetConsoleCursorInfo(TextConsoleBuffer, &CursorInfo);

11 years, 3 months

[aandrejevic] 59666: [NTVDM] Fix MSVC warnings.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed Aug 7 15:01:38 2013 New Revision: 59666 URL: http://svn.reactos.org/svn/reactos?rev=59666&view=rev Log: [NTVDM] Fix MSVC warnings. Modified: branches/ntvdm/subsystems/ntvdm/bios.c branches/ntvdm/subsystems/ntvdm/dos.c branches/ntvdm/subsystems/ntvdm/emulator.c branches/ntvdm/subsystems/ntvdm/ps2.c branches/ntvdm/subsystems/ntvdm/vga.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 7 15:01:38 2013 @@ -529,7 +529,7 @@ BYTE Page, BYTE FillAttribute) { - INT i; + DWORD i; LPWORD WindowData; DWORD WindowSize = (Rectangle.Bottom - Rectangle.Top + 1) * (Rectangle.Right - Rectangle.Left + 1); 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 7 15:01:38 2013 @@ -74,7 +74,7 @@ TotalSize += strlen(ProgramName) + 1; /* Allocate the memory for the environment block */ - DestSegment = DosAllocateMemory((TotalSize + 0x0F) >> 4, NULL); + DestSegment = DosAllocateMemory((WORD)((TotalSize + 0x0F) >> 4), NULL); if (!DestSegment) return 0; Ptr = SourceBuffer; @@ -559,7 +559,7 @@ if (FileHandle == INVALID_HANDLE_VALUE) { /* Return the error code */ - return GetLastError(); + return (WORD)GetLastError(); } /* Open the DOS handle */ @@ -632,7 +632,7 @@ if (FileHandle == INVALID_HANDLE_VALUE) { /* Return the error code */ - return GetLastError(); + return (WORD)GetLastError(); } /* Open the DOS handle */ @@ -667,7 +667,7 @@ if (!ReadFile(Handle, Buffer, Count, &BytesRead32, NULL)) { /* Store the error code */ - Result = GetLastError(); + Result = (WORD)GetLastError(); } /* The number of bytes read is always 16-bit */ @@ -694,7 +694,7 @@ if (!WriteFile(Handle, Buffer, Count, &BytesWritten32, NULL)) { /* Store the error code */ - Result = GetLastError(); + Result = (WORD)GetLastError(); } /* The number of bytes written is always 16-bit */ @@ -731,7 +731,7 @@ if (FilePointer == INVALID_SET_FILE_POINTER) { /* Get the real error code */ - Result = GetLastError(); + Result = (WORD)GetLastError(); } if (Result != ERROR_SUCCESS) @@ -877,7 +877,7 @@ LPSTR ProgramFilePath, Parameters[128]; CHAR CommandLineCopy[128]; INT ParamCount = 0; - DWORD Segment = 0; + WORD Segment = 0; WORD MaxAllocSize; DWORD i, FileSize, ExeSize; PIMAGE_DOS_HEADER Header; @@ -1027,7 +1027,7 @@ DosAllocateMemory(0xFFFF, &MaxAllocSize); /* Make sure it's enough for the whole program and the PSP */ - if ((MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) goto Cleanup; + if (((DWORD)MaxAllocSize << 4) < (FileSize + sizeof(DOS_PSP))) goto Cleanup; /* Allocate all of it */ Segment = DosAllocateMemory(MaxAllocSize, NULL); Modified: branches/ntvdm/subsystems/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/emulator… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/emulator.c [iso-8859-1] Wed Aug 7 15:01:38 2013 @@ -469,7 +469,7 @@ } else { - EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val = Value; + EmulatorContext.state->segment_reg[Register - EMULATOR_REG_ES].val = (WORD)Value; } #else // TODO: NOT IMPLEMENTED Modified: branches/ntvdm/subsystems/ntvdm/ps2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/ps2.c?re… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/ps2.c [iso-8859-1] Wed Aug 7 15:01:38 2013 @@ -289,7 +289,7 @@ if (Buffer[i].EventType != KEY_EVENT) continue; /* Get the scan code */ - ScanCode = Buffer[i].Event.KeyEvent.wVirtualScanCode; + ScanCode = (BYTE)Buffer[i].Event.KeyEvent.wVirtualScanCode; /* If this is a key release, set the highest bit in the scan code */ if (!Buffer[i].Event.KeyEvent.bKeyDown) ScanCode |= 0x80; 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 7 15:01:38 2013 @@ -218,7 +218,7 @@ static VOID VgaEnterGraphicsMode(UINT Width, UINT Height, UINT BitDepth) { - INT i; + DWORD i; CONSOLE_GRAPHICS_BUFFER_INFO GraphicsBufferInfo; BYTE BitmapInfoBuffer[VGA_BITMAP_INFO_SIZE]; LPBITMAPINFO BitmapInfo = (LPBITMAPINFO)BitmapInfoBuffer; @@ -640,7 +640,7 @@ VOID VgaReadMemory(DWORD Address, LPBYTE Buffer, DWORD Size) { - INT i; + DWORD i; DPRINT("VgaReadMemory: Address 0x%08X, Size %lu\n", Address, @@ -661,7 +661,7 @@ VOID VgaWriteMemory(DWORD Address, LPBYTE Buffer, DWORD Size) { - INT i, j; + DWORD i, j; DPRINT("VgaWriteMemory: Address 0x%08X, Size %lu\n", Address, @@ -961,7 +961,7 @@ VgaMemory[CurrentAddr] = CharBuffer[i * Resolution.X + j].Char.AsciiChar; /* Store the attribute in plane 1 */ - VgaMemory[CurrentAddr + VGA_BANK_SIZE] = CharBuffer[i * Resolution.X + j].Attributes; + VgaMemory[CurrentAddr + VGA_BANK_SIZE] = (BYTE)CharBuffer[i * Resolution.X + j].Attributes; } /* Move to the next scanline */

11 years, 3 months

[hbelusca] 59665: Synchronize with trunk revision 59636 (just before Alex's CreateProcess revamp).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed Aug 7 14:57:30 2013 New Revision: 59665 URL: http://svn.reactos.org/svn/reactos?rev=59665&view=rev Log: Synchronize with trunk revision 59636 (just before Alex's CreateProcess revamp). Added: branches/ntvdm/base/applications/cmdutils/hostname/lang/it-IT.rc - copied unchanged from r59636, trunk/reactos/base/applications/cmdutils/hostname/lang/it-IT.rc branches/ntvdm/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc - copied unchanged from r59636, trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc branches/ntvdm/base/applications/mscutils/eventvwr/lang/tr-TR.rc - copied unchanged from r59636, trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc branches/ntvdm/base/applications/mscutils/servman/lang/tr-TR.rc - copied unchanged from r59636, trunk/reactos/base/applications/mscutils/servman/lang/tr-TR.rc branches/ntvdm/base/applications/screensavers/3dtext/lang/tr-TR.rc - copied unchanged from r59636, trunk/reactos/base/applications/screensavers/3dtext/lang/tr-TR.rc branches/ntvdm/base/applications/screensavers/logon/lang/tr-TR.rc - copied unchanged from r59636, trunk/reactos/base/applications/screensavers/logon/lang/tr-TR.rc branches/ntvdm/base/applications/shutdown/lang/cs-CZ.rc - copied unchanged from r59636, trunk/reactos/base/applications/shutdown/lang/cs-CZ.rc branches/ntvdm/base/applications/sndvol32/lang/tr-TR.rc - copied unchanged from r59636, trunk/reactos/base/applications/sndvol32/lang/tr-TR.rc branches/ntvdm/dll/cpl/wined3dcfg/lang/cs-CZ.rc - copied unchanged from r59636, trunk/reactos/dll/cpl/wined3dcfg/lang/cs-CZ.rc branches/ntvdm/dll/win32/dbghelp/compat.c - copied unchanged from r59636, trunk/reactos/dll/win32/dbghelp/compat.c branches/ntvdm/dll/win32/dbghelp/compat.h - copied unchanged from r59636, trunk/reactos/dll/win32/dbghelp/compat.h branches/ntvdm/dll/win32/shell32/CMenuBand.cpp - copied unchanged from r59636, trunk/reactos/dll/win32/shell32/CMenuBand.cpp branches/ntvdm/dll/win32/shell32/CMenuBand.h - copied unchanged from r59636, trunk/reactos/dll/win32/shell32/CMenuBand.h branches/ntvdm/dll/win32/shell32/res/rgs/menuband.rgs - copied unchanged from r59636, trunk/reactos/dll/win32/shell32/res/rgs/menuband.rgs branches/ntvdm/include/host/wine/mscvpdb.h - copied unchanged from r59636, trunk/reactos/include/host/wine/mscvpdb.h branches/ntvdm/include/host/wine/rbtree.h - copied unchanged from r59636, trunk/reactos/include/host/wine/rbtree.h branches/ntvdm/tools/cdmake/dirhash.c - copied unchanged from r59636, trunk/reactos/tools/cdmake/dirhash.c branches/ntvdm/tools/cdmake/dirhash.h - copied unchanged from r59636, trunk/reactos/tools/cdmake/dirhash.h branches/ntvdm/tools/cdmake/dirsep.h - copied unchanged from r59636, trunk/reactos/tools/cdmake/dirsep.h branches/ntvdm/win32ss/user/winsrv/consrv_new/ (props changed) - copied from r59636, trunk/reactos/win32ss/user/winsrv/consrv_new/ branches/ntvdm/win32ss/user/winsrv/consrv_new.cmake - copied unchanged from r59636, trunk/reactos/win32ss/user/winsrv/consrv_new.cmake Removed: branches/ntvdm/lib/sdk/uuid/uuid.c Modified: branches/ntvdm/ (props changed) branches/ntvdm/CMakeLists.txt branches/ntvdm/base/applications/calc/lang/tr-TR.rc branches/ntvdm/base/applications/charmap/lang/tr-TR.rc branches/ntvdm/base/applications/cmdutils/hostname/rsrc.rc branches/ntvdm/base/applications/dxdiag/lang/tr-TR.rc branches/ntvdm/base/applications/fontview/lang/tr-TR.rc branches/ntvdm/base/applications/games/solitaire/lang/tr-TR.rc branches/ntvdm/base/applications/games/spider/lang/tr-TR.rc branches/ntvdm/base/applications/games/winmine/lang/tr-TR.rc branches/ntvdm/base/applications/kbswitch/lang/tr-TR.rc branches/ntvdm/base/applications/magnify/lang/tr-TR.rc branches/ntvdm/base/applications/mplay32/lang/tr-TR.rc branches/ntvdm/base/applications/msconfig/lang/tr-TR.rc branches/ntvdm/base/applications/mscutils/devmgmt_new/rsrc.rc branches/ntvdm/base/applications/mscutils/eventvwr/rsrc.rc branches/ntvdm/base/applications/mscutils/servman/rsrc.rc branches/ntvdm/base/applications/mspaint/lang/tr-TR.rc branches/ntvdm/base/applications/mstsc/lang/tr-TR.rc branches/ntvdm/base/applications/network/ping/ping.c branches/ntvdm/base/applications/notepad/dialog.c branches/ntvdm/base/applications/notepad/lang/it-IT.rc branches/ntvdm/base/applications/notepad/lang/tr-TR.rc branches/ntvdm/base/applications/notepad/rsrc.rc branches/ntvdm/base/applications/rapps/lang/tr-TR.rc branches/ntvdm/base/applications/regedit/clb/lang/tr-TR.rc branches/ntvdm/base/applications/regedit/framewnd.c branches/ntvdm/base/applications/regedit/lang/tr-TR.rc branches/ntvdm/base/applications/regedit/listview.c branches/ntvdm/base/applications/screensavers/3dtext/rsrc.rc branches/ntvdm/base/applications/screensavers/logon/logon.rc branches/ntvdm/base/applications/shutdown/rsrc.rc branches/ntvdm/base/applications/sndrec32/lang/tr-TR.rc branches/ntvdm/base/applications/sndvol32/lang/cs-CZ.rc branches/ntvdm/base/applications/sndvol32/rsrc.rc branches/ntvdm/base/applications/taskmgr/lang/cs-CZ.rc branches/ntvdm/base/applications/taskmgr/lang/tr-TR.rc branches/ntvdm/base/applications/winhlp32/Tr.rc branches/ntvdm/base/applications/winhlp32/rsrc.rc branches/ntvdm/base/applications/wordpad/Tr.rc branches/ntvdm/base/applications/write/Tr.rc branches/ntvdm/base/setup/usetup/bootsup.c branches/ntvdm/base/setup/usetup/filesup.c branches/ntvdm/base/setup/usetup/inicache.c branches/ntvdm/base/shell/cmd/misc.c branches/ntvdm/base/shell/explorer-new/precomp.h branches/ntvdm/base/shell/explorer/explorer-cz.rc branches/ntvdm/base/shell/explorer/shell/fatfs.cpp branches/ntvdm/base/shell/explorer/shell/filechild.cpp branches/ntvdm/base/system/smss/sminit.c branches/ntvdm/base/system/smss/smss.c branches/ntvdm/base/system/smss/smutil.c branches/ntvdm/boot/CMakeLists.txt branches/ntvdm/boot/bootdata/hivecls.inf branches/ntvdm/cmake/CMakeMacros.cmake branches/ntvdm/cmake/config.cmake branches/ntvdm/cmake/gcc.cmake branches/ntvdm/cmake/msvc.cmake branches/ntvdm/configure.cmd branches/ntvdm/dll/3rdparty/libxslt/CMakeLists.txt branches/ntvdm/dll/cpl/appwiz/lang/cs-CZ.rc branches/ntvdm/dll/cpl/appwiz/rsrc.rc branches/ntvdm/dll/cpl/input/lang/it-IT.rc branches/ntvdm/dll/cpl/main/lang/cs-CZ.rc branches/ntvdm/dll/cpl/main/rsrc.rc branches/ntvdm/dll/cpl/wined3dcfg/rsrc.rc branches/ntvdm/dll/directx/quartz/dsoundrender.c branches/ntvdm/dll/ntdll/def/ntdll.spec branches/ntvdm/dll/opengl/glu32/CMakeLists.txt branches/ntvdm/dll/win32/aclui/sidcache.c branches/ntvdm/dll/win32/browseui/CMakeLists.txt branches/ntvdm/dll/win32/browseui/bandsitemenu.cpp branches/ntvdm/dll/win32/browseui/browseui.cpp branches/ntvdm/dll/win32/browseui/commonbrowser.cpp branches/ntvdm/dll/win32/browseui/commonbrowser.h branches/ntvdm/dll/win32/browseui/precomp.h branches/ntvdm/dll/win32/browseui/shellbrowser.cpp branches/ntvdm/dll/win32/dbghelp/CMakeLists.txt branches/ntvdm/dll/win32/dbghelp/cpu_i386.c branches/ntvdm/dll/win32/dbghelp/dbghelp.c branches/ntvdm/dll/win32/dbghelp/dbghelp_private.h branches/ntvdm/dll/win32/dbghelp/dbghelp_ros.diff branches/ntvdm/dll/win32/dbghelp/dwarf.c branches/ntvdm/dll/win32/dbghelp/dwarf.h branches/ntvdm/dll/win32/dbghelp/image_private.h branches/ntvdm/dll/win32/dbghelp/module.c branches/ntvdm/dll/win32/dbghelp/pe_module.c branches/ntvdm/dll/win32/dbghelp/source.c branches/ntvdm/dll/win32/dbghelp/stabs.c branches/ntvdm/dll/win32/dbghelp/storage.c branches/ntvdm/dll/win32/dbghelp/symbol.c branches/ntvdm/dll/win32/dbghelp/type.c branches/ntvdm/dll/win32/devmgr/lang/cs-CZ.rc branches/ntvdm/dll/win32/devmgr/lang/it-IT.rc branches/ntvdm/dll/win32/ieframe/CMakeLists.txt branches/ntvdm/dll/win32/ieframe/ie.c branches/ntvdm/dll/win32/ieframe/ieframe.h branches/ntvdm/dll/win32/ieframe/webbrowser.c branches/ntvdm/dll/win32/kernel32/client/except.c branches/ntvdm/dll/win32/kernel32/client/file/create.c branches/ntvdm/dll/win32/kernel32/client/file/find.c branches/ntvdm/dll/win32/kernel32/client/file/npipe.c branches/ntvdm/dll/win32/kernel32/client/file/volume.c branches/ntvdm/dll/win32/kernel32/client/handle.c branches/ntvdm/dll/win32/kernel32/client/proc.c branches/ntvdm/dll/win32/kernel32/client/vista.c branches/ntvdm/dll/win32/kernel32/winnls/string/lang.c branches/ntvdm/dll/win32/msgina/lang/it-IT.rc branches/ntvdm/dll/win32/netapi32/netapi32.c branches/ntvdm/dll/win32/netshell/CMakeLists.txt branches/ntvdm/dll/win32/netshell/classfactory.cpp branches/ntvdm/dll/win32/netshell/connectmanager.cpp branches/ntvdm/dll/win32/netshell/enumlist.h branches/ntvdm/dll/win32/netshell/lanconnectui.cpp branches/ntvdm/dll/win32/netshell/lanstatusui.cpp branches/ntvdm/dll/win32/netshell/precomp.h branches/ntvdm/dll/win32/netshell/shfldr_netconnect.cpp branches/ntvdm/dll/win32/ntmarta/ntmarta.c branches/ntvdm/dll/win32/samlib/dllmain.c branches/ntvdm/dll/win32/samlib/samlib.c branches/ntvdm/dll/win32/samlib/samlib.spec branches/ntvdm/dll/win32/samsrv/samrpc.c branches/ntvdm/dll/win32/samsrv/samsrv.c branches/ntvdm/dll/win32/samsrv/samsrv.h branches/ntvdm/dll/win32/samsrv/samsrv.spec branches/ntvdm/dll/win32/samsrv/security.c branches/ntvdm/dll/win32/samsrv/setup.c branches/ntvdm/dll/win32/samsrv/utils.c branches/ntvdm/dll/win32/shell32/CMakeLists.txt branches/ntvdm/dll/win32/shell32/defcontextmenu.cpp branches/ntvdm/dll/win32/shell32/lang/cs-CZ.rc branches/ntvdm/dll/win32/shell32/precomp.h branches/ntvdm/dll/win32/shell32/rgs_res.rc branches/ntvdm/dll/win32/shell32/shell32.rc branches/ntvdm/dll/win32/shell32/shell32_main.cpp branches/ntvdm/dll/win32/shell32/shlview.cpp branches/ntvdm/dll/win32/shell32/shresdef.h branches/ntvdm/dll/win32/shlwapi/ordinal.c branches/ntvdm/dll/win32/syssetup/classinst.c branches/ntvdm/dll/win32/syssetup/syssetup.spec branches/ntvdm/drivers/bluetooth/fbtusb/CMakeLists.txt branches/ntvdm/drivers/bus/pcix/arb/tr_irq.c branches/ntvdm/drivers/bus/pcix/enum.c branches/ntvdm/drivers/bus/pcix/intrface/agpintrf.c branches/ntvdm/drivers/bus/pcix/intrface/busintrf.c branches/ntvdm/drivers/bus/pcix/intrface/cardbus.c branches/ntvdm/drivers/bus/pcix/intrface/devhere.c branches/ntvdm/drivers/bus/pcix/intrface/lddintrf.c branches/ntvdm/drivers/bus/pcix/intrface/locintrf.c branches/ntvdm/drivers/bus/pcix/intrface/pmeintf.c branches/ntvdm/drivers/bus/pcix/intrface/routintf.c branches/ntvdm/drivers/bus/pcix/utils.c branches/ntvdm/drivers/filesystems/msfs/msfs.c branches/ntvdm/drivers/filesystems/mup/mup.c branches/ntvdm/drivers/filesystems/ntfs/fastio.c branches/ntvdm/drivers/filesystems/ntfs/fcb.c branches/ntvdm/drivers/filesystems/ntfs/finfo.c branches/ntvdm/drivers/filesystems/ntfs/fsctl.c branches/ntvdm/drivers/filesystems/ntfs/mft.c branches/ntvdm/drivers/filesystems/ntfs/rw.c branches/ntvdm/drivers/filesystems/ntfs/volinfo.c branches/ntvdm/drivers/filters/mountmgr/database.c branches/ntvdm/drivers/filters/mountmgr/device.c branches/ntvdm/drivers/filters/mountmgr/mountmgr.c branches/ntvdm/drivers/filters/mountmgr/notify.c branches/ntvdm/drivers/filters/mountmgr/symlink.c branches/ntvdm/drivers/network/tcpip/include/interface.h branches/ntvdm/drivers/network/tcpip/include/neighbor.h branches/ntvdm/drivers/network/tcpip/tcpip/iinfo.c branches/ntvdm/drivers/storage/class/class2/class2.c branches/ntvdm/drivers/storage/ide/uniata/CMakeLists.txt branches/ntvdm/drivers/storage/port/buslogic/Log.c branches/ntvdm/drivers/usb/usbccgp/descriptor.c branches/ntvdm/drivers/usb/usbccgp/fdo.c branches/ntvdm/drivers/usb/usbehci/ (props changed) branches/ntvdm/drivers/usb/usbehci/hardware.cpp branches/ntvdm/drivers/usb/usbhub/ (props changed) branches/ntvdm/drivers/usb/usbhub/fdo.c branches/ntvdm/drivers/usb/usbhub/pdo.c branches/ntvdm/drivers/usb/usbstor/error.c branches/ntvdm/drivers/usb/usbstor/queue.c branches/ntvdm/drivers/usb/usbstor/scsi.c branches/ntvdm/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.cpp branches/ntvdm/drivers/wdm/audio/sysaudio/deviface.c branches/ntvdm/hal/halx86/legacy/bus/pci_classes.ids branches/ntvdm/hal/halx86/legacy/bus/pci_vendors.ids branches/ntvdm/include/crt/process.h branches/ntvdm/include/crt/sec_api/stdio_s.h branches/ntvdm/include/ddk/fltuserstructures.h branches/ntvdm/include/ddk/minitape.h branches/ntvdm/include/ddk/ndistapi.h branches/ntvdm/include/ddk/ndiswan.h branches/ntvdm/include/ddk/ntddk.h branches/ntvdm/include/ddk/ntsam.h branches/ntvdm/include/ddk/parallel.h branches/ntvdm/include/ddk/punknown.h branches/ntvdm/include/ddk/srb.h branches/ntvdm/include/ddk/storport.h branches/ntvdm/include/ddk/strmini.h branches/ntvdm/include/ddk/tdikrnl.h branches/ntvdm/include/ddk/ws2san.h branches/ntvdm/include/host/config.h branches/ntvdm/include/host/typedefs.h branches/ntvdm/include/host/wine/unicode.h branches/ntvdm/include/psdk/advpub.h branches/ntvdm/include/psdk/mstcpip.h branches/ntvdm/include/psdk/ntddstor.h branches/ntvdm/include/psdk/ntdef.h branches/ntvdm/include/psdk/sal.h branches/ntvdm/include/psdk/shdeprecated.idl branches/ntvdm/include/psdk/shobjidl.idl branches/ntvdm/include/psdk/tlogstg.idl branches/ntvdm/include/psdk/winnt.h branches/ntvdm/include/psdk/winsplp.h branches/ntvdm/include/psdk/ws2ipdef.h branches/ntvdm/include/psdk/ws2tcpip.h branches/ntvdm/include/reactos/debug.h branches/ntvdm/include/reactos/idl/sam.idl branches/ntvdm/include/reactos/wine/port.h branches/ntvdm/include/reactos/wine/test.h branches/ntvdm/include/xdk/exfuncs.h branches/ntvdm/lib/3rdparty/adns/CMakeLists.txt branches/ntvdm/lib/3rdparty/cardlib/CMakeLists.txt branches/ntvdm/lib/3rdparty/fullfat/CMakeLists.txt branches/ntvdm/lib/3rdparty/libxml2/CMakeLists.txt branches/ntvdm/lib/cmlib/hivecell.c branches/ntvdm/lib/drivers/ip/network/arp.c branches/ntvdm/lib/drivers/ip/network/icmp.c branches/ntvdm/lib/drivers/ip/network/interface.c branches/ntvdm/lib/drivers/ip/network/ip.c branches/ntvdm/lib/drivers/ip/network/neighbor.c branches/ntvdm/lib/drivers/ip/transport/rawip/rawip.c branches/ntvdm/lib/drivers/ip/transport/udp/udp.c branches/ntvdm/lib/drivers/libusb/hub_controller.cpp (contents, props changed) branches/ntvdm/lib/drivers/libusb/libusb.h (contents, props changed) branches/ntvdm/lib/drivers/libusb/usb_device.cpp (contents, props changed) branches/ntvdm/lib/fslib/ext2lib/Inode.c branches/ntvdm/lib/fslib/ext2lib/Mke2fs.c branches/ntvdm/lib/inflib/CMakeLists.txt branches/ntvdm/lib/inflib/infget.c branches/ntvdm/lib/rtl/actctx.c branches/ntvdm/lib/rtl/dbgbuffer.c branches/ntvdm/lib/rtl/registry.c branches/ntvdm/lib/sdk/comsupp/comsupp.cpp branches/ntvdm/lib/sdk/uuid/CMakeLists.txt branches/ntvdm/media/inf/hdc.inf branches/ntvdm/media/inf/shortcuts.inf branches/ntvdm/media/vgafonts/CMakeLists.txt branches/ntvdm/ntoskrnl/cache/mdlsup.c branches/ntvdm/ntoskrnl/cache/newcc.h branches/ntvdm/ntoskrnl/cc/mdl.c branches/ntvdm/ntoskrnl/config/cmhook.c branches/ntvdm/ntoskrnl/config/cminit.c branches/ntvdm/ntoskrnl/config/cmsysini.c branches/ntvdm/ntoskrnl/config/powerpc/cmhardwr.c branches/ntvdm/ntoskrnl/ex/sysinfo.c branches/ntvdm/ntoskrnl/ex/zone.c branches/ntvdm/ntoskrnl/fsrtl/fastio.c branches/ntvdm/ntoskrnl/fsrtl/notify.c branches/ntvdm/ntoskrnl/include/internal/cc.h branches/ntvdm/ntoskrnl/include/internal/i386/ke.h branches/ntvdm/ntoskrnl/io/iomgr/bootlog.c branches/ntvdm/ntoskrnl/io/iomgr/ramdisk.c branches/ntvdm/ntoskrnl/kdbg/kdb_cli.c branches/ntvdm/ntoskrnl/kdbg/kdb_symbols.c branches/ntvdm/ntoskrnl/kdbg/kdb_symbols.cmake.c branches/ntvdm/ntoskrnl/ke/i386/ctxswitch.S branches/ntvdm/ntoskrnl/ke/i386/kiinit.c branches/ntvdm/ntoskrnl/ke/i386/patpge.c branches/ntvdm/ntoskrnl/mm/ARM3/pool.c branches/ntvdm/ntoskrnl/mm/ARM3/procsup.c branches/ntvdm/ntoskrnl/mm/ARM3/section.c branches/ntvdm/ntoskrnl/mm/freelist.c branches/ntvdm/ntoskrnl/ob/obhandle.c branches/ntvdm/ntoskrnl/ps/kill.c branches/ntvdm/ntoskrnl/ps/process.c branches/ntvdm/ntoskrnl/ps/query.c branches/ntvdm/subsystems/win/basesrv/proc.c branches/ntvdm/subsystems/win32/csrsrv/api.c branches/ntvdm/subsystems/win32/csrsrv/api.h branches/ntvdm/subsystems/win32/csrsrv/procsup.c branches/ntvdm/subsystems/win32/csrsrv/srv.h branches/ntvdm/subsystems/win32/csrsrv/thredsup.c branches/ntvdm/tools/cabman/mszip.cxx branches/ntvdm/tools/cdmake/CMakeLists.txt branches/ntvdm/tools/cdmake/cdmake.c branches/ntvdm/tools/obj2bin/obj2bin.c branches/ntvdm/tools/pecoff.h branches/ntvdm/tools/rsym/CMakeLists.txt branches/ntvdm/tools/rsym/rsym.c branches/ntvdm/tools/rsym/rsym.h branches/ntvdm/tools/spec2def/spec2def.c branches/ntvdm/tools/widl/typegen.c branches/ntvdm/tools/widl/widl.c branches/ntvdm/win32ss/drivers/videoprt/child.c branches/ntvdm/win32ss/gdi/ntgdi/device.c branches/ntvdm/win32ss/gdi/ntgdi/gdidebug.h branches/ntvdm/win32ss/gdi/ntgdi/xformobj.c branches/ntvdm/win32ss/user/ntuser/monitor.c branches/ntvdm/win32ss/user/ntuser/msgqueue.c branches/ntvdm/win32ss/user/ntuser/winpos.c branches/ntvdm/win32ss/user/user32/controls/static.c branches/ntvdm/win32ss/user/user32/include/user32p.h branches/ntvdm/win32ss/user/user32/misc/dllmain.c branches/ntvdm/win32ss/user/user32/windows/spy.c branches/ntvdm/win32ss/user/winsrv/CMakeLists.txt branches/ntvdm/win32ss/user/winsrv/consrv.cmake branches/ntvdm/win32ss/user/winsrv/consrv_new/condrv/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv_new/frontends/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv_new/frontends/gui/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv_new/frontends/gui/res/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv_new/frontends/tui/ (props changed) branches/ntvdm/win32ss/user/winsrv/consrv_new/lang/ (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/CMakeLists.txt?rev=59665&… Modified: branches/ntvdm/base/applications/calc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/calc/la… Modified: branches/ntvdm/base/applications/charmap/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/charmap… Modified: branches/ntvdm/base/applications/cmdutils/hostname/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/cmdutil… Modified: branches/ntvdm/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/dxdiag/… Modified: branches/ntvdm/base/applications/fontview/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/fontvie… Modified: branches/ntvdm/base/applications/games/solitaire/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/s… Modified: branches/ntvdm/base/applications/games/spider/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/s… Modified: branches/ntvdm/base/applications/games/winmine/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/games/w… Modified: branches/ntvdm/base/applications/kbswitch/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/kbswitc… Modified: branches/ntvdm/base/applications/magnify/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/magnify… Modified: branches/ntvdm/base/applications/mplay32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mplay32… Modified: branches/ntvdm/base/applications/msconfig/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/msconfi… Modified: branches/ntvdm/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mscutils/eventvwr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mscutils/servman/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mscutil… Modified: branches/ntvdm/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mspaint… Modified: branches/ntvdm/base/applications/mstsc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/mstsc/l… Modified: branches/ntvdm/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/network… Modified: branches/ntvdm/base/applications/notepad/dialog.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/notepad… Modified: branches/ntvdm/base/applications/notepad/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/notepad… Modified: branches/ntvdm/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/notepad… Modified: branches/ntvdm/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/notepad… Modified: branches/ntvdm/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/rapps/l… Modified: branches/ntvdm/base/applications/regedit/clb/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/framewnd.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/regedit/listview.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/regedit… Modified: branches/ntvdm/base/applications/screensavers/3dtext/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/screens… Modified: branches/ntvdm/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/screens… Modified: branches/ntvdm/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/shutdow… Modified: branches/ntvdm/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/sndrec3… Modified: branches/ntvdm/base/applications/sndvol32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/sndvol3… Modified: branches/ntvdm/base/applications/sndvol32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/sndvol3… Modified: branches/ntvdm/base/applications/taskmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/taskmgr… Modified: branches/ntvdm/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/taskmgr… Modified: branches/ntvdm/base/applications/winhlp32/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/winhlp3… Modified: branches/ntvdm/base/applications/winhlp32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/winhlp3… Modified: branches/ntvdm/base/applications/wordpad/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/wordpad… Modified: branches/ntvdm/base/applications/write/Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/applications/write/T… Modified: branches/ntvdm/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/setup/usetup/bootsup… Modified: branches/ntvdm/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/setup/usetup/filesup… Modified: branches/ntvdm/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/setup/usetup/inicach… Modified: branches/ntvdm/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/cmd/misc.c?rev… Modified: branches/ntvdm/base/shell/explorer-new/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/explorer-new/p… Modified: branches/ntvdm/base/shell/explorer/explorer-cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/explorer/explo… Modified: branches/ntvdm/base/shell/explorer/shell/fatfs.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/explorer/shell… Modified: branches/ntvdm/base/shell/explorer/shell/filechild.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/shell/explorer/shell… Modified: branches/ntvdm/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/system/smss/sminit.c… Modified: branches/ntvdm/base/system/smss/smss.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/system/smss/smss.c?r… Modified: branches/ntvdm/base/system/smss/smutil.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/base/system/smss/smutil.c… Modified: branches/ntvdm/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/CMakeLists.txt?rev=5… Modified: branches/ntvdm/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/boot/bootdata/hivecls.inf… Modified: branches/ntvdm/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/CMakeMacros.cmake?r… Modified: branches/ntvdm/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/config.cmake?rev=59… Modified: branches/ntvdm/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/gcc.cmake?rev=59665… Modified: branches/ntvdm/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/cmake/msvc.cmake?rev=5966… Modified: branches/ntvdm/configure.cmd URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/configure.cmd?rev=59665&r… Modified: branches/ntvdm/dll/3rdparty/libxslt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/3rdparty/libxslt/CMak… Modified: branches/ntvdm/dll/cpl/appwiz/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/appwiz/lang/cs-CZ… Modified: branches/ntvdm/dll/cpl/appwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/appwiz/rsrc.rc?re… Modified: branches/ntvdm/dll/cpl/input/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/input/lang/it-IT.… Modified: branches/ntvdm/dll/cpl/main/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/main/lang/cs-CZ.r… Modified: branches/ntvdm/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/main/rsrc.rc?rev=… Modified: branches/ntvdm/dll/cpl/wined3dcfg/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/cpl/wined3dcfg/rsrc.r… Modified: branches/ntvdm/dll/directx/quartz/dsoundrender.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/directx/quartz/dsound… Modified: branches/ntvdm/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/ntdll/def/ntdll.spec?… Modified: branches/ntvdm/dll/opengl/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/opengl/glu32/CMakeLis… Modified: branches/ntvdm/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/aclui/sidcache.… Modified: branches/ntvdm/dll/win32/browseui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/CMakeL… Modified: branches/ntvdm/dll/win32/browseui/bandsitemenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/bandsi… Modified: branches/ntvdm/dll/win32/browseui/browseui.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/browse… Modified: branches/ntvdm/dll/win32/browseui/commonbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/common… Modified: branches/ntvdm/dll/win32/browseui/commonbrowser.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/common… Modified: branches/ntvdm/dll/win32/browseui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/precom… Modified: branches/ntvdm/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/browseui/shellb… Modified: branches/ntvdm/dll/win32/dbghelp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/CMakeLi… Modified: branches/ntvdm/dll/win32/dbghelp/cpu_i386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/cpu_i38… Modified: branches/ntvdm/dll/win32/dbghelp/dbghelp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/dbghelp… Modified: branches/ntvdm/dll/win32/dbghelp/dbghelp_private.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/dbghelp… Modified: branches/ntvdm/dll/win32/dbghelp/dbghelp_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/dbghelp… Modified: branches/ntvdm/dll/win32/dbghelp/dwarf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/dwarf.c… Modified: branches/ntvdm/dll/win32/dbghelp/dwarf.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/dwarf.h… Modified: branches/ntvdm/dll/win32/dbghelp/image_private.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/image_p… Modified: branches/ntvdm/dll/win32/dbghelp/module.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/module.… Modified: branches/ntvdm/dll/win32/dbghelp/pe_module.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/pe_modu… Modified: branches/ntvdm/dll/win32/dbghelp/source.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/source.… Modified: branches/ntvdm/dll/win32/dbghelp/stabs.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/stabs.c… Modified: branches/ntvdm/dll/win32/dbghelp/storage.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/storage… Modified: branches/ntvdm/dll/win32/dbghelp/symbol.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/symbol.… Modified: branches/ntvdm/dll/win32/dbghelp/type.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/dbghelp/type.c?… Modified: branches/ntvdm/dll/win32/devmgr/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/devmgr/lang/cs-… Modified: branches/ntvdm/dll/win32/devmgr/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/devmgr/lang/it-… Modified: branches/ntvdm/dll/win32/ieframe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/ieframe/CMakeLi… Modified: branches/ntvdm/dll/win32/ieframe/ie.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/ieframe/ie.c?re… Modified: branches/ntvdm/dll/win32/ieframe/ieframe.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/ieframe/ieframe… Modified: branches/ntvdm/dll/win32/ieframe/webbrowser.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/ieframe/webbrow… Modified: branches/ntvdm/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/file/create.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/file/npipe.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/file/volume.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/handle.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/client/vista.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/client… Modified: branches/ntvdm/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/kernel32/winnls… Modified: branches/ntvdm/dll/win32/msgina/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/msgina/lang/it-… Modified: branches/ntvdm/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netapi32/netapi… Modified: branches/ntvdm/dll/win32/netshell/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/CMakeL… Modified: branches/ntvdm/dll/win32/netshell/classfactory.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/classf… Modified: branches/ntvdm/dll/win32/netshell/connectmanager.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/connec… Modified: branches/ntvdm/dll/win32/netshell/enumlist.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/enumli… Modified: branches/ntvdm/dll/win32/netshell/lanconnectui.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/lancon… Modified: branches/ntvdm/dll/win32/netshell/lanstatusui.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/lansta… Modified: branches/ntvdm/dll/win32/netshell/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/precom… Modified: branches/ntvdm/dll/win32/netshell/shfldr_netconnect.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/netshell/shfldr… Modified: branches/ntvdm/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/ntmarta/ntmarta… Modified: branches/ntvdm/dll/win32/samlib/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samlib/dllmain.… Modified: branches/ntvdm/dll/win32/samlib/samlib.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samlib/samlib.c… Modified: branches/ntvdm/dll/win32/samlib/samlib.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samlib/samlib.s… Modified: branches/ntvdm/dll/win32/samsrv/samrpc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samrpc.c… Modified: branches/ntvdm/dll/win32/samsrv/samsrv.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.c… Modified: branches/ntvdm/dll/win32/samsrv/samsrv.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.h… Modified: branches/ntvdm/dll/win32/samsrv/samsrv.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/samsrv.s… Modified: branches/ntvdm/dll/win32/samsrv/security.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/security… Modified: branches/ntvdm/dll/win32/samsrv/setup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/setup.c?… Modified: branches/ntvdm/dll/win32/samsrv/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/samsrv/utils.c?… Modified: branches/ntvdm/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/CMakeLi… Modified: branches/ntvdm/dll/win32/shell32/defcontextmenu.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/defcont… Modified: branches/ntvdm/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/lang/cs… Modified: branches/ntvdm/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/precomp… Modified: branches/ntvdm/dll/win32/shell32/rgs_res.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/rgs_res… Modified: branches/ntvdm/dll/win32/shell32/shell32.rc URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/shell32… Modified: branches/ntvdm/dll/win32/shell32/shell32_main.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/shell32… Modified: branches/ntvdm/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/shlview… Modified: branches/ntvdm/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shell32/shresde… Modified: branches/ntvdm/dll/win32/shlwapi/ordinal.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/shlwapi/ordinal… Modified: branches/ntvdm/dll/win32/syssetup/classinst.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/syssetup/classi… Modified: branches/ntvdm/dll/win32/syssetup/syssetup.spec URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/dll/win32/syssetup/sysset… Modified: branches/ntvdm/drivers/bluetooth/fbtusb/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bluetooth/fbtusb/… Modified: branches/ntvdm/drivers/bus/pcix/arb/tr_irq.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/arb/tr_i… Modified: branches/ntvdm/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/enum.c?r… Modified: branches/ntvdm/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/busintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/cardbus.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/devhere.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/lddintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/locintrf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/pmeintf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/intrface/routintf.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/intrface… Modified: branches/ntvdm/drivers/bus/pcix/utils.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/bus/pcix/utils.c?… Modified: branches/ntvdm/drivers/filesystems/msfs/msfs.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/msfs/… Modified: branches/ntvdm/drivers/filesystems/mup/mup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/mup/m… Modified: branches/ntvdm/drivers/filesystems/ntfs/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filesystems/ntfs/fcb.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filesystems/ntfs/finfo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filesystems/ntfs/mft.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filesystems/ntfs/rw.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filesystems/ntfs/… Modified: branches/ntvdm/drivers/filters/mountmgr/database.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filters/mountmgr/… Modified: branches/ntvdm/drivers/filters/mountmgr/device.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filters/mountmgr/… Modified: branches/ntvdm/drivers/filters/mountmgr/mountmgr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filters/mountmgr/… Modified: branches/ntvdm/drivers/filters/mountmgr/notify.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filters/mountmgr/… Modified: branches/ntvdm/drivers/filters/mountmgr/symlink.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/filters/mountmgr/… Modified: branches/ntvdm/drivers/network/tcpip/include/interface.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/include/neighbor.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/inc… Modified: branches/ntvdm/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/network/tcpip/tcp… Modified: branches/ntvdm/drivers/storage/class/class2/class2.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/storage/class/cla… Modified: branches/ntvdm/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/storage/ide/uniat… Modified: branches/ntvdm/drivers/storage/port/buslogic/Log.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/storage/port/busl… Modified: branches/ntvdm/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbccgp/descr… Modified: branches/ntvdm/drivers/usb/usbccgp/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbccgp/fdo.c… Modified: branches/ntvdm/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbehci/hardw… Modified: branches/ntvdm/drivers/usb/usbhub/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbhub/fdo.c?… Modified: branches/ntvdm/drivers/usb/usbhub/pdo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbhub/pdo.c?… Modified: branches/ntvdm/drivers/usb/usbstor/error.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbstor/error… Modified: branches/ntvdm/drivers/usb/usbstor/queue.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbstor/queue… Modified: branches/ntvdm/drivers/usb/usbstor/scsi.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/usb/usbstor/scsi.… Modified: branches/ntvdm/drivers/wdm/audio/backpln/portcls/miniport_dmus.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/backpln… Modified: branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cmicontrol/main.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/drivers… Modified: branches/ntvdm/drivers/wdm/audio/drivers/CMIDriver/cpl/cmicpl.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/drivers… Modified: branches/ntvdm/drivers/wdm/audio/sysaudio/deviface.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/drivers/wdm/audio/sysaudi… Modified: branches/ntvdm/hal/halx86/legacy/bus/pci_classes.ids URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/hal/halx86/legacy/bus/pci… Modified: branches/ntvdm/hal/halx86/legacy/bus/pci_vendors.ids URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/hal/halx86/legacy/bus/pci… Modified: branches/ntvdm/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/process.h?rev… Modified: branches/ntvdm/include/crt/sec_api/stdio_s.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/crt/sec_api/stdio… Modified: branches/ntvdm/include/ddk/fltuserstructures.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/fltuserstruct… Modified: branches/ntvdm/include/ddk/minitape.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/minitape.h?re… Modified: branches/ntvdm/include/ddk/ndistapi.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/ndistapi.h?re… Modified: branches/ntvdm/include/ddk/ndiswan.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/ndiswan.h?rev… Modified: branches/ntvdm/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/ntddk.h?rev=5… Modified: branches/ntvdm/include/ddk/ntsam.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/ntsam.h?rev=5… Modified: branches/ntvdm/include/ddk/parallel.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/parallel.h?re… Modified: branches/ntvdm/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/punknown.h?re… Modified: branches/ntvdm/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/srb.h?rev=596… Modified: branches/ntvdm/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/storport.h?re… Modified: branches/ntvdm/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/strmini.h?rev… Modified: branches/ntvdm/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/tdikrnl.h?rev… Modified: branches/ntvdm/include/ddk/ws2san.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/ddk/ws2san.h?rev=… Modified: branches/ntvdm/include/host/config.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/host/config.h?rev… Modified: branches/ntvdm/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/host/typedefs.h?r… Modified: branches/ntvdm/include/host/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/host/wine/unicode… Modified: branches/ntvdm/include/psdk/advpub.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/advpub.h?rev… Modified: branches/ntvdm/include/psdk/mstcpip.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/mstcpip.h?re… Modified: branches/ntvdm/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/ntddstor.h?r… Modified: branches/ntvdm/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/ntdef.h?rev=… Modified: branches/ntvdm/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/sal.h?rev=59… Modified: branches/ntvdm/include/psdk/shdeprecated.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shdeprecated… Modified: branches/ntvdm/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/shobjidl.idl… Modified: branches/ntvdm/include/psdk/tlogstg.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/tlogstg.idl?… Modified: branches/ntvdm/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/winnt.h?rev=… Modified: branches/ntvdm/include/psdk/winsplp.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/winsplp.h?re… Modified: branches/ntvdm/include/psdk/ws2ipdef.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/ws2ipdef.h?r… Modified: branches/ntvdm/include/psdk/ws2tcpip.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/psdk/ws2tcpip.h?r… Modified: branches/ntvdm/include/reactos/debug.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/debug.h?r… Modified: branches/ntvdm/include/reactos/idl/sam.idl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/idl/sam.i… Modified: branches/ntvdm/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/wine/port… Modified: branches/ntvdm/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/wine/test… Modified: branches/ntvdm/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/xdk/exfuncs.h?rev… Modified: branches/ntvdm/lib/3rdparty/adns/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/adns/CMakeLi… Modified: branches/ntvdm/lib/3rdparty/cardlib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/cardlib/CMak… Modified: branches/ntvdm/lib/3rdparty/fullfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/fullfat/CMak… Modified: branches/ntvdm/lib/3rdparty/libxml2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/3rdparty/libxml2/CMak… Modified: branches/ntvdm/lib/cmlib/hivecell.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/cmlib/hivecell.c?rev=… Modified: branches/ntvdm/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/ar… Modified: branches/ntvdm/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/ic… Modified: branches/ntvdm/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/in… Modified: branches/ntvdm/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/ip… Modified: branches/ntvdm/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/network/ne… Modified: branches/ntvdm/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/transport/… Modified: branches/ntvdm/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/ip/transport/… Modified: branches/ntvdm/lib/drivers/libusb/hub_controller.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/libusb/hub_co… Modified: branches/ntvdm/lib/drivers/libusb/libusb.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/libusb/libusb… Modified: branches/ntvdm/lib/drivers/libusb/usb_device.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/drivers/libusb/usb_de… Modified: branches/ntvdm/lib/fslib/ext2lib/Inode.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fslib/ext2lib/Inode.c… Modified: branches/ntvdm/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fslib/ext2lib/Mke2fs.… Modified: branches/ntvdm/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/inflib/CMakeLists.txt… Modified: branches/ntvdm/lib/inflib/infget.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/inflib/infget.c?rev=5… Modified: branches/ntvdm/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/rtl/actctx.c?rev=5966… Modified: branches/ntvdm/lib/rtl/dbgbuffer.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/rtl/dbgbuffer.c?rev=5… Modified: branches/ntvdm/lib/rtl/registry.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/rtl/registry.c?rev=59… Modified: branches/ntvdm/lib/sdk/comsupp/comsupp.cpp URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/comsupp/comsupp.c… Modified: branches/ntvdm/lib/sdk/uuid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/uuid/CMakeLists.t… Removed: branches/ntvdm/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/sdk/uuid/uuid.c?rev=5… Modified: branches/ntvdm/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/inf/hdc.inf?rev=596… Modified: branches/ntvdm/media/inf/shortcuts.inf URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/inf/shortcuts.inf?r… Modified: branches/ntvdm/media/vgafonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/media/vgafonts/CMakeLists… Modified: branches/ntvdm/ntoskrnl/cache/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/cache/mdlsup.c?r… Modified: branches/ntvdm/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/cache/newcc.h?re… Modified: branches/ntvdm/ntoskrnl/cc/mdl.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/cc/mdl.c?rev=596… Modified: branches/ntvdm/ntoskrnl/config/cmhook.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/config/cmhook.c?… Modified: branches/ntvdm/ntoskrnl/config/cminit.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/config/cminit.c?… Modified: branches/ntvdm/ntoskrnl/config/cmsysini.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/config/cmsysini.… Modified: branches/ntvdm/ntoskrnl/config/powerpc/cmhardwr.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/config/powerpc/c… Modified: branches/ntvdm/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ex/sysinfo.c?rev… Modified: branches/ntvdm/ntoskrnl/ex/zone.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ex/zone.c?rev=59… Modified: branches/ntvdm/ntoskrnl/fsrtl/fastio.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/fsrtl/fastio.c?r… Modified: branches/ntvdm/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/fsrtl/notify.c?r… Modified: branches/ntvdm/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/include/internal… Modified: branches/ntvdm/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/include/internal… Modified: branches/ntvdm/ntoskrnl/io/iomgr/bootlog.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/io/iomgr/bootlog… Modified: branches/ntvdm/ntoskrnl/io/iomgr/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/io/iomgr/ramdisk… Modified: branches/ntvdm/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/kdbg/kdb_cli.c?r… Modified: branches/ntvdm/ntoskrnl/kdbg/kdb_symbols.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/kdbg/kdb_symbols… Modified: branches/ntvdm/ntoskrnl/kdbg/kdb_symbols.cmake.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/kdbg/kdb_symbols… Modified: branches/ntvdm/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ke/i386/ctxswitc… Modified: branches/ntvdm/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ke/i386/kiinit.c… Modified: branches/ntvdm/ntoskrnl/ke/i386/patpge.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ke/i386/patpge.c… Modified: branches/ntvdm/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/mm/ARM3/pool.c?r… Modified: branches/ntvdm/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/mm/ARM3/procsup.… Modified: branches/ntvdm/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/mm/ARM3/section.… Modified: branches/ntvdm/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/mm/freelist.c?re… Modified: branches/ntvdm/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ob/obhandle.c?re… Modified: branches/ntvdm/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ps/kill.c?rev=59… Modified: branches/ntvdm/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ps/process.c?rev… Modified: branches/ntvdm/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/ntoskrnl/ps/query.c?rev=5… Modified: branches/ntvdm/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win/basesrv/pr… Modified: branches/ntvdm/subsystems/win32/csrsrv/api.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/a… Modified: branches/ntvdm/subsystems/win32/csrsrv/api.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/a… Modified: branches/ntvdm/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/p… Modified: branches/ntvdm/subsystems/win32/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/s… Modified: branches/ntvdm/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/win32/csrsrv/t… Modified: branches/ntvdm/tools/cabman/mszip.cxx URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/cabman/mszip.cxx?re… Modified: branches/ntvdm/tools/cdmake/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/cdmake/CMakeLists.t… Modified: branches/ntvdm/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/cdmake/cdmake.c?rev… Modified: branches/ntvdm/tools/obj2bin/obj2bin.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/obj2bin/obj2bin.c?r… Modified: branches/ntvdm/tools/pecoff.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/pecoff.h?rev=59665&… Modified: branches/ntvdm/tools/rsym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/rsym/CMakeLists.txt… Modified: branches/ntvdm/tools/rsym/rsym.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/rsym/rsym.c?rev=596… Modified: branches/ntvdm/tools/rsym/rsym.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/rsym/rsym.h?rev=596… Modified: branches/ntvdm/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/spec2def/spec2def.c… Modified: branches/ntvdm/tools/widl/typegen.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/widl/typegen.c?rev=… Modified: branches/ntvdm/tools/widl/widl.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/tools/widl/widl.c?rev=596… Modified: branches/ntvdm/win32ss/drivers/videoprt/child.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/drivers/videoprt/… Modified: branches/ntvdm/win32ss/gdi/ntgdi/device.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/gdi/ntgdi/device.… Modified: branches/ntvdm/win32ss/gdi/ntgdi/gdidebug.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/gdi/ntgdi/gdidebu… Modified: branches/ntvdm/win32ss/gdi/ntgdi/xformobj.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/gdi/ntgdi/xformob… Modified: branches/ntvdm/win32ss/user/ntuser/monitor.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/ntuser/monit… Modified: branches/ntvdm/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/ntuser/msgqu… Modified: branches/ntvdm/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/ntuser/winpo… Modified: branches/ntvdm/win32ss/user/user32/controls/static.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/user32/contr… Modified: branches/ntvdm/win32ss/user/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/user32/inclu… Modified: branches/ntvdm/win32ss/user/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/user32/misc/… Modified: branches/ntvdm/win32ss/user/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/user32/windo… Modified: branches/ntvdm/win32ss/user/winsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/CMake… Modified: branches/ntvdm/win32ss/user/winsrv/consrv.cmake URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/win32ss/user/winsrv/consr…

11 years, 3 months

[akhaldi] 59664: [CRT] * Annotate wchar_s.h.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 7 13:20:13 2013 New Revision: 59664 URL: http://svn.reactos.org/svn/reactos?rev=59664&view=rev Log: [CRT] * Annotate wchar_s.h. Modified: trunk/reactos/include/crt/sec_api/wchar_s.h Modified: trunk/reactos/include/crt/sec_api/wchar_s.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/sec_api/wchar_… ============================================================================== --- trunk/reactos/include/crt/sec_api/wchar_s.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/sec_api/wchar_s.h [iso-8859-1] Wed Aug 7 13:20:13 2013 @@ -3,6 +3,7 @@ * This file is part of the w64 mingw-runtime package. * No warranty is given; refer to the file DISCLAIMER within this package. */ + #ifndef _INC_WCHAR_S #define _INC_WCHAR_S @@ -16,100 +17,648 @@ #ifndef _WIO_S_DEFINED #define _WIO_S_DEFINED - _CRTIMP errno_t __cdecl _waccess_s(const wchar_t *_Filename,int _AccessMode); - _CRTIMP errno_t __cdecl _wmktemp_s(wchar_t *_TemplateName,size_t _SizeInWords); -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _waccess_s( + _In_z_ const wchar_t *_Filename, + _In_ int _AccessMode); + + _CRTIMP + errno_t + __cdecl + _wmktemp_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_TemplateName, + _In_ size_t _SizeInWords); + +#endif /* _WIO_S_DEFINED */ #ifndef _WCONIO_S_DEFINED #define _WCONIO_S_DEFINED - _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_S_DEFINED */ #ifndef _WSTDIO_S_DEFINED #define _WSTDIO_S_DEFINED - _CRTIMP wchar_t *__cdecl _getws_s(wchar_t *_Str,size_t _SizeInWords); - int __cdecl fwprintf_s(FILE *_File,const wchar_t *_Format,...); - int __cdecl wprintf_s(const wchar_t *_Format,...); - int __cdecl vfwprintf_s(FILE *_File,const wchar_t *_Format,va_list _ArgList); - int __cdecl vwprintf_s(const wchar_t *_Format,va_list _ArgList); - int __cdecl swprintf_s(wchar_t *_Dst,size_t _SizeInWords,const wchar_t *_Format,...); - int __cdecl vswprintf_s(wchar_t *_Dst,size_t _SizeInWords,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_s(wchar_t *_DstBuf,size_t _DstSizeInWords,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _vsnwprintf_s(wchar_t *_DstBuf,size_t _DstSizeInWords,size_t _MaxCount,const wchar_t *_Format,va_list _ArgList); - _CRTIMP int __cdecl _wprintf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vwprintf_s_l(const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwprintf_s_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vfwprintf_s_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _swprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vswprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _snwprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _vsnwprintf_s_l(wchar_t *_DstBuf,size_t _DstSize,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,va_list _ArgList); - _CRTIMP int __cdecl _fwscanf_s_l(FILE *_File,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _swscanf_s_l(const wchar_t *_Src,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _snwscanf_s(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,...); - _CRTIMP int __cdecl _snwscanf_s_l(const wchar_t *_Src,size_t _MaxCount,const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP int __cdecl _wscanf_s_l(const wchar_t *_Format,_locale_t _Locale,...); - _CRTIMP errno_t __cdecl _wfopen_s(FILE **_File,const wchar_t *_Filename,const wchar_t *_Mode); - _CRTIMP errno_t __cdecl _wfreopen_s(FILE **_File,const wchar_t *_Filename,const wchar_t *_Mode,FILE *_OldFile); - _CRTIMP errno_t __cdecl _wtmpnam_s(wchar_t *_DstBuf,size_t _SizeInWords); -#endif + + _Check_return_opt_ + _CRTIMP + wchar_t * + __cdecl + _getws_s( + _Out_writes_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords); + + _Check_return_opt_ + int + __cdecl + fwprintf_s( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + int + __cdecl + wprintf_s( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + int + __cdecl + vfwprintf_s( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + int + __cdecl + vwprintf_s( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + int + __cdecl + swprintf_s( + _Out_writes_z_(_SizeInWords) wchar_t *_Dst, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + int + __cdecl + vswprintf_s( + _Out_writes_z_(_SizeInWords) wchar_t *_Dst, + _In_ size_t _SizeInWords, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_s( + _Out_writes_z_(_DstSizeInWords) wchar_t *_DstBuf, + _In_ size_t _DstSizeInWords, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_s( + _Out_writes_z_(_DstSizeInWords) wchar_t *_DstBuf, + _In_ size_t _DstSizeInWords, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wprintf_s_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vwprintf_s_l( + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwprintf_s_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vfwprintf_s_l( + _Inout_ FILE *_File, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vswprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _vsnwprintf_s_l( + _Out_writes_z_(_DstSize) wchar_t *_DstBuf, + _In_ size_t _DstSize, + _In_ size_t _MaxCount, + _In_z_ _Printf_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + va_list _ArgList); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _fwscanf_s_l( + _Inout_ FILE *_File, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _swscanf_s_l( + _In_z_ const wchar_t *_Src, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_s( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _snwscanf_s_l( + _In_reads_(_MaxCount) _Pre_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_opt_ + _CRTIMP + int + __cdecl + _wscanf_s_l( + _In_z_ _Scanf_s_format_string_ const wchar_t *_Format, + _In_opt_ _locale_t _Locale, + ...); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wfopen_s( + _Outptr_result_maybenull_ FILE **_File, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wfreopen_s( + _Outptr_result_maybenull_ FILE **_File, + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_Mode, + _Inout_ FILE *_OldFile); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wtmpnam_s( + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords); + +#endif /* _WSTDIO_S_DEFINED */ #ifndef _WSTDLIB_S_DEFINED #define _WSTDLIB_S_DEFINED - _CRTIMP errno_t __cdecl _itow_s (int _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ltow_s (long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ultow_s (unsigned long _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _wgetenv_s(size_t *_ReturnSize,wchar_t *_DstBuf,size_t _DstSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _wdupenv_s(wchar_t **_Buffer,size_t *_BufferSizeInWords,const wchar_t *_VarName); - _CRTIMP errno_t __cdecl _i64tow_s(__int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); - _CRTIMP errno_t __cdecl _ui64tow_s(unsigned __int64 _Val,wchar_t *_DstBuf,size_t _SizeInWords,int _Radix); -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _itow_s( + _In_ int _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ltow_s( + _In_ long _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ultow_s( + _In_ unsigned long _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wgetenv_s( + _Out_ size_t *_ReturnSize, + _Out_writes_z_(_DstSizeInWords) wchar_t *_DstBuf, + _In_ size_t _DstSizeInWords, + _In_z_ const wchar_t *_VarName); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wdupenv_s( + _Outptr_result_buffer_maybenull_(*_BufferSizeInWords) _Deref_post_z_ wchar_t **_Buffer, + _Out_opt_ size_t *_BufferSizeInWords, + _In_z_ const wchar_t *_VarName); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _i64tow_s( + _In_ __int64 _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _ui64tow_s( + _In_ unsigned __int64 _Val, + _Out_writes_z_(_SizeInWords) wchar_t *_DstBuf, + _In_ size_t _SizeInWords, + _In_ int _Radix); + +#endif /* _WSTDLIB_S_DEFINED */ #ifndef _POSIX_ #ifndef _WSTDLIBP_S_DEFINED #define _WSTDLIBP_S_DEFINED - _CRTIMP errno_t __cdecl _wmakepath_s(wchar_t *_PathResult,size_t _SizeInWords,const wchar_t *_Drive,const wchar_t *_Dir,const wchar_t *_Filename,const wchar_t *_Ext); - _CRTIMP errno_t __cdecl _wputenv_s(const wchar_t *_Name,const wchar_t *_Value); - _CRTIMP errno_t __cdecl _wsearchenv_s(const wchar_t *_Filename,const wchar_t *_EnvVar,wchar_t *_ResultPath,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wsplitpath_s(const wchar_t *_FullPath,wchar_t *_Drive,size_t _DriveSizeInWords,wchar_t *_Dir,size_t _DirSizeInWords,wchar_t *_Filename,size_t _FilenameSizeInWords,wchar_t *_Ext,size_t _ExtSizeInWords); -#endif -#endif + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wmakepath_s( + _Out_writes_z_(_SizeInBytes) wchar_t *_PathResult, + _In_ size_t _SizeInWords, + _In_opt_z_ const wchar_t *_Drive, + _In_opt_z_ const wchar_t *_Dir, + _In_opt_z_ const wchar_t *_Filename, + _In_opt_z_ const wchar_t *_Ext); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wputenv_s( + _In_z_ const wchar_t *_Name, + _In_z_ const wchar_t *_Value); + + _CRTIMP + errno_t + __cdecl + _wsearchenv_s( + _In_z_ const wchar_t *_Filename, + _In_z_ const wchar_t *_EnvVar, + _Out_writes_z_(_SizeInWords) wchar_t *_ResultPath, + _In_ size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wsplitpath_s( + _In_z_ const wchar_t *_FullPath, + _Out_writes_opt_z_(_DriveSizeInWords) wchar_t *_Drive, + _In_ size_t _DriveSizeInWords, + _Out_writes_opt_z_(_DirSizeInWords) wchar_t *_Dir, + _In_ size_t _DirSizeInWords, + _Out_writes_opt_z_(_FilenameSizeInWords) wchar_t *_Filename, + _In_ size_t _FilenameSizeInWords, + _Out_writes_opt_z_(_ExtSizeInWords) wchar_t *_Ext, + _In_ size_t _ExtSizeInWords); + +#endif /* _WSTDLIBP_S_DEFINED */ +#endif /* _POSIX_ */ #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED - _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context); - _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); - _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); - _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); - _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); - _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); - - _CRTIMP errno_t __cdecl wcsncat_s(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsncat_s_l(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount); - _CRTIMP errno_t __cdecl _wcsncpy_s_l(wchar_t *_Dst,size_t _DstSizeInChars,const wchar_t *_Src,size_t _MaxCount,_locale_t _Locale); - _CRTIMP wchar_t *__cdecl _wcstok_s_l(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsset_s_l(wchar_t *_Str,size_t _SizeInChars,unsigned int _Val,_locale_t _Locale); - _CRTIMP errno_t __cdecl _wcsnset_s_l(wchar_t *_Str,size_t _SizeInChars,unsigned int _Val, size_t _Count,_locale_t _Locale); - -#endif + + _Check_return_ + _CRTIMP + wchar_t * + __cdecl + wcstok_s( + _Inout_opt_z_ wchar_t *_Str, + _In_z_ const wchar_t *_Delim, + _Inout_ _Deref_prepost_opt_z_ wchar_t **_Context); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ int _ErrNum); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + __wcserror_s( + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Buffer, + _In_ size_t _SizeInWords, + _In_z_ const wchar_t *_ErrMsg); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsnset_s( + _Inout_updates_z_(_DstSizeInWords) wchar_t *_Dst, + _In_ size_t _DstSizeInWords, + wchar_t _Val, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsset_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + wchar_t _Val); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcslwr_s_l( + _Inout_updates_z_(_SizeInWords) wchar_t *_Str, + _In_ size_t _SizeInWords, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsupr_s_l( + _Inout_updates_z_(_Size) wchar_t *_Str, + _In_ size_t _Size, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcsncat_s( + _Inout_updates_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsncat_s_l( + _Inout_updates_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + wcsncpy_s( + _Out_writes_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount); + + _Check_return_wat_ + _CRTIMP + errno_t + __cdecl + _wcsncpy_s_l( + _Out_writes_z_(_DstSizeInChars) wchar_t *_Dst, + _In_ size_t _DstSizeInChars, + _In_z_ const wchar_t *_Src, + _In_ size_t _MaxCount, + _In_opt_ _locale_t _Locale); + + _CRTIMP + wchar_t * + __cdecl + _wcstok_s_l( + wchar_t *_Str, + const wchar_t *_Delim, + wchar_t **_Context, + _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _wcsset_s_l( + wchar_t *_Str, + size_t _SizeInChars, + unsigned int _Val, + _locale_t _Locale); + + _CRTIMP + errno_t + __cdecl + _wcsnset_s_l( + wchar_t *_Str, + size_t _SizeInChars, + unsigned int _Val, + size_t _Count, + _locale_t _Locale); + +#endif /* _WSTRING_S_DEFINED */ #ifndef _WTIME_S_DEFINED #define _WTIME_S_DEFINED - _CRTIMP errno_t __cdecl _wasctime_s(wchar_t *_Buf,size_t _SizeInWords,const struct tm *_Tm); - _CRTIMP errno_t __cdecl _wctime32_s(wchar_t *_Buf,size_t _SizeInWords,const __time32_t *_Time); - _CRTIMP errno_t __cdecl _wstrdate_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wstrtime_s(wchar_t *_Buf,size_t _SizeInWords); - _CRTIMP errno_t __cdecl _wctime64_s(wchar_t *_Buf,size_t _SizeInWords,const __time64_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wasctime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const struct tm *_Tm); + + _CRTIMP + errno_t + __cdecl + _wctime32_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time32_t *_Time); + + _CRTIMP + errno_t + __cdecl + _wstrdate_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_range_(>= , 9) size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wstrtime_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(9) wchar_t *_Buf, + _In_ size_t _SizeInWords); + + _CRTIMP + errno_t + __cdecl + _wctime64_s( + _Out_writes_(_SizeInWords) _Post_readable_size_(26) wchar_t *_Buf, + _In_ size_t _SizeInWords, + _In_ const __time64_t *_Time); #if !defined (RC_INVOKED) && !defined (_INC_WTIME_S_INL) #define _INC_WTIME_S_INL @@ -118,15 +667,45 @@ __CRT_INLINE errno_t __cdecl _wctime_s(wchar_t *_Buffer,size_t _SizeInWords,const time_t *_Time) { return _wctime64_s(_Buffer,_SizeInWords,_Time); } #endif #endif -#endif - - _CRTIMP errno_t __cdecl mbsrtowcs_s(size_t *_Retval,wchar_t *_Dst,size_t _SizeInWords,const char **_PSrc,size_t _N,mbstate_t *_State); - _CRTIMP errno_t __cdecl wcrtomb_s(size_t *_Retval,char *_Dst,size_t _SizeInBytes,wchar_t _Ch,mbstate_t *_State); - _CRTIMP errno_t __cdecl wcsrtombs_s(size_t *_Retval,char *_Dst,size_t _SizeInBytes,const wchar_t **_Src,size_t _Size,mbstate_t *_State); + +#endif /* _WTIME_S_DEFINED */ + + _CRTIMP + errno_t + __cdecl + mbsrtowcs_s( + _Out_opt_ size_t *_Retval, + _Out_writes_opt_z_(_SizeInWords) wchar_t *_Dst, + _In_ size_t _SizeInWords, + _Inout_ _Deref_prepost_opt_valid_ const char **_PSrc, + _In_ size_t _N, + _Out_opt_ mbstate_t *_State); + + _CRTIMP + errno_t + __cdecl + wcrtomb_s( + _Out_opt_ size_t *_Retval, + _Out_writes_opt_z_(_SizeInBytes) char *_Dst, + _In_ size_t _SizeInBytes, + _In_ wchar_t _Ch, + _Out_opt_ mbstate_t *_State); + + _CRTIMP + errno_t + __cdecl + wcsrtombs_s( + _Out_opt_ size_t *_Retval, + _Out_writes_bytes_to_opt_(_SizeInBytes, *_Retval) char *_Dst, + _In_ size_t _SizeInBytes, + _Inout_ _Deref_prepost_z_ const wchar_t **_Src, + _In_ size_t _Size, + _Out_opt_ mbstate_t *_State); #ifdef __cplusplus } #endif -#endif -#endif +#endif /* MINGW_HAS_SECURE_API */ + +#endif /* _INC_WCHAR_S */

11 years, 3 months

[akhaldi] 59663: [CMAKE] * We no longer need to maintain a transitional compatibility with the old CMake/RosBE for MSVC builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed Aug 7 12:28:47 2013 New Revision: 59663 URL: http://svn.reactos.org/svn/reactos?rev=59663&view=rev Log: [CMAKE] * We no longer need to maintain a transitional compatibility with the old CMake/RosBE for MSVC builds. Removed: trunk/reactos/cmake/Platform/Windows-cl.cmake Removed: trunk/reactos/cmake/Platform/Windows-cl.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/Platform/Windows-cl.… ============================================================================== --- trunk/reactos/cmake/Platform/Windows-cl.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/Platform/Windows-cl.cmake (removed) @@ -1,307 +0,0 @@ -# try to load any previously computed information for C on this platform -INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake OPTIONAL) -# try to load any previously computed information for CXX on this platform -INCLUDE( ${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake OPTIONAL) - -SET(WIN32 1) - -INCLUDE(Platform/cl) - -############ -# Detect WDK build environment -IF($ENV{DDKBUILDENV} MATCHES "chk") - MESSAGE(STATUS "DDK/WDK checked build environment detected.") - SET(CMAKE_USE_WDK_ENV 1) -ENDIF() - -IF($ENV{DDKBUILDENV} MATCHES "fre") - MESSAGE(STATUS "DDK/WDK free build environment detected.") - SET(CMAKE_USE_WDK_ENV 1) -ENDIF() - -if(CMAKE_USE_WDK_ENV) - - # Detect output architecture - if(NOT ARCH) - if($ENV{AMD64} MATCHES 1) - set(ARCH amd64) - set(MSVC_C_ARCHITECTURE_ID 64) - else() - set(ARCH i386) - endif() - endif() - - # Force C/C++ Compilers - include(CMakeForceCompiler) - CMAKE_FORCE_C_COMPILER(cl MSVC) - CMAKE_FORCE_CXX_COMPILER(cl MSVC) - - # Add library directories - STRING(REPLACE * ${ARCH} ATL_LIB_PATH $ENV{ATL_LIB_PATH}) - STRING(REPLACE * ${ARCH} CRT_LIB_PATH $ENV{CRT_LIB_PATH}) - STRING(REPLACE * ${ARCH} DDK_LIB_PATH $ENV{DDK_LIB_PATH}) - STRING(REPLACE * ${ARCH} KMDF_LIB_PATH $ENV{KMDF_LIB_PATH}) - STRING(REPLACE * ${ARCH} MFC_LIB_PATH $ENV{MFC_LIB_PATH}) - STRING(REPLACE * ${ARCH} SDK_LIB_PATH $ENV{SDK_LIB_PATH}) - LINK_DIRECTORIES(${ATL_LIB_PATH} - ${CRT_LIB_PATH} - ${DDK_LIB_PATH} - ${IFSKIT_LIB_PATH} - ${KMDF_LIB_PATH} - ${MFC_LIB_PATH} - ${SDK_LIB_PATH}) - - # Add environment variables - if(NOT CMAKE_CROSSCOMPILING) - set(ENV{INCLUDE} "$ENV{CRT_INC_PATH};$ENV{SDK_INC_PATH};$ENV{SDK_INC_PATH}\\crt\\stl60") - include_directories($ENV{INCLUDE}) - set(ENV{LIBPATH} "${CRT_LIB_PATH};${SDK_LIB_PATH}") - set(ENV{USE_MSVCRT} 1) - set(ENV{USE_STL} 1) - set(ENV{STL_VER} 60) - endif() -endif() - -############ - -# Set lib path for ARM compiler -if(${ARCH} MATCHES arm) - message("Using ARM build for cross compilation. Host tools are x86.") - - # Force C/C++ Compilers - include(CMakeForceCompiler) - CMAKE_FORCE_C_COMPILER(cl MSVC) - CMAKE_FORCE_CXX_COMPILER(cl MSVC) - - if(NOT CMAKE_CROSSCOMPILING) - message("Using x86 target for ARM host tools.") - set(ARCH i386) - - LINK_DIRECTORIES($ENV{WindowsSdkDir}\\Lib\\win8\\um\\x86) - endif() - - #LINK_DIRECTORIES($ENV{LIB}) -endif() - - -############ - -SET(CMAKE_CREATE_WIN32_EXE /subsystem:windows) -SET(CMAKE_CREATE_CONSOLE_EXE /subsystem:console) - -IF(CMAKE_GENERATOR MATCHES "Visual Studio 6") - SET (CMAKE_NO_BUILD_TYPE 1) -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") -IF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") - SET (CMAKE_NO_BUILD_TYPE 1) - SET (CMAKE_CONFIGURATION_TYPES "Debug;Release;MinSizeRel;RelWithDebInfo" CACHE STRING - "Semicolon separated list of supported configuration types, only supports Debug, Release, MinSizeRel, and RelWithDebInfo, anything else will be ignored.") - MARK_AS_ADVANCED(CMAKE_CONFIGURATION_TYPES) -ENDIF(NOT CMAKE_NO_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Visual Studio") -# does the compiler support pdbtype and is it the newer compiler -IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") - SET(CMAKE_COMPILER_2005 1) -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") - -# make sure to enable languages after setting configuration types -ENABLE_LANGUAGE(RC) -SET(CMAKE_COMPILE_RESOURCE "rc <FLAGS> /fo<OBJECT> <SOURCE>") - -# for nmake we need to compute some information about the compiler -# that is being used. -# the compiler may be free command line, 6, 7, or 71, and -# each have properties that must be determined. -# to avoid running these tests with each cmake run, the -# test results are saved in CMakeCPlatform.cmake, a file -# that is automatically copied into try_compile directories -# by the global generator. -SET(MSVC_IDE 1) -IF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") - SET(MSVC_IDE 0) - IF(NOT CMAKE_VC_COMPILER_TESTS_RUN) - SET(CMAKE_VC_COMPILER_TESTS 1) - SET(testNmakeCLVersionFile - "${CMAKE_ROOT}/Modules/CMakeTestNMakeCLVersion.c") - STRING(REGEX REPLACE "/" "\\\\" testNmakeCLVersionFile "${testNmakeCLVersionFile}") - MESSAGE(STATUS "Check for CL compiler version") - SET(CMAKE_TEST_COMPILER ${CMAKE_C_COMPILER}) - IF (NOT CMAKE_C_COMPILER) - SET(CMAKE_TEST_COMPILER ${CMAKE_CXX_COMPILER}) - ENDIF(NOT CMAKE_C_COMPILER) - EXEC_PROGRAM(${CMAKE_TEST_COMPILER} - ARGS /nologo -EP \"${testNmakeCLVersionFile}\" - OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT - RETURN_VALUE CMAKE_COMPILER_RETURN - ) - IF(NOT CMAKE_COMPILER_RETURN) - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining the version of compiler passed with the following output:\n" - "${CMAKE_COMPILER_OUTPUT}\n\n") - STRING(REGEX REPLACE "\n" " " compilerVersion "${CMAKE_COMPILER_OUTPUT}") - STRING(REGEX REPLACE ".*VERSION=(.*)" "\\1" - compilerVersion "${compilerVersion}") - MESSAGE(STATUS "Check for CL compiler version - ${compilerVersion}") - SET(MSVC60) - SET(MSVC70) - SET(MSVC71) - SET(MSVC80) - SET(CMAKE_COMPILER_2005) - IF("${compilerVersion}" LESS 1300) - SET(MSVC60 1) - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 1) - ENDIF("${compilerVersion}" LESS 1300) - IF("${compilerVersion}" EQUAL 1300) - SET(MSVC70 1) - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) - ENDIF("${compilerVersion}" EQUAL 1300) - IF("${compilerVersion}" EQUAL 1310) - SET(MSVC71 1) - SET(CMAKE_COMPILER_SUPPORTS_PDBTYPE 0) - ENDIF("${compilerVersion}" EQUAL 1310) - IF("${compilerVersion}" EQUAL 1400) - SET(MSVC80 1) - SET(CMAKE_COMPILER_2005 1) - ENDIF("${compilerVersion}" EQUAL 1400) - IF("${compilerVersion}" EQUAL 1500) - SET(MSVC90 1) - ENDIF("${compilerVersion}" EQUAL 1500) - IF("${compilerVersion}" EQUAL 1600) - SET(MSVC10 1) - ENDIF("${compilerVersion}" EQUAL 1600) - SET(MSVC_VERSION "${compilerVersion}") - ELSE(NOT CMAKE_COMPILER_RETURN) - MESSAGE(STATUS "Check for CL compiler version - failed") - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining the version of compiler failed with the following output:\n" - "${CMAKE_COMPILER_OUTPUT}\n\n") - ENDIF(NOT CMAKE_COMPILER_RETURN) - # try to figure out if we are running the free command line - # tools from Microsoft. These tools do not provide debug libraries, - # so the link flags used have to be different. - MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2") - SET(testForFreeVCFile - "${CMAKE_ROOT}/Modules/CMakeTestForFreeVC.cxx") - STRING(REGEX REPLACE "/" "\\\\" testForFreeVCFile "${testForFreeVCFile}") - MESSAGE(STATUS "Check if this is a free VC compiler") - EXEC_PROGRAM(${CMAKE_TEST_COMPILER} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp2 - ARGS /nologo /EHsc - \"${testForFreeVCFile}\" - OUTPUT_VARIABLE CMAKE_COMPILER_OUTPUT - RETURN_VALUE CMAKE_COMPILER_RETURN - ) - IF(CMAKE_COMPILER_RETURN) - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeError.log - "Determining if this is a free VC compiler failed with the following output:\n" - "${CMAKE_COMPILER_OUTPUT}\n\n") - MESSAGE(STATUS "Check if this is a free VC compiler - yes") - SET(CMAKE_USING_VC_FREE_TOOLS 1) - ELSE(CMAKE_COMPILER_RETURN) - FILE(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log - "Determining if this is a free VC compiler passed with the following output:\n" - "${CMAKE_COMPILER_OUTPUT}\n\n") - MESSAGE(STATUS "Check if this is a free VC compiler - no") - SET(CMAKE_USING_VC_FREE_TOOLS 0) - ENDIF(CMAKE_COMPILER_RETURN) - MAKE_DIRECTORY("${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp3") - ENDIF(NOT CMAKE_VC_COMPILER_TESTS_RUN) -ENDIF(CMAKE_GENERATOR MATCHES "Makefiles" OR CMAKE_GENERATOR MATCHES "Ninja") - -IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) - SET(CMAKE_CL_64 1) -ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64) - SET(CMAKE_CL_64 0) -ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64) -IF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) - SET(CMAKE_CL_64 1) -ENDIF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) - -IF("${MSVC_VERSION}" GREATER 1599) - SET(MSVC_INCREMENTAL_DEFAULT ON) -ENDIF() - -# No support for old versions -if(MSVC_VERSION LESS 1310) -message(FATAL_ERROR "Your compiler is too old. Get a newer version!") -endif() - -# for 2005 make sure the manifest is put in the dll with mt -#SET(CMAKE_CXX_CREATE_SHARED_LIBRARY "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_LIBRARY}") -#SET(CMAKE_CXX_CREATE_SHARED_MODULE "<CMAKE_COMMAND> -E vs_link_dll ${CMAKE_CXX_CREATE_SHARED_MODULE}") -# create a C shared library -#SET(CMAKE_C_CREATE_SHARED_LIBRARY "${CMAKE_CXX_CREATE_SHARED_LIBRARY}") -# create a C shared module just copy the shared library rule -#SET(CMAKE_C_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}") -#SET(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_CXX_LINK_EXECUTABLE}") -#SET(CMAKE_C_LINK_EXECUTABLE "<CMAKE_COMMAND> -E vs_link_exe ${CMAKE_C_LINK_EXECUTABLE}") - -SET(CMAKE_BUILD_TYPE_INIT Debug) -SET(CMAKE_CXX_FLAGS_DEBUG_INIT "") -SET(CMAKE_C_FLAGS_DEBUG_INIT "") -SET(CMAKE_CXX_FLAGS_INIT "") -SET(CMAKE_CXX_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") -SET(CMAKE_CXX_FLAGS_RELEASE_INIT "") -SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") -SET(CMAKE_C_FLAGS_INIT "") -SET(CMAKE_C_FLAGS_MINSIZEREL_INIT "/O1 /Ob1 /D NDEBUG") -SET(CMAKE_C_FLAGS_RELEASE_INIT "") -SET(CMAKE_C_FLAGS_RELWITHDEBINFO_INIT "/Zi /O2 /Ob1") -SET(CMAKE_C_STANDARD_LIBRARIES_INIT "") -SET(CMAKE_EXE_LINKER_FLAGS_INIT "${CMAKE_EXE_LINKER_FLAGS_INIT}") -SET(CMAKE_CXX_STANDARD_LIBRARIES_INIT "${CMAKE_C_STANDARD_LIBRARIES_INIT}") - -# executable linker flags -SET (CMAKE_LINK_DEF_FILE_FLAG "/DEF:") -# set the stack size and the machine type -SET(_MACHINE_ARCH_FLAG ${MSVC_C_ARCHITECTURE_ID}) -IF(NOT _MACHINE_ARCH_FLAG) - SET(_MACHINE_ARCH_FLAG ${MSVC_CXX_ARCHITECTURE_ID}) -ENDIF(NOT _MACHINE_ARCH_FLAG) -# HACK -if(${ARCH} MATCHES arm) - SET(_MACHINE_ARCH_FLAG ARM) -endif() -SET (CMAKE_EXE_LINKER_FLAGS_INIT - "${CMAKE_EXE_LINKER_FLAGS_INIT} /STACK:10000000 /machine:${_MACHINE_ARCH_FLAG}") - -# add /debug and /INCREMENTAL:YES to DEBUG and RELWITHDEBINFO also add pdbtype -# on versions that support it -SET( MSVC_INCREMENTAL_YES_FLAG "") -IF(NOT MSVC_INCREMENTAL_DEFAULT) - SET( MSVC_INCREMENTAL_YES_FLAG "/INCREMENTAL:YES") -ENDIF() - -IF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug /pdbtype:sept ${MSVC_INCREMENTAL_YES_FLAG}") -ELSE (CMAKE_COMPILER_SUPPORTS_PDBTYPE) - SET (CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") - SET (CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT "/debug ${MSVC_INCREMENTAL_YES_FLAG}") -ENDIF (CMAKE_COMPILER_SUPPORTS_PDBTYPE) -# for release and minsize release default to no incremental linking -SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT "/INCREMENTAL:NO") -SET(CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT "/INCREMENTAL:NO") - -# copy the EXE_LINKER flags to SHARED and MODULE linker flags -# shared linker flags -SET (CMAKE_SHARED_LINKER_FLAGS_INIT ${CMAKE_EXE_LINKER_FLAGS_INIT}) -SET (CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) -SET (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_DEBUG_INIT}) -SET (CMAKE_SHARED_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) -SET (CMAKE_SHARED_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) -# module linker flags -SET (CMAKE_MODULE_LINKER_FLAGS_INIT ${CMAKE_SHARED_LINKER_FLAGS_INIT}) -SET (CMAKE_MODULE_LINKER_FLAGS_DEBUG_INIT ${CMAKE_SHARED_LINKER_FLAGS_DEBUG_INIT}) -SET (CMAKE_MODULE_LINKER_FLAGS_RELWITHDEBINFO_INIT ${CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT}) -SET (CMAKE_MODULE_LINKER_FLAGS_RELEASE_INIT ${CMAKE_EXE_LINKER_FLAGS_RELEASE_INIT}) -SET (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL_INIT}) - -# save computed information for this platform -IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") - CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCPlatform.cmake IMMEDIATE) -ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCPlatform.cmake") - -IF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake") - CONFIGURE_FILE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake.in - ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE) -ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake")

11 years, 3 months

← Newer
1
...
24
25
26
27
28
29
30
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2013