[tkreuzer] 37857: fix some ULONG/ULONG_PTR issues

Author: tkreuzer
Date: Thu Dec  4 13:08:55 2008
New Revision: 37857

URL: http://svn.reactos.org/svn/reactos?rev=37857&view=rev
Log:
fix some ULONG/ULONG_PTR issues

Modified:
    trunk/reactos/drivers/storage/class/cdrom/cdrom.c

Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdrom...
==============================================================================
--- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Thu Dec  4 13:08:55 2008
@@ -2913,7 +2913,7 @@
                                             srb,
                                             irpStack->MajorFunction,
                                             irpStack->Parameters.DeviceIoControl.IoControlCode,
-                                            MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1),
+                                            MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
                                             &status);

DebugPrint((2, "CdRomDeviceControlCompletion: IRP will %sbe retried\n",
@@ -2972,10 +2972,10 @@

}

-        if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) {
-
-
-            if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) {
+        if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) {
+
+
+            if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {

//
                 // Retry request.
@@ -3479,7 +3479,7 @@
                                             srb,
                                             irpStack->MajorFunction,
                                             irpStack->Parameters.DeviceIoControl.IoControlCode,
-                                            MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1),
+                                            MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
                                             &status);

if (status == STATUS_DATA_OVERRUN) {
@@ -3499,9 +3499,9 @@
             retry = TRUE;
         }

-        if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) {
-
-            if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) {
+        if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) {
+
+            if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {

//
                 // Retry request.
@@ -3810,7 +3810,7 @@
                                             srb,
                                             irpStack->MajorFunction,
                                             irpStack->Parameters.DeviceIoControl.IoControlCode,
-                                            MAXIMUM_RETRIES - ((ULONG)realIrpNextStack->Parameters.Others.Argument1),
+                                            MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
                                             &status);

//
@@ -3825,9 +3825,9 @@
             retry = TRUE;
         }

-        if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)realIrpNextStack->Parameters.Others.Argument1-1))) {
-
-            if (((ULONG)realIrpNextStack->Parameters.Others.Argument1)) {
+        if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) {
+
+            if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {

//
                 // Retry request.
@@ -4186,7 +4186,7 @@
             srb,
             irpStack->MajorFunction,
             irpStack->MajorFunction == IRP_MJ_DEVICE_CONTROL ? irpStack->Parameters.DeviceIoControl.IoControlCode : 0,
-            MAXIMUM_RETRIES - ((ULONG)irpNextStack->Parameters.Others.Argument1),
+            MAXIMUM_RETRIES - ((ULONG_PTR)irpNextStack->Parameters.Others.Argument1),
             &status);

//
@@ -4201,9 +4201,9 @@
             retry = TRUE;
         }

-        if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG)irpNextStack->Parameters.Others.Argument1-1))) {
-
-            if (((ULONG)irpNextStack->Parameters.Others.Argument1)) {
+        if (retry && (irpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)irpNextStack->Parameters.Others.Argument1-1))) {
+
+            if (((ULONG_PTR)irpNextStack->Parameters.Others.Argument1)) {

//
                 // Retry request.
@@ -5883,7 +5883,7 @@
             // Decrement the countdown timer and put the IRP back in the list.
             //

-            count = (ULONG) irpStack->Parameters.Others.Argument3;
+            count = (ULONG_PTR) irpStack->Parameters.Others.Argument3;
             count--;
             irpStack->Parameters.Others.Argument3 = (PVOID) count;

@@ -6507,7 +6507,7 @@
     //

irpStack = IoGetCurrentIrpStackLocation(Irp);
-    retryCount = (ULONG) irpStack->Parameters.Others.Argument1;
+    retryCount = (ULONG_PTR) irpStack->Parameters.Others.Argument1;
     originalIrp = (PIRP) irpStack->Parameters.Others.Argument2;

if (!DeviceObject) {