Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

Implement %Fp now we have 25 fails with wine test for string version of *printf api

Browse source 
svn path=/trunk/; revision=22260
This commit is contained in:
Magnus Olsen 2006-06-07 00:04:51 +00:00
parent 00d62df5ab
commit 8fcbc86a16
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
reactos/lib/rtl/sprintf.c
View file

@ -26,7 +26,7 @@
#define LEFT 16 /* left justified */
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */
typedef struct {
unsigned int mantissal:32;
unsigned int mantissah:20;
@ -116,7 +116,7 @@ number(char * buf, char * end, long long num, int base, int size, int precision,
}
}
if (type & SPECIAL) {
if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
if (base == 16)
size -= 2;
@ -142,7 +142,7 @@ number(char * buf, char * end, long long num, int base, int size, int precision,
++buf;
}
if (type & SPECIAL) {
if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
if (base==16) {
if (buf <= end)
*buf = '0';
@ -213,7 +213,7 @@ numberf(char * buf, char * end, double num, int base, int size, int precision, i
size--;
}
}
if (type & SPECIAL) {
if (type & SPECIAL) {
if (base == 16)
size -= 2;
else if (base == 8)
@ -470,7 +470,10 @@ int _vsnprintf(char *buf, size_t cnt, const char *fmt, va_list args)
} else if (*fmt == 'I' && *(fmt+1) == '3' && *(fmt+2) == '2') {
qualifier = 'l';
fmt += 3;
}
} else if (*fmt == 'F' && *(fmt+1) == 'p') {
fmt += 1;
flags |= REMOVEHEX;
}
/* default base */
base = 10;

14
reactos/lib/rtl/swprintf.c
View file

@ -26,7 +26,7 @@
#define LEFT 16 /* left justified */
#define SPECIAL 32 /* 0x */
#define LARGE 64 /* use 'ABCDEF' instead of 'abcdef' */
#define REMOVEHEX 256 /* use 256 as remve 0x frim BASE 16 */
typedef struct {
unsigned int mantissal:32;
unsigned int mantissah:20;
@ -116,7 +116,7 @@ number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int prec
}
}
if (type & SPECIAL) {
if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
if (base == 16)
size -= 2;
}
@ -141,7 +141,7 @@ number(wchar_t * buf, wchar_t * end, long long num, int base, int size, int prec
++buf;
}
if (type & SPECIAL) {
if ((type & SPECIAL) && ((type & REMOVEHEX) == 0)) {
if (base==16) {
if (buf <= end)
*buf = L'0';
@ -468,7 +468,10 @@ int _vsnwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, va_list args)
} else if (*fmt == L'I' && *(fmt+1) == L'3' && *(fmt+2) == L'2') {
qualifier = L'l';
fmt += 3;
}
} else if (*fmt == L'F' && *(fmt+1) == L'p') {
fmt += 1;
flags |= REMOVEHEX;
}
/* default base */
base = 10;
@ -566,8 +569,7 @@ int _vsnwprintf(wchar_t *buf, size_t cnt, const wchar_t *fmt, va_list args)
case L'p':
if ((flags & LARGE) == 0)
flags |= LARGE;
flags |= LARGE;
if (field_width == -1) {
field_width = 2*sizeof(void *);
flags |= ZEROPAD;