work on registry

svn path=/trunk/; revision=1373

reactos/apps/tests/regtest/regtest.c

@@ -2,6 +2,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <windows.h>
+#include <ddk/ntddk.h>
 
 HANDLE OutputHandle;
 HANDLE InputHandle;
@@ -20,32 +21,200 @@ void dprintf(char* fmt, ...)
 
 int main(int argc, char* argv[])
 {
-   HKEY hKey = NULL;
+   HKEY hKey = NULL,hKey1;
    DWORD dwDisposition;
    DWORD dwError;
+    DWORD Err, RegDataType, RegDataSize, OldComPortNumber;
+    OBJECT_ATTRIBUTES ObjectAttributes; 
+    HANDLE StConfigHandle; 
+    ULONG Disposition; 
+    NTSTATUS Status; 
+  UNICODE_STRING KeyName;
+    BOOL GlobalFifoEnable;
+    HKEY hPortKey;
+    DWORD RegDisposition;
+ ULONG Index,Length,i;
+ KEY_BASIC_INFORMATION KeyInformation[5];
+ KEY_VALUE_FULL_INFORMATION KeyValueInformation[5];
 
   AllocConsole();
   InputHandle = GetStdHandle(STD_INPUT_HANDLE);
   OutputHandle =  GetStdHandle(STD_OUTPUT_HANDLE);
 
-   dprintf ("RegCreateKeyExW:\n");
+  dprintf("NtOpenKey \\Registry : ");
-   dwError = RegCreateKeyExW (HKEY_LOCAL_MACHINE,
+  RtlInitUnicodeString(&KeyName, L"\\Registry");
-                              L"Test",
+  InitializeObjectAttributes(&ObjectAttributes,
+                               &KeyName,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+  Status=NtOpenKey( &hKey1, MAXIMUM_ALLOWED, &ObjectAttributes);
+  dprintf("\t\t\t\tStatus =%x\n",Status);
+  if(Status==0)
+  {
+    dprintf("NtQueryKey : ");
+    Status=NtQueryKey(hKey1,KeyBasicInformation
+		,&KeyInformation[0], sizeof(KeyInformation)
+		,&Length);
+    dprintf("\t\t\t\t\tStatus =%x\n",Status);
+    if (Status == STATUS_SUCCESS)
+    {
+        dprintf("\tKey Name = ");
+	  for (i=0;i<KeyInformation[0].NameLength/2;i++)
+		dprintf("%C",KeyInformation[0].Name[i]);
+        dprintf("\n");
+    }
+    dprintf("NtEnumerateKey : \n");
+    Index=0;
+    while(Status == STATUS_SUCCESS)
+    {
+      Status=NtEnumerateKey(hKey1,Index++,KeyBasicInformation
+		,&KeyInformation[0], sizeof(KeyInformation)
+		,&Length);
+      if(Status== STATUS_SUCCESS)
+	{
+        dprintf("\tSubKey Name = ");
+	  for (i=0;i<KeyInformation[0].NameLength/2;i++)
+		dprintf("%C",KeyInformation[0].Name[i]);
+        dprintf("\n");
+	}
+    }
+    dprintf("NtCloseKey : ");
+    Status = NtClose( hKey1 );
+    dprintf("\t\t\t\t\tStatus =%x\n",Status);
+  }
+
+  dprintf("NtOpenKey \\Registry\\Machine : ");
+  RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine");
+  InitializeObjectAttributes(&ObjectAttributes,
+                               &KeyName,
+                               OBJ_CASE_INSENSITIVE,
+                               NULL,
+                               NULL);
+  Status=NtOpenKey( &hKey1, MAXIMUM_ALLOWED, &ObjectAttributes);
+  dprintf("\t\t\tStatus =%x\n",Status);
+
+  dprintf("NtOpenKey System\\Setup : ");
+  RtlInitUnicodeString(&KeyName, L"System\\Setup");
+  InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE
+				, hKey1 , NULL);
+  Status = NtOpenKey ( &hKey, KEY_READ , &ObjectAttributes);
+  dprintf("\t\t\tStatus =%x\n",Status);
+  if(Status==0)
+  {
+    dprintf("NtQueryValueKey : ");
+    RtlInitUnicodeString(&KeyName, L"CmdLine");
+    Status=NtQueryValueKey(hKey,&KeyName,KeyValueFullInformation
+		,&KeyValueInformation[0], sizeof(KeyValueInformation)
+		,&Length);
+    dprintf("\t\t\t\tStatus =%x\n",Status);
+    if (Status == STATUS_SUCCESS)
+    {
+        dprintf("\tValue:DO=%d, DL=%d, NL=%d, Name = "
+		,KeyValueInformation[0].DataOffset
+		,KeyValueInformation[0].DataLength
+		,KeyValueInformation[0].NameLength);
+	  for (i=0;i<10 && i<KeyValueInformation[0].NameLength/2;i++)
+		dprintf("%C",KeyValueInformation[0].Name[i]);
+        dprintf("\n");
+        dprintf("\t\tType = %d\n",KeyValueInformation[0].Type);
+	  if (KeyValueInformation[0].Type == REG_SZ)
+          dprintf("\t\tValue = %S\n",KeyValueInformation[0].Name+1
+    					+KeyValueInformation[0].NameLength/2);
+    }
+    dprintf("NtEnumerateValueKey : \n");
+    Index=0;
+    while(Status == STATUS_SUCCESS)
+    {
+      Status=NtEnumerateValueKey(hKey,Index++,KeyValueFullInformation
+		,&KeyValueInformation[0], sizeof(KeyValueInformation)
+		,&Length);
+      if(Status== STATUS_SUCCESS)
+	{
+        dprintf("\tValue:DO=%d, DL=%d, NL=%d, Name = "
+		,KeyValueInformation[0].DataOffset
+		,KeyValueInformation[0].DataLength
+		,KeyValueInformation[0].NameLength);
+	  for (i=0;i<KeyValueInformation[0].NameLength/2;i++)
+		dprintf("%C",KeyValueInformation[0].Name[i]);
+        dprintf(", Type = %d\n",KeyValueInformation[0].Type);
+	  if (KeyValueInformation[0].Type == REG_SZ)
+          dprintf("\t\tValue = %S\n",((char*)&KeyValueInformation[0]
+    					+KeyValueInformation[0].DataOffset));
+	}
+    }
+    dprintf("NtCloseKey : ");
+    Status = NtClose( hKey1 );
+    dprintf("\t\t\t\t\tStatus =%x\n",Status);
+  }
+
+
+return 0;
+
+
+   dprintf ("RegOpenKeyExW HKLM\\System\\ControlSet001: ");
+   dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                           L"System\\ControlSet001",
                            0,
-                              L"",
+                           KEY_ALL_ACCESS,
-                              REG_OPTION_VOLATILE,
+                           &hKey); 
+   dprintf ("dwError %x\n", dwError);
+/*
+  Status = NtCreateKey ( &hKey, KEY_ALL_ACCESS , &ObjectAttributes
+		,0,NULL,REG_OPTION_VOLATILE,NULL);
+  dprintf("Status=%x\n",Status);
+*/
+
+
+   dprintf ("RegOpenKeyExW: ");
+   dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                           L"System\\ControlSet001\\Services\\Serial",
+                           0,
+                           KEY_ALL_ACCESS,
+                           &hKey); 
+   dprintf ("dwError %x\n", dwError);
+   RegDataSize = sizeof(GlobalFifoEnable);
+   if (dwError == ERROR_SUCCESS)
+   {
+     dprintf ("RegQueryValueExW: ");
+     dwError = RegQueryValueExW(hKey,
+                        L"ForceFifoEnable",
+                        NULL,
+                        &RegDataType,
+                        (PBYTE)&GlobalFifoEnable,
+                        &RegDataSize);
+     dprintf ("dwError %x\n", dwError);
+   }
+   dprintf ("RegCreateKeyExW: ");
+   dwError = RegCreateKeyExW(hKey,
+                         L"Parameters\\Serial001",
+                         0,
+                         NULL,
+                         0,
+                         KEY_ALL_ACCESS,
+                         NULL,
+                         &hPortKey,
+                         &RegDisposition
+                        );
+   dprintf ("dwError %x\n", dwError);
+
+   dprintf ("RegCreateKeyExW: ");
+   dwError = RegCreateKeyExW (HKEY_LOCAL_MACHINE,
+//                           L"System\\ControlSet001\\Services\\Serial\\Test",
+                           L"Software\\reactos\\test",
+                              0,
+                              NULL,
+                              REG_OPTION_NON_VOLATILE,
                               KEY_ALL_ACCESS,
                               NULL,
                               &hKey,
                               &dwDisposition);
 
