[akhaldi] 73115: [0.4.3] * Merge disk size computing overflow fix by Vort in r73113. CORE-12261

Author: akhaldi
Date: Fri Nov  4 09:16:15 2016
New Revision: 73115

URL: http://svn.reactos.org/svn/reactos?rev=73115&view=rev
Log:
[0.4.3] * Merge disk size computing overflow fix by Vort in r73113. 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/drivers/storage/class/disk/disk.c

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

Propchange: branches/ros-branch-0_4_3/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Fri Nov  4 09:16:15 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
+/trunk/reactos:73043,73072,73075,73077,73113

Modified: branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/driver…
==============================================================================
--- branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c	[iso-8859-1]
(original)
+++ branches/ros-branch-0_4_3/reactos/drivers/storage/class/disk/disk.c	[iso-8859-1] Fri
Nov  4 09:16:15 2016
@@ -4283,7 +4283,7 @@
     DeviceExtension->DiskGeometry->Geometry.SectorsPerTrack = sectorsPerTrack;
     DeviceExtension->DiskGeometry->Geometry.TracksPerCylinder = tracksPerCylinder;
     DeviceExtension->DiskGeometry->Geometry.Cylinders.QuadPart =
(LONGLONG)cylinders;
-    DeviceExtension->DiskGeometry->DiskSize.QuadPart = cylinders *
tracksPerCylinder * sectorsPerTrack *
+    DeviceExtension->DiskGeometry->DiskSize.QuadPart = (LONGLONG)cylinders *
tracksPerCylinder * sectorsPerTrack *
                                                       
DeviceExtension->DiskGeometry->Geometry.BytesPerSector;
 
     DebugPrint((3,