Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 63773: [CRT] - Make some unicode printf functions actually unicode CORE-7691
by tfaber＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: tfaber Date: Tue Jul 29 16:02:55 2014 New Revision: 63773 URL: http://svn.reactos.org/svn/reactos?rev=63773&view=rev Log: [CRT] - Make some unicode printf functions actually unicode CORE-7691 Modified: trunk/reactos/lib/sdk/crt/printf/swprintf_s.c trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c Modified: trunk/reactos/lib/sdk/crt/printf/swprintf_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/swprint… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/swprintf_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/swprintf_s.c [iso-8859-1] Tue Jul 29 16:02:55 2014 @@ -9,6 +9,7 @@ #define _sxprintf swprintf_s #define USE_COUNT 0 #define USE_VARARGS 0 +#define _UNICODE #define IS_SECAPI 1 #include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wvsnpri… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/wvsnprintfW.c [iso-8859-1] Tue Jul 29 16:02:55 2014 @@ -9,6 +9,7 @@ #define _sxprintf wvsnprintfW #define USE_COUNT 1 #define USE_VARARGS 1 +#define _UNICODE #define USER32_WSPRINTF #include "_sxprintf.c" Modified: trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/printf/wvsprin… ============================================================================== --- trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/printf/wvsprintfW.c [iso-8859-1] Tue Jul 29 16:02:55 2014 @@ -9,6 +9,7 @@ #define _sxprintf wvsprintfW #define USE_COUNT 0 #define USE_VARARGS 1 +#define _UNICODE #define USER32_WSPRINTF #include "_sxprintf.c"

1 0

