Reverted latest changes.

[reactos.git] / reactos / lib / advapi32 / reg / reg.c

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index f972946..c0dd6b1 100644 (file)
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -1,4 +1,4 @@
-/* $Id: reg.c,v 1.16 2002/09/07 15:12:22 chorns Exp $
+/* $Id: reg.c,v 1.17 2002/09/08 10:22:36 chorns Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -9,7 +9,9 @@
  *                  Created 01/11/98
  *                  19990309 EA Stubs
  */
-#include <advapi32.h>
+#include <ddk/ntddk.h>
+#include <ntdll/rtl.h>
+#include <windows.h>
 #include <wchar.h>
 
 #define NDEBUG
@@ -29,13 +31,13 @@
 
 #define MAX_DEFAULT_HANDLES   6
 
-static RTL_CRITICAL_SECTION HandleTableCS;
+static CRITICAL_SECTION HandleTableCS;
 static HANDLE DefaultHandleTable[MAX_DEFAULT_HANDLES];
 
 
 /* PROTOTYPES ****************************************************************/
 
-static NTSTATUS MapDefaultKey (PHANDLE ParentKey, HKEY Key);
+static NTSTATUS MapDefaultKey (PHKEY ParentKey, HKEY Key);
 static VOID CloseDefaultKeys(VOID);
 
 static NTSTATUS OpenClassesRootKey(PHANDLE KeyHandle);
@@ -84,7 +86,7 @@ RegCleanup(VOID)
 
 
 static NTSTATUS
