wine-commits November 2015

wine-commits@winehq.org

2 participants
623 discussions

Julian Rüger : German translation for release 1.7.54
by Jeremy Newman 04 Nov '15

04 Nov '15

Module: website Branch: master Commit: a6626fb44bf19da0675b7d9eaf607b5a8125ddbc URL: http://source.winehq.org/git/website.git/?a=commit;h=a6626fb44bf19da0675b7d… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Nov 4 16:51:30 2015 +0100 German translation for release 1.7.54 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2015103001.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2015103001.xml b/news/de/2015103001.xml new file mode 100644 index 0000000..32fbb88 --- /dev/null +++ b/news/de/2015103001.xml @@ -0,0 +1,17 @@ +<news> +<date>30. Oktober 2015</date> +<title>Wine 1.7.54 freigegeben</title> +<body> + Die Entwicklungsversion 1.7.54 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.7.54">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Implementierung der TransmitFile-Funktion.</li> + <li>Weitere Implementierung der Webservices-DLL.</li> + <li>Verbesserte Video-Dekodierung.</li> + <li>Eine Alternative zum veralteten Prelink-Tool.</li> + <li>Größeres Update der türkischen Übersetzung.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="http://prdownloads.sourceforge.net/wine/wine-1.7.54.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Nikolay Sivov : comctl32: Protect TVM_GETITEM from invalid item pointers.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 60fedd23f95c66f4dce06c5c447de9ec99ebefa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fedd23f95c66f4dce06c5c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 4 12:52:04 2015 +0100 comctl32: Protect TVM_GETITEM from invalid item pointers. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 7 +++++++ dlls/comctl32/treeview.c | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 5003dfa..917df23 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -905,6 +905,13 @@ static void test_get_set_item(void) expect(TRUE, ret); ok(tviRoot.state == TVIS_FOCUSED, "got state 0x%0x\n", tviRoot.state); + /* invalid item pointer, nt4 crashes here but later versions just return 0 */ + tviRoot.hItem = (HTREEITEM)0xdeadbeef; + tviRoot.mask = TVIF_STATE; + tviRoot.state = 0; + ret = SendMessageA(hTree2, TVM_GETITEMA, 0, (LPARAM)&tviRoot); + expect(FALSE, ret); + DestroyWindow(hTree); DestroyWindow(hTree2); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 812bd35..6adafc4 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -63,6 +63,7 @@ #include "vssym32.h" #include "wine/unicode.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(treeview); @@ -2068,11 +2069,20 @@ TREEVIEW_GetItemT(const TREEVIEW_INFO *infoPtr, LPTVITEMEXW tvItem, BOOL isW) if (!TREEVIEW_ValidItem(infoPtr, item)) { + BOOL valid_item = FALSE; if (!item) return FALSE; - TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); - infoPtr = item->infoPtr; - if (!TREEVIEW_ValidItem(infoPtr, item)) return FALSE; + __TRY + { + infoPtr = item->infoPtr; + TRACE("got item from different tree %p, called from %p\n", item->infoPtr, infoPtr); + valid_item = TREEVIEW_ValidItem(infoPtr, item); + } + __EXCEPT_PAGE_FAULT + { + } + __ENDTRY + if (!valid_item) return FALSE; } TREEVIEW_UpdateDispInfo(infoPtr, item, tvItem->mask);

1 0

Martin Storsjo : makedep: Set use_msvcrt for ucrtbase imports as well.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: d33f0a492b2e5d049a076c8548974eeb2e3aec27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d33f0a492b2e5d049a076c854… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Nov 4 12:21:58 2015 +0200 makedep: Set use_msvcrt for ucrtbase imports as well. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ea3fb6..af7fea1 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2907,7 +2907,8 @@ static void update_makefile( const char *path ) make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" ); for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) - make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ); + make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) || + !strcmp( make->imports.str[i], "ucrtbase" ); make->install_lib_rules = empty_strarray; make->install_dev_rules = empty_strarray;

1 0

Martin Storsjo : ucrtbase: Handle the _s variant of vsscanf.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 1fecaae9737563ef649c7c226dfbabc747852994 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fecaae9737563ef649c7c226… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:41 2015 +0200 ucrtbase: Handle the _s variant of vsscanf. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 2 ++ dlls/msvcrt/scanf.c | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 4ce8202..77f612e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1139,4 +1139,6 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) +#define UCRTBASE_SCANF_MASK (0x0007) + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index b02977f..a19d450 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -671,9 +671,15 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, MSVCRT__locale_t locale, __ms_va_list valist) { - if (options != UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS) + /* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide + * scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf, + * but parsing of those isn't implemented at all yet. */ + if (options & ~UCRTBASE_SCANF_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - return MSVCRT_vsnscanf_l(input, length, format, locale, valist); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vsnscanf_s_l(input, length, format, locale, valist); + else + return MSVCRT_vsnscanf_l(input, length, format, locale, valist); } /*********************************************************************

