[ros-diffs] [tkreuzer] 45078: Fix merge artifacts

Author: tkreuzer
Date: Thu Jan 14 10:53:02 2010
New Revision: 45078

URL: http://svn.reactos.org/svn/reactos?rev=45078&view=rev
Log:
Fix merge artifacts

Modified:
    branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr...
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Jan 14 10:53:02 2010
@@ -1726,7 +1726,7 @@
                                          KeyValuePartialInformation,
                                          &KeyPartialInfo,
                                          sizeof(KeyPartialInfo),
-                                         &Size);
+                                         &Length);
                 if (!NT_SUCCESS(Status)) AlternateShell = FALSE;
             }

@@ -1878,17 +1878,17 @@
     ZwClose(ProcessInfo->ProcessHandle);

/* Free the initial process environment */
-    Length = 0;
+    Size = 0;
     ZwFreeVirtualMemory(NtCurrentProcess(),
                         (PVOID*)&Environment,
-                        &Length,
+                        &Size,
                         MEM_RELEASE);

/* Free the initial process parameters */
-    Length = 0;
+    Size = 0;
     ZwFreeVirtualMemory(NtCurrentProcess(),
                         (PVOID*)&ProcessParameters,
-                        &Length,
+                        &Size,
                         MEM_RELEASE);

/* Increase init phase */