-   dprintf ("dwError %x\n", dwError);
+   dprintf ("dwError %x ", dwError);
-   if (dwError != ERROR_SUCCESS)
-      return 0;
-
    dprintf ("dwDisposition %x\n", dwDisposition);
-
+   if (dwError == ERROR_SUCCESS)
-   dprintf ("RegSetValueExW:\n");
+   {
+     dprintf ("RegSetValueExW: ");
      dwError = RegSetValueExW (hKey,
                              L"TestValue",
                              0,
@@ -54,46 +223,38 @@ int main(int argc, char* argv[])
                              20);
 
      dprintf ("dwError %x\n", dwError);
-   if (dwError != ERROR_SUCCESS)
+     dprintf ("RegCloseKey: ");
-      return 0;
-
-   dprintf ("RegCloseKey:\n");
      dwError = RegCloseKey (hKey);
      dprintf ("dwError %x\n", dwError);
-   if (dwError != ERROR_SUCCESS)
+   }
-      return 0;
-
    dprintf ("\n\n");
 
    hKey = NULL;
 
    dprintf ("RegCreateKeyExW:\n");
    dwError = RegCreateKeyExW (HKEY_LOCAL_MACHINE,
-                              L"Test",
+                              L"software\\Test",
                               0,
-                              L"",
+                              NULL,
                               REG_OPTION_VOLATILE,
                               KEY_ALL_ACCESS,
                               NULL,
                               &hKey,
                               &dwDisposition);
 