1 0

Martin Storsjo : ucrtbase: Handle the C99 'z' size_t specifier for integers.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 4a79e54917a0e4d0581b62b9fcd8242291d545b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a79e54917a0e4d0581b62b9f… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:40 2015 +0200 ucrtbase: Handle the C99 'z' size_t specifier for integers. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 4 ++++ dlls/msvcrt/tests/printf.c | 5 +++++ dlls/ucrtbase/tests/printf.c | 24 ++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index f68eaf6..ce7a70e 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -473,6 +473,10 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.IntegerNative = *p++; } else if(*p == 'w') flags.WideString = *p++; +#if _MSVCR_VER >= 140 + else if(*p == 'z') + flags.IntegerNative = *p++; +#endif else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) p++; /* ignore */ else diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index c8797f3..295c6dd 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -321,6 +321,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"D"),"I64D failed: %s\n",buffer); ok( r==1, "return count wrong\n"); + format = "%zx"; + r = sprintf(buffer,format,1); + ok(!strcmp(buffer, "zx"), "Problem with \"z\" interpretation\n"); + ok( r==2, "return count wrong\n"); + format = "% d"; r = sprintf(buffer,format,1); ok(!strcmp(buffer, " 1"),"Problem with sign place-holder: '%s'\n",buffer); diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index ae12b60..6c719ea 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -423,6 +423,29 @@ static void test_printf_legacy_three_digit_exp(void) ok(!strcmp(buf, "1.230000E+123"), "buf = %s\n", buf); } +static void test_printf_c99(void) +{ + char buf[20]; + + /* The msvcrt compatibility flag doesn't affect whether 'z' is interpreted + * as size_t size for integers. */ + if (sizeof(void*) == 8) { + vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", + (size_t) 0x12345678123456, 1); + ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); + vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, + buf, sizeof(buf), "%zx %d", (size_t) 0x12345678123456, 1); + ok(!strcmp(buf, "12345678123456 1"), "buf = %s\n", buf); + } else { + vsprintf_wrapper(0, buf, sizeof(buf), "%zx %d", + (size_t) 0x123456, 1); + ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + vsprintf_wrapper(UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY, + buf, sizeof(buf), "%zx %d", (size_t) 0x123456, 1); + ok(!strcmp(buf, "123456 1"), "buf = %s\n", buf); + } +} + START_TEST(printf) { if (!init()) return; @@ -434,4 +457,5 @@ START_TEST(printf) test_printf_legacy_wide(); test_printf_legacy_msvcrt(); test_printf_legacy_three_digit_exp(); + test_printf_c99(); }

1 0

Martin Storsjo : msvcrt: Interpret 'I' as size_t size specifier for integer conversions.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 494572ed4d49dd36508759c300c59124aa88181e URL: http://source.winehq.org/git/wine.git/?a=commit;h=494572ed4d49dd36508759c30… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:39 2015 +0200 msvcrt: Interpret 'I' as size_t size specifier for integer conversions. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 6 +++--- dlls/msvcrt/tests/printf.c | 10 ++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 1e215aa..f68eaf6 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -34,7 +34,7 @@ typedef struct FUNC_NAME(pf_flags_t) { APICHAR Sign, LeftAlign, Alternate, PadZero; int FieldLength, Precision; - APICHAR IntegerLength, IntegerDouble; + APICHAR IntegerLength, IntegerDouble, IntegerNative; APICHAR WideString; APICHAR Format; } FUNC_NAME(pf_flags); @@ -470,7 +470,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API else if(isdigit(*(p+1)) || !*(p+1)) break; else - p++; + flags.IntegerNative = *p++; } else if(*p == 'w') flags.WideString = *p++; else if((*p == 'F' || *p == 'N') && legacy_msvcrt_compat) @@ -533,7 +533,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(!tmp) return -1; - if(flags.IntegerDouble) + if(flags.IntegerDouble || (flags.IntegerNative && sizeof(void*) == 8)) FUNC_NAME(pf_integer_conv)(tmp, max_len, &flags, pf_args(args_ctx, pos, VT_I8, valist).get_longlong); else if(flags.Format=='d' || flags.Format=='i') diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index c5bc102..c8797f3 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -422,6 +422,11 @@ static void test_sprintf( void ) r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X0000000000000039 "),"Pointer formatted incorrectly\n"); ok( r==20, "return count wrong\n"); + + format = "%Ix %d"; + r = sprintf(buffer,format,(size_t)0x12345678123456,1); + ok(!strcmp(buffer,"12345678123456 1"),"buffer = %s\n",buffer); + ok( r==16, "return count wrong\n"); } else { @@ -449,6 +454,11 @@ static void test_sprintf( void ) r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); ok( r==12, "return count wrong\n"); + + format = "%Ix %d"; + r = sprintf(buffer,format,0x123456,1); + ok(!strcmp(buffer,"123456 1"),"buffer = %s\n",buffer); + ok( r==8, "return count wrong\n"); } format = "%04s";

