April 2010 - Wine-Commits - list.winehq.org

Joel Holdsworth : winhlp32: Replaced progam icon with a Tango compliant icon.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 1aed5d33c9ce65895deff07cfb0a1ec76089fb41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1aed5d33c9ce65895deff07cf… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:36 2010 +0100 winhlp32: Replaced progam icon with a Tango compliant icon. --- programs/winhlp32/winhelp.ico | Bin 15086 -> 25214 bytes programs/winhlp32/winhelp.svg | 546 +++++++++++++++++------------------------ 2 files changed, 220 insertions(+), 326 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1aed5d33c9ce65895deff…

1 0

Joel Holdsworth : wcmd: Replaced program icon with a Tango compliant icon.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 8b37b340b7c902c78eb160c15b95a27039ed1e1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b37b340b7c902c78eb160c15… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Apr 18 16:28:12 2010 +0100 wcmd: Replaced program icon with a Tango compliant icon. --- programs/cmd/wcmd.ico | Bin 15086 -> 25214 bytes programs/cmd/wcmd.svg | 494 +++++++++++++++++++++++++++++-------------------- 2 files changed, 289 insertions(+), 205 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8b37b340b7c902c78eb16…

1 0

Andrew Nguyen : kernel32: Unify the format_message ANSI and Unicode helpers .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 43436f64d858eec8b12b3427a95bf534093ef681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43436f64d858eec8b12b3427a… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:10:08 2010 -0500 kernel32: Unify the format_message ANSI and Unicode helpers. --- dlls/kernel32/format_msg.c | 120 ++----------------------------------------- 1 files changed, 6 insertions(+), 114 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index adb24f2..a5426ae 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -260,118 +260,10 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, } /********************************************************************** - * format_messageA (internal) + * format_message (internal) */ -static LPWSTR format_messageA( DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) -{ - LPWSTR target,t; - DWORD talloced; - LPCWSTR f; - DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; - BOOL eos = FALSE; - WCHAR ch; - - target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR)); - talloced = 100; - -#define ADD_TO_T(c) do { \ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ - t = target+talloced;\ - talloced*=2;\ - }\ -} while (0) - - f = fmtstr; - if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { - while (*f && !eos) - ADD_TO_T(*f++); - } - else { - while (*f && !eos) { - if (*f=='%') { - int insertnr; - WCHAR *str,*x; - - f++; - if (!*f) { - ADD_TO_T('%'); - continue; - } - switch (*f) { - case '1':case '2':case '3':case '4':case '5': - case '6':case '7':case '8':case '9': - insertnr = *f-'0'; - switch (f[1]) { - case '0':case '1':case '2':case '3': - case '4':case '5':case '6':case '7': - case '8':case '9': - f++; - insertnr = insertnr*10 + *f-'0'; - f++; - break; - default: - f++; - break; - } - f = format_insert( FALSE, insertnr, f, dwFlags, format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); - HeapFree( GetProcessHeap(), 0, str ); - break; - case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); - f++; - break; - case '0': - eos = TRUE; - f++; - break; - default: - ADD_TO_T(*f++); - break; - } - } else { - ch = *f; - f++; - if (ch == '\r') { - if (*f == '\n') - f++; - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } else { - if (ch == '\n') - { - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } - else - ADD_TO_T(ch); - } - } - } - } - *t = '\0'; - - return target; -} -#undef ADD_TO_T - -/********************************************************************** - * format_messageW (internal) - */ -static LPWSTR format_messageW( DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) +static LPWSTR format_message( BOOL unicode_caller, DWORD dwFlags, LPCWSTR fmtstr, + struct format_args *format_args ) { LPWSTR target,t; DWORD talloced; @@ -425,7 +317,7 @@ static LPWSTR format_messageW( DWORD dwFlags, LPCWSTR fmtstr, struct format_args f++; break; } - f = format_insert( TRUE, insertnr, f, dwFlags, format_args, &str ); + f = format_insert( unicode_caller, insertnr, f, dwFlags, format_args, &str ); for (x = str; *x; x++) ADD_TO_T(*x); HeapFree( GetProcessHeap(), 0, str ); break; @@ -540,7 +432,7 @@ DWORD WINAPI FormatMessageA( if (!from) return 0; } - target = format_messageA( dwFlags, from, &format_args ); + target = format_message( FALSE, dwFlags, from, &format_args ); TRACE("-- %s\n", debugstr_w(target)); destlength = WideCharToMultiByte(CP_ACP, 0, target, -1, NULL, 0, NULL, NULL); @@ -630,7 +522,7 @@ DWORD WINAPI FormatMessageW( if (!from) return 0; } - target = format_messageW( dwFlags, from, &format_args ); + target = format_message( TRUE, dwFlags, from, &format_args ); talloced = strlenW(target)+1; TRACE("-- %s\n",debugstr_w(target));

