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

Andrew Eikum : winecoreaudio.drv: Add mmdevapi driver.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: d2f7b628d947338d3a0a0229107365c44d954689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f7b628d947338d3a0a02291… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 22 15:25:35 2011 -0500 winecoreaudio.drv: Add mmdevapi driver. --- dlls/winecoreaudio.drv/Makefile.in | 3 +- dlls/winecoreaudio.drv/audio.c | 1 - dlls/winecoreaudio.drv/mmdevdrv.c | 2086 +++++++++++++++++++++++++ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 5 + 4 files changed, 2093 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2f7b628d947338d3a0a0…

1 0

Andrew Bogott : crypt32/tests: Demonstrate that CryptStringToBinary can take arbitrary key headers and trailers .
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 812d6477058a0f27a9542c602eebe282d552eee7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=812d6477058a0f27a9542c602… Author: Andrew Bogott <Andrew(a)CodeWeavers.com> Date: Sat Apr 23 10:18:40 2011 -0500 crypt32/tests: Demonstrate that CryptStringToBinary can take arbitrary key headers and trailers. --- dlls/crypt32/tests/base64.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c index 39fa2e1..c5c436b 100644 --- a/dlls/crypt32/tests/base64.c +++ b/dlls/crypt32/tests/base64.c @@ -28,7 +28,9 @@ #include "wine/test.h" #define CERT_HEADER "-----BEGIN CERTIFICATE-----\r\n" +#define ALT_CERT_HEADER "-----BEGIN This is some arbitrary text that goes on and on-----\r\n" #define CERT_TRAILER "-----END CERTIFICATE-----\r\n" +#define ALT_CERT_TRAILER "-----END More arbitrary text------\r\n" #define CERT_REQUEST_HEADER "-----BEGIN NEW CERTIFICATE REQUEST-----\r\n" #define CERT_REQUEST_TRAILER "-----END NEW CERTIFICATE REQUEST-----\r\n" #define X509_HEADER "-----BEGIN X509 CRL-----\r\n" @@ -360,6 +362,9 @@ static void testStringToBinaryA(void) decodeAndCompareBase64_A(tests[i].base64, CERT_HEADER, CERT_TRAILER, CRYPT_STRING_BASE64HEADER, CRYPT_STRING_BASE64HEADER, tests[i].toEncode, tests[i].toEncodeLen); + decodeAndCompareBase64_A(tests[i].base64, ALT_CERT_HEADER, ALT_CERT_TRAILER, + CRYPT_STRING_BASE64HEADER, CRYPT_STRING_BASE64HEADER, + tests[i].toEncode, tests[i].toEncodeLen); decodeAndCompareBase64_A(tests[i].base64, CERT_REQUEST_HEADER, CERT_REQUEST_TRAILER, CRYPT_STRING_BASE64REQUESTHEADER, CRYPT_STRING_BASE64REQUESTHEADER, tests[i].toEncode,

1 0

Amine Khaldi : gdi32/test: SelectObject doesn't work with palettes, use SelectPalette instead.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 30b8d046bab6dcc574fd68326678e7a36ade91eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=30b8d046bab6dcc574fd68326… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Apr 24 17:42:35 2011 +0100 gdi32/test: SelectObject doesn't work with palettes, use SelectPalette instead. --- dlls/gdi32/tests/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index adef035..6dd612c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -792,7 +792,7 @@ static void test_dibsections(void) DeleteObject(hdib2); SelectObject(hdcmem, oldbm); - SelectObject(hdcmem, oldpal); + SelectPalette(hdcmem, oldpal, TRUE); DeleteObject(hdib); DeleteObject(hpal);

1 0

Piotr Caban : msvcrt: Copy and reorganize printf implementation.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 056dfb26cefb04805db9289dd9295b8e53f7264b URL: http://source.winehq.org/git/wine.git/?a=commit;h=056dfb26cefb04805db9289dd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 14:42:16 2011 +0200 msvcrt: Copy and reorganize printf implementation. --- dlls/msvcrt/msvcrt.h | 15 ++ dlls/msvcrt/printf.h | 534 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/wcs.c | 5 + 3 files changed, 554 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=056dfb26cefb04805db92…

1 0

