Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 21976: replace follow _wtol, _wtoi, _i64tow, _ui64tow, _ltow, _ultow, _ui64toa, _itow, _ltow, ultow with wine from wine cvs 2006-05-21 for we did fail on wine test on all these. In windows 2000 wine test ntdll string did not fail.
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Mon May 22 02:41:35 2006 New Revision: 21976 URL: http://svn.reactos.ru/svn/reactos?rev=21976&view=rev Log: replace follow _wtol, _wtoi, _i64tow, _ui64tow, _ltow, _ultow, _ui64toa, _itow, _ltow, ultow with wine from wine cvs 2006-05-21 for we did fail on wine test on all these. In windows 2000 wine test ntdll string did not fail. Modified: trunk/reactos/lib/crt/stdlib/itow.c trunk/reactos/lib/crt/stdlib/witoa.c trunk/reactos/lib/string/itoa.c trunk/reactos/lib/string/itow.c trunk/reactos/lib/string/wtoi.c trunk/reactos/lib/string/wtol.c Modified: trunk/reactos/lib/crt/stdlib/itow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/itow.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/stdlib/itow.c (original) +++ trunk/reactos/lib/crt/stdlib/itow.c Mon May 22 02:41:35 2006 @@ -16,138 +16,81 @@ /* * @implemented + * from wine cvs 2006-05-21 */ wchar_t* _itow(int value, wchar_t* string, int radix) { - wchar_t tmp [33]; - wchar_t * tp = tmp; - int i; - unsigned int v; - int sign; - wchar_t * sp; + return _ltow(value, string, radix); +} - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } +/* + * @implemented + * from wine cvs 2006-05-21 + */ +wchar_t* _ltow(long value, wchar_t* string, int radix) +{ + unsigned long val; + int negative; + WCHAR buffer[33]; + PWCHAR pos; + WCHAR digit; - sign = ((radix == 10) && (value < 0)); - if (sign) { - v = -value; + if (value < 0 && radix == 10) { + negative = 1; + val = -value; } else { - v = (unsigned) value; - } - while (v || tp == tmp) { - i = v % radix; - v = v / radix; - if (i < 10) { - *tp++ = i+ (wchar_t) '0'; - } else { - *tp++ = i + (wchar_t) 'a' - 10; - } - } + negative = 0; + val = value; + } /* if */ - if (string == 0) { - string = (wchar_t*) malloc((tp-tmp) + (sign + 1) * sizeof(wchar_t)); - } - sp = string; + pos = &buffer[32]; + *pos = '\0'; - if (sign) { - *sp++ = (wchar_t) '-'; - } - while (tp > tmp) { - *sp++ = *--tp; - } - *sp = (wchar_t) 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 */ + + if (str != NULL) { + memcpy(string, pos, (&buffer[32] - pos + 1) * sizeof(WCHAR)); + } /* if */ return string; } /* * @implemented - */ -wchar_t* _ltow(long value, wchar_t* string, int radix) -{ - wchar_t tmp [33]; - wchar_t* tp = tmp; - long int i; - unsigned long int v; - int sign; - wchar_t* sp; - - if (radix > 36 || radix <= 1) { - __set_errno(EDOM); - return 0; - } - - sign = ((radix == 10) && (value < 0)); - if (sign) { - v = -value; - } else { - v = (unsigned long) value; - } - while (v || tp == tmp) { - i = v % radix; - v = v / radix; - if (i < 10) { - *tp++ = i + (wchar_t) '0'; - } else { - *tp++ = i + (wchar_t) 'a' - 10; - } - } - - if (string == 0) { - string = (wchar_t*) malloc((tp - tmp) + (sign + 1) * sizeof(wchar_t)); - } - sp = string; - - if (sign) { - *sp++ = (wchar_t) '-'; - } - while (tp > tmp) { - *sp++ = *--tp; - } - *sp = (wchar_t) 0; - return string; -} - -/* - * @unimplemented + * from wine cvs 2006-05-21 */ wchar_t* _ultow(unsigned long value, wchar_t* string, int radix) { - wchar_t tmp [33]; - wchar_t* tp = tmp; - long int i; - unsigned long int v = value; - wchar_t* sp; + WCHAR buffer[33]; + PWCHAR pos; + WCHAR digit; - if (radix > 36 || radix <= 1) { - __set_errno(EDOM); - return 0; - } - while (v || tp == tmp) { - i = v % radix; - v = v / radix; - if (i < 10) { - *tp++ = i + (wchar_t) '0'; - } else { - *tp++ = i + (wchar_t) 'a' - 10; - } - } + pos = &buffer[32]; + *pos = '\0'; - if (string == 0) { -#ifdef _MSVCRT_LIB_ // TODO: check on difference? - string = (wchar_t*)malloc(((tp-tmp)+1)*sizeof(wchar_t)); -#else // TODO: FIXME: review which is correct - string = (wchar_t*)malloc((tp - tmp) + sizeof(wchar_t)); -#endif /*_MSVCRT_LIB_*/ - } - sp = string; + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - while (tp > tmp) { - *sp++ = *--tp; - } - *sp = (wchar_t) 0; + if (string != NULL) { + memcpy(string, pos, (&buffer[32] - pos + 1) * sizeof(WCHAR)); + } /* if */ return string; } Modified: trunk/reactos/lib/crt/stdlib/witoa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/witoa.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/stdlib/witoa.c (original) +++ trunk/reactos/lib/crt/stdlib/witoa.c Mon May 22 02:41:35 2006 @@ -7,8 +7,9 @@ * UPDATE HISTORY: * 1995: Created * 1998: Added ltoa Boudewijn Dekker + * 2006 : replace all api in this file to wine cvs 2006-05-21 */ -/* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */ +/* */ #include <precomp.h> /* @@ -58,34 +59,23 @@ */ char* _ui64toa(unsigned __int64 value, char* string, int radix) { - char tmp[65]; - char *tp = tmp; - long i; - unsigned long v = value; - char *sp; + char buffer[65]; + char *pos; + int digit; - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } + pos = &buffer[64]; + *pos = '\0'; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - if (string == 0) - string = (char *)malloc((tp-tmp)+1); - sp = string; - - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + memcpy(string, pos, &buffer[64] - pos + 1); + return string; } Modified: trunk/reactos/lib/string/itoa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/string/itoa.c?rev=21976… ============================================================================== --- trunk/reactos/lib/string/itoa.c (original) +++ trunk/reactos/lib/string/itoa.c Mon May 22 02:41:35 2006 @@ -47,37 +47,30 @@ /* * @implemented + * copy _i64toa from wine cvs 2006 month 05 day 21 */ char * _ui64toa(unsigned __int64 value, char *string, int radix) { - char tmp[65]; - char *tp = tmp; - __int64 i; - unsigned __int64 v; - char *sp; + char buffer[65]; + char *pos; + int digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + pos = &buffer[64]; + *pos = '\0'; - v = (unsigned __int64)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - sp = string; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + memcpy(string, pos, &buffer[64] - pos + 1); + return string; } Modified: trunk/reactos/lib/string/itow.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/string/itow.c?rev=21976… ============================================================================== --- trunk/reactos/lib/string/itow.c (original) +++ trunk/reactos/lib/string/itow.c Mon May 22 02:41:35 2006 @@ -1,45 +1,48 @@ #include <string.h> +#include <windows.h> /* * @implemented + * from wine cvs 2006-05-21 */ wchar_t * _i64tow(__int64 value, wchar_t *string, int radix) { - wchar_t tmp[65]; - wchar_t *tp = tmp; - __int64 i; - unsigned __int64 v; - __int64 sign; - wchar_t *sp; + ULONGLONG val; + int negative; + WCHAR buffer[65]; + PWCHAR pos; + WCHAR digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned __int64)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+L'0'; - else - *tp++ = i + L'a' - 10; - } + pos = &buffer[64]; + *pos = '\0'; - sp = string; - if (sign) - *sp++ = L'-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + 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 */ + + if (string != NULL) { + memcpy(string, pos, (&buffer[64] - pos + 1) * sizeof(WCHAR)); + } /* if */ + return string; } @@ -49,152 +52,112 @@ wchar_t * _ui64tow(unsigned __int64 value, wchar_t *string, int radix) { - wchar_t tmp[65]; - wchar_t *tp = tmp; - __int64 i; - unsigned __int64 v; - wchar_t *sp; + WCHAR buffer[65]; + PWCHAR pos; + WCHAR digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + pos = &buffer[64]; + *pos = '\0'; - v = (unsigned __int64)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+L'0'; - else - *tp++ = i + L'a' - 10; - } + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - sp = string; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + if (string != NULL) { + memcpy(string, pos, (&buffer[64] - pos + 1) * sizeof(WCHAR)); + } /* if */ + return string; } /* * @implemented + * from wine cvs 2006-05-21 */ wchar_t * _itow(int value, wchar_t *string, int radix) { - wchar_t tmp[33]; - wchar_t *tp = tmp; - int i; - unsigned v; - int sign; - wchar_t *sp; - - if (radix > 36 || radix <= 1) - { - return 0; - } - - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+L'0'; - else - *tp++ = i + L'a' - 10; - } - - sp = string; - if (sign) - *sp++ = L'-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + return _ltow(value, string, radix); } /* * @implemented + * from wine cvs 2006-05-21 */ wchar_t * _ltow(long value, wchar_t *string, int radix) { - wchar_t tmp[33]; - wchar_t *tp = tmp; - long i; - unsigned long v; - int sign; - wchar_t *sp; + unsigned long val; + int negative; + WCHAR buffer[33]; + PWCHAR pos; + WCHAR digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned long)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+L'0'; - else - *tp++ = i + L'a' - 10; - } + pos = &buffer[32]; + *pos = '\0'; - sp = string; - if (sign) - *sp++ = L'-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + 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 */ + + if (string != NULL) { + memcpy(string, pos, (&buffer[32] - pos + 1) * sizeof(WCHAR)); + } /* if */ + return string; } /* * @implemented + * from wine cvs 2006-05-21 */ wchar_t * _ultow(unsigned long value, wchar_t *string, int radix) { - wchar_t tmp[33]; - wchar_t *tp = tmp; - long i; - unsigned long v = value; - wchar_t *sp; + WCHAR buffer[33]; + PWCHAR pos; + WCHAR digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + pos = &buffer[32]; + *pos = '\0'; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+L'0'; - else - *tp++ = i + L'a' - 10; - } + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - sp = string; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + if (string != NULL) { + memcpy(string, pos, (&buffer[32] - pos + 1) * sizeof(WCHAR)); + } /* if */ + return string; } Modified: trunk/reactos/lib/string/wtoi.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/string/wtoi.c?rev=21976… ============================================================================== --- trunk/reactos/lib/string/wtoi.c (original) +++ trunk/reactos/lib/string/wtoi.c Mon May 22 02:41:35 2006 @@ -3,9 +3,10 @@ /* * @implemented + * copy _i64toa from wine cvs 2006 month 05 day 21 */ int _wtoi(const wchar_t *str) { - return (int)wcstol(str, 0, 10); + return _wtol(str); } Modified: trunk/reactos/lib/string/wtol.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/string/wtol.c?rev=21976… ============================================================================== --- trunk/reactos/lib/string/wtol.c (original) +++ trunk/reactos/lib/string/wtol.c Mon May 22 02:41:35 2006 @@ -1,5 +1,6 @@ #include <string.h> #include <stdlib.h> +#include <windows.h> /* * @implemented @@ -7,5 +8,26 @@ long _wtol(const wchar_t *str) { - return wcstol(str, 0, 10); + ULONG RunningTotal = 0; + char bMinus = 0; + + while (iswctype(*str, _SPACE) ) { + str++; + } /* while */ + + if (*str == L'+') { + str++; + } else if (*str == L'-') { + bMinus = 1; + str++; + } /* if */ + + while (*str >= L'0' && *str <= L'9') { + RunningTotal = RunningTotal * 10 + *str - L'0'; + str++; + } /* while */ + + return bMinus ? -RunningTotal : RunningTotal; } + +