1 0

Martin Storsjo : ucrtbase: Implement the new printf corner case behaviour.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: b9d0f5d562b1a5e96a32779f8906e50c0e4ba206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9d0f5d562b1a5e96a32779f8… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:38 2015 +0200 ucrtbase: Implement the new printf corner case behaviour. Check the option flags whether the new or old legacy behaviours are wanted. For _MSVCR_VER < 140, don't check the option flags but hardcode them to TRUE. (This avoids having to manually add all three flags into every caller of pf_printf.) Mask out any other flags, to avoid other out-of-range flags to be interpreted as the other flags (positional params, invoke invalid param handler). Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 6 ++- dlls/msvcrt/msvcrt.h | 3 +- dlls/msvcrt/printf.h | 51 +++++++++++++++++++------ dlls/msvcrt/wcs.c | 35 +++++++++++------ dlls/ucrtbase/tests/printf.c | 90 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 158 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b9d0f5d562b1a5e96a327…

1 0

Martin Storsjo : msvcrt: Ignore 'N' as format length modifier for pointers , just like 'F'.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 1d17e8502668c1d17cd2eba73eabd93cb2f1b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d17e8502668c1d17cd2eba73… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:37 2015 +0200 msvcrt: Ignore 'N' as format length modifier for pointers, just like 'F'. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 2 +- dlls/msvcrt/tests/printf.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 91b27ad..a724404 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -461,7 +461,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API p++; } else if(*p == 'w') flags.WideString = *p++; - else if(*p == 'F') + else if(*p == 'F' || *p == 'N') p++; /* ignore */ else break; diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 2de515d..c5bc102 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -413,6 +413,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"0000000000000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); ok( r==16, "return count wrong\n"); + format = "%Np"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"0000000000000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==16, "return count wrong\n"); + format = "%#-020p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X0000000000000039 "),"Pointer formatted incorrectly\n"); @@ -435,6 +440,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); ok( r==8, "return count wrong\n"); + format = "%Np"; + r = sprintf(buffer,format,(void *)57); + ok(!strcmp(buffer,"00000039"),"Pointer formatted incorrectly \"%s\"\n",buffer); + ok( r==8, "return count wrong\n"); + format = "%#-012p"; r = sprintf(buffer,format,(void *)57); ok(!strcmp(buffer,"0X00000039 "),"Pointer formatted incorrectly\n"); @@ -670,6 +680,11 @@ static void test_sprintf( void ) ok(!strcmp(buffer,""), "failed\n"); ok( r==0, "return count wrong\n"); + format = "%N"; + r = sprintf(buffer, format,-1); + ok(!strcmp(buffer,""), "failed\n"); + ok( r==0, "return count wrong\n"); + format = "%H"; r = sprintf(buffer, format,-1); ok(!strcmp(buffer,"H"), "failed\n");

1 0

Martin Storsjo : msvcrt: Refactor pf_printf to take options as flags instead of as BOOL parameter.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: 1c8412d9e5bd941428ccfe615f5260dd7406145d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8412d9e5bd941428ccfe615… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:36 2015 +0200 msvcrt: Refactor pf_printf to take options as flags instead of as BOOL parameter. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/file.c | 14 ++++++++------ dlls/msvcrt/msvcrt.h | 7 +++++-- dlls/msvcrt/printf.h | 8 +++++--- dlls/msvcrt/wcs.c | 47 +++++++++++++++++++++++++++-------------------- 5 files changed, 47 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c8412d9e5bd941428ccf…

1 0

Martin Storsjo : ucrtbase: Handle the swprintf style termination and return values.
by Alexandre Julliard 04 Nov '15

04 Nov '15