Piotr Caban : msvcrt/tests: Added fprintf tests.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: dbc8c07ba80a4226664f8f71181839b3dbf77057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc8c07ba80a4226664f8f711… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 14:41:39 2011 +0200 msvcrt/tests: Added fprintf tests. --- dlls/msvcrt/tests/printf.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 22ad1f6..a121533 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -625,6 +625,41 @@ static void test_snprintf (void) }; } +static void test_fprintf(void) +{ + static char file_name[] = "fprintf.tst"; + FILE *fp = fopen(file_name, "wb"); + char buf[1024]; + int ret; + + ret = fprintf(fp, "simple test\n"); + ok(ret == 12, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 12, "ftell returned %d\n", ret); + + ret = fprintf(fp, "contains%cnull\n", '\0'); + ok(ret == 14, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 26, "ftell returned %d\n", ret); + + fclose(fp); + + fp = fopen(file_name, "rb"); + ret = fscanf(fp, "%[^\n] ", buf); + ok(ret == 1, "ret = %d\n", ret); + ret = ftell(fp); + ok(ret == 12, "ftell returned %d\n", ret); + ok(!strcmp(buf, "simple test"), "buf = %s\n", buf); + + fgets(buf, sizeof(buf), fp); + ret = ftell(fp); + ok(ret == 26, "ret = %d\n", ret); + ok(!memcmp(buf, "contains\0null\n", 14), "buf = %s\n", buf); + + fclose(fp); + unlink(file_name); +} + static void test_fcvt(void) { char *str; @@ -1036,6 +1071,7 @@ START_TEST(printf) test_sprintf(); test_swprintf(); test_snprintf(); + test_fprintf(); test_fcvt(); test_xcvt(); test_vsnwprintf();

1 0

Piotr Caban : msvcrt: Use callback based printf in fprintf functions family .
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: b9e456aa7976f6dde080fe8eae3435e4dcb4886b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9e456aa7976f6dde080fe8ea… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 14:42:36 2011 +0200 msvcrt: Use callback based printf in fprintf functions family. --- dlls/msvcrt/file.c | 118 ++++++++++------------------------------------------ 1 files changed, 22 insertions(+), 96 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e34c11f..30613ca 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3379,37 +3379,22 @@ MSVCRT_FILE* CDECL MSVCRT_tmpfile(void) return file; } +static int puts_clbk_file_a(void *file, int len, const char *str) +{ + return MSVCRT_fwrite(str, sizeof(char), len, file); +} + +static int puts_clbk_file_w(void *file, int len, const MSVCRT_wchar_t *str) +{ + return MSVCRT_fwrite(str, sizeof(MSVCRT_wchar_t), len, file); +} + /********************************************************************* * vfprintf (MSVCRT.@) */ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { - char buf[2048]; - LPWSTR formatW = NULL; - DWORD sz; - pf_output out; - int written, retval; - - out.unicode = FALSE; - out.buf.A = out.grow.A = buf; - out.used = 0; - out.len = sizeof(buf); - - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - - if ((written = pf_vsnprintf( &out, formatW, NULL, FALSE, valist )) >= 0) - { - retval = MSVCRT_fwrite(out.buf.A, sizeof(*out.buf.A), written, file); - } - else retval = -1; - - HeapFree( GetProcessHeap(), 0, formatW ); - - if (out.buf.A != out.grow.A) - MSVCRT_free (out.buf.A); - return retval; + return pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, valist); } /********************************************************************* @@ -3417,38 +3402,12 @@ int CDECL MSVCRT_vfprintf(MSVCRT_FILE* file, const char *format, __ms_va_list va */ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list valist) { - char buf[2048]; - LPWSTR formatW = NULL; - DWORD sz; - pf_output out; - int written, retval; - - if( !MSVCRT_CHECK_PMT( file != NULL ) ) - { - *MSVCRT__errno() = MSVCRT_EINVAL; - return -1; - } - - out.unicode = FALSE; - out.buf.A = out.grow.A = buf; - out.used = 0; - out.len = sizeof(buf); - - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - - if ((written = pf_vsnprintf( &out, formatW, NULL, TRUE, valist )) >= 0) - { - retval = MSVCRT_fwrite(out.buf.A, sizeof(*out.buf.A), written, file); - } - else retval = -1; - - HeapFree( GetProcessHeap(), 0, formatW ); + if(!MSVCRT_CHECK_PMT(file != NULL)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } - if (out.buf.A != out.grow.A) - MSVCRT_free (out.buf.A); - return retval; + return pf_printf_a(puts_clbk_file_a, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, valist); } /********************************************************************* @@ -3456,23 +3415,7 @@ int CDECL MSVCRT_vfprintf_s(MSVCRT_FILE* file, const char *format, __ms_va_list */ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { - MSVCRT_wchar_t buf[2048]; - pf_output out; - int written, retval; - - out.unicode = TRUE; - out.buf.W = out.grow.W = buf; - out.used = 0; - out.len = sizeof(buf) / sizeof(buf[0]); - - if ((written = pf_vsnprintf( &out, format, NULL, FALSE, valist )) >= 0) - { - retval = MSVCRT_fwrite(out.buf.W, sizeof(*out.buf.W), written, file); - } - else retval = -1; - if (out.buf.W != out.grow.W) - MSVCRT_free (out.buf.W); - return retval; + return pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, valist); } /********************************************************************* @@ -3480,29 +3423,12 @@ int CDECL MSVCRT_vfwprintf(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms */ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ms_va_list valist) { - MSVCRT_wchar_t buf[2048]; - pf_output out; - int written, retval; - - if( !MSVCRT_CHECK_PMT( file != NULL ) ) - { - *MSVCRT__errno() = MSVCRT_EINVAL; - return -1; - } - - out.unicode = TRUE; - out.buf.W = out.grow.W = buf; - out.used = 0; - out.len = sizeof(buf) / sizeof(buf[0]); + if(!MSVCRT_CHECK_PMT( file != NULL)) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } - if ((written = pf_vsnprintf( &out, format, NULL, TRUE, valist )) >= 0) - { - retval = MSVCRT_fwrite(out.buf.W, sizeof(*out.buf.W), written, file); - } - else retval = -1; - if (out.buf.W != out.grow.W) - MSVCRT_free (out.buf.W); - return retval; + return pf_printf_w(puts_clbk_file_w, file, format, NULL, FALSE, TRUE, arg_clbk_valist, NULL, valist); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Removed pf_vnsprintf internal function.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: c09f9ef498c189394e358292540277a30e0a266a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c09f9ef498c189394e3582925… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 14:43:02 2011 +0200 msvcrt: Removed pf_vnsprintf internal function. --- dlls/msvcrt/msvcrt.h | 18 -- dlls/msvcrt/wcs.c | 677 -------------------------------------------------- 2 files changed, 0 insertions(+), 695 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c09f9ef498c189394e358…

