[ros-diffs] [weiden] 18098: RegOverridePredefKey does not (as opposed to the PSDK documentation) accept predefined handles for the hNewHKey parameter

RegOverridePredefKey does not (as opposed to the PSDK documentation)
accept predefined handles for the hNewHKey parameter
Modified: trunk/reactos/lib/advapi32/reg/reg.c
  _____

Modified: trunk/reactos/lib/advapi32/reg/reg.c
--- trunk/reactos/lib/advapi32/reg/reg.c	2005-09-26 18:03:17 UTC
(rev 18097)
+++ trunk/reactos/lib/advapi32/reg/reg.c	2005-09-26 18:05:57 UTC
(rev 18098)
@@ -38,10 +38,14 @@

static NTSTATUS MapDefaultKey (PHANDLE ParentKey, HKEY Key);
 static VOID CloseDefaultKeys(VOID);
-#define CloseDefaultKey(Handle)
\
+#define ClosePredefKey(Handle)
\
     if ((ULONG_PTR)Handle & 0x1) {
\
         NtClose(Handle);
\
     }
+#define IsPredefKey(HKey)
\
+    (((ULONG)(HKey) & 0xF0000000) == 0x80000000)
+#define GetPredefKeyIndex(HKey)
\
+    ((ULONG)(HKey) & 0x0FFFFFFF)

static NTSTATUS OpenClassesRootKey(PHANDLE KeyHandle);
 static NTSTATUS OpenLocalMachineKey (PHANDLE KeyHandle);
@@ -147,14 +151,14 @@

TRACE("MapDefaultKey (Key %x)\n", Key);

-  if (((ULONG)Key & 0xF0000000) != 0x80000000)
+  if (!IsPredefKey(Key))
     {
       *RealKey = (HANDLE)((ULONG_PTR)Key & ~0x1);
       return STATUS_SUCCESS;
     }

/* Handle special cases here */
-  Index = (ULONG)Key & 0x0FFFFFFF;
+  Index = GetPredefKeyIndex(Key);
   if (Index >= MAX_DEFAULT_HANDLES)
     {
       return STATUS_INVALID_PARAMETER;
@@ -319,17 +323,18 @@
 {
     LONG ErrorCode = ERROR_SUCCESS;

-    if (hKey == HKEY_CLASSES_ROOT ||
-        hKey == HKEY_CURRENT_CONFIG ||
-        hKey == HKEY_CURRENT_USER ||
-        hKey == HKEY_LOCAL_MACHINE ||
-        hKey == HKEY_PERFORMANCE_DATA ||
-        hKey == HKEY_USERS)
+    if ((hKey == HKEY_CLASSES_ROOT ||
+         hKey == HKEY_CURRENT_CONFIG ||
+         hKey == HKEY_CURRENT_USER ||
+         hKey == HKEY_LOCAL_MACHINE ||
+         hKey == HKEY_PERFORMANCE_DATA ||
+         hKey == HKEY_USERS) &&
+        !IsPredefKey(hNewHKey))
     {
         PHANDLE Handle;
         ULONG Index;

-        Index = (ULONG)hKey & 0x0FFFFFFF;
+        Index = GetPredefKeyIndex(hKey);
         Handle = &DefaultHandleTable[Index];

if (hNewHKey == NULL)
@@ -736,9 +741,9 @@
     }

Cleanup:
-    CloseDefaultKey(DestKeyHandle);
+    ClosePredefKey(DestKeyHandle);
 Cleanup2:
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -991,7 +996,7 @@
       RtlFreeUnicodeString (&ClassString);
     }

-  CloseDefaultKey(ParentKey);
+  ClosePredefKey(ParentKey);

TRACE("Status %x\n", Status);
   if (!NT_SUCCESS(Status))
@@ -1052,7 +1057,7 @@
                            samDesired,
                            lpdwDisposition);

