STABLE14-window-largeint-20051019

The large integer support was applying a <<32 to a 32-bit value.
This is an undefined operation.

(cherry picked from commit 8b0b064f7ec60d8b5913248c97553ce3b7fdb775)

diff --git a/src/WINNT/afsd/largeintdotnet.c b/src/WINNT/afsd/largeintdotnet.c
index 231182395c3be60c3627c7f84ebeef2cb028401d..73abe67c2559a5da312e308a153e2d8a3b16292a 100644 (file)
--- a/src/WINNT/afsd/largeintdotnet.c
+++ b/src/WINNT/afsd/largeintdotnet.c
@@ -20,71 +20,77 @@
 #if (_MSC_VER >= 1300)
 LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b)
 { 
-       LARGE_INTEGER result;
-       int carry;
-       result.LowPart=a.LowPart+b.LowPart;
-       carry=(result.LowPart < b.LowPart) ? 1 : 0;
-       result.HighPart=a.HighPart+b.HighPart+ carry;
-       return result;
+    LARGE_INTEGER result;
+    int carry;
+    result.LowPart=a.LowPart+b.LowPart;
+    carry=(result.LowPart < b.LowPart) ? 1 : 0;
+    result.HighPart=a.HighPart+b.HighPart+ carry;
+    return result;
 }
 LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b)
 { 
-       LARGE_INTEGER result;
-       int borrow;
-       result.LowPart=a.LowPart-b.LowPart;
-       borrow=(result.LowPart > a.LowPart) ? 1 : 0;
-       result.HighPart=a.HighPart-b.HighPart- borrow;
-       return result;
+    LARGE_INTEGER result;
+    int borrow;
+    result.LowPart=a.LowPart-b.LowPart;
+    borrow=(result.LowPart > a.LowPart) ? 1 : 0;
+    result.HighPart=a.HighPart-b.HighPart- borrow;
+    return result;
 }
 LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder)
 {
-       LARGE_INTEGER result;
-       ULONGLONG a1,q1,r1;
+    LARGE_INTEGER result;
+    ULONGLONG a1,q1,r1;
 
     result.HighPart=0;
     result.LowPart=0;
     if (b == 0) { return result; }
     if (b == 1) { *remainder = 0; return a; }
 
-       a1=(a.HighPart << 32) | a.LowPart;
-       q1=a1/b;
-       r1=a1-(q1*b);
-       if (r1 > ULONG_MAX) /*XXX */;
-       result.HighPart=q1 >> 32;
-       result.LowPart=q1 & 0xffffffff;
-       *remainder=r1 & 0xffffffff;
-       return result;
+    a1=a.HighPart;
+    a1<<=32;
+    a1 |= a.LowPart;
+    q1=a1/b;
+    r1=a1-(q1*b);
+    if (r1 > ULONG_MAX) /*XXX */;
+    result.HighPart=(LONG)(q1 >> 32);
+    result.LowPart=(DWORD)(q1 & 0xffffffff);
+    *remainder=(unsigned long)(r1 & 0xffffffff);
+    return result;
 }
 LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder)
 {
-       LARGE_INTEGER result;
-       ULONGLONG a1,b1,q1,r1;
+    LARGE_INTEGER result;
+    ULONGLONG a1,b1,q1,r1;
 
     result.HighPart=0;
     result.LowPart=0;
     if (b.HighPart == 0 && b.LowPart == 0) { return result; }
     if (b.HighPart == 0 && b.LowPart == 1) { 
-               remainder->HighPart = 0; 
-               remainder->LowPart = 0;
-               return a; 
-       }
+       remainder->HighPart = 0; 
+       remainder->LowPart = 0;
+       return a; 
+    }
 
-       a1=(a.HighPart << 32) | a.LowPart;
-       b1=(b.HighPart << 32) | a.LowPart;
-       q1=a1/b1;
-       r1=a1-(q1*b1);
-       result.HighPart=q1 >> 32;
-       result.LowPart=q1 & 0xffffffff;
-       remainder->HighPart=r1 >> 32;
-       remainder->LowPart=r1 & 0xffffffff;
-       return result;
-}
+    a1=a.HighPart;
+    a1<<=32;
+    a1|=a.LowPart;
+    b1=b.HighPart;
+    b1<<=32;
+    b1|=b.LowPart;
+    q1=a1/b1;
+    r1=a1-(q1*b1);
+    result.HighPart=(LONG)(q1 >> 32);
+    result.LowPart=(DWORD)(q1 & 0xffffffff);
+    remainder->HighPart=(LONG)(r1 >> 32);
+    remainder->LowPart=(DWORD)(r1 & 0xffffffff);
+    return result;
+}      
 
 LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a) 
 {
-       LARGE_INTEGER result;
-       result.HighPart=0;
-       result.LowPart=a;
-       return result;
-}
-#endif
+    LARGE_INTEGER result;
+    result.HighPart=0;
+    result.LowPart=a;
+    return result;
+}      
+#endif