Changeset 884

Timestamp:

4/18/2009 2:22:51 AM (4 years ago)

Author:

lowjoel

Message:

-Fixed a few 64-bit warnings
-Fixed a wrong use of assignment operator (== was intended)
-Corrected the ISAAC code for 64-bit, buffers were assumed to be long enough onlt to fit in a 32-bit integer

Location:

trunk

Files:

• EraserDll/Eraser.cpp (modified) (2 diffs)
• EraserDll/File.cpp (modified) (1 diff)
• EraserDll/Random.cpp (modified) (4 diffs)
• EraserDll/Random.h (modified) (1 diff)
• EraserDll/Schneier7Pass.cpp (modified) (1 diff)
• SchedulerView.cpp (modified) (1 diff)

trunk/EraserDll/Eraser.cpp

@@ -142 +142 @@
     TCHAR szNewName[MAX_PATH];
     PTCHAR pszLastSlash;
-    E_UINT32 i, j, length;
-    size_t index;
+    size_t index, i, j, length;
 
     try {
@@ -2167 +2166 @@
 
             // number of files to process
-            context->m_uProgressWipedFiles = 0;
+            context->m_uProgressWipedFiles = 0u;
             context->m_uProgressFiles = context->m_saData.GetSize();
 

trunk/EraserDll/File.cpp

@@ -374 +374 @@
         DataStreamArray streams;
         DataStream defaultStream;
-        LPDWORD                   lpStatus = 0;
-    
+
         if (isWindowsNT) {
-            FileEncryptionStatus (context->m_strData,lpStatus);
-            if (lpStatus=(LPDWORD)FILE_IS_ENCRYPTED) { 
+            DWORD cryptStatus = 0;
+            FileEncryptionStatus (context->m_strData, &cryptStatus);
+            if (cryptStatus == FILE_IS_ENCRYPTED) { 
                 DecryptFile(context->m_strData,0);
             }

trunk/EraserDll/Random.cpp

@@ -103 +103 @@
 static E_INT32 poolMixes = 0;
 
-static E_UINT32 isaacOutputPosition = 0;
+static UINT_PTR isaacOutputPosition = 0;
 static LARGE_INTEGER lastCall;
 
@@ -487 +487 @@
 
 static void
-clearBuffer(E_PUINT8 buffer, E_UINT32 size)
+clearBuffer(E_PUINT8 buffer, UINT_PTR size)
 {
     if (size == 0) {
@@ -1811 +1811 @@
 
 bool
-isaacFill(E_PUINT8 puBuffer, E_UINT32 uSize)
+isaacFill(E_PUINT8 puBuffer, UINT_PTR uSize)
 {
     if (!AfxIsValidAddress(puBuffer, uSize)) {
@@ -1821 +1821 @@
 
     try {
-        E_UINT32 uAvailableData, uPosition = 0;
+        UINT_PTR uAvailableData, uPosition = 0;
         E_PUINT8 puRandom = (E_PUINT8)isaacOutput;
         while (uPosition < uSize) {

trunk/EraserDll/Random.h

@@ -240 +240 @@
 isaacSeed();
 bool
-isaacFill(E_PUINT8, E_UINT32);
+isaacFill(E_PUINT8, UINT_PTR);
 
 #endif

trunk/EraserDll/Schneier7Pass.cpp

@@ -7 +7 @@
     SCHNEIER_PASS_COUNT = 7
 };
-typedef bool (*PFPassFillStrategy)(E_PUINT8, E_UINT32);
-static bool oneFill(E_PUINT8 pBuffer, E_UINT32 bufferSize)
+typedef bool (*PFPassFillStrategy)(E_PUINT8, UINT_PTR);
+static bool oneFill(E_PUINT8 pBuffer, UINT_PTR bufferSize)
 {
     memset(pBuffer, 1, bufferSize);
     return true;
 }
-static bool zeroFill(E_PUINT8 pBuffer, E_UINT32 bufferSize)
+static bool zeroFill(E_PUINT8 pBuffer, UINT_PTR bufferSize)
 {
     memset(pBuffer, 0, bufferSize);

trunk/SchedulerView.cpp

@@ -523 +523 @@
         {
             int nItem;
-            INT_PTR iSize = pDoc->m_paScheduledTasks.GetSize();
+            DWORD_PTR iSize = pDoc->m_paScheduledTasks.GetSize();
             DWORD_PTR nIndex;
             CScheduleItem *psiItem = 0;