Module: wine Branch: master Commit: b09aadd202db469a8bab163624986961a1472111 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09aadd202db469a8bab16362… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 20:40:35 2015 +0200 ucrtbase: Handle the swprintf style termination and return values. When neither the "legacy vsprintf null termination" nor the "standard snprintf behaviour" flags are specified, the functions return -2 when the output string didn't fit (similar to old style msvcrt _snprintf that returned -1), but they are null terminated (similar to the C99 snprintf style behaviour). This is the same way as the C99 swprintf function behaves. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 3 +++ dlls/msvcrt/wcs.c | 40 ++++++++++++++++++++++++++-------------- dlls/ucrtbase/tests/printf.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 14 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index a3b2595..f11d0a8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1130,6 +1130,9 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_PRINTF_LEGACY_MSVCRT_COMPATIBILITY (0x0008) #define UCRTBASE_PRINTF_LEGACY_THREE_DIGIT_EXPONENTS (0x0010) +#define UCRTBASE_PRINTF_TERMINATION_MASK (UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION | \ + UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + #define UCRTBASE_SCANF_SECURECRT (0x0001) #define UCRTBASE_SCANF_LEGACY_WIDE_SPECIFIERS (0x0002) #define UCRTBASE_SCANF_LEGACY_MSVCRT_COMPATIBILITY (0x0004) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0bfddbb..169012c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -701,10 +701,10 @@ static int puts_clbk_str_c99_a(void *ctx, int len, const char *str) if(!out->buf) return len; - if(out->len - 1 < len) { - memcpy(out->buf, str, out->len - 1); - out->buf += out->len - 1; - out->len = 1; + if(out->len < len) { + memcpy(out->buf, str, out->len); + out->buf += out->len; + out->len = 0; return len; } @@ -724,12 +724,18 @@ int CDECL MSVCRT__stdio_common_vsprintf( unsigned __int64 options, char *str, MS struct _str_ctx_a ctx = {len, str}; int ret; - if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && - options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_a(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_a : puts_clbk_str_a, + ret = pf_printf_a(puts_clbk_str_c99_a, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); puts_clbk_str_a(&ctx, 1, &nullbyte); + + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } return ret; } @@ -1148,10 +1154,10 @@ static int puts_clbk_str_c99_w(void *ctx, int len, const MSVCRT_wchar_t *str) if(!out->buf) return len; - if(out->len - 1 < len) { - memcpy(out->buf, str, (out->len - 1)*sizeof(MSVCRT_wchar_t)); - out->buf += out->len - 1; - out->len = 1; + if(out->len < len) { + memcpy(out->buf, str, out->len*sizeof(MSVCRT_wchar_t)); + out->buf += out->len; + out->len = 0; return len; } @@ -1171,12 +1177,18 @@ int CDECL MSVCRT__stdio_common_vswprintf( unsigned __int64 options, MSVCRT_wchar struct _str_ctx_w ctx = {len, str}; int ret; - if (options != UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION && - options != UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) + if (options & ~UCRTBASE_PRINTF_TERMINATION_MASK) FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); - ret = pf_printf_w(options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR ? puts_clbk_str_c99_w : puts_clbk_str_w, + ret = pf_printf_w(puts_clbk_str_c99_w, &ctx, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); puts_clbk_str_w(&ctx, 1, &nullbyte); + + if(options & UCRTBASE_PRINTF_LEGACY_VSPRINTF_NULL_TERMINATION) + return ret>len ? -1 : ret; + if(ret>=len) { + if(len) str[len-1] = 0; + return (options & UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR) ? ret : -2; + } return ret; } diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 99d756e..ce47e2a 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -120,6 +120,21 @@ static void test_snprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); } + + /* swprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const char *fmt = tests[i]; + const int expect = strlen(fmt) >= bufsiz ? -2 : strlen(fmt); + const int n = vsprintf_wrapper (0, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz - 1 : n; + + ok (n == expect, "\"%s\": expected %d, returned %d\n", + fmt, expect, n); + ok (!memcmp (fmt, buffer, valid), + "\"%s\": rendered \"%.*s\"\n", fmt, valid, buffer); + ok (buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d\n", fmt, n, buffer[valid]); + } } static int __cdecl vswprintf_wrapper(unsigned __int64 options, wchar_t *str, @@ -177,6 +192,23 @@ static void test_swprintf (void) ok (buffer[valid] == '\0', "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); } + + /* swprintf style termination */ + for (i = 0; i < sizeof tests / sizeof tests[0]; i++) { + const wchar_t *fmt = tests[i]; + const int expect = wcslen(fmt) >= bufsiz ? -2 : wcslen(fmt); + const int n = vswprintf_wrapper (0, buffer, bufsiz, fmt); + const int valid = n < 0 ? bufsiz - 1 : n; + + WideCharToMultiByte (CP_ACP, 0, buffer, -1, narrow, sizeof(narrow), NULL, NULL); + WideCharToMultiByte (CP_ACP, 0, fmt, -1, narrow_fmt, sizeof(narrow_fmt), NULL, NULL); + ok (n == expect, "\"%s\": expected %d, returned %d\n", + narrow_fmt, expect, n); + ok (!memcmp (fmt, buffer, valid * sizeof(wchar_t)), + "\"%s\": rendered \"%.*s\"\n", narrow_fmt, valid, narrow); + ok (buffer[valid] == '\0', + "\"%s\": Missing null termination (ret %d) - is %d\n", narrow_fmt, n, buffer[valid]); + } } static int __cdecl vfprintf_wrapper(FILE *file,

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2015