Author: tkreuzer
Date: Wed Jul 28 01:17:23 2010
New Revision: 48322
URL: http://svn.reactos.org/svn/reactos?rev=48322&view=rev
Log:
[WIN32CSR]
- Fix array subscript out of bounds error
- Fix a cast
Modified:
trunk/reactos/subsystems/win32/csrss/win32csr/console.c
trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/console.c?rev=48322&r1=48321&r2=48322&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Wed
Jul 28 01:17:23 2010
@@ -780,7 +780,7 @@
current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA,
ProcessEntry);
if (++nItems <= Request->Data.GetProcessListRequest.nMaxIds)
{
- *Buffer++ = (DWORD)current->ProcessId;
+ *Buffer++ = HandleToUlong(current->ProcessId);
}
}
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c?rev=48322&r1=48321&r2=48322&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1]
(original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Wed
Jul 28 01:17:23 2010
@@ -383,13 +383,12 @@
{
/* Print the string into the buffer */
StringCbPrintfW(TextStringU->Buffer,
- TextStringU->MaximumLength,
- FormatString,
- Parameters[0],
- Parameters[1],
- Parameters[2],
- Parameters[3],
- Parameters[4]);
+ TextStringU->MaximumLength,
+ FormatString,
+ Parameters[0],
+ Parameters[1],
+ Parameters[2],
+ Parameters[3]);
Status = STATUS_SUCCESS;
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
