From: Pierre Schweitzer <pierre@reactos.org>
Date: Wed, 18 Mar 2015 15:26:46 +0000 (+0000)
Subject: [NTOSKRNL]
X-Git-Tag: ReactOS-0.3.17-CLT2015~4^2~10
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=88e3a5126f76cedce121742cc1366cef2a600d5d;hp=0b60c945c83959783a7d7b2f688833b96587cc06

[NTOSKRNL]
Also partly revert r66781.
By Stefan G.

svn path=/trunk/; revision=66784
---

diff --git a/reactos/ntoskrnl/ke/i386/traphdlr.c b/reactos/ntoskrnl/ke/i386/traphdlr.c
index b485f156a97..627c32c99d3 100644
--- a/reactos/ntoskrnl/ke/i386/traphdlr.c
+++ b/reactos/ntoskrnl/ke/i386/traphdlr.c
@@ -1673,7 +1673,6 @@ KiSystemServiceHandler(IN PKTRAP_FRAME TrapFrame,
         if (!NT_SUCCESS(Result))
         {
             /* Set the last error and fail */
-            NtCurrentTeb()->LastErrorValue = RtlNtStatusToDosError(Result);
             goto ExitCall;
         }
 
diff --git a/reactos/ntoskrnl/ps/win32.c b/reactos/ntoskrnl/ps/win32.c
index c80f1b97255..acb2b8b4f8b 100644
--- a/reactos/ntoskrnl/ps/win32.c
+++ b/reactos/ntoskrnl/ps/win32.c
@@ -9,6 +9,7 @@
 /* INCLUDES ****************************************************************/
 
 #include <ntoskrnl.h>
+#include <winerror.h>
 #define NDEBUG
 #include <debug.h>
 
@@ -63,6 +64,7 @@ PsConvertToGuiThread(VOID)
         if (!NewStack)
         {
             /* Panic in user-mode */
+            NtCurrentTeb()->LastErrorValue = ERROR_NOT_ENOUGH_MEMORY;
             return STATUS_NO_MEMORY;
         }