Changeset 9986 for trunk/src/NTDLL/string.c

Timestamp:

Apr 7, 2003, 8:40:53 PM (22 years ago)

Author:

sandervl

Message:

PF: NTDLL update for GCC 3.2.1 + resync with Wine

File:

• trunk/src/NTDLL/string.c (modified) (5 diffs)

trunk/src/NTDLL/string.c

@@ -25 +25 @@
 #include <string.h>
 
+
 #include "windef.h"
 
@@ -30 +31 @@
  *                  _memicmp   (NTDLL.@)
  */
-#ifdef __WIN32OS2__
-INT __cdecl NTDLL_memicmp( LPCSTR s1, LPCSTR s2, DWORD len )
-#else
-INT __cdecl _memicmp( LPCSTR s1, LPCSTR s2, DWORD len )
-#endif
+INT __cdecl NTDLL__memicmp( LPCSTR s1, LPCSTR s2, DWORD len )
 {
     int ret = 0;
@@ -73 +70 @@
  */
 #ifdef __WIN32OS2__
-LPSTR  __cdecl NTDLL_ultoa( unsigned long x, LPSTR buf, INT radix )
+LPSTR  __cdecl NTDLL_ultoa( unsigned long value, LPSTR str, INT radix )
 #else
-LPSTR  __cdecl _ultoa( unsigned long x, LPSTR buf, INT radix )
+LPSTR  __cdecl _ultoa( unsigned long value, LPSTR str, INT radix )
 #endif
 {
-    char buffer[32], *p;
-
-    p = buffer + sizeof(buffer);
-    *--p = 0;
-    do
-    {
-        int rem = x % radix;
-        *--p = (rem <= 9) ? rem + '0' : rem + 'a' - 10;
-        x /= radix;
-    } while (x);
-    strcpy( buf, p );
-    return buf;
+    char buffer[33];
+    char *pos;
+    int digit;
+
+    pos = &buffer[32];
+    *pos = '\0';
+
+    do {
+        digit = value % radix;
+        value = value / radix;
+        if (digit < 10) {
+            *--pos = '0' + digit;
+        } else {
+            *--pos = 'a' + digit - 10;
+        } /* if */
+    } while (value != 0L);
+
+    memcpy(str, pos, &buffer[32] - pos + 1);
+    return str;
 }
 
@@ -95 +99 @@
 /*********************************************************************
  *                  _ltoa   (NTDLL.@)
- */
+ *
+ * RETURNS
+ *  Always returns str.
+ *
+ * NOTES
+ *  Converts value to a '\0' terminated string which is copied to str.
+ *  The maximum length of the copied str is 33 bytes. If radix
+ *  is 10 and value is negative, the value is converted with sign.
+ *  Does not check if radix is in the range of 2 to 36.
+ *  If str is NULL it crashes, as the native function does.
+ */
+
 #ifdef __WIN32OS2__
-LPSTR  __cdecl NTDLL_ltoa( long x, LPSTR buf, INT radix )
+LPSTR  __cdecl NTDLL_ltoa( long value, LPSTR str, INT radix )
 #else
-LPSTR  __cdecl _ltoa( long x, LPSTR buf, INT radix )
+LPSTR  __cdecl _ltoa( long value, LPSTR str, INT radix )
 #endif
 {
-    LPSTR p = buf;
-    if (x < 0)
-    {
-        *p++ = '-';
-        x = -x;
-    }
-    _ultoa( x, p, radix );
-    return buf;
+    unsigned long val;
+    int negative;
+    char buffer[33];
+    char *pos;
+    int digit;
+
+    if (value < 0 && radix == 10) {
+        negative = 1;
+        val = -value;
+    } else {
+        negative = 0;
+        val = value;
+    } /* if */
+
+    pos = &buffer[32];
+    *pos = '\0';
+
+    do {
+        digit = val % radix;
+        val = val / radix;
+        if (digit < 10) {
+            *--pos = '0' + digit;
+        } else {
+            *--pos = 'a' + digit - 10;
+        } /* if */
+    } while (val != 0L);
+
+    if (negative) {
+        *--pos = '-';
+    } /* if */
+
+    memcpy(str, pos, &buffer[32] - pos + 1);
+    return str;
 }
 
@@ -122 +162 @@
 #endif
 {
-    return _ltoa( x, buf, radix );
+    return NTDLL_ltoa( x, buf, radix );
+}
+
+/*********************************************************************
+ *      _ui64toa   (NTDLL.@)
+ *
+ * Converts a large unsigned integer to a string.
+ *
+ * Assigns a '\0' terminated string to str and returns str.
+ * Does not check if radix is in the range of 2 to 36 (as native DLL).
+ * For str == NULL just crashes (as native DLL).
+ */
+char * __cdecl _ui64toa( ULONGLONG value, char *str, int radix )
+{
+    char buffer[65];
+    char *pos;
+    int digit;
+
+    pos = &buffer[64];
+    *pos = '\0';
+
+    do {
+        digit = value % radix;
+        value = value / radix;
+        if (digit < 10) {
+            *--pos = '0' + digit;
+        } else {
+            *--pos = 'a' + digit - 10;
+        } /* if */
+    } while (value != 0L);
+
+    memcpy(str, pos, &buffer[64] - pos + 1);
+    return str;
+}
+
+
+/*********************************************************************
+ *      _i64toa   (NTDLL.@)
+ *
+ * Converts a large integer to a string.
+ *
+ * Assigns a '\0' terminated string to str and returns str. If radix
+ * is 10 and value is negative, the value is converted with sign.
+ * Does not check if radix is in the range of 2 to 36 (as native DLL).
+ * For str == NULL just crashes (as native DLL).
+ *
+ * Difference:
+ * - The native DLL converts negative values (for base 10) wrong:
+ *                     -1 is converted to -18446744073709551615
+ *                     -2 is converted to -18446744073709551614
+ *   -9223372036854775807 is converted to  -9223372036854775809
+ *   -9223372036854775808 is converted to  -9223372036854775808
+ *   The native msvcrt _i64toa function and our ntdll function do
+ *   not have this bug.
+ */
+char * __cdecl _i64toa( LONGLONG value, char *str, int radix )
+{
+    ULONGLONG val;
+    int negative;
+    char buffer[65];
+    char *pos;
+    int digit;
+
+    if (value < 0 && radix == 10) {
+        negative = 1;
+        val = -value;
+    } else {
+        negative = 0;
+        val = value;
+    } /* if */
+
+    pos = &buffer[64];
+    *pos = '\0';
+
+    do {
+        digit = val % radix;
+        val = val / radix;
+        if (digit < 10) {
+            *--pos = '0' + digit;
+        } else {
+            *--pos = 'a' + digit - 10;
+        } /* if */
+    } while (val != 0L);
+
+    if (negative) {
+        *--pos = '-';
+    } /* if */
+
+    memcpy(str, pos, &buffer[64] - pos + 1);
+    return str;
+}
+
+
+/*********************************************************************
+ *      _atoi64   (NTDLL.@)
+ *
+ * Converts a string to a large integer.
+ *
+ * On success it returns the integer value otherwise it returns 0.
+ * Accepts: {whitespace} [+|-] {digits}
+ * No check of overflow: Just assigns lower 64 bits (as native DLL).
+ * Does not check for str != NULL (as native DLL).
+ */
+LONGLONG __cdecl _atoi64( char *str )
+{
+    ULONGLONG RunningTotal = 0;
+    char bMinus = 0;
+
+    while (*str == ' ' || (*str >= '\011' && *str <= '\015')) {
+        str++;
+    } /* while */
+
+    if (*str == '+') {
+        str++;
+    } else if (*str == '-') {
+        bMinus = 1;
+        str++;
+    } /* if */
+
+    while (*str >= '0' && *str <= '9') {
+        RunningTotal = RunningTotal * 10 + *str - '0';
+        str++;
+    } /* while */
+
+    return bMinus ? -RunningTotal : RunningTotal;
 }