August 2012 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : winedbg: Make the crash dialog slightly larger and minimize/maximize-able.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 6407cd8e0ccb53c0c80c1f61d6d1568c671ba45c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6407cd8e0ccb53c0c80c1f61d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Aug 6 11:08:20 2012 +0900 winedbg: Make the crash dialog slightly larger and minimize/maximize-able. --- programs/winedbg/winedbg.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/winedbg/winedbg.rc b/programs/winedbg/winedbg.rc index 4effa6e..8d9dc34 100644 --- a/programs/winedbg/winedbg.rc +++ b/programs/winedbg/winedbg.rc @@ -58,17 +58,17 @@ BEGIN PUSHBUTTON "Show &Details", ID_DETAILS, 140, 151, 60, 16, WS_TABSTOP END -IDD_DETAILS_DLG DIALOGEX 100, 100, 300, 240 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_VISIBLE +IDD_DETAILS_DLG DIALOGEX 100, 100, 400, 340 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_VISIBLE CAPTION "Program Error Details" FONT 8, "MS Shell Dlg" BEGIN - EDITTEXT IDC_CRASH_TXT, 4, 4, 292, 172, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP + EDITTEXT IDC_CRASH_TXT, 4, 4, 392, 272, ES_MULTILINE | ES_READONLY | WS_HSCROLL | WS_VSCROLL, WS_TABSTOP CONTROL "If this problem is not present under Windows and has not been reported yet, \ you can save the detailed information to a file using the \"Save As\" button, \ then <a href=\"http://wiki.winehq.org/Bugs\">file a bug report</a> \ and attach that file to the report.", - IDC_STATIC_TXT2,"SysLink",0,6,185,288,32 - DEFPUSHBUTTON "Close", IDOK, 226, 220, 70, 16, WS_TABSTOP - PUSHBUTTON "&Save As...", ID_SAVEAS, 152, 220, 70, 16, WS_TABSTOP + IDC_STATIC_TXT2,"SysLink",0,6,285,388,32 + DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP + PUSHBUTTON "&Save As...", ID_SAVEAS, 252, 320, 70, 16, WS_TABSTOP END

1 0

Aric Stewart : usp10: Correct rounding of negative offsets in GPOS.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: cd8c1b28ad32ec115a304377b277f96a0e5a671e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd8c1b28ad32ec115a304377b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Aug 14 09:32:08 2012 -0500 usp10: Correct rounding of negative offsets in GPOS. --- dlls/usp10/opentype.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index a21e0f1..05ac53f 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -43,6 +43,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); #define GET_BE_DWORD(x) RtlUlongByteSwap(x) #endif +#define round(x) (((x) < 0) ? (int)((x) - 0.5) : (int)((x) + 0.5)) + /* These are all structures needed for the cmap format 12 table */ #define CMAP_TAG MS_MAKE_TAG('c', 'm', 'a', 'p') @@ -1403,13 +1405,13 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I if (adjust.x || adjust.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust.x, adjust.y, &devX, &devY); - pGoffset[glyph_index].du += (int)(devX+0.5); - pGoffset[glyph_index].dv += (int)(devY+0.5); + pGoffset[glyph_index].du += round(devX); + pGoffset[glyph_index].dv += round(devY); } if (advance.x || advance.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, advance.x, advance.y, &devX, &devY); - piAdvance[glyph_index] += (int)(devX+0.5); + piAdvance[glyph_index] += round(devX); if (advance.y) FIXME("Unhandled adjustment to Y advancement\n"); } @@ -1424,24 +1426,24 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I if (adjust[0].x || adjust[0].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[0].x, adjust[0].y, &devX, &devY); - pGoffset[glyph_index].du += (int)(devX+0.5); - pGoffset[glyph_index].dv += (int)(devY+0.5); + pGoffset[glyph_index].du += round(devX); + pGoffset[glyph_index].dv += round(devY); } if (advance[0].x || advance[0].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[0].x, advance[0].y, &devX, &devY); - piAdvance[glyph_index] += (int)(devX+0.5); + piAdvance[glyph_index] += round(devX); } if (adjust[1].x || adjust[1].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[1].x, adjust[1].y, &devX, &devY); - pGoffset[glyph_index + write_dir].du += (int)(devX+0.5); - pGoffset[glyph_index + write_dir].dv += (int)(devY+0.5); + pGoffset[glyph_index + write_dir].du += round(devX); + pGoffset[glyph_index + write_dir].dv += round(devY); } if (advance[1].x || advance[1].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, advance[1].x, advance[1].y, &devX, &devY); - piAdvance[glyph_index + write_dir] += (int)(devX+0.5); + piAdvance[glyph_index + write_dir] += round(devX); } return index; } @@ -1453,8 +1455,8 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, I if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += ((int)(devX+0.5) - piAdvance[glyph_index-1]); - pGoffset[glyph_index].dv += (int)(devY+0.5); + pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); + pGoffset[glyph_index].dv += round(devY); } break; }

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawImage to GdipDrawImagePointRect .
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: fa7a34b907ea842134a31b1ad24660d7630d09c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa7a34b907ea842134a31b1ad… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 15 12:08:22 2012 +0900 gdiplus: Forward GdipDrawImage to GdipDrawImagePointRect. --- dlls/gdiplus/graphics.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5c0ddf9..77f2f8d 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2943,7 +2943,6 @@ GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, REAL y) { UINT width, height; - GpPointF points[3]; TRACE("(%p, %p, %.2f, %.2f)\n", graphics, image, x, y); @@ -2953,15 +2952,8 @@ GpStatus WINGDIPAPI GdipDrawImage(GpGraphics *graphics, GpImage *image, REAL x, GdipGetImageWidth(image, &width); GdipGetImageHeight(image, &height); - /* FIXME: we should use the graphics and image dpi, somehow */ - - points[0].X = points[2].X = x; - points[0].Y = points[1].Y = y; - points[1].X = x + width; - points[2].Y = y + height; - - return GdipDrawImagePointsRect(graphics, image, points, 3, 0, 0, width, height, - UnitPixel, NULL, NULL, NULL); + return GdipDrawImagePointRect(graphics, image, x, y, + 0.0, 0.0, (REAL)width, (REAL)height, UnitPixel); } GpStatus WINGDIPAPI GdipDrawImageI(GpGraphics *graphics, GpImage *image, INT x,

1 0

Piotr Caban : msvcp90: Added strstreambuf seekpos and seekoff implementation.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 0ef93eb0e5defae95b0fe9fddb2acdf17e190dde URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ef93eb0e5defae95b0fe9fdd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:28 2012 +0200 msvcp90: Added strstreambuf seekpos and seekoff implementation. --- dlls/msvcp90/ios.c | 59 ++++++++++++++++++++++++++++++++++++++++++++--- dlls/msvcp90/msvcp90.h | 6 ++-- 2 files changed, 58 insertions(+), 7 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 78dbd67..6491278 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -12714,8 +12714,53 @@ int __thiscall strstreambuf_pbackfail(strstreambuf *this, int c) DEFINE_THISCALL_WRAPPER(strstreambuf_seekoff, 20) fpos_int* __thiscall strstreambuf_seekoff(strstreambuf *this, fpos_int *ret, streamoff off, int way, int mode) { - FIXME("(%p %p %ld %d %d) stub\n", this, ret, off, way, mode); - return NULL; + char *eback = basic_streambuf_char_eback(&this->base); + char *pptr = basic_streambuf_char_pptr(&this->base); + char *gptr = basic_streambuf_char_gptr(&this->base); + + TRACE("(%p %p %ld %d %d)\n", this, ret, off, way, mode); + + ret->off = 0; + ret->state = 0; + + if(pptr > this->seekhigh) + this->seekhigh = pptr; + + if((mode & OPENMODE_in) && gptr) { + if(way==SEEKDIR_cur && !(mode & OPENMODE_out)) + off += gptr-eback; + else if(way == SEEKDIR_end) + off += this->seekhigh-eback; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-eback) { + off = -1; + }else { + basic_streambuf_char_gbump(&this->base, eback-gptr+off); + if((mode & OPENMODE_out) && pptr) { + basic_streambuf_char_setp_next(&this->base, eback, + gptr, basic_streambuf_char_epptr(&this->base)); + } + } + }else if((mode & OPENMODE_out) && pptr) { + if(way == SEEKDIR_cur) + off += pptr-eback; + else if(way == SEEKDIR_end) + off += this->seekhigh-eback; + else if(way != SEEKDIR_beg) + off = -1; + + if(off<0 || off>this->seekhigh-eback) + off = -1; + else + basic_streambuf_char_pbump(&this->base, eback-pptr+off); + }else { + off = -1; + } + + ret->pos = off; + return ret; } /* ?seekpos(a)strstreambuf@std@@MAE?AV?$fpos(a)H@2(a)V32@H(a)Z */ @@ -12723,8 +12768,14 @@ fpos_int* __thiscall strstreambuf_seekoff(strstreambuf *this, fpos_int *ret, str DEFINE_THISCALL_WRAPPER(strstreambuf_seekpos, 36) fpos_int* __thiscall strstreambuf_seekpos(strstreambuf *this, fpos_int *ret, fpos_int pos, int mode) { - FIXME("(%p %p %s %d) stub\n", this, ret, debugstr_fpos_int(&pos), mode); - return NULL; + TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode); + + if(pos.off==0 && pos.pos==-1 && pos.state==0) { + *ret = pos; + return ret; + } + + return strstreambuf_seekoff(this, ret, pos.off, SEEKDIR_beg, mode); } /* ?underflow(a)strstreambuf@std@@MAEHXZ */ diff --git a/dlls/msvcp90/msvcp90.h b/dlls/msvcp90/msvcp90.h index 9343d16..b91faac 100644 --- a/dlls/msvcp90/msvcp90.h +++ b/dlls/msvcp90/msvcp90.h @@ -246,9 +246,9 @@ typedef enum { } IOSB_openmode; typedef enum { - SEEKDIR_beg = 0x1, - SEEKDIR_cur = 0x2, - SEEKDIR_end = 0x3, + SEEKDIR_beg = 0x0, + SEEKDIR_cur = 0x1, + SEEKDIR_end = 0x2, SEEKDIR_mask = 0x3 } IOSB_seekdir;

1 0

Piotr Caban : msvcp90: Reset width value in basic_istream class on error.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: e5d7d65791cb6e8b45e238782b12d897f7317ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d7d65791cb6e8b45e238782… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:18 2012 +0200 msvcp90: Reset width value in basic_istream class on error. --- dlls/msvcp90/ios.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 43fb46f..78dbd67 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -8123,11 +8123,10 @@ basic_istream_char* __cdecl basic_istream_char_read_bstr( state = IOSTATE_goodbit; MSVCP_basic_string_char_append_ch(str, c); } - - ios_base_width_set(&base->base, 0); } basic_istream_char_sentry_destroy(istream); + ios_base_width_set(&base->base, 0); basic_ios_char_setstate(base, state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -8156,12 +8155,11 @@ basic_istream_char* __cdecl basic_istream_char_read_str(basic_istream_char *istr state = IOSTATE_goodbit; *str++ = c; } - - *str = 0; - ios_base_width_set(&base->base, 0); } basic_istream_char_sentry_destroy(istream); + *str = 0; + ios_base_width_set(&base->base, 0); basic_ios_char_setstate(base, state | (c==EOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -9550,11 +9548,10 @@ static basic_istream_wchar* basic_istream_read_bstr(basic_istream_wchar *istream state = IOSTATE_goodbit; MSVCP_basic_string_wchar_append_ch(str, c); } - - ios_base_width_set(&base->base, 0); } basic_istream_wchar_sentry_destroy(istream); + ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; } @@ -9594,12 +9591,11 @@ basic_istream_wchar* basic_istream_read_str(basic_istream_wchar *istream, wchar_ state = IOSTATE_goodbit; *str++ = c; } - - *str = 0; - ios_base_width_set(&base->base, 0); } basic_istream_wchar_sentry_destroy(istream); + *str = 0; + ios_base_width_set(&base->base, 0); basic_ios_wchar_setstate(base, state | (c==WEOF ? IOSTATE_eofbit : IOSTATE_goodbit)); return istream; }

1 0

Piotr Caban : msvcp90: Added partial strstreambuf implementation.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: f143f3e6bc74eb491a38530fd35ebc356fdf633b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f143f3e6bc74eb491a38530fd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:58 2012 +0200 msvcp90: Added partial strstreambuf implementation. --- dlls/msvcp90/ios.c | 357 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 82 +++++----- 2 files changed, 398 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f143f3e6bc74eb491a385…

1 0

Piotr Caban : msvcp90: Use streamoff in std::_BADOFF definition.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 1202e8bf87ea4d1058b425a26c630b085c9d160a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1202e8bf87ea4d1058b425a26… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:48 2012 +0200 msvcp90: Use streamoff in std::_BADOFF definition. --- dlls/msvcp90/msvcp90_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/msvcp90_main.c b/dlls/msvcp90/msvcp90_main.c index 18a2514..9981e95 100644 --- a/dlls/msvcp90/msvcp90_main.c +++ b/dlls/msvcp90/msvcp90_main.c @@ -104,11 +104,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) /* ?_BADOFF(a)std@@3JB -> long const std::_BADOFF */ /* ?_BADOFF(a)std@@3_JB -> __int64 const std::_BADOFF */ -const INT_PTR std_BADOFF = -1; +const streamoff std_BADOFF = -1; /* ?_BADOFF_func(a)std@@YAABJXZ -> long const & __cdecl std::_BADOFF_func(void) */ /* ?_BADOFF_func(a)std@@YAAEB_JXZ -> __int64 const & __ptr64 __cdecl std::_BADOFF_func(void) */ -const INT_PTR * __cdecl std_BADOFF_func(void) +const streamoff * __cdecl std_BADOFF_func(void) { return &std_BADOFF; }

1 0

Piotr Caban : msvcp90: Added missing -ret64 option.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: c5f2e6623dde9e536b9dba3552312975b624e009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5f2e6623dde9e536b9dba355… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:41 2012 +0200 msvcp90: Added missing -ret64 option. --- dlls/msvcp90/msvcp90.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 3b41cbd..680830f 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -3240,8 +3240,8 @@ @ cdecl ?denorm_min@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_denorm_min -@ cdecl ?denorm_min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_denorm_min -@ cdecl ?denorm_min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_denorm_min +@ cdecl -ret64 ?denorm_min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_denorm_min +@ cdecl -ret64 ?denorm_min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_denorm_min @ cdecl ?denorm_min@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_denorm_min @ thiscall -arch=win32 ?destroy@?$allocator(a)D@std@@QAEXPAD(a)Z(ptr ptr) MSVCP_allocator_char_destroy @@ -3754,8 +3754,8 @@ @ cdecl ?epsilon@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_epsilon @ cdecl ?epsilon@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_epsilon @ cdecl ?epsilon@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_epsilon -@ cdecl ?epsilon@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_epsilon -@ cdecl ?epsilon@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_epsilon +@ cdecl -ret64 ?epsilon@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_epsilon +@ cdecl -ret64 ?epsilon@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_epsilon @ cdecl ?epsilon@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_epsilon @ cdecl ?epsilon@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_epsilon @ cdecl -arch=win32 ?eq@?$char_traits(a)D@std@@SA_NABD0(a)Z(ptr ptr) MSVCP_char_traits_char_eq @@ -4294,8 +4294,8 @@ @ cdecl ?infinity@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_infinity @ cdecl ?infinity@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_infinity @ cdecl ?infinity@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_infinity -@ cdecl ?infinity@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_infinity -@ cdecl ?infinity@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_infinity +@ cdecl -ret64 ?infinity@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_infinity +@ cdecl -ret64 ?infinity@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_infinity @ cdecl ?infinity@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_infinity @ cdecl ?infinity@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_infinity @ thiscall -arch=win32 ?init@?$basic_ios(a)DU?$char_traits(a)D@std@@@std@@IAEXPAV?$basic_streambuf(a)DU?$char_traits(a)D@std@@@2(a)_N@Z(ptr ptr long) basic_ios_char_init @@ -4495,8 +4495,8 @@ @ cdecl ?max@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_max @ cdecl ?max@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_max @ cdecl ?max@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_max -@ cdecl ?max@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_max -@ cdecl ?max@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max +@ cdecl -ret64 ?max@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_max +@ cdecl -ret64 ?max@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_max @ cdecl ?max@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_max @ cdecl ?max@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_max @ extern ?max_exponent10@?$numeric_limits(a)M@std@@2HB std_numeric_limits_float_max_exponent10 @@ -4533,8 +4533,8 @@ @ cdecl ?min@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_min @ cdecl ?min@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_min @ cdecl ?min@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_min -@ cdecl ?min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_min -@ cdecl ?min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_min +@ cdecl -ret64 ?min@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_min +@ cdecl -ret64 ?min@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_min @ cdecl ?min@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_min @ cdecl ?min@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_min @ extern ?min_exponent10@?$numeric_limits(a)M@std@@2HB std_numeric_limits_float_min_exponent10 @@ -4994,8 +4994,8 @@ @ cdecl ?quiet_NaN@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_quiet_NaN -@ cdecl ?quiet_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_quiet_NaN -@ cdecl ?quiet_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_quiet_NaN +@ cdecl -ret64 ?quiet_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_quiet_NaN +@ cdecl -ret64 ?quiet_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_quiet_NaN @ cdecl ?quiet_NaN@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_quiet_NaN @ extern ?radix(a)_Num_base@std@@2HB std_Num_base_radix @@ -5222,8 +5222,8 @@ @ cdecl ?round_error@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_round_error @ cdecl ?round_error@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_round_error @ cdecl ?round_error@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_round_error -@ cdecl ?round_error@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_round_error -@ cdecl ?round_error@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_round_error +@ cdecl -ret64 ?round_error@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_round_error +@ cdecl -ret64 ?round_error@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_round_error @ cdecl ?round_error@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_round_error @ cdecl ?round_error@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_round_error @ extern ?round_style(a)_Num_base@std@@2W4float_round_style(a)2@B std_Num_base_round_style @@ -5400,8 +5400,8 @@ @ cdecl ?signaling_NaN@?$numeric_limits(a)M@std@@SAMXZ() std_numeric_limits_float_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)N@std@@SANXZ() std_numeric_limits_double_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)O@std@@SAOXZ() std_numeric_limits_long_double_signaling_NaN -@ cdecl ?signaling_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_signaling_NaN -@ cdecl ?signaling_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_signaling_NaN +@ cdecl -ret64 ?signaling_NaN@?$numeric_limits(a)_J@std@@SA_JXZ() std_numeric_limits_int64_signaling_NaN +@ cdecl -ret64 ?signaling_NaN@?$numeric_limits(a)_K@std@@SA_KXZ() std_numeric_limits_unsigned_int64_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)_N@std@@SA_NXZ() std_numeric_limits_bool_signaling_NaN @ cdecl ?signaling_NaN@?$numeric_limits(a)_W@std@@SA_WXZ() std_numeric_limits_wchar_t_signaling_NaN @ cdecl ?sin@?$_Ctraits(a)M@std@@SAMM(a)Z(float) std_Ctraits_float_sin

1 0

Piotr Caban : msvcp90: Fixed basic_streambuf:: sputn functions behaviour when there's no place in buffer.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: 76821340a4ece7a4f140b96f7d2e62655634eaab URL: http://source.winehq.org/git/wine.git/?a=commit;h=76821340a4ece7a4f140b96f7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:27:09 2012 +0200 msvcp90: Fixed basic_streambuf::sputn functions behaviour when there's no place in buffer. --- dlls/msvcp90/ios.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index a053103..43fb46f 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -1031,7 +1031,7 @@ streamsize __thiscall basic_streambuf_char__Xsgetn_s(basic_streambuf_char *this, if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy_s(ptr+copied, size, *this->prpos, chunk); *this->prpos += chunk; *this->prsize -= chunk; @@ -1450,7 +1450,7 @@ streamsize __thiscall basic_streambuf_char_xsputn(basic_streambuf_char *this, co if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy(*this->pwpos, ptr+copied, chunk); *this->pwpos += chunk; *this->pwsize -= chunk; @@ -1776,7 +1776,7 @@ streamsize __thiscall basic_streambuf_wchar__Xsgetn_s(basic_streambuf_wchar *thi if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy_s(ptr+copied, size, *this->prpos, chunk); *this->prpos += chunk; *this->prsize -= chunk; @@ -2269,7 +2269,7 @@ streamsize __thiscall basic_streambuf_wchar_xsputn(basic_streambuf_wchar *this, if(chunk > count-copied) chunk = count-copied; - if(chunk) { + if(chunk > 0) { memcpy(*this->pwpos, ptr+copied, chunk); *this->pwpos += chunk; *this->pwsize -= chunk;

1 0

Piotr Caban : msvcp90: Added basic_istringstream<short> implementation.
by Alexandre Julliard Aug. 15, 2012

Aug. 15, 2012

Module: wine Branch: master Commit: b1ff81a7702d2cdc08d69648af81323d6b2380f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1ff81a7702d2cdc08d69648a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 15 10:26:27 2012 +0200 msvcp90: Added basic_istringstream<short> implementation. --- dlls/msvcp90/ios.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 75 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b1ff81a7702d2cdc08d69…

1 0