[ros-diffs] [weiden] 17537: minor simplifications

minor simplifications
Modified: trunk/reactos/lib/advapi32/reg/reg.c
  _____  

Modified: trunk/reactos/lib/advapi32/reg/reg.c
--- trunk/reactos/lib/advapi32/reg/reg.c	2005-08-25 12:27:25 UTC
(rev 17536)
+++ trunk/reactos/lib/advapi32/reg/reg.c	2005-08-25 12:30:10 UTC
(rev 17537)
@@ -833,12 +833,14 @@

         {
             return RtlNtStatusToDosError(Status);
         }
+        
+        KeyHandle = SubKeyHandle;
     }
 
     RtlInitUnicodeString(&ValueName,
                          (LPWSTR)lpValueName);
 
-    Status = NtDeleteValueKey((SubKeyHandle != NULL) ? SubKeyHandle :
KeyHandle,
+    Status = NtDeleteValueKey(KeyHandle,
                               &ValueName);
 
     if (SubKeyHandle != NULL)
@@ -944,6 +946,8 @@
         {
             return RtlNtStatusToDosError(Status);
         }
+        
+        KeyHandle = SubKeyHandle;
     }
 
     /* FIXME - delete all keys recursively */
@@ -1041,9 +1045,11 @@
         {
             return RtlNtStatusToDosError(Status);
         }
+        
+        KeyHandle = SubKeyHandle;
     }
     
-    Ret = RegSetValueExW((SubKeyHandle != NULL) ? SubKeyHandle :
KeyHandle,
+    Ret = RegSetValueExW(KeyHandle,
                          lpValueName,
                          0,
                          dwType,
@@ -1110,9 +1116,11 @@
         {
             return RtlNtStatusToDosError(Status);
         }
+        
+        KeyHandle = SubKeyHandle;
     }
 
-    Ret = RegSetValueExA((SubKeyHandle != NULL) ? SubKeyHandle :
KeyHandle,
+    Ret = RegSetValueExA(KeyHandle,
                          lpValueName,
                          0,
                          dwType,