-   dprintf ("dwError %x\n", dwError);
+   dprintf ("dwError %x ", dwError);
-   if (dwError != ERROR_SUCCESS)
-      return 0;
-
    dprintf ("dwDisposition %x\n", dwDisposition);
 
 #if 0
    dprintf ("RegQueryKeyExW:\n");
 
 #endif
-
+   if (dwError == ERROR_SUCCESS)
+   {
      dprintf ("RegCloseKey:\n");
      dwError = RegCloseKey (hKey);
      dprintf ("dwError %x\n", dwError);
-   if (dwError != ERROR_SUCCESS)
+   }
-      return 0;
 
    dprintf ("\nTests done...\n");
 

reactos/drivers/dd/blue/blue.c

@@ -1,4 +1,4 @@
-/* $Id: blue.c,v 1.27 2000/09/12 10:12:12 jean Exp $
+/* $Id: blue.c,v 1.28 2000/09/29 15:03:21 jean Exp $
  *
  * COPYRIGHT:            See COPYING in the top level directory
  * PROJECT:              ReactOS kernel
@@ -121,7 +121,7 @@ STDCALL ScrCreate (PDEVICE_OBJECT DeviceObject, PIRP Irp)
     DeviceExtension->Rows =
         DeviceExtension->Rows / DeviceExtension->ScanLines;
 #ifdef BOCHS_30ROWS
-    DeviceExtension->Rows = 25;
+    DeviceExtension->Rows = 30;
 #endif
 
     DPRINT ("%d Columns  %d Rows %d Scanlines\n",

reactos/include/ddk/defines.h

@@ -168,11 +168,13 @@ enum
  */
 enum
 {
-   OBJ_INHERIT = 0x1,
+   OBJ_INHERIT = 0x2,
-   OBJ_PERMANENT = 0x2,
+   OBJ_PERMANENT = 0x10,
-   OBJ_EXCLUSIVE = 0x4,
+   OBJ_EXCLUSIVE = 0x20,
-   OBJ_CASE_INSENSITIVE = 0x8,
+   OBJ_CASE_INSENSITIVE = 0x40,
-   OBJ_OPENIF = 0x10,
+   OBJ_OPENIF = 0x80,
+   OBJ_OPENLINK = 0x100,
+   OBJ_VALID_ATTRIBUTES = 0x1F2,
 };
 
 /*

reactos/ntoskrnl/hal/x86/display.c

@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.8 2000/09/12 10:12:11 jean Exp $
+/* $Id: display.c,v 1.9 2000/09/29 15:03:21 jean Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -131,7 +131,7 @@ HalInitializeDisplay (PLOADER_PARAMETER_BLOCK LoaderBlock)
         SizeY = SizeY / ScanLines;
 
 #ifdef BOCHS_30ROWS
-SizeY=25;
+SizeY=30;
 #endif
         HalClearDisplay ();
 

reactos/ntoskrnl/ob/object.c

@@ -1,4 +1,4 @@
-/* $Id: object.c,v 1.26 2000/08/24 19:12:16 ekohl Exp $
+/* $Id: object.c,v 1.27 2000/09/29 15:03:21 jean Exp $
  * 
  * COPYRIGHT:     See COPYING in the top level directory
  * PROJECT:       ReactOS kernel
@@ -138,13 +138,19 @@ NTSTATUS ObFindObject(POBJECT_ATTRIBUTES ObjectAttributes,
 	return(STATUS_SUCCESS);
      }
    
-   if (Path[0] != '\\')
+   if ((ObjectAttributes->RootDirectory == NULL) && (Path[0] != '\\'))
      {
 	return(STATUS_UNSUCCESSFUL);
      }
    
    if (Path)
      {
+//	if ( Path[0] != '\\' )
+//	{
+//	  RtlCreateUnicodeString (&PathString, L"\\");
+//	  RtlAppendUnicodeToString (&PathString, Path);
+//	}
+//	else
 	RtlCreateUnicodeString (&PathString, Path);
 	current = PathString.Buffer;
      }