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

svn path=/trunk/; revision=42766

diff --git a/reactos/lib/sdk/crt/string/scanf.c b/reactos/lib/sdk/crt/string/scanf.c
index 4e6c9bb..57c56d0 100644 (file)
--- a/reactos/lib/sdk/crt/string/scanf.c
+++ b/reactos/lib/sdk/crt/string/scanf.c
@@ -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.
  */
 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 @@ int sscanf(const char *str, const char *format, ...)
 /*********************************************************************
  *             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 @@ int swscanf(const wchar_t *str, const wchar_t *format, ...)
 /*********************************************************************
  *             _cscanf (MSVCRT.@)
  */
-int _cscanf(const char *format, ...)
+int CDECL _cscanf(const char *format, ...)
 {
     va_list valist;
     int res;

diff --git a/reactos/lib/sdk/crt/string/scanf.h b/reactos/lib/sdk/crt/string/scanf.h
index 4217d43..bfe7a05 100644 (file)
--- a/reactos/lib/sdk/crt/string/scanf.h
+++ b/reactos/lib/sdk/crt/string/scanf.h
@@ -79,7 +79,7 @@ _FUNCTION_ {
     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 @@ _FUNCTION_ {
             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 @@ _FUNCTION_ {
                     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);
                    }

diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 45f6c92..0f241d7 100644 (file)
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -207,7 +207,7 @@ advapi32 -
   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 @@ kernel32 -
   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