partial sync of with wine 1.7.11

svn path=/trunk/; revision=62199
This commit is contained in:
Christoph von Wittich 2014-02-15 19:12:07 +00:00
parent 484e8c8db2
commit ac49d0b2d3

View file

@ -131,8 +131,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':
@ -227,7 +233,7 @@ _FUNCTION_ {
#define _SET_NUMBER_(type) *va_arg(ap, type*) = (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);
}
}
@ -527,6 +533,7 @@ _FUNCTION_ {
if (nch!=_EOF_) {
_UNGETC_(nch, file);
}
TRACE("returning %d\n", rd);
return rd;
}