[akhaldi] 73119: [0.4.3] * Merge FstubReadPartitionTableEFI() fix by Pierre in r73112. CORE-12261

Author: akhaldi
Date: Fri Nov  4 09:33:03 2016
New Revision: 73119

URL: http://svn.reactos.org/svn/reactos?rev=73119&view=rev
Log:
[0.4.3] * Merge FstubReadPartitionTableEFI() fix by Pierre in r73112. CORE-12261

Modified:
    branches/ros-branch-0_4_3/   (props changed)
    branches/ros-branch-0_4_3/reactos/   (props changed)
    branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c

Propchange: branches/ros-branch-0_4_3/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Nov  4 09:33:03 2016
@@ -1 +1 @@
-/trunk:73043,73072,73075,73077,73113-73114,73117
+/trunk:73043,73072,73075,73077,73112-73114,73117

Propchange: branches/ros-branch-0_4_3/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Nov  4 09:33:03 2016
@@ -21,4 +21,4 @@
 /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:73043,73072,73075,73077,73113-73114,73117
+/trunk/reactos:73043,73072,73075,73077,73112-73114,73117

Modified: branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/ntoskrn...
==============================================================================
--- branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c	[iso-8859-1] (original)
+++ branches/ros-branch-0_4_3/reactos/ntoskrnl/fstub/fstubex.c	[iso-8859-1] Fri Nov  4 09:33:03 2016
@@ -963,8 +963,12 @@
     ULONG NumberOfEntries;
     PEFI_PARTITION_HEADER EfiHeader;
     EFI_PARTITION_ENTRY PartitionEntry;
+#if 0
     BOOLEAN UpdatedPartitionTable = FALSE;
     ULONGLONG SectorsForPartitions, PartitionEntryLBA;
+#else
+    ULONGLONG PartitionEntryLBA;
+#endif
     PDRIVE_LAYOUT_INFORMATION_EX DriveLayoutEx = NULL;
     ULONG i, PartitionCount, PartitionIndex, PartitionsPerSector;
     PAGED_CODE();
@@ -996,6 +1000,7 @@
         return STATUS_INSUFFICIENT_RESOURCES;
     }

+#if 0
     if (!ReadBackupTable)
     {
         /* If we weren't ask to read backup table,
@@ -1015,6 +1020,7 @@
             UpdatedPartitionTable = TRUE;
         }
     }
+#endif

DriveLayoutEx->PartitionStyle = PARTITION_STYLE_GPT;
     /* Translate LBA -> Offset */
@@ -1083,12 +1089,14 @@
     }
     DriveLayoutEx->PartitionCount = PartitionCount;

+#if 0
     /* If we updated partition table using backup table, rewrite partition table */
     if (UpdatedPartitionTable)
     {
         IoWritePartitionTableEx(Disk->DeviceObject,
                                 DriveLayoutEx);
     }
+#endif

/* Finally, return read data */
     *DriveLayout = DriveLayoutEx;