DEVEL15-windows-largeinteger-20070910

Fix the function type so that assignment of return values are
properly applied.

Add missing comparison routines.

(cherry picked from commit 22da0dd5f8025d8e842229290e3e07207483ce1a)

diff --git a/src/WINNT/client_osi/largeint.h b/src/WINNT/client_osi/largeint.h
index 393b69bcd3ba8f5a600cb10fe5c64c898f51bd77..e877ba48d999a17818f7779c347a297194348367 100644 (file)
--- a/src/WINNT/client_osi/largeint.h
+++ b/src/WINNT/client_osi/largeint.h
@@ -29,7 +29,6 @@ extern "C" {
 //
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerAdd (
     LARGE_INTEGER Addend1,
     LARGE_INTEGER Addend2
@@ -40,7 +39,6 @@ LargeIntegerAdd (
 //
 
 LARGE_INTEGER
-WINAPI
 EnlargedIntegerMultiply (
     LONG Multiplicand,
     LONG Multiplier
@@ -51,7 +49,6 @@ EnlargedIntegerMultiply (
 //
 
 LARGE_INTEGER
-WINAPI
 EnlargedUnsignedMultiply (
     ULONG Multiplicand,
     ULONG Multiplier
@@ -62,7 +59,6 @@ EnlargedUnsignedMultiply (
 //
 
 ULONG
-WINAPI
 EnlargedUnsignedDivide (
     IN ULARGE_INTEGER Dividend,
     IN ULONG Divisor,
@@ -74,7 +70,6 @@ EnlargedUnsignedDivide (
 //
 
 LARGE_INTEGER
-WINAPI
 ExtendedMagicDivide (
     LARGE_INTEGER Dividend,
     LARGE_INTEGER MagicDivisor,
@@ -86,7 +81,6 @@ ExtendedMagicDivide (
 //
 
 LARGE_INTEGER
-WINAPI
 ExtendedLargeIntegerDivide (
     LARGE_INTEGER Dividend,
     ULONG Divisor,
@@ -98,7 +92,6 @@ ExtendedLargeIntegerDivide (
 //
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerDivide (
     LARGE_INTEGER Dividend,
     LARGE_INTEGER Divisor,
@@ -110,7 +103,6 @@ LargeIntegerDivide (
 //
 
 LARGE_INTEGER
-WINAPI
 ExtendedIntegerMultiply (
     LARGE_INTEGER Multiplicand,
     LONG Multiplier
@@ -121,7 +113,6 @@ ExtendedIntegerMultiply (
 //
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerNegate (
     LARGE_INTEGER Subtrahend
     );
@@ -131,7 +122,6 @@ LargeIntegerNegate (
 //
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerSubtract (
     LARGE_INTEGER Minuend,
     LARGE_INTEGER Subtrahend
@@ -157,7 +147,6 @@ LargeIntegerSubtract (
 //
 
 LARGE_INTEGER
-WINAPI
 ConvertLongToLargeInteger (
     LONG SignedInteger
     );
@@ -167,7 +156,6 @@ ConvertLongToLargeInteger (
 //
 
 LARGE_INTEGER
-WINAPI
 ConvertUlongToLargeInteger (
     ULONG UnsignedInteger
     );
@@ -178,21 +166,18 @@ ConvertUlongToLargeInteger (
 //
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerShiftLeft (
     LARGE_INTEGER LargeInteger,
     CCHAR ShiftCount
     );
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerShiftRight (
     LARGE_INTEGER LargeInteger,
     CCHAR ShiftCount
     );
 
 LARGE_INTEGER
-WINAPI
 LargeIntegerArithmeticShift (
     LARGE_INTEGER LargeInteger,
     CCHAR ShiftCount

diff --git a/src/WINNT/client_osi/osi.h b/src/WINNT/client_osi/osi.h
index 071533e253dcb7518bd52b8c87ec6c55c7017677..002e0e5c572539e4f108c87afd70e56d968a1bd6 100644 (file)
--- a/src/WINNT/client_osi/osi.h
+++ b/src/WINNT/client_osi/osi.h
@@ -53,6 +53,9 @@ LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a);
 #define LargeIntegerEqualTo(a, b) \
   ((a).HighPart == (b).HighPart && (a).LowPart == (b).LowPart)
   
+#define LargeIntegerGreaterThanZero(a) \
+ ((a).HighPart > 0 || ((a).HighPart == 0 && (a).LowPart != 0))
+
 #define LargeIntegerGreaterOrEqualToZero(a) ((a).HighPart >= 0)
   
 #define LargeIntegerLessThanZero(a) ((a).HighPart < 0)

diff --git a/src/WINNT/client_osi/osiutils.c b/src/WINNT/client_osi/osiutils.c
index 9d5a91e83632b9a50a30e8ca1659446885743ca6..c9918cde29c39e3e26a50d7fd3c7a05a5341f117 100644 (file)
--- a/src/WINNT/client_osi/osiutils.c
+++ b/src/WINNT/client_osi/osiutils.c
@@ -76,7 +76,7 @@ void __RPC_API MIDL_user_free(void *p)
 }
 
 #if (_MSC_VER >= 1300)
-LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b)
+LARGE_INTEGER /* WINAPI */ LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b)
 { 
        LARGE_INTEGER result;
        int carry;
@@ -85,7 +85,7 @@ LARGE_INTEGER LargeIntegerAdd(LARGE_INTEGER a, LARGE_INTEGER b)
        result.HighPart=a.HighPart+b.HighPart+ carry;
        return result;
 }
-LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b)
+LARGE_INTEGER /* WINAPI */ LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b)
 { 
        LARGE_INTEGER result;
        int borrow;
@@ -94,7 +94,7 @@ LARGE_INTEGER LargeIntegerSubtract(LARGE_INTEGER a, LARGE_INTEGER b)
        result.HighPart=a.HighPart-b.HighPart- borrow;
        return result;
 }
-LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder)
+LARGE_INTEGER /* WINAPI */ ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsigned long *remainder)
 {
     LARGE_INTEGER result;
     ULONGLONG a1,q1,r1;
@@ -115,7 +115,7 @@ LARGE_INTEGER ExtendedLargeIntegerDivide(LARGE_INTEGER a, unsigned long b, unsig
     *remainder=(unsigned long)(r1 & 0xffffffff);
     return result;
 }
-LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder)
+LARGE_INTEGER /* WINAPI */ LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER *remainder)
 {
     LARGE_INTEGER result;
     ULONGLONG a1,b1,q1,r1;
@@ -144,7 +144,7 @@ LARGE_INTEGER LargeIntegerDivide(LARGE_INTEGER a, LARGE_INTEGER b, LARGE_INTEGER
     return result;
 }
 
-LARGE_INTEGER ConvertLongToLargeInteger(unsigned long a) 
+LARGE_INTEGER /* WINAPI */ ConvertLongToLargeInteger(unsigned long a) 
 {
     LARGE_INTEGER result;
     result.HighPart=0;