1 0

Andrew Nguyen : kernel32: Unify the format_insert ANSI and Unicode helpers.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 4c657b870f053c042d30be3f93c7c2fc510a3e55 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c657b870f053c042d30be3f9… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:59 2010 -0500 kernel32: Unify the format_insert ANSI and Unicode helpers. --- dlls/kernel32/format_msg.c | 159 +++++++------------------------------------- 1 files changed, 24 insertions(+), 135 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 72cc55e..adb24f2 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -121,12 +121,12 @@ static ULONG_PTR get_arg( int nr, DWORD flags, struct format_args *args ) return args->args[nr - 1]; } - /********************************************************************** - * format_insertA (internal) + * format_insert (internal) */ -static LPCWSTR format_insertA( int insert, LPCWSTR format, DWORD flags, - struct format_args *args, LPWSTR *result ) +static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, + DWORD flags, struct format_args *args, + LPWSTR *result ) { static const WCHAR fmt_lu[] = {'%','l','u',0}; WCHAR *wstring = NULL, *p, fmt[256]; @@ -135,135 +135,20 @@ static LPCWSTR format_insertA( int insert, LPCWSTR format, DWORD flags, if (*format != '!') /* simple string */ { - char *str = (char *)get_arg( insert, flags, args ); - DWORD length = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); - MultiByteToWideChar(CP_ACP, 0, str, -1, *result, length); - return format; - } - - format++; - p = fmt; - *p++ = '%'; - - while (*format == '0' || - *format == '+' || - *format == '-' || - *format == ' ' || - *format == '*' || - *format == '#') - { - if (*format == '*') + arg = get_arg( insert, flags, args ); + if (unicode_caller) { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); - insert = -1; - format++; - } - else *p++ = *format++; - } - while (isdigit(*format)) *p++ = *format++; - - if (*format == '.') - { - *p++ = *format++; - if (*format == '*') - { - p += sprintfW( p, fmt_lu, get_arg( insert, flags, args )); - insert = -1; - format++; - } - else - while (isdigit(*format)) *p++ = *format++; - } - - /* replicate MS bug: drop an argument when using va_list with width/precision */ - if (insert == -1 && args->list) args->last--; - arg = get_arg( insert, flags, args ); - - /* check for wide string format */ - if ((format[0] == 'l' && format[1] == 's') || - (format[0] == 'l' && format[1] == 'S') || - (format[0] == 'w' && format[1] == 's') || - (format[0] == 'S')) - { - *p++ = 's'; - } - /* check for wide character format */ - else if ((format[0] == 'l' && format[1] == 'c') || - (format[0] == 'l' && format[1] == 'C') || - (format[0] == 'w' && format[1] == 'c') || - (format[0] == 'C')) - { - *p++ = 'c'; - } - /* check for ascii string format */ - else if ((format[0] == 'h' && format[1] == 's') || - (format[0] == 'h' && format[1] == 'S') || - (format[0] == 's')) - { - DWORD len = MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, NULL, 0 ); - wstring = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, wstring, len ); - arg = (ULONG_PTR)wstring; - *p++ = 's'; - } - /* check for ascii character format */ - else if ((format[0] == 'h' && format[1] == 'c') || - (format[0] == 'h' && format[1] == 'C') || - (format[0] == 'c')) - { - char ch = arg; - wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, &ch, 1, wstring, 1 ); - wstring[1] = 0; - arg = (ULONG_PTR)wstring; - *p++ = 's'; - } - /* FIXME: handle I64 etc. */ - else while (*format && *format != '!') *p++ = *format++; - - *p = 0; - size = 256; - for (;;) - { - WCHAR *ret = HeapAlloc( GetProcessHeap(), 0, size * sizeof(WCHAR)); - int needed = snprintfW( ret, size, fmt, arg ); - if (needed == -1 || needed >= size) - { - HeapFree( GetProcessHeap(), 0, ret ); - size = max( needed + 1, size * 2 ); + WCHAR *str = (WCHAR *)arg; + *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); + strcpyW( *result, str ); } else { - *result = ret; - break; + char *str = (char *)get_arg( insert, flags, args ); + DWORD length = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + *result = HeapAlloc( GetProcessHeap(), 0, length * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, str, -1, *result, length ); } - } - - while (*format && *format != '!') format++; - if (*format == '!') format++; - - HeapFree( GetProcessHeap(), 0, wstring ); - return format; -} - - -/********************************************************************** - * format_insertW (internal) - */ -static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, - struct format_args *args, LPWSTR *result ) -{ - static const WCHAR fmt_lu[] = {'%','l','u',0}; - WCHAR *wstring = NULL, *p, fmt[256]; - ULONG_PTR arg; - int size; - - if (*format != '!') /* simple string */ - { - WCHAR *str = (WCHAR *)get_arg( insert, flags, args ); - *result = HeapAlloc( GetProcessHeap(), 0, (strlenW(str) + 1) * sizeof(WCHAR) ); - strcpyW( *result, str ); return format; } @@ -308,9 +193,10 @@ static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, /* check for ascii string format */ if ((format[0] == 'h' && format[1] == 's') || (format[0] == 'h' && format[1] == 'S') || - (format[0] == 'S')) + (unicode_caller && format[0] == 'S') || + (!unicode_caller && format[0] == 's')) { - DWORD len = MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, /*FIXME*/ NULL, 0 ); + DWORD len = MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, NULL, 0 ); wstring = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); MultiByteToWideChar( CP_ACP, 0, (char *)arg, -1, wstring, len ); arg = (ULONG_PTR)wstring; @@ -319,7 +205,8 @@ static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, /* check for ascii character format */ else if ((format[0] == 'h' && format[1] == 'c') || (format[0] == 'h' && format[1] == 'C') || - (format[0] == 'C')) + (unicode_caller && format[0] == 'C') || + (!unicode_caller && format[0] == 'c')) { char ch = arg; wstring = HeapAlloc( GetProcessHeap(), 0, 2 * sizeof(WCHAR) ); @@ -331,14 +218,16 @@ static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, /* check for wide string format */ else if ((format[0] == 'l' && format[1] == 's') || (format[0] == 'l' && format[1] == 'S') || - (format[0] == 'w' && format[1] == 's')) + (format[0] == 'w' && format[1] == 's') || + (!unicode_caller && format[0] == 'S')) { *p++ = 's'; } /* check for wide character format */ else if ((format[0] == 'l' && format[1] == 'c') || (format[0] == 'l' && format[1] == 'C') || - (format[0] == 'w' && format[1] == 'c')) + (format[0] == 'w' && format[1] == 'c') || + (!unicode_caller && format[0] == 'C')) { *p++ = 'c'; } @@ -426,7 +315,7 @@ static LPWSTR format_messageA( DWORD dwFlags, LPCWSTR fmtstr, struct format_args f++; break; } - f = format_insertA( insertnr, f, dwFlags, format_args, &str ); + f = format_insert( FALSE, insertnr, f, dwFlags, format_args, &str ); for (x = str; *x; x++) ADD_TO_T(*x); HeapFree( GetProcessHeap(), 0, str ); break; @@ -536,7 +425,7 @@ static LPWSTR format_messageW( DWORD dwFlags, LPCWSTR fmtstr, struct format_args f++; break; } - f = format_insertW( insertnr, f, dwFlags, format_args, &str ); + f = format_insert( TRUE, insertnr, f, dwFlags, format_args, &str ); for (x = str; *x; x++) ADD_TO_T(*x); HeapFree( GetProcessHeap(), 0, str ); break;