1 0

Amine Khaldi : comctl32: Don' t draw text when the number of text lines has been set to zero.
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 942aa70a0e7b30ead40902987afc9b03f8da2360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=942aa70a0e7b30ead40902987… Author: Amine Khaldi <amine.khaldi(a)reactos.org> Date: Sun Apr 24 17:56:30 2011 +0100 comctl32: Don't draw text when the number of text lines has been set to zero. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 0b9dec2..c49b842 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -574,7 +574,7 @@ TOOLBAR_DrawString (const TOOLBAR_INFO *infoPtr, RECT *rcText, LPCWSTR lpText, UINT state = tbcd->nmcd.uItemState; /* draw text */ - if (lpText) { + if (lpText && infoPtr->nMaxTextRows > 0) { TRACE("string=%s rect=(%s)\n", debugstr_w(lpText), wine_dbgstr_rect(rcText));

1 0

Piotr Caban : msvcrt: Use callback based printf in sprintf functions family .
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: bfc2f5f2a538f3d6eff7e23c129571392705c560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc2f5f2a538f3d6eff7e23c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 14:42:48 2011 +0200 msvcrt: Use callback based printf in sprintf functions family. --- dlls/msvcrt/printf.h | 24 ++++++++++++ dlls/msvcrt/wcs.c | 98 +++++++++++++++++++++++-------------------------- 2 files changed, 70 insertions(+), 52 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 90909a1..2db9b6c 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -35,6 +35,30 @@ typedef struct FUNC_NAME(pf_flags_t) APICHAR Format; } FUNC_NAME(pf_flags); +struct FUNC_NAME(_str_ctx) { + MSVCRT_size_t len; + APICHAR *buf; +}; + +static int FUNC_NAME(puts_clbk_str)(void *ctx, int len, const APICHAR *str) +{ + struct FUNC_NAME(_str_ctx) *out = ctx; + + if(!out->buf) + return len; + + if(out->len < len) { + memcpy(out->buf, str, out->len); + out->buf += out->len; + out->len = 0; + return -1; + } + + memcpy(out->buf, str, len*sizeof(APICHAR)); + out->buf += len; + return len; +} + static inline const APICHAR* FUNC_NAME(pf_parse_int)(const APICHAR *fmt, int *val) { *val = 0; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a7cec7c..b67fba2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1114,40 +1114,19 @@ printf_arg arg_clbk_valist(void *ctx, int arg_pos, int type, __ms_va_list *valis } /********************************************************************* - * vsnprintf_internal (INTERNAL) - */ -static inline int vsnprintf_internal( char *str, MSVCRT_size_t len, const char *format, - MSVCRT__locale_t locale, BOOL valid, __ms_va_list valist ) -{ - DWORD sz; - LPWSTR formatW = NULL; - pf_output out; - int r; - - out.unicode = FALSE; - out.buf.A = str; - out.grow.A = NULL; - out.used = 0; - out.len = len; - - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - - r = pf_vsnprintf( &out, formatW, locale, valid, valist ); - - HeapFree( GetProcessHeap(), 0, formatW ); - - return r; -} - -/********************************************************************* * _vsnprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist ) { - return vsnprintf_internal(str, len, format, NULL, FALSE, valist); + static const char nullbyte = '\0'; + struct _str_ctx_a ctx = {len, str}; + int ret; + + ret = pf_printf_a(puts_clbk_str_a, &ctx, format, NULL, FALSE, FALSE, + arg_clbk_valist, NULL, valist); + puts_clbk_str_a(&ctx, 1, &nullbyte); + return ret; } /********************************************************************* @@ -1156,7 +1135,14 @@ int CDECL MSVCRT_vsnprintf( char *str, MSVCRT_size_t len, int CDECL MSVCRT_vsnprintf_l( char *str, MSVCRT_size_t len, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { - return vsnprintf_internal(str, len, format, locale, FALSE, valist); + static const char nullbyte = '\0'; + struct _str_ctx_a ctx = {len, str}; + int ret; + + ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, FALSE, FALSE, + arg_clbk_valist, NULL, valist); + puts_clbk_str_a(&ctx, 1, &nullbyte); + return ret; } /********************************************************************* @@ -1166,6 +1152,8 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, MSVCRT_size_t count, const char *format, MSVCRT__locale_t locale, __ms_va_list valist ) { + static const char nullbyte = '\0'; + struct _str_ctx_a ctx; int len, ret; if(sizeOfBuffer<count+1 || count==-1) @@ -1173,7 +1161,11 @@ int CDECL MSVCRT_vsnprintf_s_l( char *str, MSVCRT_size_t sizeOfBuffer, else len = count+1; - ret = vsnprintf_internal(str, len, format, locale, TRUE, valist); + ctx.len = len; + ctx.buf = str; + ret = pf_printf_a(puts_clbk_str_a, &ctx, format, locale, FALSE, TRUE, + arg_clbk_valist, NULL, valist); + puts_clbk_str_a(&ctx, 1, &nullbyte); if(ret<0 || ret==len) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) { @@ -1263,30 +1255,19 @@ int CDECL MSVCRT__scprintf(const char *format, ...) } /********************************************************************* - * vsnwprintf_internal (INTERNAL) - */ -static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, - const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid, - __ms_va_list valist) -{ - pf_output out; - - out.unicode = TRUE; - out.buf.W = str; - out.grow.W = NULL; - out.used = 0; - out.len = len; - - return pf_vsnprintf( &out, format, locale, valid, valist ); -} - -/********************************************************************* * _vsnwprintf (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist) { - return vsnwprintf_internal(str, len, format, NULL, FALSE, valist); + static const MSVCRT_wchar_t nullbyte = '\0'; + struct _str_ctx_w ctx = {len, str}; + int ret; + + ret = pf_printf_w(puts_clbk_str_w, &ctx, format, NULL, FALSE, FALSE, + arg_clbk_valist, NULL, valist); + puts_clbk_str_w(&ctx, 1, &nullbyte); + return ret; } /********************************************************************* @@ -1296,7 +1277,14 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { - return vsnwprintf_internal(str, len, format, locale, FALSE, valist); + static const MSVCRT_wchar_t nullbyte = '\0'; + struct _str_ctx_w ctx = {len, str}; + int ret; + + ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, FALSE, FALSE, + arg_clbk_valist, NULL, valist); + puts_clbk_str_w(&ctx, 1, &nullbyte); + return ret; } /********************************************************************* @@ -1306,13 +1294,19 @@ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer MSVCRT_size_t count, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list valist) { + static const MSVCRT_wchar_t nullbyte = '\0'; + struct _str_ctx_w ctx; int len, ret; len = sizeOfBuffer; if(count!=-1 && len>count+1) len = count+1; - ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); + ctx.len = len; + ctx.buf = str; + ret = pf_printf_w(puts_clbk_str_w, &ctx, format, locale, FALSE, TRUE, + arg_clbk_valist, NULL, valist); + puts_clbk_str_w(&ctx, 1, &nullbyte); if(ret<0 || ret==len) { if(count!=MSVCRT__TRUNCATE && count>sizeOfBuffer) {

1 0

Piotr Caban : msvcrt: Use callback based printf in cprintf functions family .
by Alexandre Julliard April 25, 2011

April 25, 2011

Module: wine Branch: master Commit: 7303b8c4dbae5dc8d0904aefc7c4ef4bd524225b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7303b8c4dbae5dc8d0904aefc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 20 14:42:26 2011 +0200 msvcrt: Use callback based printf in cprintf functions family. --- dlls/msvcrt/console.c | 62 +++++++++++++++---------------------------------- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/wcs.c | 23 ++++++++++++++++++ 3 files changed, 44 insertions(+), 44 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index e23ff3e..41e5e0d 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -298,37 +298,30 @@ int CDECL _kbhit(void) return retval; } +static int puts_clbk_console_a(void *ctx, int len, const char *str) +{ + LOCK_CONSOLE; + if(!WriteConsoleA(MSVCRT_console_out, str, len, NULL, NULL)) + len = -1; + UNLOCK_CONSOLE; + return len; +} + +static int puts_clbk_console_w(void *ctx, int len, const MSVCRT_wchar_t *str) +{ + LOCK_CONSOLE; + if(!WriteConsoleW(MSVCRT_console_out, str, len, NULL, NULL)) + len = -1; + UNLOCK_CONSOLE; + return len; +} /********************************************************************* * _vcprintf (MSVCRT.@) */ int CDECL _vcprintf(const char* format, __ms_va_list valist) { - char buf[2048]; - LPWSTR formatW = NULL; - DWORD sz; - pf_output out; - int retval; - - out.unicode = FALSE; - out.buf.A = out.grow.A = buf; - out.used = 0; - out.len = sizeof(buf); - - sz = MultiByteToWideChar( CP_ACP, 0, format, -1, NULL, 0 ); - formatW = HeapAlloc( GetProcessHeap(), 0, sz*sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, format, -1, formatW, sz ); - - if ((retval = pf_vsnprintf( &out, formatW, NULL, FALSE, valist )) > 0) - { - LOCK_CONSOLE; - retval = _cputs( out.buf.A ); - UNLOCK_CONSOLE; - } - HeapFree( GetProcessHeap(), 0, formatW ); - if (out.buf.A != buf) - MSVCRT_free (out.buf.A); - return retval; + return pf_printf_a(puts_clbk_console_a, NULL, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, valist); } /********************************************************************* @@ -352,24 +345,7 @@ int CDECL _cprintf(const char* format, ...) */ int CDECL _vcwprintf(const MSVCRT_wchar_t* format, __ms_va_list valist) { - MSVCRT_wchar_t buf[2048]; - pf_output out; - int retval; - - out.unicode = TRUE; - out.buf.W = out.grow.W = buf; - out.used = 0; - out.len = sizeof(buf) / sizeof(buf[0]); - - if ((retval = pf_vsnprintf( &out, format, NULL, FALSE, valist )) >= 0) - { - LOCK_CONSOLE; - retval = _cputws( out.buf.W ); - UNLOCK_CONSOLE; - } - if (out.buf.W != buf) - MSVCRT_free (out.buf.W); - return retval; + return pf_printf_w(puts_clbk_console_w, NULL, format, NULL, FALSE, FALSE, arg_clbk_valist, NULL, valist); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 677bb57..979a05b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -943,11 +943,12 @@ typedef union _printf_arg LONGLONG get_longlong; double get_double; } printf_arg; -typedef printf_arg (*args_clbk)(void*, int, size_t, __ms_va_list*); +typedef printf_arg (*args_clbk)(void*, int, int, __ms_va_list*); int pf_printf_a(puts_clbk_a, void*, const char*, MSVCRT__locale_t, BOOL, BOOL, args_clbk, void*, __ms_va_list); int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, BOOL, BOOL, args_clbk, void*, __ms_va_list); +printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*); #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a4c817b..a7cec7c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1091,6 +1091,29 @@ int pf_vsnprintf( pf_output *out, const WCHAR *format, } /********************************************************************* + * arg_clbk_valist (INTERNAL) + */ +printf_arg arg_clbk_valist(void *ctx, int arg_pos, int type, __ms_va_list *valist) +{ + printf_arg ret; + + if(type == VT_I8) + ret.get_longlong = va_arg(*valist, LONGLONG); + else if(type == VT_INT) + ret.get_int = va_arg(*valist, int); + else if(type == VT_R8) + ret.get_double = va_arg(*valist, double); + else if(type == VT_PTR) + ret.get_ptr = va_arg(*valist, void*); + else { + ERR("Incorrect type\n"); + ret.get_int = 0; + } + + return ret; +} + +/********************************************************************* * vsnprintf_internal (INTERNAL) */ static inline int vsnprintf_internal( char *str, MSVCRT_size_t len, const char *format,

1 0