-MapDefaultKey(PHANDLE RealKey,
+MapDefaultKey(PHKEY RealKey,
              HKEY Key)
 {
    PHANDLE Handle;
@@ -284,7 +286,7 @@ RegCloseKey(HKEY hKey)
  *     RegConnectRegistryA
  */
 LONG STDCALL
-RegConnectRegistryA(LPCSTR lpMachineName,
+RegConnectRegistryA(LPSTR lpMachineName,
                    HKEY hKey,
                    PHKEY phkResult)
 {
@@ -297,7 +299,7 @@ RegConnectRegistryA(LPCSTR lpMachineName,
  *     RegConnectRegistryW
  */
 LONG STDCALL
-RegConnectRegistryW(LPCWSTR lpMachineName,
+RegConnectRegistryW(LPWSTR lpMachineName,
                    HKEY hKey,
                    PHKEY phkResult)
 {
@@ -364,7 +366,7 @@ RegCreateKeyExA(HKEY hKey,
   UNICODE_STRING ClassString;
   OBJECT_ATTRIBUTES Attributes;
   NTSTATUS Status;
-  HANDLE ParentKey;
+  HKEY ParentKey;
 
   DPRINT("RegCreateKeyExW() called\n");
 
@@ -393,7 +395,7 @@ RegCreateKeyExA(HKEY hKey,
                             (HANDLE)ParentKey,
                             (PSECURITY_DESCRIPTOR)lpSecurityAttributes);
 
-  Status = NtCreateKey((PHANDLE)phkResult,
+  Status = NtCreateKey(phkResult,
                       samDesired,
                       &Attributes,
                       0,
@@ -436,7 +438,7 @@ RegCreateKeyExW(HKEY                        hKey,
        UNICODE_STRING ClassString;
        OBJECT_ATTRIBUTES Attributes;
        NTSTATUS Status;
-       HANDLE ParentKey;
+       HKEY ParentKey;
 
        DPRINT("RegCreateKeyExW() called\n");
 
@@ -460,7 +462,7 @@ RegCreateKeyExW(HKEY                        hKey,
                                    (HANDLE)ParentKey,
                                    (PSECURITY_DESCRIPTOR)lpSecurityAttributes);
 
-       Status = NtCreateKey ((PHANDLE)phkResult,
+       Status = NtCreateKey (phkResult,
                              samDesired,
                              &Attributes,
                              0,
@@ -854,14 +856,14 @@ RegEnumKeyExW(
        BufferSize = sizeof (KEY_NODE_INFORMATION) + *lpcbName * sizeof(WCHAR);
        if (lpClass)
                BufferSize += *lpcbClass;
-       KeyInfo = (PKEY_NODE_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize);
+       KeyInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, BufferSize);
 
   /* We don't know the exact size of the data returned, so call
      NtEnumerateKey() with a buffer size determined from parameters
      to this function. If that call fails with a status code of
      STATUS_BUFFER_OVERFLOW, allocate a new buffer and try again */
   while (TRUE) {
-    KeyInfo = (PKEY_NODE_INFORMATION)RtlAllocateHeap(
+    KeyInfo = RtlAllocateHeap(
       RtlGetProcessHeap(),
                0,
                BufferSize);
@@ -1049,7 +1051,7 @@ RegEnumValueW(
      to this function. If that call fails with a status code of
      STATUS_BUFFER_OVERFLOW, allocate a new buffer and try again */
   while (TRUE) {
-    ValueInfo = (PKEY_VALUE_FULL_INFORMATION)RtlAllocateHeap(
+    ValueInfo = RtlAllocateHeap(
       RtlGetProcessHeap(),
                0,
                BufferSize);
@@ -1256,7 +1258,7 @@ RegOpenKeyA(HKEY hKey,
                             KeyHandle,
                             NULL);
 
-  Status = NtOpenKey((PHANDLE)phkResult,
+  Status = NtOpenKey(phkResult,
                     KEY_ALL_ACCESS,
                     &ObjectAttributes);
 
@@ -1313,7 +1315,7 @@ RegOpenKeyW (
                                   NULL);
 
        errCode = NtOpenKey(
-                       (PHANDLE)phkResult,
+                       phkResult,
                        KEY_ALL_ACCESS,
                        & ObjectAttributes
                        );
@@ -1363,7 +1365,7 @@ RegOpenKeyExA(HKEY hKey,
                             KeyHandle,
                             NULL);
 
-  Status = NtOpenKey((PHANDLE)phkResult,
+  Status = NtOpenKey(phkResult,
                     samDesired,
                     &ObjectAttributes);
 
@@ -1416,7 +1418,7 @@ RegOpenKeyExW(HKEY hKey,
                             KeyHandle,
                             NULL);
 
-  Status = NtOpenKey((PHANDLE)phkResult,
+  Status = NtOpenKey(phkResult,
                     samDesired,
                     &ObjectAttributes);
   if (!NT_SUCCESS(Status))
@@ -1530,7 +1532,7 @@ RegQueryInfoKeyW(
   if (lpClass)
   {
     FullInfoSize = sizeof(KEY_FULL_INFORMATION) + *lpcbClass;
-    FullInfo = (PKEY_FULL_INFORMATION)RtlAllocateHeap(RtlGetProcessHeap(), 0, FullInfoSize);
+    FullInfo = RtlAllocateHeap(RtlGetProcessHeap(), 0, FullInfoSize);
     if (!FullInfo)
     {
                  SetLastError(ERROR_OUTOFMEMORY);
@@ -1627,7 +1629,7 @@ LONG
 STDCALL
 RegQueryMultipleValuesA(
        HKEY    hKey,
-       PVALENTA        val_list,
+       PVALENT val_list,
        DWORD   num_vals,
        LPSTR   lpValueBuf,
        LPDWORD ldwTotsize
@@ -1646,7 +1648,7 @@ LONG
 STDCALL
 RegQueryMultipleValuesW(
        HKEY    hKey,
-       PVALENTW        val_list,
+       PVALENT val_list,
        DWORD   num_vals,
        LPWSTR  lpValueBuf,
        LPDWORD ldwTotsize
@@ -1698,7 +1700,7 @@ RegQueryValueA(
   {
     ValueSize = *lpcbValue * sizeof(WCHAR);
     Value.MaximumLength = ValueSize;
-    Value.Buffer = (PWCHAR)RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueSize);
+    Value.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, ValueSize);
     if (!Value.Buffer)
     {
            SetLastError(ERROR_OUTOFMEMORY);
@@ -1739,12 +1741,11 @@ RegQueryValueA(
 /************************************************************************
  *     RegQueryValueExA
  */
-LONG WINAPI RegQueryValueExA (HKEY,LPCSTR,PDWORD,PDWORD,LPBYTE,LPDWORD);
 LONG
 STDCALL
 RegQueryValueExA(
        HKEY    hKey,
-       LPCSTR  lpValueName,
+       LPSTR   lpValueName,
        LPDWORD lpReserved,
        LPDWORD lpType,
        LPBYTE  lpData,
@@ -1772,7 +1773,7 @@ RegQueryValueExA(
   if (lpData)
   {
     ValueData.MaximumLength = *lpcbData * sizeof(WCHAR);
-         ValueData.Buffer = (PWCHAR)RtlAllocateHeap(
+         ValueData.Buffer = RtlAllocateHeap(
       RtlGetProcessHeap(),
       0,
       ValueData.MaximumLength);
@@ -1848,7 +1849,7 @@ LONG
 STDCALL
 RegQueryValueExW(
        HKEY    hKey,
-       LPCWSTR lpValueName,
+       LPWSTR  lpValueName,
        LPDWORD lpReserved,
        LPDWORD lpType,
        LPBYTE  lpData,
@@ -1884,7 +1885,7 @@ RegQueryValueExW(
                              lpValueName);
 
        BufferSize = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + *lpcbData;
-       ValueInfo = (PKEY_VALUE_PARTIAL_INFORMATION)RtlAllocateHeap (RtlGetProcessHeap(),
+       ValueInfo = RtlAllocateHeap (RtlGetProcessHeap(),
                                     0,
                                     BufferSize);
        if (ValueInfo == NULL)
@@ -2239,7 +2240,7 @@ RegSetValueA(
 
   DataSize = cbData * sizeof(WCHAR);
   Data.MaximumLength = DataSize;
-  Data.Buffer = (PWCHAR)RtlAllocateHeap(RtlGetProcessHeap(), 0, DataSize);
+  Data.Buffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, DataSize);
   if (!Data.Buffer)
   {
          SetLastError(ERROR_OUTOFMEMORY);