1 0

[janderwald] 21975: dont allow '=' in the environmental name in the set command
by janderwald＠svn.reactos.org 21 May '06

21 May '06

Author: janderwald Date: Mon May 22 01:31:20 2006 New Revision: 21975 URL: http://svn.reactos.ru/svn/reactos?rev=21975&view=rev Log: dont allow '=' in the environmental name in the set command Modified: trunk/reactos/base/shell/cmd/set.c Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=21… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c (original) +++ trunk/reactos/base/shell/cmd/set.c Mon May 22 01:31:20 2006 @@ -119,6 +119,14 @@ if (p) { /* set or remove environment variable */ + if (p == param) + { + /* handle set =val case */ + LoadString(CMD_ModuleHandle, STRING_SYNTAX_COMMAND_INCORRECT, szMsg, RC_STRING_MAX_SIZE); + ConErrPrintf (szMsg, param); + return 0; + } + *p = _T('\0'); p++; if (*p == _T('\0'))

1 0

[greatlrd] 21974: [AUDIT] clean from DJGPP
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Mon May 22 00:49:53 2006 New Revision: 21974 URL: http://svn.reactos.ru/svn/reactos?rev=21974&view=rev Log: [AUDIT] clean from DJGPP Modified: trunk/reactos/lib/crt/stdlib/itow.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/itow.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21973: Fixing a i64ltoa bug, replacing both version with wine, copy the code from wine cvs 2005-05-21, bug report by wine test
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Mon May 22 00:26:51 2006 New Revision: 21973 URL: http://svn.reactos.ru/svn/reactos?rev=21973&view=rev Log: Fixing a i64ltoa bug, replacing both version with wine, copy the code from wine cvs 2005-05-21, bug report by wine test Modified: trunk/reactos/lib/crt/stdlib/witoa.c trunk/reactos/lib/string/itoa.c Modified: trunk/reactos/lib/crt/stdlib/witoa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/witoa.c?rev=… ============================================================================== --- trunk/reactos/lib/crt/stdlib/witoa.c (original) +++ trunk/reactos/lib/crt/stdlib/witoa.c Mon May 22 00:26:51 2006 @@ -13,48 +13,45 @@ /* * @implemented + * copy _i64toa from wine cvs 2006 month 05 day 21 */ char* _i64toa(__int64 value, char* string, int radix) { - char tmp[65]; - char *tp = tmp; - int i; - unsigned v; - int sign; - char *sp; + ULONGLONG val; + int negative; + char buffer[65]; + char *pos; + int digit; - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } + pos = &buffer[64]; + *pos = '\0'; - if (string == 0) - string = (char *)malloc((tp-tmp)+sign+1); - sp = string; + do { + digit = val % radix; + val = val / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (val != 0L); - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + if (negative) { + *--pos = '-'; + } /* if */ + + memcpy(string, pos, &buffer[64] - pos + 1); + return string; } + /* * @implemented Modified: trunk/reactos/lib/string/itoa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/string/itoa.c?rev=21973… ============================================================================== --- trunk/reactos/lib/string/itoa.c (original) +++ trunk/reactos/lib/string/itoa.c Mon May 22 00:26:51 2006 @@ -1,46 +1,47 @@ #include <string.h> #include <stdlib.h> +#include <windows.h> /* * @implemented + * copy _i64toa from wine cvs 2006 month 05 day 21 */ char * _i64toa(__int64 value, char *string, int radix) { - char tmp[65]; - char *tp = tmp; - __int64 i; - unsigned __int64 v; - __int64 sign; - char *sp; + ULONGLONG val; + int negative; + char buffer[65]; + char *pos; + int digit; - if (radix > 36 || radix <= 1) - { - return 0; - } + if (value < 0 && radix == 10) { + negative = 1; + val = -value; + } else { + negative = 0; + val = value; + } /* if */ - sign = (radix == 10 && value < 0); - if (sign) - v = -value; - else - v = (unsigned __int64)value; - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } + pos = &buffer[64]; + *pos = '\0'; - sp = string; - if (sign) - *sp++ = '-'; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + 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(string, pos, &buffer[64] - pos + 1); + return string; }