1 0

Andrew Nguyen : kernel32: Rename the load_message helper to reflect its sole handling of Unicode strings .
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 12efa6135cf60e4739935697bf4791d0377b3d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=12efa6135cf60e4739935697b… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:10:19 2010 -0500 kernel32: Rename the load_message helper to reflect its sole handling of Unicode strings. --- dlls/kernel32/format_msg.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index a5426ae..4dbaf36 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -72,9 +72,9 @@ static const WCHAR PCNTFMTWSTR[] = { '%','%','%','s',0 }; static const WCHAR FMTWSTR[] = { '%','s',0 }; /********************************************************************** - * load_messageW (internal) + * load_message (internal) */ -static LPWSTR load_messageW( HMODULE module, UINT id, WORD lang ) +static LPWSTR load_message( HMODULE module, UINT id, WORD lang ) { const MESSAGE_RESOURCE_ENTRY *mre; WCHAR *buffer; @@ -426,9 +426,9 @@ DWORD WINAPI FormatMessageA( } else { if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_messageW( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } @@ -514,11 +514,10 @@ DWORD WINAPI FormatMessageW( strcpyW( from, lpSource ); } else { - from = NULL; if (dwFlags & FORMAT_MESSAGE_FROM_HMODULE) - from = load_messageW( (HMODULE)lpSource, dwMessageId, dwLanguageId ); + from = load_message( (HMODULE)lpSource, dwMessageId, dwLanguageId ); if (!from && (dwFlags & FORMAT_MESSAGE_FROM_SYSTEM)) - from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); + from = load_message( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; }

1 0

Andrew Nguyen : kernel32: Separate format string parsing in FormatMessageW into a new function.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: df83469258e25d2ca8e8d4a5f04d3c2817c7785c URL: http://source.winehq.org/git/wine.git/?a=commit;h=df83469258e25d2ca8e8d4a5f… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:28 2010 -0500 kernel32: Separate format string parsing in FormatMessageW into a new function. --- dlls/kernel32/format_msg.c | 209 +++++++++++++++++++++++--------------------- 1 files changed, 111 insertions(+), 98 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index db97300..0ba0229 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -404,6 +404,115 @@ static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, return format; } +/********************************************************************** + * format_messageW (internal) + */ +static LPWSTR format_messageW( DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) +{ + LPWSTR target,t; + DWORD talloced; + LPCWSTR f; + DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; + BOOL eos = FALSE; + WCHAR ch; + + target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); + talloced = 100; + +#define ADD_TO_T(c) do {\ + *t++=c;\ + if ((DWORD)(t-target) == talloced) {\ + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ + t = target+talloced;\ + talloced*=2;\ + } \ +} while (0) + + f = fmtstr; + if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { + while (*f && !eos) + ADD_TO_T(*f++); + } + else { + while (*f && !eos) { + if (*f=='%') { + int insertnr; + WCHAR *str,*x; + + f++; + if (!*f) { + ADD_TO_T('%'); + continue; + } + + switch (*f) { + case '1':case '2':case '3':case '4':case '5': + case '6':case '7':case '8':case '9': + insertnr = *f-'0'; + switch (f[1]) { + case '0':case '1':case '2':case '3': + case '4':case '5':case '6':case '7': + case '8':case '9': + f++; + insertnr = insertnr*10 + *f-'0'; + f++; + break; + default: + f++; + break; + } + f = format_insertW( insertnr, f, dwFlags, format_args, &str ); + for (x = str; *x; x++) ADD_TO_T(*x); + HeapFree( GetProcessHeap(), 0, str ); + break; + case 'n': + ADD_TO_T('\r'); + ADD_TO_T('\n'); + f++; + break; + case '0': + eos = TRUE; + f++; + break; + default: + ADD_TO_T(*f++); + break; + } + } else { + ch = *f; + f++; + if (ch == '\r') { + if (*f == '\n') + f++; + if(width) + ADD_TO_T(' '); + else + { + ADD_TO_T('\r'); + ADD_TO_T('\n'); + } + } else { + if (ch == '\n') + { + if(width) + ADD_TO_T(' '); + else + { + ADD_TO_T('\r'); + ADD_TO_T('\n'); + } + } + else + ADD_TO_T(ch); + } + } + } + } + *t = '\0'; + + return target; +} +#undef ADD_TO_T /*********************************************************************** * FormatMessageA (KERNEL32.@) @@ -603,13 +712,10 @@ DWORD WINAPI FormatMessageW( { struct format_args format_args; DWORD ret = 0; - LPWSTR target,t; + LPWSTR target; DWORD talloced; LPWSTR from; - LPCWSTR f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; - BOOL eos = FALSE; - WCHAR ch; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -652,102 +758,9 @@ DWORD WINAPI FormatMessageW( from = load_messageW( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } - target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100 * sizeof(WCHAR) ); - t = target; - talloced= 100; - -#define ADD_TO_T(c) do {\ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2*sizeof(WCHAR));\ - t = target+talloced;\ - talloced*=2;\ - } \ -} while (0) - - if (from) { - f=from; - if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { - while (*f && !eos) - ADD_TO_T(*f++); - } - else { - while (*f && !eos) { - if (*f=='%') { - int insertnr; - WCHAR *str,*x; - f++; - if (!*f) { - ADD_TO_T('%'); - continue; - } + target = format_messageW( dwFlags, from, &format_args ); - switch (*f) { - case '1':case '2':case '3':case '4':case '5': - case '6':case '7':case '8':case '9': - insertnr=*f-'0'; - switch (f[1]) { - case '0':case '1':case '2':case '3': - case '4':case '5':case '6':case '7': - case '8':case '9': - f++; - insertnr=insertnr*10+*f-'0'; - f++; - break; - default: - f++; - break; - } - f = format_insertW( insertnr, f, dwFlags, &format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); - HeapFree( GetProcessHeap(), 0, str ); - break; - case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); - f++; - break; - case '0': - eos = TRUE; - f++; - break; - default: - ADD_TO_T(*f++); - break; - } - } else { - ch = *f; - f++; - if (ch == '\r') { - if (*f == '\n') - f++; - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } else { - if (ch == '\n') - { - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } - else - ADD_TO_T(ch); - } - } - } - } - *t='\0'; - } talloced = strlenW(target)+1; TRACE("-- %s\n",debugstr_w(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) {

1 0

Andrew Nguyen : kernel32: Separate format string parsing in FormatMessageA into a new function.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: f199a83d476d27250f559e8dbb2d245181f8df93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f199a83d476d27250f559e8db… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:45 2010 -0500 kernel32: Separate format string parsing in FormatMessageA into a new function. --- dlls/kernel32/format_msg.c | 208 +++++++++++++++++++++++-------------------- 1 files changed, 111 insertions(+), 97 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 0ba0229..1ee5bd4 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -405,6 +405,115 @@ static LPCWSTR format_insertW( int insert, LPCWSTR format, DWORD flags, } /********************************************************************** + * format_messageA (internal) + */ +static LPSTR format_messageA( DWORD dwFlags, LPCSTR fmtstr, struct format_args *format_args ) +{ + LPSTR target,t; + DWORD talloced; + LPCSTR f; + DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; + BOOL eos = FALSE; + CHAR ch; + + target = t = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100); + talloced = 100; + +#define ADD_TO_T(c) do { \ + *t++=c;\ + if ((DWORD)(t-target) == talloced) {\ + target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ + t = target+talloced;\ + talloced*=2;\ + }\ +} while (0) + + f = fmtstr; + if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { + while (*f && !eos) + ADD_TO_T(*f++); + } + else { + while (*f && !eos) { + if (*f=='%') { + int insertnr; + char *str,*x; + + f++; + if (!*f) { + ADD_TO_T('%'); + continue; + } + switch (*f) { + case '1':case '2':case '3':case '4':case '5': + case '6':case '7':case '8':case '9': + insertnr = *f-'0'; + switch (f[1]) { + case '0':case '1':case '2':case '3': + case '4':case '5':case '6':case '7': + case '8':case '9': + f++; + insertnr = insertnr*10 + *f-'0'; + f++; + break; + default: + f++; + break; + } + f = format_insertA( insertnr, f, dwFlags, format_args, &str ); + for (x = str; *x; x++) ADD_TO_T(*x); + HeapFree( GetProcessHeap(), 0, str ); + break; + case 'n': + ADD_TO_T('\r'); + ADD_TO_T('\n'); + f++; + break; + case '0': + eos = TRUE; + f++; + break; + default: + ADD_TO_T(*f++); + break; + } + } else { + ch = *f; + f++; + if (ch == '\r') { + if (*f == '\n') + f++; + if(width) + ADD_TO_T(' '); + else + { + ADD_TO_T('\r'); + ADD_TO_T('\n'); + } + } else { + if (ch == '\n') + { + if(width) + ADD_TO_T(' '); + else + { + ADD_TO_T('\r'); + ADD_TO_T('\n'); + } + } + else + ADD_TO_T(ch); + } + } + } + } + *t = '\0'; + + return target; +} +#undef ADD_TO_T + +/********************************************************************** * format_messageW (internal) */ static LPWSTR format_messageW( DWORD dwFlags, LPCWSTR fmtstr, struct format_args *format_args ) @@ -529,13 +638,10 @@ DWORD WINAPI FormatMessageA( { struct format_args format_args; DWORD ret = 0; - LPSTR target,t; + LPSTR target; DWORD talloced; LPSTR from; - LPCSTR f; DWORD width = dwFlags & FORMAT_MESSAGE_MAX_WIDTH_MASK; - BOOL eos = FALSE; - CHAR ch; TRACE("(0x%x,%p,%d,0x%x,%p,%d,%p)\n", dwFlags,lpSource,dwMessageId,dwLanguageId,lpBuffer,nSize,args); @@ -578,101 +684,9 @@ DWORD WINAPI FormatMessageA( from = load_messageA( kernel32_handle, dwMessageId, dwLanguageId ); if (!from) return 0; } - target = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, 100); - t = target; - talloced= 100; -#define ADD_TO_T(c) do { \ - *t++=c;\ - if ((DWORD)(t-target) == talloced) {\ - target = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,target,talloced*2);\ - t = target+talloced;\ - talloced*=2;\ - }\ -} while (0) - - if (from) { - f=from; - if (dwFlags & FORMAT_MESSAGE_IGNORE_INSERTS) { - while (*f && !eos) - ADD_TO_T(*f++); - } - else { - while (*f && !eos) { - if (*f=='%') { - int insertnr; - char *str,*x; + target = format_messageA( dwFlags, from, &format_args ); - f++; - if (!*f) { - ADD_TO_T('%'); - continue; - } - switch (*f) { - case '1':case '2':case '3':case '4':case '5': - case '6':case '7':case '8':case '9': - insertnr=*f-'0'; - switch (f[1]) { - case '0':case '1':case '2':case '3': - case '4':case '5':case '6':case '7': - case '8':case '9': - f++; - insertnr=insertnr*10+*f-'0'; - f++; - break; - default: - f++; - break; - } - f = format_insertA( insertnr, f, dwFlags, &format_args, &str ); - for (x = str; *x; x++) ADD_TO_T(*x); - HeapFree( GetProcessHeap(), 0, str ); - break; - case 'n': - ADD_TO_T('\r'); - ADD_TO_T('\n'); - f++; - break; - case '0': - eos = TRUE; - f++; - break; - default: - ADD_TO_T(*f++); - break; - } - } else { - ch = *f; - f++; - if (ch == '\r') { - if (*f == '\n') - f++; - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } else { - if (ch == '\n') - { - if(width) - ADD_TO_T(' '); - else - { - ADD_TO_T('\r'); - ADD_TO_T('\n'); - } - } - else - ADD_TO_T(ch); - } - } - } - } - *t='\0'; - } talloced = strlen(target)+1; TRACE("-- %s\n",debugstr_a(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) {

1 0

Andrew Nguyen : kernel32: Consistify allocation behavior with FormatMessageA/W.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: fcdd0d30400ee791ed4098bcf360eb928b01309b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcdd0d30400ee791ed4098bcf… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:21 2010 -0500 kernel32: Consistify allocation behavior with FormatMessageA/W. --- dlls/kernel32/format_msg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 8c37434..db97300 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -752,8 +752,7 @@ DWORD WINAPI FormatMessageW( TRACE("-- %s\n",debugstr_w(target)); if (dwFlags & FORMAT_MESSAGE_ALLOCATE_BUFFER) { /* nSize is the MINIMUM size */ - DWORD len = strlenW(target) + 1; - *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT,len*sizeof(WCHAR)); + *((LPVOID*)lpBuffer) = LocalAlloc(LMEM_ZEROINIT, max(nSize, talloced)*sizeof(WCHAR)); strcpyW(*(LPWSTR*)lpBuffer, target); } else

1 0

Andrew Nguyen : kernel32: Transition FormatMessageA to the internal use of Unicode strings.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 053d4385c9f929d44bcbb00090cd2d8ae475735c URL: http://source.winehq.org/git/wine.git/?a=commit;h=053d4385c9f929d44bcbb0009… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:53 2010 -0500 kernel32: Transition FormatMessageA to the internal use of Unicode strings. --- dlls/kernel32/format_msg.c | 134 +++++++++++++++++--------------------------- 1 files changed, 51 insertions(+), 83 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=053d4385c9f929d44bcbb…

1 0

Andrew Nguyen : kernel32/tests: Add tests for buffer allocation in FormatMessage.
by Alexandre Julliard April 19, 2010

April 19, 2010

Module: wine Branch: master Commit: 8e203225781ebc6634d4bf3500a766b31da4afea URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e203225781ebc6634d4bf350… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Sun Apr 18 09:09:14 2010 -0500 kernel32/tests: Add tests for buffer allocation in FormatMessage. --- dlls/kernel32/tests/format_msg.c | 168 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 21b6377..f118831 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -835,6 +835,172 @@ static void test_message_null_buffer_wide(void) ok(error == ERROR_INVALID_PARAMETER, "last error %u\n", error); } +static void test_message_allocate_buffer(void) +{ + DWORD ret; + char *buf; + + /* While MSDN suggests that FormatMessageA allocates a buffer whose size is + * the larger of the output string and the requested buffer size, the tests + * will not try to determine the actual size of the buffer allocated, as + * the return value of LocalSize cannot be trusted for the purpose, and it should + * in any case be safe for FormatMessageA to allocate in the manner that + * MSDN suggests. */ + + buf = (char *)0xdeadbeef; + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + "test", 0, 0, (char *)&buf, 0, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (char *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (char *)0xdeadbeef) + { + ok(!strcmp("test", buf), + "Expected buffer to contain \"test\", got %s\n", buf); + LocalFree(buf); + } + + buf = (char *)0xdeadbeef; + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + "test", 0, 0, (char *)&buf, strlen("test"), NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (char *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (char *)0xdeadbeef) + { + ok(!strcmp("test", buf), + "Expected buffer to contain \"test\", got %s\n", buf); + LocalFree(buf); + } + + buf = (char *)0xdeadbeef; + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + "test", 0, 0, (char *)&buf, strlen("test") + 1, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (char *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (char *)0xdeadbeef) + { + ok(!strcmp("test", buf), + "Expected buffer to contain \"test\", got %s\n", buf); + LocalFree(buf); + } + + buf = (char *)0xdeadbeef; + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + "test", 0, 0, (char *)&buf, strlen("test") + 2, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (char *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (char *)0xdeadbeef) + { + ok(!strcmp("test", buf), + "Expected buffer to contain \"test\", got %s\n", buf); + LocalFree(buf); + } + + buf = (char *)0xdeadbeef; + ret = FormatMessageA(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + "test", 0, 0, (char *)&buf, 1024, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (char *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (char *)0xdeadbeef) + { + ok(!strcmp("test", buf), + "Expected buffer to contain \"test\", got %s\n", buf); + LocalFree(buf); + } +} + +static void test_message_allocate_buffer_wide(void) +{ + static const WCHAR test[] = {'t','e','s','t',0}; + + DWORD ret; + WCHAR *buf; + + SetLastError(0xdeadbeef); + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING, NULL, 0, 0, NULL, 0, NULL); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + win_skip("FormatMessageW is not implemented\n"); + return; + } + + /* While MSDN suggests that FormatMessageA allocates a buffer whose size is + * the larger of the output string and the requested buffer size, the tests + * will not try to determine the actual size of the buffer allocated, as + * the return value of LocalSize cannot be trusted for the purpose, and it should + * in any case be safe for FormatMessageA to allocate in the manner that + * MSDN suggests. */ + + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + test, 0, 0, (WCHAR *)&buf, 0, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (WCHAR *)0xdeadbeef) + { + ok(!lstrcmpW(test, buf), + "Expected buffer to contain \"test\", got %s\n", wine_dbgstr_w(buf)); + LocalFree(buf); + } + + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + test, 0, 0, (WCHAR *)&buf, sizeof(test)/sizeof(WCHAR) - 1, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (WCHAR *)0xdeadbeef) + { + ok(!lstrcmpW(test, buf), + "Expected buffer to contain \"test\", got %s\n", wine_dbgstr_w(buf)); + LocalFree(buf); + } + + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + test, 0, 0, (WCHAR *)&buf, sizeof(test)/sizeof(WCHAR), NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (WCHAR *)0xdeadbeef) + { + ok(!lstrcmpW(test, buf), + "Expected buffer to contain \"test\", got %s\n", wine_dbgstr_w(buf)); + LocalFree(buf); + } + + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + test, 0, 0, (WCHAR *)&buf, sizeof(test)/sizeof(WCHAR) + 1, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (WCHAR *)0xdeadbeef) + { + ok(!lstrcmpW(test, buf), + "Expected buffer to contain \"test\", got %s\n", wine_dbgstr_w(buf)); + LocalFree(buf); + } + + buf = (WCHAR *)0xdeadbeef; + ret = FormatMessageW(FORMAT_MESSAGE_FROM_STRING | FORMAT_MESSAGE_ALLOCATE_BUFFER, + test, 0, 0, (WCHAR *)&buf, 1024, NULL); + ok(ret == 4, "Expected FormatMessageA to return 4, got %u\n", ret); + ok(buf != NULL && buf != (WCHAR *)0xdeadbeef, + "Expected output buffer pointer to be valid\n"); + if (buf != NULL && buf != (WCHAR *)0xdeadbeef) + { + ok(!lstrcmpW(test, buf), + "Expected buffer to contain \"test\", got %s\n", wine_dbgstr_w(buf)); + LocalFree(buf); + } +} + static void test_message_from_hmodule(void) { DWORD ret, error; @@ -903,5 +1069,7 @@ START_TEST(format_msg) test_message_insufficient_buffer_wide(); test_message_null_buffer(); test_message_null_buffer_wide(); + test_message_allocate_buffer(); + test_message_allocate_buffer_wide(); test_message_from_hmodule(); }

1 0