-  CloseDefaultKey(ParentKey);
+  ClosePredefKey(ParentKey);

TRACE("Status %x\n", Status);
   if (!NT_SUCCESS(Status))
@@ -1151,7 +1156,7 @@
   NtClose (TargetKey);

Cleanup:
-  CloseDefaultKey(ParentKey);
+  ClosePredefKey(ParentKey);

if (!NT_SUCCESS(Status))
     {
@@ -1203,7 +1208,7 @@
   NtClose (TargetKey);

Cleanup:
-  CloseDefaultKey(ParentKey);
+  ClosePredefKey(ParentKey);

if (!NT_SUCCESS(Status))
     {
@@ -1274,7 +1279,7 @@
     }

Cleanup:
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -1565,7 +1570,7 @@
            subkey, because the handle would be invalid already! */
         if (CurKey != KeyHandle)
         {
-            CloseDefaultKey(KeyHandle);
+            ClosePredefKey(KeyHandle);
         }

return ERROR_SUCCESS;
@@ -1579,7 +1584,7 @@
         }

Cleanup:
-        CloseDefaultKey(KeyHandle);
+        ClosePredefKey(KeyHandle);

return RtlNtStatusToDosError(Status);
     }
@@ -1679,7 +1684,7 @@
     }

Cleanup:
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);

return Ret;
 }
@@ -1757,7 +1762,7 @@
     }

Cleanup:
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);

return Ret;
 }
@@ -1789,7 +1794,7 @@
    		     &ValueName);
   RtlFreeUnicodeString (&ValueName);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -1826,7 +1831,7 @@
   Status = NtDeleteValueKey (KeyHandle,
    		     &ValueName);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -2051,7 +2056,7 @@
    	KeyInfo);

Cleanup:
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -2199,7 +2204,7 @@
           KeyInfo);

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -2314,7 +2319,7 @@

done:
     if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr );
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);
     return RtlNtStatusToDosError(status);
 }

@@ -2422,7 +2427,7 @@

done:
     if (buf_ptr != buffer) HeapFree( GetProcessHeap(), 0, buf_ptr );
-    CloseDefaultKey(KeyHandle);
+    ClosePredefKey(KeyHandle);
     return RtlNtStatusToDosError(status);
 }

@@ -2451,7 +2456,7 @@

Status = NtFlushKey (KeyHandle);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -2495,7 +2500,7 @@
    			 *lpcbSecurityDescriptor,
    			 lpcbSecurityDescriptor);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -2603,7 +2608,7 @@
     }

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -2660,7 +2665,7 @@
       ErrorCode = RtlNtStatusToDosError (Status);
     }

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -2779,7 +2784,7 @@
    	ErrorCode = RtlNtStatusToDosError (Status);
    }
    
-	CloseDefaultKey(KeyHandle);
+	ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -2830,7 +2835,7 @@
    	ErrorCode = RtlNtStatusToDosError (Status);
    }
    
-	CloseDefaultKey(KeyHandle);
+	ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -3216,7 +3221,7 @@
     }

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -3466,7 +3471,7 @@
           ValueInfo);

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -3735,7 +3740,7 @@
     }

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -3897,7 +3902,7 @@
     }

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -3991,7 +3996,7 @@
   NtClose (FileHandle);

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -4092,7 +4097,7 @@
   NtClose (FileHandle);

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -4132,7 +4137,7 @@
    			SecurityInformation,
    			pSecurityDescriptor);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -4282,7 +4287,7 @@
    		  (PVOID)lpData,
    		  (ULONG)cbData);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {
@@ -4407,7 +4412,7 @@
     }

Cleanup:
-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

return ErrorCode;
 }
@@ -4473,7 +4478,7 @@

Status = NtUnloadKey (&ObjectAttributes);

-  CloseDefaultKey(KeyHandle);
+  ClosePredefKey(KeyHandle);

if (!NT_SUCCESS(Status))
     {