diff --git a/reactos/apps/utils/objdir/objdir.c b/reactos/apps/utils/objdir/objdir.c index 26ae48bc791..06e7d4f6588 100644 --- a/reactos/apps/utils/objdir/objdir.c +++ b/reactos/apps/utils/objdir/objdir.c @@ -1,4 +1,4 @@ -/* $Id: objdir.c,v 1.2 2000/05/01 13:53:43 ea Exp $ +/* $Id: objdir.c,v 1.3 2000/05/13 14:56:46 ea Exp $ * * DESCRIPTION: Object Manager Simple Explorer * PROGRAMMER: David Welch @@ -32,6 +32,27 @@ struct } DirectoryEntry; +static +const char * +STDCALL +StatusToName (NTSTATUS Status) +{ + static char RawValue [16]; + + switch (Status) + { + case STATUS_OBJECT_NAME_INVALID: + return "STATUS_OBJECT_NAME_INVALID"; + case STATUS_OBJECT_NAME_NOT_FOUND: + return "STATUS_OBJECT_NAME_NOT_FOUND"; + case STATUS_PATH_SYNTAX_BAD: + return "STATUS_PATH_SYNTAX_BAD"; + } + wsprintf (RawValue, "0x%08x", Status); + return (const char *) RawValue; +} + + int main(int argc, char* argv[]) { UNICODE_STRING DirectoryNameW; @@ -86,8 +107,8 @@ int main(int argc, char* argv[]) if (!NT_SUCCESS(Status)) { printf ( - "Failed to open directory object (Status: %x)\n", - Status + "Failed to open directory object (Status: %s)\n", + StatusToName (Status) ); return EXIT_FAILURE; } @@ -106,8 +127,8 @@ int main(int argc, char* argv[]) if (!NT_SUCCESS(Status)) { printf ( - "Failed to query directory object (Status: %x)\n", - Status + "Failed to query directory object (Status: %s)\n", + StatusToName (Status) ); NtClose (DirectoryHandle); return EXIT_FAILURE; diff --git a/reactos/drivers/dd/vga/display/makefile b/reactos/drivers/dd/vga/display/makefile index bb7db246e36..2b0da279aa8 100644 --- a/reactos/drivers/dd/vga/display/makefile +++ b/reactos/drivers/dd/vga/display/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.5 2000/04/10 20:17:32 jfilby Exp $ +# $Id: makefile,v 1.6 2000/05/13 14:56:47 ea Exp $ # # Makefile for ReactOS vgaddi.dll # @@ -43,7 +43,7 @@ $(TARGET).dll: $(DLLMAIN) $(OBJECTS) $(TARGET).def -mdll \ -o junk.tmp \ -Wl,--entry,_DrvEnableDriver \ - -Wl,--base-file,base.tmp + -Wl,--base-file,base.tmp - $(RM) junk.tmp $(DLLTOOL) \ --dllname $(TARGET).dll \ diff --git a/reactos/include/ddk/iofuncs.h b/reactos/include/ddk/iofuncs.h index 5f40cad28ef..dde394b5461 100644 --- a/reactos/include/ddk/iofuncs.h +++ b/reactos/include/ddk/iofuncs.h @@ -1,6 +1,6 @@ #ifndef _INCLUDE_DDK_IOFUNCS_H #define _INCLUDE_DDK_IOFUNCS_H -/* $Id: iofuncs.h,v 1.10 2000/04/05 15:47:40 ekohl Exp $ */ +/* $Id: iofuncs.h,v 1.11 2000/05/13 14:56:46 ea Exp $ */ /* --- EXPORTED BY NTOSKRNL --- */ @@ -799,10 +799,10 @@ IoSetShareAccess ( PFILE_OBJECT FileObject, PSHARE_ACCESS ShareAccess ); -VOID +BOOLEAN STDCALL IoSetThreadHardErrorMode ( - IN PVOID Unknown0 + IN BOOLEAN HardErrorEnabled ); VOID STDCALL diff --git a/reactos/ntoskrnl/io/process.c b/reactos/ntoskrnl/io/process.c index fbb4432fe8e..bb62af6f726 100644 --- a/reactos/ntoskrnl/io/process.c +++ b/reactos/ntoskrnl/io/process.c @@ -1,4 +1,4 @@ -/* $Id: process.c,v 1.4 2000/05/13 10:39:23 ekohl Exp $ +/* $Id: process.c,v 1.5 2000/05/13 14:56:46 ea Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -70,13 +70,38 @@ IoGetRequestorProcess ( } -VOID +/********************************************************************** + * NAME EXPORTED + * IoSetThreadHardErrorMode@4 + * + * ARGUMENTS + * HardErrorEnabled + * TRUE : enable hard errors processing; + * FALSE: do NOT process hard errors. + * + * RETURN VALUE + * Previous value for the current thread's hard errors + * processing policy. + */ +BOOLEAN STDCALL +EXPORTED IoSetThreadHardErrorMode ( - IN PVOID Unknown0 + IN BOOLEAN HardErrorEnabled ) { - UNIMPLEMENTED; + BOOLEAN PreviousHEM = NtCurrentTeb ()->HardErrorDisabled; + + NtCurrentTeb ()->HardErrorDisabled = ( + (TRUE == HardErrorEnabled) + ? FALSE + : TRUE + ); + return ( + (TRUE == PreviousHEM) + ? FALSE + : TRUE + ); } diff --git a/reactos/ntoskrnl/ke/main.c b/reactos/ntoskrnl/ke/main.c index 5c1f6c7b99d..c186c669133 100644 --- a/reactos/ntoskrnl/ke/main.c +++ b/reactos/ntoskrnl/ke/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.43 2000/04/08 19:10:21 ekohl Exp $ +/* $Id: main.c,v 1.44 2000/05/13 14:56:46 ea Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -25,7 +25,7 @@ #include #include -#define NDEBUG +//#define NDEBUG #include /* DATA *********************************************************************/