1 0

[fireball] 21972: - Fix GDIOBJ_* prototypes so win32k compiles with GDI_DEBUG compile option
by fireball＠svn.reactos.org 21 May '06

21 May '06

Author: fireball Date: Mon May 22 00:22:54 2006 New Revision: 21972 URL: http://svn.reactos.ru/svn/reactos?rev=21972&view=rev Log: - Fix GDIOBJ_* prototypes so win32k compiles with GDI_DEBUG compile option Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Modified: trunk/reactos/subsystems/win32/win32k/include/gdiobj.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/gdiobj.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/gdiobj.h Mon May 22 00:22:54 2006 @@ -55,10 +55,10 @@ #ifdef GDI_DEBUG /* a couple macros for debugging GDIOBJ locking */ -#define GDIOBJ_AllocObj(ty) GDIOBJ_AllocObjDbg(GdiHandleTable,__FILE__,__LINE__,ty) -#define GDIOBJ_FreeObj(obj,ty) GDIOBJ_FreeObjDbg(GdiHandleTable,__FILE__,__LINE__,obj,ty) -#define GDIOBJ_LockObj(obj,ty) GDIOBJ_LockObjDbg(GdiHandleTable,__FILE__,__LINE__,obj,ty) -#define GDIOBJ_ShareLockObj(obj,ty) GDIOBJ_ShareLockObjDbg(GdiHandleTable,__FILE__,__LINE__,obj,ty) +#define GDIOBJ_AllocObj(ht,ty) GDIOBJ_AllocObjDbg(ht,__FILE__,__LINE__,ty) +#define GDIOBJ_FreeObj(ht,obj,ty) GDIOBJ_FreeObjDbg(ht,__FILE__,__LINE__,obj,ty) +#define GDIOBJ_LockObj(ht,obj,ty) GDIOBJ_LockObjDbg(ht,__FILE__,__LINE__,obj,ty) +#define GDIOBJ_ShareLockObj(ht,obj,ty) GDIOBJ_ShareLockObjDbg(ht,__FILE__,__LINE__,obj,ty) HGDIOBJ INTERNAL_CALL GDIOBJ_AllocObjDbg(PGDI_HANDLE_TABLE HandleTable, const char* file, int line, ULONG ObjectType); BOOL INTERNAL_CALL GDIOBJ_FreeObjDbg (PGDI_HANDLE_TABLE HandleTable, const char* file, int line, HGDIOBJ hObj, DWORD ObjectType);

1 0

[janderwald] 21971: msvc compiling fix
by janderwald＠svn.reactos.org 21 May '06

21 May '06

Author: janderwald Date: Mon May 22 00:20:07 2006 New Revision: 21971 URL: http://svn.reactos.ru/svn/reactos?rev=21971&view=rev Log: msvc compiling fix Modified: trunk/reactos/regtests/winetests/msvcrt/cpp.c Modified: trunk/reactos/regtests/winetests/msvcrt/cpp.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/regtests/winetests/msvcrt/c… ============================================================================== --- trunk/reactos/regtests/winetests/msvcrt/cpp.c (original) +++ trunk/reactos/regtests/winetests/msvcrt/cpp.c Mon May 22 00:20:07 2006 @@ -122,7 +122,7 @@ /* Emulate a __thiscall */ #ifdef _MSC_VER -inline static void* do_call_func1(void *func, void *_this) +__inline static void* do_call_func1(void *func, void *_this) { volatile void* retval = 0; __asm @@ -136,7 +136,7 @@ return (void*)retval; } -inline static void* do_call_func2(void *func, void *_this, void* arg) +__inline static void* do_call_func2(void *func, void *_this, void* arg) { volatile void* retval = 0; __asm

1 0

[greatlrd] 21970: [AUDIT] clean from DJGPP
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Mon May 22 00:15:15 2006 New Revision: 21970 URL: http://svn.reactos.ru/svn/reactos?rev=21970&view=rev Log: [AUDIT] clean from DJGPP Modified: trunk/reactos/lib/crt/stdlib/witoa.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/witoa.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[greatlrd] 21969: [AUDIT] clean this file are clean after I look at them
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Mon May 22 00:11:27 2006 New Revision: 21969 URL: http://svn.reactos.ru/svn/reactos?rev=21969&view=rev Log: [AUDIT] clean this file are clean after I look at them Modified: trunk/reactos/lib/crt/README.txt (props changed) trunk/reactos/lib/crt/precomp.h (props changed) Propchange: trunk/reactos/lib/crt/README.txt ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/lib/crt/precomp.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ekohl] 21968: Add FSRTL_COMMON_FCB_HEADER to the beginning of the FCB.
by ekohl＠svn.reactos.org 21 May '06

21 May '06

Author: ekohl Date: Sun May 21 23:38:35 2006 New Revision: 21968 URL: http://svn.reactos.ru/svn/reactos?rev=21968&view=rev Log: Add FSRTL_COMMON_FCB_HEADER to the beginning of the FCB. Modified: trunk/reactos/drivers/filesystems/ms/msfs.h Modified: trunk/reactos/drivers/filesystems/ms/msfs.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/drivers/filesystems/ms/msfs… ============================================================================== --- trunk/reactos/drivers/filesystems/ms/msfs.h (original) +++ trunk/reactos/drivers/filesystems/ms/msfs.h Sun May 21 23:38:35 2006 @@ -37,6 +37,7 @@ typedef struct _MSFS_FCB { + FSRTL_COMMON_FCB_HEADER RFCB; UNICODE_STRING Name; LIST_ENTRY FcbListEntry; KSPIN_LOCK CcbListLock;

1 0

[greatlrd] 21967: Fixing a ultoa bug, replacing both version with wine, copy the code from wine 0.9.0; I did add a NULL check for the string so it can not bsod. wine ntdll string only report one error, left to fix, I run wine test on windows 2000 and reactos to compare the result. Fireball report wine_ntdll_test string crach on windows xp, but it does not crash in windows 2000.
by greatlrd＠svn.reactos.org 21 May '06

21 May '06

Author: greatlrd Date: Sun May 21 22:54:21 2006 New Revision: 21967 URL: http://svn.reactos.ru/svn/reactos?rev=21967&view=rev Log: Fixing a ultoa bug, replacing both version with wine, copy the code from wine 0.9.0; I did add a NULL check for the string so it can not bsod. wine ntdll string only report one error, left to fix, I run wine test on windows 2000 and reactos to compare the result. Fireball report wine_ntdll_test string crach on windows xp, but it does not crash in windows 2000. Modified: trunk/reactos/lib/crt/stdlib/itoa.c trunk/reactos/lib/string/itoa.c Modified: trunk/reactos/lib/crt/stdlib/itoa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/itoa.c?rev=2… ============================================================================== --- trunk/reactos/lib/crt/stdlib/itoa.c (original) +++ trunk/reactos/lib/crt/stdlib/itoa.c Sun May 21 22:54:21 2006 @@ -104,37 +104,32 @@ /* * @implemented + * copy it from wine 0.9.0 with small modifcations do check for NULL */ -char* _ultoa(unsigned long value, char* string, int radix) +char* ultoa(unsigned long value, char* string, int radix) { - char tmp[33]; - char* tp = tmp; - long i; - unsigned long v = value; - char* sp; + char buffer[33]; + char *pos; + int digit; + + pos = &buffer[32]; + *pos = '\0'; - if (radix > 36 || radix <= 1) - { - __set_errno(EDOM); - return 0; - } + if (string == NULL) + { + return NULL; + } + + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - if (string == 0) - string = (char*)malloc((tp-tmp)+1); - sp = string; - - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + memcpy(string, pos, &buffer[32] - pos + 1); + return string; } Modified: trunk/reactos/lib/string/itoa.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/string/itoa.c?rev=21967… ============================================================================== --- trunk/reactos/lib/string/itoa.c (original) +++ trunk/reactos/lib/string/itoa.c Sun May 21 22:54:21 2006 @@ -133,35 +133,35 @@ /* - * @implemented + * @implemented + * copy it from wine 0.9.0 with small modifcations do check for NULL */ char * _ultoa(unsigned long value, char *string, int radix) { - char tmp[33]; - char *tp = tmp; - long i; - unsigned long v = value; - char *sp; + char buffer[33]; + char *pos; + int digit; + + pos = &buffer[32]; + *pos = '\0'; - if (radix > 36 || radix <= 1) - { - return 0; - } + if (string == NULL) + { + return NULL; + } + + do { + digit = value % radix; + value = value / radix; + if (digit < 10) { + *--pos = '0' + digit; + } else { + *--pos = 'a' + digit - 10; + } /* if */ + } while (value != 0L); - while (v || tp == tmp) - { - i = v % radix; - v = v / radix; - if (i < 10) - *tp++ = i+'0'; - else - *tp++ = i + 'a' - 10; - } - - sp = string; - while (tp > tmp) - *sp++ = *--tp; - *sp = 0; - return string; + memcpy(string, pos, &buffer[32] - pos + 1); + + return string; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs