August 2016 - Wine-commits - list.winehq.org

Nikolay Sivov : ucrtbase: Added __stdio_common_vswprintf_p().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: ff49f86fa14e4fee3e2d959354f26cbe33dd9d4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff49f86fa14e4fee3e2d95935… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 3 07:23:09 2016 +0300 ucrtbase: Added __stdio_common_vswprintf_p(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/wcs.c | 40 ++++++++++++++++------ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 10a2ab7..d52c0d4 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -16,7 +16,7 @@ @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) ucrtbase.__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf -@ stub __stdio_common_vswprintf_p +@ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6fc642c..c497a10 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1112,11 +1112,8 @@ int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, return ret; } -/********************************************************************* - * _vswprintf_p_l (MSVCRT.@) - */ -int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, - const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) +static int MSVCRT_vswprintf_p_l_opt(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, DWORD options, MSVCRT__locale_t locale, __ms_va_list args) { static const MSVCRT_wchar_t nullbyte = '\0'; printf_arg args_ctx[MSVCRT__ARGMAX+1]; @@ -1131,11 +1128,11 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, *MSVCRT__errno() = MSVCRT_EINVAL; return ret; } else if(ret == 0) - ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_valist, NULL, &args); else ret = pf_printf_w(puts_clbk_str_w, &puts_ctx, format, locale, - MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, + MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER | options, arg_clbk_positional, args_ctx, NULL); puts_clbk_str_w(&puts_ctx, 1, &nullbyte); @@ -1143,16 +1140,37 @@ int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, } /********************************************************************* + * _vswprintf_p_l (MSVCRT.@) + */ +int CDECL MSVCRT_vswprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args) +{ + return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, args); +} + +/********************************************************************* * _vswprintf_p (MSVCR100.@) */ int CDECL MSVCRT__vswprintf_p(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l(buffer, length, format, NULL, args); + return MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, NULL, args); } /********************************************************************* + * __stdio_common_vswprintf_p (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswprintf_p( unsigned __int64 options, + MSVCRT_wchar_t *str, MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist ) +{ + if (options & ~UCRTBASE_PRINTF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + return MSVCRT_vswprintf_p_l_opt(str, count, format, options & UCRTBASE_PRINTF_MASK, locale, valist); +} + +/********************************************************************* * _vsnwprintf_s_l (MSVCRT.@) */ int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, @@ -1399,7 +1417,7 @@ int CDECL MSVCRT__vscwprintf_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t l */ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, __ms_va_list args ) { - return MSVCRT_vswprintf_p_l( NULL, INT_MAX, format, locale, args ); + return MSVCRT_vswprintf_p_l_opt( NULL, INT_MAX, format, 0, locale, args ); } /********************************************************************* @@ -1407,7 +1425,7 @@ int CDECL MSVCRT__vscwprintf_p_l( const MSVCRT_wchar_t *format, MSVCRT__locale_t */ int CDECL MSVCRT__vscwprintf_p(const MSVCRT_wchar_t *format, __ms_va_list args) { - return MSVCRT_vswprintf_p_l(NULL, INT_MAX, format, NULL, args); + return MSVCRT_vswprintf_p_l_opt(NULL, INT_MAX, format, 0, NULL, args); } /********************************************************************* @@ -1523,7 +1541,7 @@ int CDECL MSVCRT_swprintf_p_l(MSVCRT_wchar_t *buffer, MSVCRT_size_t length, int r; __ms_va_start(valist, locale); - r = MSVCRT_vswprintf_p_l(buffer, length, format, locale, valist); + r = MSVCRT_vswprintf_p_l_opt(buffer, length, format, 0, locale, valist); __ms_va_end(valist); return r; diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index f77cbe3..95fcc05 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -161,7 +161,7 @@ @ cdecl __stdio_common_vsprintf_s(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsprintf_s @ cdecl __stdio_common_vsscanf(int64 ptr long str ptr ptr) MSVCRT__stdio_common_vsscanf @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf -@ stub __stdio_common_vswprintf_p +@ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s @ stub __stdio_common_vswscanf @ stub __strncnt

1 0

Martin Storsjo : msvcp140: Add MSVC 2015 C++ support DLL.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 1135db7095bf7d46801492b30dc5ecf8455e1b06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1135db7095bf7d46801492b30… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Nov 3 23:54:34 2015 +0200 msvcp140: Add MSVC 2015 C++ support DLL. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 4 +- configure.ac | 3 +- dlls/msvcp140/Makefile.in | 14 + dlls/msvcp140/msvcp140.spec | 3783 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/ios.c | 10 + dlls/msvcp90/msvcp90.h | 8 + dlls/msvcp90/msvcp_main.c | 54 + dlls/ucrtbase/Makefile.in | 1 + tools/make_specfiles | 1 + 9 files changed, 3876 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1135db7095bf7d4680149…

1 0

Daniel Lehman : msvcp140: Add sprintf.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 69ad826ebb286ba004b010b864da494e50be753d URL: http://source.winehq.org/git/wine.git/?a=commit;h=69ad826ebb286ba004b010b86… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Apr 8 16:14:28 2016 -0700 msvcp140: Add sprintf. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/msvcp_main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcp90/msvcp_main.c b/dlls/msvcp90/msvcp_main.c index a60c4b6..c9a72d2 100644 --- a/dlls/msvcp90/msvcp_main.c +++ b/dlls/msvcp90/msvcp_main.c @@ -117,6 +117,16 @@ int __cdecl _scprintf(const char* fmt, ...) __ms_va_end(valist); return ret; } + +int __cdecl sprintf(char *buf, const char *fmt, ...) +{ + int ret; + __ms_va_list valist; + __ms_va_start(valist, fmt); + ret = __stdio_common_vsprintf(UCRTBASE_PRINTF_STANDARD_SNPRINTF_BEHAVIOUR, buf, -1, fmt, NULL, valist); + __ms_va_end(valist); + return ret; +} #endif static void init_cxx_funcs(void)

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for strings.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 605f7a45dad4ae13c51e7fcb462578330964578d URL: http://source.winehq.org/git/wine.git/?a=commit;h=605f7a45dad4ae13c51e7fcb4… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 3 10:34:25 2016 +0100 msvcirt: Implement istream::operator>> for strings. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 25 ++++++++++++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 361285a..605072a 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3514,7 +3514,30 @@ istream* __thiscall istream_read_char(istream *this, char *ch) DEFINE_THISCALL_WRAPPER(istream_read_str, 8) istream* __thiscall istream_read_str(istream *this, char *str) { - FIXME("(%p %p) stub\n", this, str); + ios *base = istream_get_ios(this); + int ch, count = 0; + + TRACE("(%p %p)\n", this, str); + + if (istream_ipfx(this, 0)) { + if (str) { + for (ch = streambuf_sgetc(base->sb); + count < (unsigned int) base->width - 1 && !isspace(ch); + ch = streambuf_snextc(base->sb)) { + if (ch == EOF) { + base->state |= IOSTATE_eofbit; + break; + } + str[count++] = ch; + } + } + if (!count) /* nothing to output */ + base->state |= IOSTATE_failbit; + else /* append a null terminator */ + str[count] = 0; + base->width = 0; + istream_isfx(this); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index a706703..6d97566 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -328,6 +328,7 @@ static streampos (*__thiscall p_istream_tellg)(istream*); static int (*__thiscall p_istream_getint)(istream*, char*); static int (*__thiscall p_istream_getdouble)(istream*, char*, int); static istream* (*__thiscall p_istream_read_char)(istream*, char*); +static istream* (*__thiscall p_istream_read_str)(istream*, char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -544,6 +545,7 @@ static BOOL init(void) SET(p_istream_getint, "?getint(a)istream@@AEAAHPEAD(a)Z"); SET(p_istream_getdouble, "?getdouble(a)istream@@AEAAHPEADH(a)Z"); SET(p_istream_read_char, "??5istream@@QEAAAEAV0(a)AEAD@Z"); + SET(p_istream_read_str, "??5istream@@QEAAAEAV0(a)PEAD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -682,6 +684,7 @@ static BOOL init(void) SET(p_istream_getint, "?getint(a)istream@@AAEHPAD(a)Z"); SET(p_istream_getdouble, "?getdouble(a)istream@@AAEHPADH(a)Z"); SET(p_istream_read_char, "??5istream@@QAEAAV0(a)AAD@Z"); + SET(p_istream_read_str, "??5istream@@QAEAAV0(a)PAD@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4863,9 +4866,10 @@ static void test_istream_read(void) /* makes tables narrower */ const ios_io_state IOSTATE_faileof = IOSTATE_failbit|IOSTATE_eofbit; - char c, char_out[] = {-85, ' ', 'a', -50}; + char c, st[8], char_out[] = {-85, ' ', 'a', -50}; + const char *str_out[] = {"AAAAAAA", "abc", "a", "abc", "ab", "abcde"}; struct istream_read_test { - enum { type_chr } type; + enum { type_chr, type_str } type; const char *stream_content; ios_flags flags; int width; @@ -4882,6 +4886,22 @@ static void test_istream_read(void) {type_chr, " abc ", FLAGS_skipws, 6, /* 'a' */ 2, IOSTATE_goodbit, 6, 2, FALSE}, {type_chr, " a", FLAGS_skipws, 0, /* 'a' */ 2, IOSTATE_goodbit, 0, 2, FALSE}, {type_chr, "\xce", 0, 6, /* -50 */ 3, IOSTATE_goodbit, 6, 1, FALSE}, + /* str */ + {type_str, "", FLAGS_skipws, 6, /* "AAAAAAA" */ 0, IOSTATE_faileof, 6, 0, FALSE}, + {type_str, " ", FLAGS_skipws, 6, /* "AAAAAAA" */ 0, IOSTATE_faileof, 6, 1, FALSE}, + {type_str, " abc", FLAGS_skipws, 6, /* "abc" */ 1, IOSTATE_eofbit, 0, 4, FALSE}, + {type_str, " abc ", FLAGS_skipws, 6, /* "abc" */ 1, IOSTATE_goodbit, 0, 4, FALSE}, + {type_str, " a\tc", FLAGS_skipws, 6, /* "a" */ 2, IOSTATE_goodbit, 0, 2, FALSE}, + {type_str, " a\tc", 0, 6, /* "AAAAAAA" */ 0, IOSTATE_failbit, 0, 0, FALSE}, + {type_str, "abcde\n", 0, 4, /* "abc" */ 3, IOSTATE_goodbit, 0, 3, FALSE}, + {type_str, "abc\n", 0, 4, /* "abc" */ 3, IOSTATE_goodbit, 0, 3, FALSE}, + {type_str, "ab\r\n", 0, 3, /* "ab" */ 4, IOSTATE_goodbit, 0, 2, FALSE}, + {type_str, "abc", 0, 4, /* "abc" */ 3, IOSTATE_goodbit, 0, 3, FALSE}, + {type_str, "abc", 0, 1, /* "AAAAAAA" */ 0, IOSTATE_failbit, 0, 0, FALSE}, + {type_str, "\n", 0, 1, /* "AAAAAAA" */ 0, IOSTATE_failbit, 0, 0, FALSE}, + {type_str, "abcde\n", 0, 0, /* "abcde" */ 5, IOSTATE_goodbit, 0, 5, FALSE}, + {type_str, "\n", 0, 0, /* "AAAAAAA" */ 0, IOSTATE_failbit, 0, 0, FALSE}, + {type_str, "abcde", 0, -1, /* "abcde" */ 5, IOSTATE_eofbit, 0, 5, FALSE}, }; pssb = call_func2(p_strstreambuf_dynamic_ctor, &ssb, 64); @@ -4907,6 +4927,13 @@ static void test_istream_read(void) ok(c == char_out[tests[i].expected_val], "Test %d: expected %d got %d\n", i, char_out[tests[i].expected_val], c); break; + case type_str: + memset(st, 'A', sizeof(st)); + st[7] = 0; + pis = call_func2(p_istream_read_str, &is, st); + ok(!strcmp(st, str_out[tests[i].expected_val]), "Test %d: expected %s got %s\n", i, + str_out[tests[i].expected_val], st); + break; } ok(pis == &is, "Test %d: wrong return, expected %p got %p\n", i, &is, pis);

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for integers.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: d8bb77d84223d57fcf0d6f23a3d11a01c2c42206 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8bb77d84223d57fcf0d6f23a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 3 10:34:26 2016 +0100 msvcirt: Implement istream::operator>> for integers. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 78 ++++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 128 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 7 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8bb77d84223d57fcf0d6…

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for floats.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 9736024e99bc0781f269a8546e33fa1793c0dcbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9736024e99bc0781f269a8546… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 3 10:34:27 2016 +0100 msvcirt: Implement istream::operator>> for floats. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 37 ++++++++++++++++++++++-- dlls/msvcirt/tests/msvcirt.c | 69 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9736024e99bc0781f269a…

1 0

Iván Matellanes : msvcirt: Implement istream:: operator>> for streambufs.
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 4c17eda4a25ebbc3f4c06daddafee06244b98465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c17eda4a25ebbc3f4c06dadd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Aug 3 10:34:28 2016 +0100 msvcirt: Implement istream::operator>> for streambufs. Signed-off-by: Iván Matellanes <matellanesivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 12 +++++++++++- dlls/msvcirt/tests/msvcirt.c | 31 +++++++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index e04262a..9a0a05b 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -3724,7 +3724,17 @@ istream* __thiscall istream_read_long_double(istream *this, double *ld) DEFINE_THISCALL_WRAPPER(istream_read_streambuf, 8) istream* __thiscall istream_read_streambuf(istream *this, streambuf *sb) { - FIXME("(%p %p) stub\n", this, sb); + ios *base = istream_get_ios(this); + int ch; + + TRACE("(%p %p)\n", this, sb); + + if (istream_ipfx(this, 0)) { + while ((ch = streambuf_sbumpc(base->sb)) != EOF) + if (streambuf_sputc(sb, ch) == EOF) + base->state |= IOSTATE_failbit; + istream_isfx(this); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 7e0f33c..ad0f057 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -338,6 +338,7 @@ static istream* (*__thiscall p_istream_read_unsigned_long)(istream*, ULONG*); static istream* (*__thiscall p_istream_read_float)(istream*, float*); static istream* (*__thiscall p_istream_read_double)(istream*, double*); static istream* (*__thiscall p_istream_read_long_double)(istream*, double*); +static istream* (*__thiscall p_istream_read_streambuf)(istream*, streambuf*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -564,6 +565,7 @@ static BOOL init(void) SET(p_istream_read_float, "??5istream@@QEAAAEAV0(a)AEAM@Z"); SET(p_istream_read_double, "??5istream@@QEAAAEAV0(a)AEAN@Z"); SET(p_istream_read_long_double, "??5istream@@QEAAAEAV0(a)AEAO@Z"); + SET(p_istream_read_streambuf, "??5istream@@QEAAAEAV0(a)PEAVstreambuf@@@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -712,6 +714,7 @@ static BOOL init(void) SET(p_istream_read_float, "??5istream@@QAEAAV0(a)AAM@Z"); SET(p_istream_read_double, "??5istream@@QAEAAV0(a)AAN@Z"); SET(p_istream_read_long_double, "??5istream@@QAEAAV0(a)AAO@Z"); + SET(p_istream_read_streambuf, "??5istream@@QAEAAV0(a)PAVstreambuf@@@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -4887,7 +4890,7 @@ static void test_istream_getdouble(void) static void test_istream_read(void) { istream is, *pis; - strstreambuf ssb, *pssb; + strstreambuf ssb, ssb_test, *pssb; int len, ret, i; /* makes tables narrower */ @@ -4903,9 +4906,10 @@ static void test_istream_read(void) ULONG ul, ulong_out[] = {4294967295ul, 4294967294ul, 2147483648ul, 1ul}; float f, float_out[] = {123.456f, 0.0f, 1.0f, 0.1f, -1.0f, -0.1f, FLT_MIN, -FLT_MIN, FLT_MAX, -FLT_MAX}; double d, double_out[] = {1.0, 0.1, 0.0, INFINITY, -INFINITY}; + const char *sbf_out[] = {"", "abcd\n", "abcdef"}; struct istream_read_test { enum { type_chr, type_str, type_shrt, type_ushrt, type_int, type_uint, - type_long, type_ulong, type_flt, type_dbl, type_ldbl } type; + type_long, type_ulong, type_flt, type_dbl, type_ldbl, type_sbf } type; const char *stream_content; ios_flags flags; int width; @@ -5041,8 +5045,19 @@ static void test_istream_read(void) {type_ldbl, "-1.69781699841e-1475l", 0, 6, /* 0.0 */ 2, IOSTATE_goodbit, 6, 20, FALSE}, {type_ldbl, "1.69781699841e1475", 0, 6, /* INF */ 3, IOSTATE_eofbit, 6, 18, FALSE}, {type_ldbl, "-1.69781699841e1475", 0, 6, /* -INF */ 4, IOSTATE_eofbit, 6, 19, FALSE}, + /* streambuf */ + {type_sbf, "", FLAGS_skipws, 6, /* "" */ 0, IOSTATE_faileof, 6, 0, FALSE}, + {type_sbf, " ", FLAGS_skipws, 6, /* "" */ 0, IOSTATE_faileof, 6, 2, FALSE}, + {type_sbf, "\r\nabcd\n", FLAGS_skipws, 6, /* "abc\n" */ 1, IOSTATE_goodbit, 6, 8, FALSE}, + {type_sbf, "abcdefg\n", 0, 6, /* "abcde" */ 2, IOSTATE_failbit, 6, 9, FALSE}, + {type_sbf, "abcdefg\n", 0, 0, /* "" */ 0, IOSTATE_failbit, 0, 9, FALSE} }; + pssb = call_func2(p_strstreambuf_dynamic_ctor, &ssb_test, 64); + ok(pssb == &ssb_test, "wrong return, expected %p got %p\n", &ssb_test, pssb); + ret = (int) call_func1(p_streambuf_allocate, &ssb_test.base); + ok(ret == 1, "expected 1 got %d\n", ret); + ssb_test.dynamic = 0; pssb = call_func2(p_strstreambuf_dynamic_ctor, &ssb, 64); ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); ret = (int) call_func1(p_streambuf_allocate, &ssb.base); @@ -5127,6 +5142,16 @@ static void test_istream_read(void) ok(d == double_out[tests[i].expected_val], "Test %d: expected %f got %f\n", i, double_out[tests[i].expected_val], d); break; + case type_sbf: + ssb_test.base.pbase = ssb_test.base.pptr = ssb_test.base.base; + ssb_test.base.epptr = ssb_test.base.base + tests[i].width; + pis = call_func2(p_istream_read_streambuf, &is, &ssb_test.base); + len = strlen(sbf_out[tests[i].expected_val]); + ok(ssb_test.base.pptr == ssb_test.base.pbase + len, "Test %d: wrong put pointer, expected %p got %p\n", + i, ssb_test.base.pbase + len, ssb_test.base.pptr); + ok(!strncmp(ssb_test.base.pbase, sbf_out[tests[i].expected_val], len), + "Test %d: expected %s got %s\n", i, sbf_out[tests[i].expected_val], ssb_test.base.pbase); + break; } ok(pis == &is, "Test %d: wrong return, expected %p got %p\n", i, &is, pis); @@ -5139,8 +5164,10 @@ static void test_istream_read(void) ssb.base.base + tests[i].expected_offset, ssb.base.gptr); } + ssb_test.dynamic = 1; call_func1(p_istream_vbase_dtor, &is); call_func1(p_strstreambuf_dtor, &ssb); + call_func1(p_strstreambuf_dtor, &ssb_test); } START_TEST(msvcirt)

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_blt_fbo().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 2437c77ebd5df99b8c408ff782d364ed4d60a26f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2437c77ebd5df99b8c408ff78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 15:25:27 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ae4b73..68a6f7d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -502,6 +502,7 @@ static void surface_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect_in) { unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); + unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_texture *src_texture = src_surface->container; const struct wined3d_gl_info *gl_info; @@ -545,9 +546,9 @@ static void surface_blt_fbo(const struct wined3d_device *device, * surface isn't required if the entire surface is overwritten. (And is * in fact harmful if we're being called by surface_load_location() with * the purpose of loading the destination surface.) */ - surface_load_location(src_surface, old_ctx, src_location); + wined3d_texture_load_location(src_texture, src_sub_resource_idx, old_ctx, src_location); if (!surface_is_full_rect(dst_surface, &dst_rect)) - surface_load_location(dst_surface, old_ctx, dst_location); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location); else wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, old_ctx, dst_location);

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_upload_from_surface().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: 4119b907b57b142b75ffabd6588a85cdafe4ce06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4119b907b57b142b75ffabd65… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 15:25:28 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 68a6f7d..744912c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1188,7 +1188,7 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P if (update_w == dst_w && update_h == dst_h) wined3d_texture_prepare_texture(dst_texture, context, FALSE); else - surface_load_location(dst_surface, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data,

1 0

Henri Verbeet : wined3d: Use wined3d_texture_load_location() in surface_load_sysmem().
by Alexandre Julliard 03 Aug '16

03 Aug '16

Module: wine Branch: master Commit: df099ca72b0eff7256e1199c0f501b36d35e45d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df099ca72b0eff7256e1199c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Aug 3 15:25:29 2016 +0200 wined3d: Use wined3d_texture_load_location() in surface_load_sysmem(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 744912c..fdc7a51 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2792,7 +2792,7 @@ static void surface_load_sysmem(struct wined3d_surface *surface, } if (sub_resource->locations & (WINED3D_LOCATION_RB_MULTISAMPLE | WINED3D_LOCATION_RB_RESOLVED)) - surface_load_location(surface, context, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); /* Download the surface to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB))

1 0