Author: sginsberg
Date: Sat Oct 31 14:46:16 2009
New Revision: 43871
URL: http://svn.reactos.org/svn/reactos?rev=43871&view=rev
Log:
- Don't define the SizePcr entry to the size of the PCR PLUS the PRCB SIZE! The PRCB size is already defined in the SizePrcb entry.
- Likewise, the OffsetPrcbProcStateSpecialReg entry defines the offset to the special registers in the PRCB, not a PCR + PRCB offset + special registers offset! This can only have worked on x86 and AMD64 if WinDbg uses a hard coded offset, but define it correctly anyway.
- The OffsetPcrSelfPcr and OffsetPcrContainedPrcb entries are not applicable for ARM, so define them to 0 for it.
Modified:
trunk/reactos/ntoskrnl/kd64/kddata.c
Modified: trunk/reactos/ntoskrnl/kd64/kddata.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev…
==============================================================================
--- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sat Oct 31 14:46:16 2009
@@ -36,9 +36,9 @@
#elif defined(_M_ARM)
-//#define KPCR_SELF_OFFSET
+#define KPCR_SELF_OFFSET 0
#define KPCR_CURRENT_PRCB_OFFSET FIELD_OFFSET(KPCR, Prcb)
-//#define KPCR_CONTAINED_PRCB_OFFSET
+#define KPCR_CONTAINED_PRCB_OFFSET 0
#else
#error Unsupported Architecture
@@ -485,7 +485,7 @@
{(ULONG_PTR)KdPrintDefaultCircularBuffer},
{(ULONG_PTR)&KdPrintBufferSize},
{(ULONG_PTR)&KeLoaderBlock},
- sizeof(KPCR) + sizeof(KPRCB),
+ sizeof(KPCR),
KPCR_SELF_OFFSET,
KPCR_CURRENT_PRCB_OFFSET,
KPCR_CONTAINED_PRCB_OFFSET,
@@ -494,7 +494,6 @@
0,
0,
0,
- KPCR_CONTAINED_PRCB_OFFSET +
FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters),
#if defined(_M_IX86)
//
Author: cgutman
Date: Sat Oct 31 08:34:27 2009
New Revision: 43867
URL: http://svn.reactos.org/svn/reactos?rev=43867&view=rev
Log:
- Add more cases to TCPTranslateError
- Fix a header typo
Modified:
trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h
Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t…
==============================================================================
--- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 31 08:34:27 2009
@@ -563,8 +563,16 @@
case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break;
case OSK_ECONNREFUSED:
case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break;
- case OSK_EINPROGRESS:
- case OSK_EAGAIN: Status = STATUS_PENDING; break;
+ case OSK_EINPROGRESS: Status = STATUS_PENDING; break;
+ case OSK_EWOULDBLOCK: Status = STATUS_CANT_WAIT; break;
+ case OSK_EINVAL: Status = STATUS_INVALID_PARAMETER; break;
+ case OSK_ENOMEM:
+ case OSK_ENOBUFS: Status = STATUS_INSUFFICIENT_RESOURCES; break;
+ case OSK_ESHUTDOWN: Status = STATUS_FILE_CLOSED; break;
+ case OSK_EMSGSIZE: Status = STATUS_BUFFER_TOO_SMALL; break;
+ case OSK_ETIMEDOUT: Status = STATUS_TIMEOUT; break;
+ case OSK_ENETUNREACH: Status = STATUS_NETWORK_UNREACHABLE; break;
+ case OSK_EFAULT: Status = STATUS_ACCESS_VIOLATION; break;
default:
DbgPrint("OskitTCP returned unhandled error code: %d\n", OskitError);
Status = STATUS_INVALID_CONNECTION;
Modified: trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/inclu…
==============================================================================
--- trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h [iso-8859-1] (original)
+++ trunk/reactos/lib/drivers/oskittcp/include/oskiterrno.h [iso-8859-1] Sat Oct 31 08:34:27 2009
@@ -97,7 +97,7 @@
/* non-blocking and interrupt i/o */
#define OSK_EAGAIN 35 /* Resource temporarily unavailable */
#ifndef _POSIX_SOURCE
-#define OSK_EWOULDBLOCK EAGAIN /* Operation would block */
+#define OSK_EWOULDBLOCK OSK_EAGAIN /* Operation would block */
#define OSK_EINPROGRESS 36 /* Operation now in progress */
#define OSK_EALREADY 37 /* Operation already in progress */