Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-05 22:12:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync scanf to current wine sources, correct msvcrt cpp sync date

Browse source 
svn path=/trunk/; revision=42766
This commit is contained in:
Gregor Schneider 2009-08-18 14:23:51 +00:00
parent d2fa38f67a
commit 332c985b52
3 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/lib/sdk/crt/string/scanf.c
View file

@ -48,10 +48,10 @@ static int char2digit(char c, int base) {
* given base, or -1 if the given character is not a digit of the base. * given base, or -1 if the given character is not a digit of the base.
*/ */
static int wchar2digit(wchar_t c, int 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 (base<=10) return -1;
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>=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);
return -1; return -1;
} }
@ -166,7 +166,7 @@ int sscanf(const char *str, const char *format, ...)
/********************************************************************* /*********************************************************************
* swscanf (MSVCRT.@) * 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; va_list valist;
int res; int res;
@ -181,7 +181,7 @@ int swscanf(const wchar_t *str, const wchar_t *format, ...)
/********************************************************************* /*********************************************************************
* _cscanf (MSVCRT.@) * _cscanf (MSVCRT.@)
*/ */
int _cscanf(const char *format, ...) int CDECL _cscanf(const char *format, ...)
{ {
va_list valist; va_list valist;
int res; int res;

6
reactos/lib/sdk/crt/string/scanf.h
View file

@ -79,7 +79,7 @@ _FUNCTION_ {
if (!*format) return 0; if (!*format) return 0;
#ifndef WIDE_SCANF #ifndef WIDE_SCANF
#ifdef CONSOLE #ifdef CONSOLE
TRACE("(%s): \n", debugstr_a(format)); TRACE("(%s):\n", debugstr_a(format));
#else /* CONSOLE */ #else /* CONSOLE */
#ifdef STRING #ifdef STRING
TRACE("%s (%s)\n", file, debugstr_a(format)); TRACE("%s (%s)\n", file, debugstr_a(format));
@ -151,6 +151,8 @@ _FUNCTION_ {
switch(*format) { switch(*format) {
case 'p': case 'p':
case 'P': /* pointer. */ case 'P': /* pointer. */
if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1;
/* fall through */
case 'x': case 'x':
case 'X': /* hexadecimal integer. */ case 'X': /* hexadecimal integer. */
base = 16; base = 16;
@ -224,7 +226,7 @@ _FUNCTION_ {
if (!suppress) { if (!suppress) {
#define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur
if (I64_prefix) _SET_NUMBER_(LONGLONG); 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 if (h_prefix) _SET_NUMBER_(short int);
else _SET_NUMBER_(int); else _SET_NUMBER_(int);
} }

6
reactos/media/doc/README.WINE
View file

@ -207,7 +207,7 @@ advapi32 -
reactos/dll/win32/advapi32/sec/sid.c # Out of Sync reactos/dll/win32/advapi32/sec/sid.c # Out of Sync
gdi32 - gdi32 -
reactos/dll/win32/gdi32/objects/linedda.c # Synched at 20090410 reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410
kernel32 - kernel32 -
reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync
@ -216,9 +216,9 @@ kernel32 -
reactos/dll/win32/kernel32/misc/lzexpand.c # Synced to Wine-1_1_23 reactos/dll/win32/kernel32/misc/lzexpand.c # Synced to Wine-1_1_23
msvcrt - 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/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/strings/wcs.c # Synced at 20080611
reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529
reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130 reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130