[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:03:21 UTC 2012


The following commit has been merged in the wheezy branch:
commit 50ba504f097f88b15bc277f9abeb110341d38ef2
Author: Piotr Caban <piotr at codeweavers.com>
Date:   Mon Apr 16 16:32:57 2012 +0200

    msvcrt: Added more length modifiers in scanf function.
    (cherry picked from commit 7240170ceedecef6aac674e795fdc4e1a74e131a)

diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h
index 9f6911e..cc2b861 100644
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -198,8 +198,14 @@ _FUNCTION_ {
 	    /* read prefix (if any) */
 	    while (!prefix_finished) {
 		switch(*format) {
-		case 'h': h_prefix = 1; break;
-		case 'l': l_prefix = 1; break;
+		case 'h': h_prefix++; break;
+		case 'l':
+                    if(*(format+1) == 'l') {
+                        I64_prefix = 1;
+                        format++;
+                    }
+                    l_prefix = 1;
+                    break;
 		case 'w': w_prefix = 1; break;
 		case 'L': L_prefix = 1; break;
 		case 'I':
@@ -294,7 +300,7 @@ _FUNCTION_ {
 #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur
 			if (I64_prefix) _SET_NUMBER_(LONGLONG);
 			else if (l_prefix) _SET_NUMBER_(LONG);
-			else if (h_prefix) _SET_NUMBER_(short int);
+			else if (h_prefix == 1) _SET_NUMBER_(short int);
 			else _SET_NUMBER_(int);
 		    }
                 }

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list