Removed unused NLS stuff.

Cleaned-up PEB initialization.

svn path=/trunk/; revision=4734

diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile
index 676ca0d..7572060 100644 (file)
--- a/reactos/ntoskrnl/Makefile
+++ b/reactos/ntoskrnl/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.94 2003/05/13 21:28:26 chorns Exp $
+# $Id: Makefile,v 1.95 2003/05/21 15:06:33 ekohl Exp $
 #
 # ReactOS Operating System
 #
@@ -320,9 +320,6 @@ OBJECTS_LPC = \
        lpc/reply.o \
        lpc/send.o
 
-# Nation Language Support Library (Nls)
-OBJECTS_NLS = nls/nls.o
-
 # Power Management (Po)
 OBJECTS_PO = po/power.o
 
@@ -455,12 +452,6 @@ $(OBJECTS_PATH)/lpc.o: $(OBJECTS_LPC)
                -o $(OBJECTS_PATH)/lpc.o \
                $(OBJECTS_LPC)
 
-$(OBJECTS_PATH)/nls.o: $(OBJECTS_NLS)
-       $(LD) \
-               -r \
-               -o $(OBJECTS_PATH)/nls.o \
-               $(OBJECTS_NLS)
-
 $(OBJECTS_PATH)/nt.o: $(OBJECTS_NT)
        $(LD) \
                -r \
@@ -499,7 +490,6 @@ OBJECTS := \
        $(OBJECTS_PATH)/kd.o \
        $(OBJECTS_PATH)/ldr.o \
        $(OBJECTS_PATH)/mm.o \
-       $(OBJECTS_PATH)/nls.o \
        $(OBJECTS_PATH)/nt.o \
        $(OBJECTS_PATH)/ob.o \
        $(OBJECTS_PATH)/po.o \
@@ -662,7 +652,7 @@ implib: $(DDK_PATH_LIB)/$(TARGETNAME).a
 clean:
        - $(RM) $(OBJECTS_PATH)/*.o cc/*.o cm/*.o dbg/*.o dbg/i386/*.o ex/*.o \
               ex/i386/*.o io/*.o ke/*.o ldr/*.o mm/*.o nt/*.o ob/*.o ps/*.o \
-              rtl/*.o rtl/i386/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o nls/*.o \
+              rtl/*.o rtl/i386/*.o se/*.o ke/i386/*.o mm/i386/*.o fs/*.o po/*.o \
               lpc/*.o kd/*.o $(TARGETNAME).o junk.tmp base.tmp temp.exp \
               $(TARGETNAME).exe $(TARGETNAME).nostrip.exe $(TARGETNAME).sym ntoskrnl.map \
                  $(TARGETNAME).coff bugcodes.rc msg?????.bin $(DEP_FILES) \

diff --git a/reactos/ntoskrnl/nls/.cvsignore b/reactos/ntoskrnl/nls/.cvsignore
deleted file mode 100644 (file)
index bd0e3df..0000000
--- a/reactos/ntoskrnl/nls/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-*.d
-*.o
-*.sym

diff --git a/reactos/ntoskrnl/nls/nls.c b/reactos/ntoskrnl/nls/nls.c
deleted file mode 100644 (file)
index 37149d4..0000000
--- a/reactos/ntoskrnl/nls/nls.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* $Id: nls.c,v 1.4 2002/09/08 10:23:37 chorns Exp $
- *
- * reactos/ntoskrnl/nls/nls.c
- */
-#include <ntos.h>
-
-#if 0
-BYTE
-NlsLeadByteInfo = 0; /* ? */
-
-BOOLEAN /* USHORT? */
-NlsMbCodePageTag = 0;
-
-USHORT
-NlsOemLeadByteInfo = 0;
-
-USHORT
-NlsAnsiCodePage = 0;
-#endif
-
-/* EOF */

diff --git a/reactos/ntoskrnl/ps/process.c b/reactos/ntoskrnl/ps/process.c
index 433b60a..cfef27a 100644 (file)
--- a/reactos/ntoskrnl/ps/process.c
+++ b/reactos/ntoskrnl/ps/process.c
@@ -1,4 +1,4 @@
-/* $Id: process.c,v 1.103 2003/05/20 14:37:44 ekohl Exp $
+/* $Id: process.c,v 1.104 2003/05/21 15:05:47 ekohl Exp $
  *
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
@@ -317,12 +317,10 @@ PsCreatePeb(HANDLE ProcessHandle,
 {
   ULONG PebSize;
   PPEB Peb;
-  NTSTATUS Status;
-//#if 0
   LARGE_INTEGER SectionOffset;
   ULONG ViewSize;
   PVOID TableBase;
-//#endif
+  NTSTATUS Status;
 
   /* Allocate the Process Environment Block (PEB) */
   Peb = (PPEB)PEB_BASE;
@@ -340,7 +338,6 @@ PsCreatePeb(HANDLE ProcessHandle,
     }
   DPRINT("Peb %p  PebSize %lu\n", Peb, PebSize);
 
-//#if 0
   ViewSize = 0;
   SectionOffset.QuadPart = 0LL;
   Status = MmMapViewOfSection(NlsSectionObject,
@@ -358,8 +355,7 @@ PsCreatePeb(HANDLE ProcessHandle,
       DPRINT1("MmMapViewOfSection() failed (Status %lx)\n", Status);
       return(Status);
     }
-  DPRINT1("TableBase %p  ViewSize %lx\n", TableBase, ViewSize);
-//#endif
+  DPRINT("TableBase %p  ViewSize %lx\n", TableBase, ViewSize);
 
   KeAttachProcess(Process);
 
@@ -367,11 +363,14 @@ PsCreatePeb(HANDLE ProcessHandle,
   RtlZeroMemory(Peb, sizeof(PEB));
   Peb->ImageBaseAddress = ImageBase;
 
-//#if 0
+  Peb->OSMajorVersion = 4;
+  Peb->OSMinorVersion = 0;
+  Peb->OSBuildNumber = 0;
+  Peb->OSPlatformId = 2; //VER_PLATFORM_WIN32_NT;
+
   Peb->AnsiCodePageData = TableBase + NlsAnsiTableOffset;
   Peb->OemCodePageData = TableBase + NlsOemTableOffset;
   Peb->UnicodeCaseTableData = TableBase + NlsUnicodeTableOffset;
-//#endif
 
   Process->Peb = Peb;
   KeDetachProcess();