[hbelusca] 63772: [KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add para...
by hbelusca＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: hbelusca Date: Tue Jul 29 15:59:17 2014 New Revision: 63772 URL: http://svn.reactos.org/svn/reactos?rev=63772&view=rev Log: [KERNEL32] - It is supposed that user buffers are valid, and if not, access to them is protected with SEH. This fixes almost all of the kernel32_winetest:console tests. - Add parameter annotations. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Tue Jul 29 15:59:17 2014 @@ -118,29 +118,30 @@ static BOOL -IntGetConsoleInput(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead, - WORD wFlags, - BOOLEAN bUnicode) -{ +IntGetConsoleInput(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead, + IN WORD wFlags, + IN BOOLEAN bUnicode) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETINPUT GetInputRequest = &ApiMessage.Data.GetInputRequest; PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; - if (lpBuffer == NULL) - { - SetLastError(ERROR_INVALID_ACCESS); - return FALSE; - } - if (!IsConsoleHandle(hConsoleInput)) { - SetLastError(ERROR_INVALID_HANDLE); - - if (lpNumberOfEventsRead != NULL) + _SEH2_TRY + { *lpNumberOfEventsRead = 0; + SetLastError(ERROR_INVALID_HANDLE); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + } + _SEH2_END; return FALSE; } @@ -191,33 +192,37 @@ sizeof(*GetInputRequest)); /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - /* Return the number of events read */ + Success = NT_SUCCESS(ApiMessage.Status); + + /* Retrieve the results */ + _SEH2_TRY + { DPRINT("Events read: %lx\n", GetInputRequest->NumRecords); - - if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = GetInputRequest->NumRecords; - - /* Copy into the buffer */ - RtlCopyMemory(lpBuffer, - GetInputRequest->RecordBufPtr, - GetInputRequest->NumRecords * sizeof(INPUT_RECORD)); - } - else - { - if (lpNumberOfEventsRead != NULL) - *lpNumberOfEventsRead = 0; - - /* Error out */ - BaseSetLastNTError(ApiMessage.Status); - } + *lpNumberOfEventsRead = GetInputRequest->NumRecords; + + if (Success) + { + RtlCopyMemory(lpBuffer, + GetInputRequest->RecordBufPtr, + GetInputRequest->NumRecords * sizeof(INPUT_RECORD)); + } + else + { + BaseSetLastNTError(ApiMessage.Status); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; /* Release the capture buffer if needed */ if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); - /* Return TRUE or FALSE */ - return NT_SUCCESS(ApiMessage.Status); + /* Return success status */ + return Success; } @@ -305,13 +310,14 @@ static BOOL -IntReadConsoleOutputCode(HANDLE hConsoleOutput, - CODE_TYPE CodeType, - PVOID pCode, - DWORD nLength, - COORD dwReadCoord, - LPDWORD lpNumberOfCodesRead) -{ +IntReadConsoleOutputCode(IN HANDLE hConsoleOutput, + IN CODE_TYPE CodeType, + OUT PVOID pCode, + IN DWORD nLength, + IN COORD dwReadCoord, + OUT LPDWORD lpNumberOfCodesRead) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_READOUTPUTCODE ReadOutputCodeRequest = &ApiMessage.Data.ReadOutputCodeRequest; PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; @@ -386,30 +392,36 @@ sizeof(*ReadOutputCodeRequest)); /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - DWORD NumCodes = ReadOutputCodeRequest->NumCodes; - RtlCopyMemory(pCode, - ReadOutputCodeRequest->pCode, - NumCodes * CodeSize); - - if (lpNumberOfCodesRead != NULL) - *lpNumberOfCodesRead = NumCodes; - } - else - { - if (lpNumberOfCodesRead != NULL) - *lpNumberOfCodesRead = 0; - - /* Error out */ - BaseSetLastNTError(ApiMessage.Status); - } + Success = NT_SUCCESS(ApiMessage.Status); + + /* Retrieve the results */ + _SEH2_TRY + { + *lpNumberOfCodesRead = ReadOutputCodeRequest->NumCodes; + + if (Success) + { + RtlCopyMemory(pCode, + ReadOutputCodeRequest->pCode, + ReadOutputCodeRequest->NumCodes * CodeSize); + } + else + { + BaseSetLastNTError(ApiMessage.Status); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; /* Release the capture buffer if needed */ if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); - /* Return TRUE or FALSE */ - return NT_SUCCESS(ApiMessage.Status); + /* Return success status */ + return Success; } @@ -488,22 +500,17 @@ static BOOL -IntWriteConsoleInput(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsWritten, - BOOLEAN bUnicode, - BOOLEAN bAppendToEnd) -{ +IntWriteConsoleInput(IN HANDLE hConsoleInput, + IN PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsWritten, + IN BOOLEAN bUnicode, + IN BOOLEAN bAppendToEnd) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEINPUT WriteInputRequest = &ApiMessage.Data.WriteInputRequest; PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; - - if (lpBuffer == NULL) - { - SetLastError(ERROR_INVALID_ACCESS); - return FALSE; - } DPRINT("IntWriteConsoleInput: %lx %p\n", nLength, lpNumberOfEventsWritten); @@ -525,9 +532,18 @@ WriteInputRequest->RecordBufPtr = WriteInputRequest->RecordStaticBuffer; // CaptureBuffer = NULL; - RtlCopyMemory(WriteInputRequest->RecordBufPtr, - lpBuffer, - nLength * sizeof(INPUT_RECORD)); + _SEH2_TRY + { + RtlCopyMemory(WriteInputRequest->RecordBufPtr, + lpBuffer, + nLength * sizeof(INPUT_RECORD)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + _SEH2_END; } else { @@ -555,29 +571,30 @@ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleInput), sizeof(*WriteInputRequest)); + /* Check for success */ + Success = NT_SUCCESS(ApiMessage.Status); + /* Release the capture buffer if needed */ if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); - /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - /* Return the number of events written */ + /* Retrieve the results */ + _SEH2_TRY + { DPRINT("Events written: %lx\n", WriteInputRequest->NumRecords); - - if (lpNumberOfEventsWritten != NULL) - *lpNumberOfEventsWritten = WriteInputRequest->NumRecords; - } - else - { - if (lpNumberOfEventsWritten != NULL) - *lpNumberOfEventsWritten = 0; - - /* Error out */ - BaseSetLastNTError(ApiMessage.Status); - } - - /* Return TRUE or FALSE */ - return NT_SUCCESS(ApiMessage.Status); + *lpNumberOfEventsWritten = WriteInputRequest->NumRecords; + + if (!Success) + BaseSetLastNTError(ApiMessage.Status); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; + + /* Return success status */ + return Success; } @@ -661,23 +678,18 @@ static BOOL -IntWriteConsoleOutputCode(HANDLE hConsoleOutput, - CODE_TYPE CodeType, - CONST VOID *pCode, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfCodesWritten) -{ +IntWriteConsoleOutputCode(IN HANDLE hConsoleOutput, + IN CODE_TYPE CodeType, + IN CONST VOID *pCode, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCodesWritten) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_WRITEOUTPUTCODE WriteOutputCodeRequest = &ApiMessage.Data.WriteOutputCodeRequest; PCSR_CAPTURE_BUFFER CaptureBuffer = NULL; ULONG SizeBytes, CodeSize; - - if (pCode == NULL) - { - SetLastError(ERROR_INVALID_ACCESS); - return FALSE; - } if ( (CodeType != CODE_ASCII ) && (CodeType != CODE_UNICODE ) && @@ -724,9 +736,18 @@ WriteOutputCodeRequest->pCode = WriteOutputCodeRequest->CodeStaticBuffer; // CaptureBuffer = NULL; - RtlCopyMemory(WriteOutputCodeRequest->pCode, - pCode, - SizeBytes); + _SEH2_TRY + { + RtlCopyMemory(WriteOutputCodeRequest->pCode, + pCode, + SizeBytes); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + return FALSE; + } + _SEH2_END; } else { @@ -752,38 +773,42 @@ CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepWriteConsoleOutputString), sizeof(*WriteOutputCodeRequest)); + /* Check for success */ + Success = NT_SUCCESS(ApiMessage.Status); + /* Release the capture buffer if needed */ if (CaptureBuffer) CsrFreeCaptureBuffer(CaptureBuffer); - /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - if (lpNumberOfCodesWritten != NULL) - *lpNumberOfCodesWritten = WriteOutputCodeRequest->NumCodes; - } - else - { - if (lpNumberOfCodesWritten != NULL) - *lpNumberOfCodesWritten = 0; - - /* Error out */ - BaseSetLastNTError(ApiMessage.Status); - } - - /* Return TRUE or FALSE */ - return NT_SUCCESS(ApiMessage.Status); + /* Retrieve the results */ + _SEH2_TRY + { + *lpNumberOfCodesWritten = WriteOutputCodeRequest->NumCodes; + + if (!Success) + BaseSetLastNTError(ApiMessage.Status); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; + + /* Return success status */ + return Success; } static BOOL -IntFillConsoleOutputCode(HANDLE hConsoleOutput, - CODE_TYPE CodeType, - CODE_ELEMENT Code, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfCodesWritten) -{ +IntFillConsoleOutputCode(IN HANDLE hConsoleOutput, + IN CODE_TYPE CodeType, + IN CODE_ELEMENT Code, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCodesWritten) +{ + BOOL Success; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &ApiMessage.Data.FillOutputRequest; @@ -812,21 +837,25 @@ sizeof(*FillOutputRequest)); /* Check for success */ - if (NT_SUCCESS(ApiMessage.Status)) - { - if (lpNumberOfCodesWritten != NULL) - *lpNumberOfCodesWritten = FillOutputRequest->NumCodes; - } - else - { - if (lpNumberOfCodesWritten != NULL) - *lpNumberOfCodesWritten = 0; - - BaseSetLastNTError(ApiMessage.Status); - } - - /* Return TRUE or FALSE */ - return NT_SUCCESS(ApiMessage.Status); + Success = NT_SUCCESS(ApiMessage.Status); + + /* Retrieve the results */ + _SEH2_TRY + { + *lpNumberOfCodesWritten = FillOutputRequest->NumCodes; + + if (!Success) + BaseSetLastNTError(ApiMessage.Status); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + SetLastError(ERROR_INVALID_ACCESS); + Success = FALSE; + } + _SEH2_END; + + /* Return success status */ + return Success; } @@ -887,10 +916,10 @@ */ BOOL WINAPI -PeekConsoleInputW(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead) +PeekConsoleInputW(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead) { return IntGetConsoleInput(hConsoleInput, lpBuffer, @@ -908,10 +937,10 @@ */ BOOL WINAPI -PeekConsoleInputA(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead) +PeekConsoleInputA(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead) { return IntGetConsoleInput(hConsoleInput, lpBuffer, @@ -929,10 +958,10 @@ */ BOOL WINAPI -ReadConsoleInputW(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead) +ReadConsoleInputW(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead) { return IntGetConsoleInput(hConsoleInput, lpBuffer, @@ -950,10 +979,10 @@ */ BOOL WINAPI -ReadConsoleInputA(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead) +ReadConsoleInputA(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead) { return IntGetConsoleInput(hConsoleInput, lpBuffer, @@ -971,11 +1000,11 @@ */ BOOL WINAPI -ReadConsoleInputExW(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead, - WORD wFlags) +ReadConsoleInputExW(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead, + IN WORD wFlags) { return IntGetConsoleInput(hConsoleInput, lpBuffer, @@ -993,11 +1022,11 @@ */ BOOL WINAPI -ReadConsoleInputExA(HANDLE hConsoleInput, - PINPUT_RECORD lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsRead, - WORD wFlags) +ReadConsoleInputExA(IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead, + IN WORD wFlags) { return IntGetConsoleInput(hConsoleInput, lpBuffer, @@ -1059,11 +1088,11 @@ */ BOOL WINAPI -ReadConsoleOutputCharacterW(HANDLE hConsoleOutput, - LPWSTR lpCharacter, - DWORD nLength, - COORD dwReadCoord, - LPDWORD lpNumberOfCharsRead) +ReadConsoleOutputCharacterW(IN HANDLE hConsoleOutput, + OUT LPWSTR lpCharacter, + IN DWORD nLength, + IN COORD dwReadCoord, + OUT LPDWORD lpNumberOfCharsRead) { return IntReadConsoleOutputCode(hConsoleOutput, CODE_UNICODE, @@ -1081,11 +1110,11 @@ */ BOOL WINAPI -ReadConsoleOutputCharacterA(HANDLE hConsoleOutput, - LPSTR lpCharacter, - DWORD nLength, - COORD dwReadCoord, - LPDWORD lpNumberOfCharsRead) +ReadConsoleOutputCharacterA(IN HANDLE hConsoleOutput, + OUT LPSTR lpCharacter, + IN DWORD nLength, + IN COORD dwReadCoord, + OUT LPDWORD lpNumberOfCharsRead) { return IntReadConsoleOutputCode(hConsoleOutput, CODE_ASCII, @@ -1103,11 +1132,11 @@ */ BOOL WINAPI -ReadConsoleOutputAttribute(HANDLE hConsoleOutput, - LPWORD lpAttribute, - DWORD nLength, - COORD dwReadCoord, - LPDWORD lpNumberOfAttrsRead) +ReadConsoleOutputAttribute(IN HANDLE hConsoleOutput, + OUT LPWORD lpAttribute, + IN DWORD nLength, + IN COORD dwReadCoord, + OUT LPDWORD lpNumberOfAttrsRead) { return IntReadConsoleOutputCode(hConsoleOutput, CODE_ATTRIBUTE, @@ -1173,10 +1202,10 @@ */ BOOL WINAPI -WriteConsoleInputW(HANDLE hConsoleInput, - CONST INPUT_RECORD *lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsWritten) +WriteConsoleInputW(IN HANDLE hConsoleInput, + IN CONST INPUT_RECORD *lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsWritten) { return IntWriteConsoleInput(hConsoleInput, (PINPUT_RECORD)lpBuffer, @@ -1194,10 +1223,10 @@ */ BOOL WINAPI -WriteConsoleInputA(HANDLE hConsoleInput, - CONST INPUT_RECORD *lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsWritten) +WriteConsoleInputA(IN HANDLE hConsoleInput, + IN CONST INPUT_RECORD *lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsWritten) { return IntWriteConsoleInput(hConsoleInput, (PINPUT_RECORD)lpBuffer, @@ -1215,10 +1244,10 @@ */ BOOL WINAPI -WriteConsoleInputVDMW(HANDLE hConsoleInput, - CONST INPUT_RECORD *lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsWritten) +WriteConsoleInputVDMW(IN HANDLE hConsoleInput, + IN CONST INPUT_RECORD *lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsWritten) { return IntWriteConsoleInput(hConsoleInput, (PINPUT_RECORD)lpBuffer, @@ -1236,10 +1265,10 @@ */ BOOL WINAPI -WriteConsoleInputVDMA(HANDLE hConsoleInput, - CONST INPUT_RECORD *lpBuffer, - DWORD nLength, - LPDWORD lpNumberOfEventsWritten) +WriteConsoleInputVDMA(IN HANDLE hConsoleInput, + IN CONST INPUT_RECORD *lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsWritten) { return IntWriteConsoleInput(hConsoleInput, (PINPUT_RECORD)lpBuffer, @@ -1301,11 +1330,11 @@ */ BOOL WINAPI -WriteConsoleOutputCharacterW(HANDLE hConsoleOutput, - LPCWSTR lpCharacter, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfCharsWritten) +WriteConsoleOutputCharacterW(IN HANDLE hConsoleOutput, + IN LPCWSTR lpCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten) { return IntWriteConsoleOutputCode(hConsoleOutput, CODE_UNICODE, @@ -1323,11 +1352,11 @@ */ BOOL WINAPI -WriteConsoleOutputCharacterA(HANDLE hConsoleOutput, - LPCSTR lpCharacter, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfCharsWritten) +WriteConsoleOutputCharacterA(IN HANDLE hConsoleOutput, + IN LPCSTR lpCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten) { return IntWriteConsoleOutputCode(hConsoleOutput, CODE_ASCII, @@ -1345,11 +1374,11 @@ */ BOOL WINAPI -WriteConsoleOutputAttribute(HANDLE hConsoleOutput, - CONST WORD *lpAttribute, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfAttrsWritten) +WriteConsoleOutputAttribute(IN HANDLE hConsoleOutput, + IN CONST WORD *lpAttribute, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfAttrsWritten) { return IntWriteConsoleOutputCode(hConsoleOutput, CODE_ATTRIBUTE, @@ -1367,11 +1396,11 @@ */ BOOL WINAPI -FillConsoleOutputCharacterW(HANDLE hConsoleOutput, - WCHAR cCharacter, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfCharsWritten) +FillConsoleOutputCharacterW(IN HANDLE hConsoleOutput, + IN WCHAR cCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten) { CODE_ELEMENT Code; Code.UnicodeChar = cCharacter; @@ -1391,10 +1420,10 @@ */ BOOL WINAPI -FillConsoleOutputCharacterA(HANDLE hConsoleOutput, - CHAR cCharacter, - DWORD nLength, - COORD dwWriteCoord, +FillConsoleOutputCharacterA(IN HANDLE hConsoleOutput, + IN CHAR cCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, LPDWORD lpNumberOfCharsWritten) { CODE_ELEMENT Code; @@ -1415,11 +1444,11 @@ */ BOOL WINAPI -FillConsoleOutputAttribute(HANDLE hConsoleOutput, - WORD wAttribute, - DWORD nLength, - COORD dwWriteCoord, - LPDWORD lpNumberOfAttrsWritten) +FillConsoleOutputAttribute(IN HANDLE hConsoleOutput, + IN WORD wAttribute, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfAttrsWritten) { CODE_ELEMENT Code; Code.Attribute = wAttribute;

1 0

[dreimer] 63771: [RAPPS] Add NirLauncher to ReactOS downloader by Alex (jedi-to-be) CORE-7984 #resolve #comment Committed, thx.
by dreimer＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: dreimer Date: Tue Jul 29 15:54:58 2014 New Revision: 63771 URL: http://svn.reactos.org/svn/reactos?rev=63771&view=rev Log: [RAPPS] Add NirLauncher to ReactOS downloader by Alex (jedi-to-be) CORE-7984 #resolve #comment Committed, thx. Added: trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt [iso-8859-1] Tue Jul 29 15:54:58 2014 @@ -0,0 +1,13 @@ +[Section] +Name = NirLauncher +Version = 1.18.69 +Licence = Freeware +Description = A package of more than 180 utilities for Windows. +Size = 19.8 MB +Category = 12 +URLSite = http://launcher.nirsoft.net/ +URLDownload = http://download.nirsoft.net/nirsoft_package_1.18.69.zip +CDPath = none + +[Section.0407] +Description = Ein Paket von mehr als 180 Utilities fÃ¼r Windows. Propchange: trunk/reactos/base/applications/rapps/rapps/nirlauncher.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 63770: [CONSRV] Fix returned number of read/write codes.
by hbelusca＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: hbelusca Date: Tue Jul 29 15:54:03 2014 New Revision: 63770 URL: http://svn.reactos.org/svn/reactos?rev=63770&view=rev Log: [CONSRV] Fix returned number of read/write codes. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Jul 29 15:54:03 2014 @@ -1117,7 +1117,7 @@ Cleanup: if (tmpString) RtlFreeHeap(RtlGetProcessHeap(), 0, tmpString); - // if (NumCodesWritten) *NumCodesWritten = Written; + if (NumCodesWritten) *NumCodesWritten = NumCodesToWrite; // Written; return Status; } @@ -1194,7 +1194,7 @@ TermDrawRegion(Console, &UpdateRect); } - // if (NumCodesWritten) *NumCodesWritten = Written; // NumCodesToWrite; + if (NumCodesWritten) *NumCodesWritten = NumCodesToWrite; // Written; return STATUS_SUCCESS; } @@ -1329,7 +1329,11 @@ CapturedDestinationOrigin.X + ConioRectWidth(&SrcRegion ) - 1); if (!Unicode) - ConsoleAnsiCharToUnicodeChar(Console, &FillChar.Char.UnicodeChar, &FillChar.Char.AsciiChar); + { + WCHAR tmp; + ConsoleAnsiCharToUnicodeChar(Console, &tmp, &FillChar.Char.AsciiChar); + FillChar.Char.UnicodeChar = tmp; + } ConioMoveRegion(Buffer, &SrcRegion, &DstRegion, &CapturedClipRectangle, FillChar); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Tue Jul 29 15:54:03 2014 @@ -586,7 +586,11 @@ Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), ReadOutputCodeRequest->OutputHandle, &Buffer, GENERIC_READ, TRUE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + ReadOutputCodeRequest->NumCodes = 0; + return Status; + } Status = ConDrvReadConsoleOutputString(Buffer->Header.Console, Buffer, @@ -670,7 +674,11 @@ Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), WriteOutputCodeRequest->OutputHandle, &Buffer, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + WriteOutputCodeRequest->NumCodes = 0; + return Status; + } Status = ConDrvWriteConsoleOutputString(Buffer->Header.Console, Buffer, @@ -712,7 +720,11 @@ Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), FillOutputRequest->OutputHandle, &Buffer, GENERIC_WRITE, TRUE); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + FillOutputRequest->NumCodes = 0; + return Status; + } Status = ConDrvFillConsoleOutput(Buffer->Header.Console, Buffer,

1 0

[hbelusca] 63769: [CONSRV] Add the optional "number of things read/written" parameters back.
by hbelusca＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: hbelusca Date: Tue Jul 29 14:00:46 2014 New Revision: 63769 URL: http://svn.reactos.org/svn/reactos?rev=63769&view=rev Log: [CONSRV] Add the optional "number of things read/written" parameters back. Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Jul 29 14:00:46 2014 @@ -892,7 +892,7 @@ IN ULONG NumCodesToRead, IN PCOORD ReadCoord, // OUT PCOORD EndCoord, - OUT PULONG CodesRead) + OUT PULONG NumCodesRead OPTIONAL) { SHORT Xpos, Ypos; PVOID ReadBuffer; @@ -900,8 +900,7 @@ ULONG CodeSize; PCHAR_INFO Ptr; - if (Console == NULL || Buffer == NULL || - ReadCoord == NULL || /* EndCoord == NULL || */ CodesRead == NULL) + if (Console == NULL || Buffer == NULL || ReadCoord == NULL /* || EndCoord == NULL */) { return STATUS_INVALID_PARAMETER; } @@ -909,6 +908,8 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToRead == 0)); + + if (NumCodesRead) *NumCodesRead = 0; switch (CodeType) { @@ -985,7 +986,8 @@ // EndCoord->X = Xpos; // EndCoord->Y = (Ypos - Buffer->VirtualY + Buffer->ScreenBufferSize.Y) % Buffer->ScreenBufferSize.Y; - *CodesRead = (ULONG)((ULONG_PTR)ReadBuffer - (ULONG_PTR)StringBuffer) / CodeSize; + if (NumCodesRead) + *NumCodesRead = (ULONG)((ULONG_PTR)ReadBuffer - (ULONG_PTR)StringBuffer) / CodeSize; // <= NumCodesToRead return STATUS_SUCCESS; @@ -997,9 +999,9 @@ IN CODE_TYPE CodeType, IN PVOID StringBuffer, IN ULONG NumCodesToWrite, - IN PCOORD WriteCoord /*, - OUT PCOORD EndCoord, - OUT PULONG CodesWritten */) + IN PCOORD WriteCoord, + // OUT PCOORD EndCoord, + OUT PULONG NumCodesWritten OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; PVOID WriteBuffer = NULL; @@ -1008,8 +1010,7 @@ ULONG CodeSize; PCHAR_INFO Ptr; - if (Console == NULL || Buffer == NULL || - WriteCoord == NULL /* || EndCoord == NULL || CodesWritten == NULL */) + if (Console == NULL || Buffer == NULL || WriteCoord == NULL /* || EndCoord == NULL */) { return STATUS_INVALID_PARAMETER; } @@ -1017,6 +1018,8 @@ /* Validity checks */ ASSERT(Console == Buffer->Header.Console); ASSERT((StringBuffer != NULL) || (StringBuffer == NULL && NumCodesToWrite == 0)); + + if (NumCodesWritten) *NumCodesWritten = 0; switch (CodeType) { @@ -1114,7 +1117,7 @@ Cleanup: if (tmpString) RtlFreeHeap(RtlGetProcessHeap(), 0, tmpString); - // CodesWritten = Written; + // if (NumCodesWritten) *NumCodesWritten = Written; return Status; } @@ -1124,19 +1127,21 @@ IN CODE_TYPE CodeType, IN CODE_ELEMENT Code, IN ULONG NumCodesToWrite, - IN PCOORD WriteCoord /*, - OUT PULONG CodesWritten */) + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL) { DWORD X, Y, Length; // , Written = 0; PCHAR_INFO Ptr; - if (Console == NULL || Buffer == NULL || WriteCoord == NULL /* || CodesWritten == NULL */) + if (Console == NULL || Buffer == NULL || WriteCoord == NULL) { return STATUS_INVALID_PARAMETER; } /* Validity check */ ASSERT(Console == Buffer->Header.Console); + + if (NumCodesWritten) *NumCodesWritten = 0; if (CodeType == CODE_ASCII) { @@ -1189,7 +1194,7 @@ TermDrawRegion(Console, &UpdateRect); } - // CodesWritten = Written; // NumCodesToWrite; + // if (NumCodesWritten) *NumCodesWritten = Written; // NumCodesToWrite; return STATUS_SUCCESS; } Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Tue Jul 29 14:00:46 2014 @@ -525,7 +525,7 @@ IN ULONG NumCodesToRead, IN PCOORD ReadCoord, // OUT PCOORD EndCoord, - OUT PULONG CodesRead); + OUT PULONG NumCodesRead OPTIONAL); CSR_API(SrvReadConsoleOutputString) { NTSTATUS Status; @@ -607,9 +607,9 @@ IN CODE_TYPE CodeType, IN PVOID StringBuffer, IN ULONG NumCodesToWrite, - IN PCOORD WriteCoord /*, - OUT PCOORD EndCoord, - OUT PULONG CodesWritten */); + IN PCOORD WriteCoord, + // OUT PCOORD EndCoord, + OUT PULONG NumCodesWritten OPTIONAL); CSR_API(SrvWriteConsoleOutputString) { NTSTATUS Status; @@ -677,11 +677,9 @@ WriteOutputCodeRequest->CodeType, pCode, WriteOutputCodeRequest->NumCodes, - &WriteOutputCodeRequest->Coord /*, - &WriteOutputCodeRequest->EndCoord, - &WriteOutputCodeRequest->NrCharactersWritten */); - - // WriteOutputCodeRequest->NrCharactersWritten = Written; + &WriteOutputCodeRequest->Coord, + // &WriteOutputCodeRequest->EndCoord, + &WriteOutputCodeRequest->NumCodes); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status; @@ -693,8 +691,8 @@ IN CODE_TYPE CodeType, IN CODE_ELEMENT Code, IN ULONG NumCodesToWrite, - IN PCOORD WriteCoord /*, - OUT PULONG CodesWritten */); + IN PCOORD WriteCoord, + OUT PULONG NumCodesWritten OPTIONAL); CSR_API(SrvFillConsoleOutput) { NTSTATUS Status; @@ -721,10 +719,8 @@ CodeType, FillOutputRequest->Code, FillOutputRequest->NumCodes, - &FillOutputRequest->WriteCoord /*, - &FillOutputRequest->NrCharactersWritten */); - - // FillOutputRequest->NrCharactersWritten = Written; + &FillOutputRequest->WriteCoord, + &FillOutputRequest->NumCodes); ConSrvReleaseScreenBuffer(Buffer, TRUE); return Status;

1 0

[hbelusca] 63768: Simplify code.
by hbelusca＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: hbelusca Date: Tue Jul 29 13:49:03 2014 New Revision: 63768 URL: http://svn.reactos.org/svn/reactos?rev=63768&view=rev Log: Simplify code. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Tue Jul 29 13:49:03 2014 @@ -319,6 +319,14 @@ DPRINT("IntReadConsoleOutputCode\n"); + if ( (CodeType != CODE_ASCII ) && + (CodeType != CODE_UNICODE ) && + (CodeType != CODE_ATTRIBUTE) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + /* Set up the data to send to the Console Server */ ReadOutputCodeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; ReadOutputCodeRequest->OutputHandle = hConsoleOutput; @@ -330,20 +338,16 @@ switch (CodeType) { case CODE_ASCII: - CodeSize = sizeof(CHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); break; case CODE_UNICODE: - CodeSize = sizeof(WCHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); break; case CODE_ATTRIBUTE: - CodeSize = sizeof(WORD); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); break; - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; } SizeBytes = nLength * CodeSize; @@ -355,7 +359,7 @@ */ if (SizeBytes <= sizeof(ReadOutputCodeRequest->CodeStaticBuffer)) { - ReadOutputCodeRequest->pCode.pCode = ReadOutputCodeRequest->CodeStaticBuffer; + ReadOutputCodeRequest->pCode = ReadOutputCodeRequest->CodeStaticBuffer; // CaptureBuffer = NULL; } else @@ -372,7 +376,7 @@ /* Allocate space in the Buffer */ CsrAllocateMessagePointer(CaptureBuffer, SizeBytes, - (PVOID*)&ReadOutputCodeRequest->pCode.pCode); + (PVOID*)&ReadOutputCodeRequest->pCode); } /* Call the server */ @@ -386,7 +390,7 @@ { DWORD NumCodes = ReadOutputCodeRequest->NumCodes; RtlCopyMemory(pCode, - ReadOutputCodeRequest->pCode.pCode, + ReadOutputCodeRequest->pCode, NumCodes * CodeSize); if (lpNumberOfCodesRead != NULL) @@ -675,6 +679,14 @@ return FALSE; } + if ( (CodeType != CODE_ASCII ) && + (CodeType != CODE_UNICODE ) && + (CodeType != CODE_ATTRIBUTE) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + DPRINT("IntWriteConsoleOutputCode\n"); /* Set up the data to send to the Console Server */ @@ -688,20 +700,16 @@ switch (CodeType) { case CODE_ASCII: - CodeSize = sizeof(CHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); break; case CODE_UNICODE: - CodeSize = sizeof(WCHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); break; case CODE_ATTRIBUTE: - CodeSize = sizeof(WORD); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); break; - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; } SizeBytes = nLength * CodeSize; @@ -713,10 +721,10 @@ */ if (SizeBytes <= sizeof(WriteOutputCodeRequest->CodeStaticBuffer)) { - WriteOutputCodeRequest->pCode.pCode = WriteOutputCodeRequest->CodeStaticBuffer; + WriteOutputCodeRequest->pCode = WriteOutputCodeRequest->CodeStaticBuffer; // CaptureBuffer = NULL; - RtlCopyMemory(WriteOutputCodeRequest->pCode.pCode, + RtlCopyMemory(WriteOutputCodeRequest->pCode, pCode, SizeBytes); } @@ -735,7 +743,7 @@ CsrCaptureMessageBuffer(CaptureBuffer, (PVOID)pCode, SizeBytes, - (PVOID*)&WriteOutputCodeRequest->pCode.pCode); + (PVOID*)&WriteOutputCodeRequest->pCode); } /* Call the server */ @@ -778,6 +786,8 @@ { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &ApiMessage.Data.FillOutputRequest; + + DPRINT("IntFillConsoleOutputCode\n"); if ( (CodeType != CODE_ASCII ) && (CodeType != CODE_UNICODE ) && Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Tue Jul 29 13:49:03 2014 @@ -464,7 +464,7 @@ CHAR AsciiChar; WCHAR UnicodeChar; WORD Attribute; -} CODE_ELEMENT, *PCODE_ELEMENT; +} CODE_ELEMENT; typedef struct { @@ -473,14 +473,15 @@ COORD Coord; CODE_TYPE CodeType; - CHAR CodeStaticBuffer[80]; - union - { - PVOID pCode; - PCHAR AsciiChar; - PWCHAR UnicodeChar; - PWORD Attribute; - } pCode; // Either a pointer to a character or to an attribute. + CHAR CodeStaticBuffer[80]; // == 40 * sizeof(CODE_ELEMENT) + PVOID pCode; // Either a pointer to a character or to an attribute. + // union + // { + // PVOID pCode; + // PCHAR AsciiChar; + // PWCHAR UnicodeChar; + // PWORD Attribute; + // } pCode; // Either a pointer to a character or to an attribute. ULONG NumCodes; } CONSOLE_READOUTPUTCODE , *PCONSOLE_READOUTPUTCODE, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Jul 29 13:49:03 2014 @@ -913,15 +913,15 @@ switch (CodeType) { case CODE_ASCII: - CodeSize = sizeof(CHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); break; case CODE_UNICODE: - CodeSize = sizeof(WCHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); break; case CODE_ATTRIBUTE: - CodeSize = sizeof(WORD); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); break; default: @@ -982,21 +982,6 @@ } } - // switch (CodeType) - // { - // case CODE_UNICODE: - // *(PWCHAR)ReadBuffer = 0; - // break; - - // case CODE_ASCII: - // *(PCHAR)ReadBuffer = 0; - // break; - - // case CODE_ATTRIBUTE: - // *(PWORD)ReadBuffer = 0; - // break; - // } - // EndCoord->X = Xpos; // EndCoord->Y = (Ypos - Buffer->VirtualY + Buffer->ScreenBufferSize.Y) % Buffer->ScreenBufferSize.Y; @@ -1036,15 +1021,15 @@ switch (CodeType) { case CODE_ASCII: - CodeSize = sizeof(CHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); break; case CODE_UNICODE: - CodeSize = sizeof(WCHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); break; case CODE_ATTRIBUTE: - CodeSize = sizeof(WORD); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); break; default: Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Tue Jul 29 13:49:03 2014 @@ -540,15 +540,15 @@ switch (ReadOutputCodeRequest->CodeType) { case CODE_ASCII: - CodeSize = sizeof(CHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); break; case CODE_UNICODE: - CodeSize = sizeof(WCHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); break; case CODE_ATTRIBUTE: - CodeSize = sizeof(WORD); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); break; default: @@ -567,20 +567,20 @@ * Adjust the internal pointer, because its old value points to * the static buffer in the original ApiMessage structure. */ - // ReadOutputCodeRequest->pCode.pCode = ReadOutputCodeRequest->CodeStaticBuffer; + // ReadOutputCodeRequest->pCode = ReadOutputCodeRequest->CodeStaticBuffer; pCode = ReadOutputCodeRequest->CodeStaticBuffer; } else { if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&ReadOutputCodeRequest->pCode.pCode, + (PVOID*)&ReadOutputCodeRequest->pCode, ReadOutputCodeRequest->NumCodes, CodeSize)) { return STATUS_INVALID_PARAMETER; } - pCode = ReadOutputCodeRequest->pCode.pCode; + pCode = ReadOutputCodeRequest->pCode; } Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process), @@ -624,15 +624,15 @@ switch (WriteOutputCodeRequest->CodeType) { case CODE_ASCII: - CodeSize = sizeof(CHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, AsciiChar); break; case CODE_UNICODE: - CodeSize = sizeof(WCHAR); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, UnicodeChar); break; case CODE_ATTRIBUTE: - CodeSize = sizeof(WORD); + CodeSize = RTL_FIELD_SIZE(CODE_ELEMENT, Attribute); break; default: @@ -651,20 +651,20 @@ * Adjust the internal pointer, because its old value points to * the static buffer in the original ApiMessage structure. */ - // WriteOutputCodeRequest->pCode.pCode = WriteOutputCodeRequest->CodeStaticBuffer; + // WriteOutputCodeRequest->pCode = WriteOutputCodeRequest->CodeStaticBuffer; pCode = WriteOutputCodeRequest->CodeStaticBuffer; } else { if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&WriteOutputCodeRequest->pCode.pCode, + (PVOID*)&WriteOutputCodeRequest->pCode, WriteOutputCodeRequest->NumCodes, CodeSize)) { return STATUS_INVALID_PARAMETER; } - pCode = WriteOutputCodeRequest->pCode.pCode; + pCode = WriteOutputCodeRequest->pCode; } Status = ConSrvGetTextModeBuffer(ConsoleGetPerProcessData(CsrGetClientThread()->Process),

1 0

[dreimer] 63767: [TRANSLATION] rapps: (for database) Many Improvements and Many Fixes by Erdem Ersoy CORE-7710 #resolve #comment Committed and hopefully worked around all conflicts I generated toda...
by dreimer＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: dreimer Date: Tue Jul 29 13:38:27 2014 New Revision: 63767 URL: http://svn.reactos.org/svn/reactos?rev=63767&view=rev Log: [TRANSLATION] rapps: (for database) Many Improvements and Many Fixes by Erdem Ersoy CORE-7710 #resolve #comment Committed and hopefully worked around all conflicts I generated today, thx. Modified: trunk/reactos/base/applications/rapps/rapps/ants.txt trunk/reactos/base/applications/rapps/rapps/cnt.txt trunk/reactos/base/applications/rapps/rapps/firefox.txt trunk/reactos/base/applications/rapps/rapps/firefox36.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/net20sp2.txt trunk/reactos/base/applications/rapps/rapps/offbyone.txt trunk/reactos/base/applications/rapps/rapps/opera9.txt trunk/reactos/base/applications/rapps/rapps/ptanks.txt trunk/reactos/base/applications/rapps/rapps/rosbearm.txt trunk/reactos/base/applications/rapps/rapps/scite.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/smplayer.txt Modified: trunk/reactos/base/applications/rapps/rapps/ants.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ants.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ants.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -9,7 +9,7 @@ Description = A card strategic game. Build your own castle and try to destroy enemy castle. You need a ZIP decompression program to install it. Size = 632 kB Category = 4 -URLSite = http://peter.hostuju.cz/index.htm +URLSite = http://peter.hostuju.cz/ URLDownload = http://petr.hostuju.cz/program/download/ANTS.zip CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/cnt.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/cnt.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/cnt.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -8,7 +8,7 @@ Description = Freeware virtual keyboard application. Size = 1.3 MB Category = 12 -URLSite = http://http://cnt.lakefolks.com +URLSite = http://cnt.lakefolks.com URLDownload = http://svn.reactos.org/packages/CNTzip.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/firefox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -11,6 +11,12 @@ URLSite = http://www.mozilla.org/en-US/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/en-US/Fi… CDPath = none + +[Section.0405] +Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. +Size = 30.6 MB +URLSite = http://www.mozilla.org/cs/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/cs/Firef… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. @@ -82,3 +88,9 @@ Size = 30.97 MB URLSite = http://www.mozilla.org/uk/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/uk/Firef… + +[Section.0813] +Description = De meest populaire en een van de beste gratis Web browsers. +Size = 31.2 MB +URLSite = http://www.mozilla.org/nl/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/31.0/win32/nl/Firef… Modified: trunk/reactos/base/applications/rapps/rapps/firefox36.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/firefox36.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -11,6 +11,12 @@ URLSite = http://www.mozilla.org/en-US/ URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/en-US/… CDPath = none + +[Section.0405] +Description = NejpopulÃ¡rnÄjÅ¡Ã a jeden z nejlepÅ¡Ãch svobodnÃ½ch webovÃ½ch prohlÃÅ¾eÄÅ¯. +Size = 8.06 MB +URLSite = http://www.mozilla.org/cs/ +URLDownload = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.28/win32/cs/Fir… [Section.0407] Description = Der populÃ¤rste und einer der besten freien Webbrowser. Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/mono2.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -8,7 +8,7 @@ Description = Open-source .NET Framework. Size = 91.93 MB Category = 14 -URLSite = http://www.mono-project.com/Main_Page +URLSite = http://www.mono-project.com/ URLDownload = http://download.mono-project.com/archive/2.11.4/windows-installer/mono-2.11… CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/net20sp2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/net20sp2.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -8,30 +8,31 @@ Description = Microsoft .NET Framework Version 2.0 Service Pack 2. Size = 23.84 MB Category = 14 -URLSite = http://www.microsoft.com/en-us/download/details.aspx?id=1639 +URLSite = http://www.microsoft.com/en-US/download/details.aspx?id=1639 URLDownload = http://download.microsoft.com/download/c/6/e/c6e88215-0178-4c6c-b5f3-158ff7… CDPath = none [Section.0407] Description = Microsoft .NET Framework Version 2.0 Service Pack 2. URLSite = http://www.microsoft.com/de-DE/download/details.aspx?id=1639 -URLDownload = http://www.microsoft.com/de-de/download/confirmation.aspx?id=1639&6B49FDFB-… [Section.040a] Description = Microsoft .NET Framework versiÃ³n 2.0 Service Pack 2. URLSite = http://www.microsoft.com/es-ES/download/details.aspx?id=1639 -URLDownload = http://www.microsoft.com/es-es/download/confirmation.aspx?id=1639&6B49FDFB-… [Section.040c] Description = Microsoft .NET Framework version 2.0 Service Pack 2. Size = 23,84 Mo URLSite = http://www.microsoft.com/fr-FR/download/details.aspx?id=1639 -URLDownload = http://www.microsoft.com/fr-fr/download/confirmation.aspx?id=1639&6B49FDFB-… + +[Section.0410] +Description = Microsoft .NET Framework Version 2.0 - Redistributable Package. +Size = 23.8 MB +URLSite = http://www.microsoft.com/it-IT/download/details.aspx?id=1639 [Section.0415] Description = Microsoft .NET Framework Wersja 2.0 Service Pack 2. URLSite = http://www.microsoft.com/pl-PL/download/details.aspx?id=1639 -URLDownload = http://www.microsoft.com/pl-pl/download/confirmation.aspx?id=1639&6B49FDFB-… [Section.0418] Licence = NespecificatÄ @@ -44,4 +45,3 @@ Description = Microsoft .NET ÃatÄ±sÄ± SÃ¼rÃ¼m 2.0 - Hizmet Paketi 2 Size = 23,84 MB URLSite = http://www.microsoft.com/tr-TR/download/details.aspx?id=1639 -URLDownload = http://www.microsoft.com/tr-tr/download/confirmation.aspx?id=1639&6B49FDFB-… Modified: trunk/reactos/base/applications/rapps/rapps/offbyone.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/offbyone.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -8,7 +8,7 @@ Description = The Off By One Browser is a very small and fast web browser with full HTML 3.2 support. Size = 1010.89 kB Category = 5 -URLSite = http://offbyone.com/offbyone/ +URLSite = http://offbyone.com/ URLDownload = http://offbyone.com/offbyone/images/OffByOneSetup.exe CDPath = none Modified: trunk/reactos/base/applications/rapps/rapps/opera9.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/opera9.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -11,6 +11,9 @@ URLSite = http://www.opera.com/ URLDownload = http://arc.opera.com/pub/opera/win/964/int/Opera_964_int_Setup.exe CDPath = none + +[Section.0405] +Description = PopulÃ¡rnÃ prohlÃÅ¾eÄ Opera s mnoha pokroÄilÃ½mi vlastnostmi, vÄetnÄ vestavenÃ© podpory pro e-mail a BitTorrent. [Section.0407] Description = Der populÃ¤re Opera Browser mit vielen fortschrittlichen Eigenschaften, enthÃ¤lt einen Mail und BitTorrent Client. Modified: trunk/reactos/base/applications/rapps/rapps/ptanks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/ptanks.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/ptanks.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -29,5 +29,5 @@ [Section.041f] Licence = PaylaÅÄ±mlÄ± -Description = Åimdiye kadar oynayacaÄÄ±nÄ±z en hÄ±zlÄ± topÃ§uluk oyunu. +Description = Åimdiye dek oynayacaÄÄ±nÄ±z en hÄ±zlÄ± topÃ§uluk oyunu. Size = 2,86 MB Modified: trunk/reactos/base/applications/rapps/rapps/rosbearm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/rosbearm.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -11,6 +11,9 @@ URLSite = http://reactos.org/wiki/Build_Environment/ URLDownload = http://download.sourceforge.net/project/reactos/RosBE-Windows/arm/1.0/RosBE… CDPath = none + +[Section.0405] +Description = Dovoluje zkompilovat zdrojovÃ½ kÃ³d systÃ©mu ReactOS ARM. Pro dalÅ¡Ã detaily viz. ReactOS wiki. [Section.0407] Description = Erlaubt es Ihnen den ReactOS ARM Source Code zu kompilieren. Im ReactOS-Wiki finden Sie dazu nÃ¤here Anweisungen. Modified: trunk/reactos/base/applications/rapps/rapps/scite.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/scite.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -38,7 +38,7 @@ [Section.041f] Licence = Ãcretsiz -Description = SciTE, bir Scintilla tabanlÄ± metin dÃ¼zenleyicisidir. Ä°lk baÅta Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±ldÄ±, izlenceleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle bir umÃ»miyetle kullanÄ±ÅlÄ± dÃ¼zenleyici olmak iÃ§in geliÅti. +Description = SciTE, bir Scintilla tabanlÄ± metin dÃ¼zenleyicisidir. Ä°lk baÅta Scintilla'yÄ± gÃ¶stermek iÃ§in yapÄ±ldÄ±; izlenceleri yapmak ve Ã§alÄ±ÅtÄ±rmak yetenekleriyle, umÃ»miyetle kullanÄ±ÅlÄ± bir dÃ¼zenleyici olmak iÃ§in geliÅti. Size = 736 KB [Section.0422] Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -11,6 +11,9 @@ URLSite = http://www.libsdl.org/ URLDownload = http://www.libsdl.org/release/SDL-1.2.15-win32.zip CDPath = none + +[Section.0405] +Description = NutnÃ½ pro spuÅ¡tÄnÃ nÄkterÃ½ch open source her. K rozbalenÃ je nutnÃ½ 7-zip nebo podobnÃ½ nÃ¡stroj. [Section.0407] Name = Simple Direct Media Layer (SDL) Laufzeitsystem Modified: trunk/reactos/base/applications/rapps/rapps/smplayer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/smplayer.txt [iso-8859-1] Tue Jul 29 13:38:27 2014 @@ -8,31 +8,31 @@ Description = Graphical Frontend for MPlayer. Size = 20.7 MB Category = 2 -URLSite = http://smplayer.sourceforge.net/en/info +URLSite = http://smplayer.sourceforge.net/en/ URLDownload = http://download.sourceforge.net/project/smplayer/SMPlayer/14.3.0/smplayer-1… CDPath = none [Section.0407] Description = Grafische OberflÃ¤che fÃ¼r MPlayer. -URLSite = http://smplayer.sourceforge.net/de/info +URLSite = http://smplayer.sourceforge.net/de/ [Section.040a] Description = Interfaz grÃ¡fico para Mplayer (reproductor multimedia). -URLSite = http://smplayer.sourceforge.net/es/info +URLSite = http://smplayer.sourceforge.net/es/ [Section.040c] Size = 20,7 Mo -URLSite = http://smplayer.sourceforge.net/fr/info +URLSite = http://smplayer.sourceforge.net/fr/ [Section.0410] -URLSite = http://smplayer.sourceforge.net/it/info +URLSite = http://smplayer.sourceforge.net/it/ [Section.0413] Description = Mediaspeler, grafische interface voor MPlayer. [Section.0415] Description = Graficzna nakÅadka na MPlayer, otwarty odtwarzacz filmÃ³w. -URLSite = http://smplayer.sourceforge.net/pl/info +URLSite = http://smplayer.sourceforge.net/pl/ [Section.0418] Description = Lector multimedia (interfaÈÄ pentru MPlayer). @@ -41,11 +41,11 @@ [Section.041f] Description = MPlayer iÃ§in Ã§izgelik Ã¶n yÃ¼z. Size = 20,7 MB -URLSite = http://smplayer.sourceforge.net/tr/info +URLSite = http://smplayer.sourceforge.net/tr/ [Section.0422] Description = ÐÑÐ°ÑÑÑÐ½Ð¸Ð¹ ÑÐ½ÑÐµÑÑÐµÐ¹Ñ Ð´Ð»Ñ MPlayer (Ð¼ÑÐ»ÑÑÐ¸Ð¼ÐµÐ´ÑÐ¹Ð½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ). -URLSite = http://smplayer.sourceforge.net/uk/info +URLSite = http://smplayer.sourceforge.net/uk/ [Section.0813] Description = Mediaspeler, grafische interface voor MPlayer.

1 0

[hbelusca] 63766: [KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion.
by hbelusca＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: hbelusca Date: Tue Jul 29 13:18:59 2014 New Revision: 63766 URL: http://svn.reactos.org/svn/reactos?rev=63766&view=rev Log: [KERNEL32][CONSRV] - Use a CODE_ELEMENT structure in order to simplify the code. - Do not do an on-place ansi to unicode conversion. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/readwrite.c [iso-8859-1] Tue Jul 29 13:18:59 2014 @@ -771,39 +771,29 @@ BOOL IntFillConsoleOutputCode(HANDLE hConsoleOutput, CODE_TYPE CodeType, - PVOID pCode, + CODE_ELEMENT Code, DWORD nLength, COORD dwWriteCoord, LPDWORD lpNumberOfCodesWritten) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &ApiMessage.Data.FillOutputRequest; + + if ( (CodeType != CODE_ASCII ) && + (CodeType != CODE_UNICODE ) && + (CodeType != CODE_ATTRIBUTE) ) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } /* Set up the data to send to the Console Server */ FillOutputRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; FillOutputRequest->OutputHandle = hConsoleOutput; FillOutputRequest->WriteCoord = dwWriteCoord; - FillOutputRequest->NumCodes = nLength; - FillOutputRequest->CodeType = CodeType; - switch (CodeType) - { - case CODE_ASCII: - FillOutputRequest->Code.AsciiChar = *(PCHAR)pCode; - break; - - case CODE_UNICODE: - FillOutputRequest->Code.UnicodeChar = *(PWCHAR)pCode; - break; - - case CODE_ATTRIBUTE: - FillOutputRequest->Code.Attribute = *(PWORD)pCode; - break; - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + FillOutputRequest->Code = Code; + FillOutputRequest->NumCodes = nLength; /* Call the server */ CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, @@ -1373,9 +1363,11 @@ COORD dwWriteCoord, LPDWORD lpNumberOfCharsWritten) { + CODE_ELEMENT Code; + Code.UnicodeChar = cCharacter; return IntFillConsoleOutputCode(hConsoleOutput, CODE_UNICODE, - &cCharacter, + Code, nLength, dwWriteCoord, lpNumberOfCharsWritten); @@ -1395,9 +1387,11 @@ COORD dwWriteCoord, LPDWORD lpNumberOfCharsWritten) { + CODE_ELEMENT Code; + Code.AsciiChar = cCharacter; return IntFillConsoleOutputCode(hConsoleOutput, CODE_ASCII, - &cCharacter, + Code, nLength, dwWriteCoord, lpNumberOfCharsWritten); @@ -1417,9 +1411,11 @@ COORD dwWriteCoord, LPDWORD lpNumberOfAttrsWritten) { + CODE_ELEMENT Code; + Code.Attribute = wAttribute; return IntFillConsoleOutputCode(hConsoleOutput, CODE_ATTRIBUTE, - &wAttribute, + Code, nLength, dwWriteCoord, lpNumberOfAttrsWritten); Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Tue Jul 29 13:18:59 2014 @@ -459,6 +459,13 @@ CODE_ATTRIBUTE = 0x03 } CODE_TYPE; +typedef union _CODE_ELEMENT +{ + CHAR AsciiChar; + WCHAR UnicodeChar; + WORD Attribute; +} CODE_ELEMENT, *PCODE_ELEMENT; + typedef struct { HANDLE ConsoleHandle; @@ -485,13 +492,8 @@ HANDLE OutputHandle; COORD WriteCoord; - CODE_TYPE CodeType; - union - { - CHAR AsciiChar; - WCHAR UnicodeChar; - WORD Attribute; - } Code; // Either a character or an attribute. + CODE_TYPE CodeType; + CODE_ELEMENT Code; // Either a character or an attribute. ULONG NumCodes; } CONSOLE_FILLOUTPUTCODE, *PCONSOLE_FILLOUTPUTCODE; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/text.c [iso-8859-1] Tue Jul 29 13:18:59 2014 @@ -1137,7 +1137,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, IN CODE_TYPE CodeType, - IN PVOID Code, + IN CODE_ELEMENT Code, IN ULONG NumCodesToWrite, IN PCOORD WriteCoord /*, OUT PULONG CodesWritten */) @@ -1145,8 +1145,7 @@ DWORD X, Y, Length; // , Written = 0; PCHAR_INFO Ptr; - if (Console == NULL || Buffer == NULL || Code == NULL || - WriteCoord == NULL /* || CodesWritten == NULL */) + if (Console == NULL || Buffer == NULL || WriteCoord == NULL /* || CodesWritten == NULL */) { return STATUS_INVALID_PARAMETER; } @@ -1154,29 +1153,13 @@ /* Validity check */ ASSERT(Console == Buffer->Header.Console); -#if 0 - switch (CodeType) - { - case CODE_ASCII: - /* On-place conversion from the ASCII char to the UNICODE char */ - ConsoleAnsiCharToUnicodeChar(Console, &Code->UnicodeChar, &Code->AsciiChar); - /* Fall through */ - case CODE_UNICODE: - Code = &Code->UnicodeChar; - break; - - case CODE_ATTRIBUTE: - Code = &Code->Attribute; - break; - } -#else if (CodeType == CODE_ASCII) { - /* On-place conversion from the ASCII char to the UNICODE char */ - // FIXME: What if Code points to an invalid memory zone ?? - ConsoleAnsiCharToUnicodeChar(Console, (PWCHAR)Code, (PCHAR)Code); - } -#endif + /* Conversion from the ASCII char to the UNICODE char */ + CODE_ELEMENT tmp; + ConsoleAnsiCharToUnicodeChar(Console, &tmp.UnicodeChar, &Code.AsciiChar); + Code = tmp; + } X = WriteCoord->X; Y = (WriteCoord->Y + Buffer->VirtualY) % Buffer->ScreenBufferSize.Y; @@ -1193,11 +1176,11 @@ { case CODE_ASCII: case CODE_UNICODE: - Ptr->Char.UnicodeChar = *(PWCHAR)Code; + Ptr->Char.UnicodeChar = Code.UnicodeChar; break; case CODE_ATTRIBUTE: - Ptr->Attributes = *(PWORD)Code; + Ptr->Attributes = Code.Attribute; break; } // ++Ptr; Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/conoutput.c [iso-8859-1] Tue Jul 29 13:18:59 2014 @@ -691,7 +691,7 @@ ConDrvFillConsoleOutput(IN PCONSOLE Console, IN PTEXTMODE_SCREEN_BUFFER Buffer, IN CODE_TYPE CodeType, - IN PVOID Code, + IN CODE_ELEMENT Code, IN ULONG NumCodesToWrite, IN PCOORD WriteCoord /*, OUT PULONG CodesWritten */); @@ -700,7 +700,7 @@ NTSTATUS Status; PCONSOLE_FILLOUTPUTCODE FillOutputRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.FillOutputRequest; PTEXTMODE_SCREEN_BUFFER Buffer; - USHORT CodeType = FillOutputRequest->CodeType; + CODE_TYPE CodeType = FillOutputRequest->CodeType; DPRINT("SrvFillConsoleOutput\n"); @@ -719,7 +719,7 @@ Status = ConDrvFillConsoleOutput(Buffer->Header.Console, Buffer, CodeType, - &FillOutputRequest->Code, + FillOutputRequest->Code, FillOutputRequest->NumCodes, &FillOutputRequest->WriteCoord /*, &FillOutputRequest->NrCharactersWritten */);

1 0

[dreimer] 63765: [TRANSLATION] general maintenance of Romanian resources by Stefan Fuela CORE-8334 #resolve #comment Committed, thx.
by dreimer＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: dreimer Date: Tue Jul 29 13:17:00 2014 New Revision: 63765 URL: http://svn.reactos.org/svn/reactos?rev=63765&view=rev Log: [TRANSLATION] general maintenance of Romanian resources by Stefan Fuela CORE-8334 #resolve #comment Committed, thx. Added: trunk/reactos/base/applications/network/net/lang/ro-RO.rc (with props) trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/help/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/help/lang/uk-UA.rc trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/network/net/net.rc trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt trunk/reactos/base/applications/rapps/rapps/alreader.txt trunk/reactos/base/applications/rapps/rapps/bochs.txt trunk/reactos/base/applications/rapps/rapps/boundaround.txt trunk/reactos/base/applications/rapps/rapps/christmasbound.txt trunk/reactos/base/applications/rapps/rapps/codeblocks.txt trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt trunk/reactos/base/applications/rapps/rapps/doublecommander.txt trunk/reactos/base/applications/rapps/rapps/dplus.txt trunk/reactos/base/applications/rapps/rapps/fira.txt trunk/reactos/base/applications/rapps/rapps/freebasic.txt trunk/reactos/base/applications/rapps/rapps/ghostscript.txt trunk/reactos/base/applications/rapps/rapps/ghostview.txt trunk/reactos/base/applications/rapps/rapps/libreoffice.txt trunk/reactos/base/applications/rapps/rapps/mcwin32.txt trunk/reactos/base/applications/rapps/rapps/miktex.txt trunk/reactos/base/applications/rapps/rapps/mirandaim.txt trunk/reactos/base/applications/rapps/rapps/mono2.txt trunk/reactos/base/applications/rapps/rapps/net11.txt trunk/reactos/base/applications/rapps/rapps/openoffice.txt trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt trunk/reactos/base/applications/rapps/rapps/openttd.txt trunk/reactos/base/applications/rapps/rapps/peazip.txt trunk/reactos/base/applications/rapps/rapps/pptview.txt trunk/reactos/base/applications/rapps/rapps/qmmp.txt trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt trunk/reactos/base/applications/rapps/rapps/scummvm.txt trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/seamonkey.txt trunk/reactos/base/applications/rapps/rapps/snoopy.txt trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt trunk/reactos/base/applications/rapps/rapps/summerbound.txt trunk/reactos/base/applications/rapps/rapps/supertux.txt trunk/reactos/base/applications/rapps/rapps/ultravnc.txt trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/vmwinst/lang/ro-RO.rc trunk/reactos/base/shell/cmd/cmd.rc trunk/reactos/base/system/winlogon/lang/ro-RO.rc trunk/reactos/boot/bootdata/hivecls.inf trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/subsystems/ntvdm/ntvdm.rc trunk/reactos/win32ss/user/user32/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc trunk/reactos/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cmdutils/help/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/help/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/lang/Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Added: trunk/reactos/base/applications/network/net/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/net/net.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/rapps/rapps/ac97forvirtualbox.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/alreader.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/bochs.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/boundaround.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/christmasbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/codeblocks_gcc_2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_mingw32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/devcpp_tdm_gcc_x64.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/doublecommander.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/dplus.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/fira.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/freebasic.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ghostscript.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ghostview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/libreoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mcwin32.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/miktex.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mirandaim.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/mono2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/net11.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openoffice2.4.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/openttd.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/peazip.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/pptview.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/qmmp.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sbforvmware.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/scummvm.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_mixer.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/seamonkey.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/snoopy.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/sumatrapdf.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/summerbound.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/supertux.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/applications/rapps/rapps/ultravnc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… Modified: trunk/reactos/base/setup/vmwinst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ro… Modified: trunk/reactos/base/shell/cmd/cmd.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.rc?rev=… Modified: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… Modified: trunk/reactos/dll/cpl/appwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/liccpa/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/liccpa/lang/ro-RO.… Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… Modified: trunk/reactos/dll/cpl/wined3dcfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/wined3dcfg/lang/ro… Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… Modified: trunk/reactos/dll/win32/rasdlg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasdlg/lang/ro-R… Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… Added: trunk/reactos/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/ro-R… Modified: trunk/reactos/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.rc?… Modified: trunk/reactos/win32ss/user/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/lang/r… Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv… Modified: trunk/reactos/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv…

1 0

[hbelusca] 63764: [CONSRV] Add diagnostics ASSERTs for MultiByteToWideChar & its companion (the source and target pointers must not be the same, otherwise it doesn't work).
by hbelusca＠svn.reactos.org 29 Jul '14

29 Jul '14

Author: hbelusca Date: Tue Jul 29 12:54:01 2014 New Revision: 63764 URL: http://svn.reactos.org/svn/reactos?rev=63764&view=rev Log: [CONSRV] Add diagnostics ASSERTs for MultiByteToWideChar & its companion (the source and target pointers must not be the same, otherwise it doesn't work). Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Tue Jul 29 12:54:01 2014 @@ -69,6 +69,14 @@ /*P*/USHORT TargetLength) { ASSERT(Source && Target && TargetLength); + + /* + * From MSDN: + * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. + * If they are the same, the function fails, and GetLastError returns + * ERROR_INVALID_PARAMETER." + */ + ASSERT((ULONG_PTR)Source != (ULONG_PTR)Target); /* Use the console input CP for the conversion */ // *TargetLength = WideCharToMultiByte(Console->InputCodePage, 0, Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/coninput.c [iso-8859-1] Tue Jul 29 12:54:01 2014 @@ -16,10 +16,18 @@ /* GLOBALS ********************************************************************/ +/* + * From MSDN: + * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. + * If they are the same, the function fails, and GetLastError returns + * ERROR_INVALID_PARAMETER." + */ #define ConsoleInputUnicodeCharToAnsiChar(Console, dChar, sWChar) \ + ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ WideCharToMultiByte((Console)->InputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) #define ConsoleInputAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ MultiByteToWideChar((Console)->InputCodePage, 0, (sChar), 1, (dWChar), 1) typedef struct ConsoleInput_t Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Tue Jul 29 12:54:01 2014 @@ -352,10 +352,18 @@ #define ConioRectWidth(Rect) \ (((Rect)->Left) > ((Rect)->Right) ? 0 : ((Rect)->Right) - ((Rect)->Left) + 1) +/* + * From MSDN: + * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. + * If they are the same, the function fails, and GetLastError returns + * ERROR_INVALID_PARAMETER." + */ #define ConsoleUnicodeCharToAnsiChar(Console, dChar, sWChar) \ + ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) #define ConsoleAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio_winsrv.h [iso-8859-1] Tue Jul 29 12:54:01 2014 @@ -161,10 +161,18 @@ #define ConioRectWidth(Rect) \ (((Rect)->Left) > ((Rect)->Right) ? 0 : ((Rect)->Right) - ((Rect)->Left) + 1) +/* + * From MSDN: + * "The lpMultiByteStr and lpWideCharStr pointers must not be the same. + * If they are the same, the function fails, and GetLastError returns + * ERROR_INVALID_PARAMETER." + */ #define ConsoleUnicodeCharToAnsiChar(Console, dChar, sWChar) \ + ASSERT((ULONG_PTR)dChar != (ULONG_PTR)sWChar); \ WideCharToMultiByte((Console)->OutputCodePage, 0, (sWChar), 1, (dChar), 1, NULL, NULL) #define ConsoleAnsiCharToUnicodeChar(Console, dWChar, sChar) \ + ASSERT((ULONG_PTR)dWChar != (ULONG_PTR)sChar); \ MultiByteToWideChar((Console)->OutputCodePage, 0, (sChar), 1, (dWChar), 1) PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs