Author: gschneider Date: Tue Aug 18 16:23:51 2009 New Revision: 42766
URL: http://svn.reactos.org/svn/reactos?rev=42766&view=rev Log: Sync scanf to current wine sources, correct msvcrt cpp sync date
Modified: trunk/reactos/lib/sdk/crt/string/scanf.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/media/doc/README.WINE
Modified: trunk/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.c?... ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] Tue Aug 18 16:23:51 2009 @@ -48,10 +48,10 @@ * given base, or -1 if the given character is not a digit of the base. */ static int wchar2digit(wchar_t c, int base) { - if ((c>=L'0') && (c<=L'9') && (c<=L'0'+base-1)) return (c-L'0'); + if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0'); if (base<=10) return -1; - if ((c>=L'A') && (c<=L'Z') && (c<=L'A'+base-11)) return (c-L'A'+10); - if ((c>=L'a') && (c<=L'z') && (c<=L'a'+base-11)) return (c-L'a'+10); + if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10); + if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10); return -1; }
@@ -166,7 +166,7 @@ /********************************************************************* * swscanf (MSVCRT.@) */ -int swscanf(const wchar_t *str, const wchar_t *format, ...) +int CDECL swscanf(const wchar_t *str, const wchar_t *format, ...) { va_list valist; int res; @@ -181,7 +181,7 @@ /********************************************************************* * _cscanf (MSVCRT.@) */ -int _cscanf(const char *format, ...) +int CDECL _cscanf(const char *format, ...) { va_list valist; int res;
Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h?... ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Tue Aug 18 16:23:51 2009 @@ -79,7 +79,7 @@ if (!*format) return 0; #ifndef WIDE_SCANF #ifdef CONSOLE - TRACE("(%s): \n", debugstr_a(format)); + TRACE("(%s):\n", debugstr_a(format)); #else /* CONSOLE */ #ifdef STRING TRACE("%s (%s)\n", file, debugstr_a(format)); @@ -151,6 +151,8 @@ switch(*format) { case 'p': case 'P': /* pointer. */ + if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; + /* fall through */ case 'x': case 'X': /* hexadecimal integer. */ base = 16; @@ -224,7 +226,7 @@ if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); + else if (l_prefix) _SET_NUMBER_(LONG); else if (h_prefix) _SET_NUMBER_(short int); else _SET_NUMBER_(int); }
Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=4... ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 18 16:23:51 2009 @@ -207,7 +207,7 @@ reactos/dll/win32/advapi32/sec/sid.c # Out of Sync
gdi32 - - reactos/dll/win32/gdi32/objects/linedda.c # Synched at 20090410 + reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410
kernel32 - reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync @@ -216,9 +216,9 @@ reactos/dll/win32/kernel32/misc/lzexpand.c # Synced to Wine-1_1_23
msvcrt - - reactos/lib/sdk/crt/except/cpp.c # Synced at 20071111 + reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 - reactos/lib/sdk/crt/strings/scanf.c/h # Synced at 20080604 + reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1_1_27 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130
-
gschneider＠svn.reactos.org