wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Andrey Gusev : winhttp/tests: Fix a typo in ok() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: a66f08db46ab7c6fb15b51473b15019d1d1fe154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a66f08db46ab7c6fb15b51473… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Wed Jun 22 21:30:07 2016 +0300 winhttp/tests: Fix a typo in ok() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index f81c07c..6be7598 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -617,7 +617,7 @@ static void test_WinHttpAddHeaders(void) test_header_name, NULL, &len, &index); ok(ret == FALSE, "WinHttpQueryHeaders unexpectedly succeeded.\n"); ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, - "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, go %u\n", GetLastError()); + "WinHttpQueryHeaders set incorrect error: expected ERROR_INSUFFICENT_BUFFER, got %u\n", GetLastError()); ok(len > 40, "WinHttpQueryHeaders returned invalid length: expected greater than 40, got %d\n", len); ok(index == 0, "WinHttpQueryHeaders incorrectly incremented header index.\n");

1 0

Alexandre Julliard : gdi32: Validate the point count in Polyline and Polygon.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 117f862ce52aab6f166e918b391fac20e682befc URL: http://source.winehq.org/git/wine.git/?a=commit;h=117f862ce52aab6f166e918b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 23 12:36:23 2016 +0900 gdi32: Validate the point count in Polyline and Polygon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 0d4ad59..9666ea3 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1253,13 +1253,14 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, /************************************************************* * pathdrv_Polyline */ -static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) +static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); - BYTE *type = add_log_points( physdev, pts, cbPoints, PT_LINETO ); + BYTE *type; - if (!type) return FALSE; - if (cbPoints) type[0] = PT_MOVETO; + if (count < 2) return FALSE; + if (!(type = add_log_points( physdev, pts, count, PT_LINETO ))) return FALSE; + type[0] = PT_MOVETO; return TRUE; } @@ -1267,25 +1268,27 @@ static BOOL pathdrv_Polyline( PHYSDEV dev, const POINT *pts, INT cbPoints ) /************************************************************* * pathdrv_PolylineTo */ -static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT cbPoints ) +static BOOL pathdrv_PolylineTo( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); - return add_log_points_new_stroke( physdev, pts, cbPoints, PT_LINETO ); + if (count < 1) return FALSE; + return add_log_points_new_stroke( physdev, pts, count, PT_LINETO ); } /************************************************************* * pathdrv_Polygon */ -static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) +static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT count ) { struct path_physdev *physdev = get_path_physdev( dev ); - BYTE *type = add_log_points( physdev, pts, cbPoints, PT_LINETO ); + BYTE *type; - if (!type) return FALSE; - if (cbPoints) type[0] = PT_MOVETO; - if (cbPoints > 1) type[cbPoints - 1] = PT_LINETO | PT_CLOSEFIGURE; + if (count < 2) return FALSE; + if (!(type = add_log_points( physdev, pts, count, PT_LINETO ))) return FALSE; + type[0] = PT_MOVETO; + type[count - 1] = PT_LINETO | PT_CLOSEFIGURE; return TRUE; }

1 0

Alexandre Julliard : gdi32/tests: Get rid of the todo mechanism in the path tests.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: b2702b2d6f68fc28dd821d0d982157bf45901d31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2702b2d6f68fc28dd821d0d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 23 12:26:04 2016 +0900 gdi32/tests: Get rid of the todo mechanism in the path tests. All the tests succeed now. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/path.c | 242 ++++++++++++++++++++++-------------------------- 1 file changed, 112 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b2702b2d6f68fc28dd821…

1 0

André Hentschel : advapi32/tests: Allow Win8+ flags for Admins ACE.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 4464793e601c541587c199d45ccaee721e4f02cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4464793e601c541587c199d45… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:36:27 2016 +0200 advapi32/tests: Allow Win8+ flags for Admins ACE. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index eebd163..cf104ab 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4023,7 +4023,8 @@ static void test_GetNamedSecurityInfoA(void) flags = ((ACE_HEADER *)ace)->AceFlags; ok(flags == 0x0 || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE|INHERITED_ACE)) /* w2k8 */ - || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)), /* win7 */ + || broken(flags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE)) /* win7 */ + || broken(flags == (INHERIT_ONLY_ACE|CONTAINER_INHERIT_ACE)), /* win8+ */ "Builtin Admins ACE has unexpected flags (0x%x != 0x0)\n", flags); ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS);

1 0

André Hentschel : advapi32/tests: Allow MACHINE\Software to be owned by local system.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 9db9c9ef5a557aca0cde7c78350f52c80b13f575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9db9c9ef5a557aca0cde7c783… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:35:33 2016 +0200 advapi32/tests: Allow MACHINE\Software to be owned by local system. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 3639ebd..eebd163 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -3652,8 +3652,9 @@ static void test_GetNamedSecurityInfoA(void) char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; char system_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; char users_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES]; + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; PSID admin_sid = (PSID) admin_ptr, users_sid = (PSID) users_ptr; - PSID system_sid = (PSID) system_ptr, user_sid; + PSID system_sid = (PSID) system_ptr, user_sid, localsys_sid; DWORD sid_size = sizeof(admin_ptr), user_size; char invalid_path[] = "/an invalid file path"; int users_ace_id = -1, admins_ace_id = -1, i; @@ -3958,10 +3959,15 @@ static void test_GetNamedSecurityInfoA(void) NULL, NULL, NULL, NULL, &pSD); ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); + bret = AllocateAndInitializeSid(&SIDAuthNT, 1, SECURITY_LOCAL_SYSTEM_RID, 0, 0, 0, 0, 0, 0, 0, &localsys_sid); + ok(bret, "AllocateAndInitializeSid failed with error %d\n", GetLastError()); + bret = GetSecurityDescriptorOwner(pSD, &owner, &owner_defaulted); ok(bret, "GetSecurityDescriptorOwner failed with error %d\n", GetLastError()); ok(owner != NULL, "owner should not be NULL\n"); - ok(EqualSid(owner, admin_sid), "MACHINE\\Software owner SID (%s) != Administrators SID (%s).\n", debugstr_sid(owner), debugstr_sid(admin_sid)); + ok(EqualSid(owner, admin_sid) || EqualSid(owner, localsys_sid), + "MACHINE\\Software owner SID (%s) != Administrators SID (%s) or Local System Sid (%s).\n", + debugstr_sid(owner), debugstr_sid(admin_sid), debugstr_sid(localsys_sid)); bret = GetSecurityDescriptorGroup(pSD, &group, &group_defaulted); ok(bret, "GetSecurityDescriptorGroup failed with error %d\n", GetLastError()); @@ -4022,6 +4028,8 @@ static void test_GetNamedSecurityInfoA(void) ok(ace->Mask == KEY_ALL_ACCESS || broken(ace->Mask == GENERIC_ALL) /* w2k8 */, "Builtin Admins ACE has unexpected mask (0x%x != 0x%x)\n", ace->Mask, KEY_ALL_ACCESS); } + + FreeSid(localsys_sid); LocalFree(pSD); }

1 0

André Hentschel : kernel32/tests: Fix a typo.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: fdd953c2aa7979e837cf78a9bc01bfd51569dc80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdd953c2aa7979e837cf78a9b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jun 22 23:35:06 2016 +0200 kernel32/tests: Fix a typo. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index b42b1f8..f42e7ec 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2460,7 +2460,7 @@ static void test_LocaleNameToLCID(void) SetLastError(0xdeadbeef); lcid = pLocaleNameToLCID(fooW, 0); ok(!lcid && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected lcid == 0, got got %08x, error %d\n", lcid, GetLastError()); + "Expected lcid == 0, got %08x, error %d\n", lcid, GetLastError()); /* english neutral name */ lcid = pLocaleNameToLCID(enW, 0);

1 0

Nikolay Sivov : dwrite: Update line breaking algorithm according to Unicode 9.0.0 specification.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: bbb9bbdbdb330aca21c363503274e21d558db1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbb9bbdbdb330aca21c363503… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jun 23 00:02:31 2016 +0300 dwrite: Update line breaking algorithm according to Unicode 9.0.0 specification. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 49 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 56f6e23..14a9320 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -463,13 +463,18 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B i++; set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_CAN_BREAK, &state); break; + /* LB8a - do not break between ZWJ and an ideograph, emoji base or emoji modifier */ + case b_ZWJ: + if (i < count-1 && (break_class[i+1] == b_ID || break_class[i+1] == b_EB || break_class[i+1] == b_EM)) + set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); + break; } } /* LB9 - LB10 */ for (i = 0; i < count; i++) { - if (break_class[i] == b_CM) + if (break_class[i] == b_CM || break_class[i] == b_ZWJ) { if (i > 0) { @@ -607,6 +612,8 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B case b_HL: case b_EX: case b_ID: + case b_EB: + case b_EM: case b_IN: case b_NU: set_break_condition(i, BreakConditionBefore, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); @@ -617,19 +624,31 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B if (i < count-1) { - /* LB23 */ - if ((break_class[i] == b_ID && break_class[i+1] == b_PO) || - (break_class[i] == b_AL && break_class[i+1] == b_NU) || + /* LB23 - do not break between digits and letters */ + if ((break_class[i] == b_AL && break_class[i+1] == b_NU) || (break_class[i] == b_HL && break_class[i+1] == b_NU) || (break_class[i] == b_NU && break_class[i+1] == b_AL) || (break_class[i] == b_NU && break_class[i+1] == b_HL)) set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - /* LB24 */ + + /* LB23a - do not break between numeric prefixes and ideographs, or between ideographs and numeric postfixes */ if ((break_class[i] == b_PR && break_class[i+1] == b_ID) || - (break_class[i] == b_PR && break_class[i+1] == b_AL) || + (break_class[i] == b_PR && break_class[i+1] == b_EB) || + (break_class[i] == b_PR && break_class[i+1] == b_EM) || + (break_class[i] == b_ID && break_class[i+1] == b_PO) || + (break_class[i] == b_EM && break_class[i+1] == b_PO) || + (break_class[i] == b_EB && break_class[i+1] == b_PO)) + set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); + + /* LB24 - do not break between numeric prefix/postfix and letters, or letters and prefix/postfix */ + if ((break_class[i] == b_PR && break_class[i+1] == b_AL) || (break_class[i] == b_PR && break_class[i+1] == b_HL) || (break_class[i] == b_PO && break_class[i+1] == b_AL) || - (break_class[i] == b_PO && break_class[i+1] == b_HL)) + (break_class[i] == b_PO && break_class[i+1] == b_HL) || + (break_class[i] == b_AL && break_class[i+1] == b_PR) || + (break_class[i] == b_HL && break_class[i+1] == b_PR) || + (break_class[i] == b_AL && break_class[i+1] == b_PO) || + (break_class[i] == b_HL && break_class[i+1] == b_PO)) set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); /* LB25 */ @@ -712,8 +731,20 @@ static HRESULT analyze_linebreaks(const WCHAR *text, UINT32 count, DWRITE_LINE_B (break_class[i+1] == b_AL || break_class[i] == b_HL || break_class[i] == b_NU)) set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); - /* LB30a */ - if (break_class[i] == b_RI && break_class[i+1] == b_RI) + /* LB30a - break between two RIs if and only if there are an even number of RIs preceding position of the break */ + if (break_class[i] == b_RI && break_class[i+1] == b_RI) { + unsigned int c = 0; + + j = i + 1; + while (j > 0 && break_class[--j] == b_RI) + c++; + + if ((c & 1) == 0) + set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); + } + + /* LB30b - do not break between an emoji base and an emoji modifier */ + if (break_class[i] == b_EB && break_class[i+1] == b_EM) set_break_condition(i, BreakConditionAfter, DWRITE_BREAK_CONDITION_MAY_NOT_BREAK, &state); } }

1 0

Iván Matellanes : msvcirt: Implement ostream manipulators.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 38fb1062daaf68afe4dc20e1aceddfa89fe1ea4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=38fb1062daaf68afe4dc20e1a… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:53 2016 +0100 msvcirt: Implement ostream manipulators. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 32c1bf4..666c44c 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2843,24 +2843,25 @@ ostream* __thiscall ostream_print_ios_manip(ostream *this, ios* (__cdecl *func)( /* ?endl@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_endl(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + ostream_put_char(this, '\n'); + return ostream_flush(this); } /* ?ends@@YAAAVostream@@AAV1@@Z */ /* ?ends@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_ends(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + return ostream_put_char(this, 0); } /* ?flush@@YAAAVostream@@AAV1@@Z */ /* ?flush@@YAAEAVostream@@AEAV1@@Z */ ostream* __cdecl ostream_flush_manip(ostream *this) { - FIXME("(%p) stub\n", this); - return this; + TRACE("(%p)\n", this); + return ostream_flush(this); } /******************************************************************

1 0

Iván Matellanes : msvcirt: Implement ostream:: operator<< for streambuf.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 2cb786b6a005e8a1111a329772f9d46b088a90ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cb786b6a005e8a1111a32977… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:52 2016 +0100 msvcirt: Implement ostream::operator<< for streambuf. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 15 ++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 39 +++++++++++++++++++++++++++++++++++---- 2 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index c6a58fe..32c1bf4 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2803,7 +2803,20 @@ ostream* __thiscall ostream_print_ptr(ostream *this, const void *ptr) DEFINE_THISCALL_WRAPPER(ostream_print_streambuf, 8) ostream* __thiscall ostream_print_streambuf(ostream *this, streambuf *sb) { - FIXME("(%p %p) stub\n", this, sb); + ios *base = ostream_get_ios(this); + int c; + + TRACE("(%p %p)\n", this, sb); + + if (ostream_opfx(this)) { + while ((c = streambuf_sbumpc(sb)) != EOF) { + if (streambuf_sputc(base->sb, c) == EOF) { + base->state |= IOSTATE_failbit; + break; + } + } + ostream_osfx(this); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2e8003e..64b97db 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -291,6 +291,7 @@ static ostream* (*__thiscall p_ostream_print_int)(ostream*, int); static ostream* (*__thiscall p_ostream_print_float)(ostream*, float); static ostream* (*__thiscall p_ostream_print_double)(ostream*, double); static ostream* (*__thiscall p_ostream_print_ptr)(ostream*, const void*); +static ostream* (*__thiscall p_ostream_print_streambuf)(ostream*, streambuf*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -479,6 +480,7 @@ static BOOL init(void) SET(p_ostream_print_float, "??6ostream@@QEAAAEAV0@M@Z"); SET(p_ostream_print_double, "??6ostream@@QEAAAEAV0@N@Z"); SET(p_ostream_print_ptr, "??6ostream@@QEAAAEAV0@PEBX@Z"); + SET(p_ostream_print_streambuf, "??6ostream@@QEAAAEAV0@PEAVstreambuf@@@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -589,6 +591,7 @@ static BOOL init(void) SET(p_ostream_print_float, "??6ostream@@QAEAAV0@M@Z"); SET(p_ostream_print_double, "??6ostream@@QAEAAV0@N@Z"); SET(p_ostream_print_ptr, "??6ostream@@QAEAAV0@PBX@Z"); + SET(p_ostream_print_streambuf, "??6ostream@@QAEAAV0@PAVstreambuf@@@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -3047,9 +3050,9 @@ static void test_ostream_print(void) { const BOOL is_64 = (sizeof(void*) == 8); ostream os, *pos; - strstreambuf ssb, *pssb; + strstreambuf ssb, ssb_test1, ssb_test2, ssb_test3, *pssb; LONG length, expected_length; - int i; + int ret, i; char param_char[] = {'a', '9', 'e'}; const char* param_str[] = {"Test", "800", "3.14159", " Test"}; @@ -3059,8 +3062,9 @@ static void test_ostream_print(void) double param_double[] = {1.0, 3.141592653589793238, 314.1592653589793238, 314.159265358979, 1231314.269811862199, 9.961472e6, 8.98846567431e307, DBL_MAX}; void* param_ptr[] = {NULL, (void*) 0xdeadbeef, (void*) 0x1234cdef, (void*) 0x1, (void*) 0xffffffff}; + streambuf* param_streambuf[] = {NULL, &ssb_test1.base, &ssb_test2.base, &ssb_test3.base}; struct ostream_print_test { - enum { type_chr, type_str, type_int, type_flt, type_dbl, type_ptr } type; + enum { type_chr, type_str, type_int, type_flt, type_dbl, type_ptr, type_sbf } type; int param_index; ios_io_state state; ios_flags flags; @@ -3215,13 +3219,35 @@ static void test_ostream_print(void) {type_ptr, /* NULL */ 0, IOSTATE_goodbit, FLAGS_uppercase|FLAGS_showbase, 12, 'x', 12, is_64 ? "0x0000000000000000" : "xx0x00000000", IOSTATE_goodbit}, {type_ptr, /* NULL */ 0, IOSTATE_goodbit, FLAGS_internal|FLAGS_uppercase|FLAGS_showbase, 6, '?', 20, - is_64 ? "0x??0000000000000000" : "0x??????????00000000", IOSTATE_goodbit} + is_64 ? "0x??0000000000000000" : "0x??????????00000000", IOSTATE_goodbit}, + /* streambuf* */ + {type_sbf, /* NULL */ 0, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, + {type_sbf, /* NULL */ 0, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, + /* crashes on native {STREAMBUF, NULL 0, IOSTATE_goodbit, 0, 6, ' ', 0, "", IOSTATE_goodbit}, */ + {type_sbf, /* &ssb_test1.base */ 1, IOSTATE_goodbit, FLAGS_skipws|FLAGS_showpos|FLAGS_uppercase, + 6, ' ', 0, " we both know what's been going on ", IOSTATE_goodbit}, + {type_sbf, /* &ssb_test1.base */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_hex|FLAGS_showbase, + 6, '*', 50, "123 We know the game and", IOSTATE_goodbit}, + {type_sbf, /* &ssb_test1.base */ 3, IOSTATE_goodbit, FLAGS_internal|FLAGS_scientific|FLAGS_showpoint, + 6, '*', 50, "we're gonna play it 3.14159", IOSTATE_goodbit} }; pssb = call_func1(p_strstreambuf_ctor, &ssb); ok(pssb == &ssb, "wrong return, expected %p got %p\n", &ssb, pssb); pos = call_func3(p_ostream_sb_ctor, &os, &ssb.base, TRUE); ok(pos == &os, "wrong return, expected %p got %p\n", &os, pos); + pssb = call_func1(p_strstreambuf_ctor, &ssb_test1); + ok(pssb == &ssb_test1, "wrong return, expected %p got %p\n", &ssb_test1, pssb); + ret = (int) call_func3(p_streambuf_xsputn, &ssb_test1.base, " we both know what's been going on ", 36); + ok(ret == 36, "expected 36 got %d\n", ret); + pssb = call_func1(p_strstreambuf_ctor, &ssb_test2); + ok(pssb == &ssb_test2, "wrong return, expected %p got %p\n", &ssb_test2, pssb); + ret = (int) call_func3(p_streambuf_xsputn, &ssb_test2.base, "123 We know the game and", 24); + ok(ret == 24, "expected 24 got %d\n", ret); + pssb = call_func1(p_strstreambuf_ctor, &ssb_test3); + ok(pssb == &ssb_test3, "wrong return, expected %p got %p\n", &ssb_test3, pssb); + ret = (int) call_func3(p_streambuf_xsputn, &ssb_test3.base, "we're gonna play it 3.14159", 27); + ok(ret == 27, "expected 27 got %d\n", ret); for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { os.base_ios.state = tests[i].state; @@ -3244,6 +3270,8 @@ static void test_ostream_print(void) pos = call_func2_ptr_dbl(p_ostream_print_double, &os, param_double[tests[i].param_index]); break; case type_ptr: pos = call_func2(p_ostream_print_ptr, &os, param_ptr[tests[i].param_index]); break; + case type_sbf: + pos = call_func2(p_ostream_print_streambuf, &os, param_streambuf[tests[i].param_index]); break; } length = ssb.base.pptr - ssb.base.pbase; @@ -3259,6 +3287,9 @@ static void test_ostream_print(void) call_func1(p_ostream_vbase_dtor, &os); call_func1(p_strstreambuf_dtor, &ssb); + call_func1(p_strstreambuf_dtor, &ssb_test1); + call_func1(p_strstreambuf_dtor, &ssb_test2); + call_func1(p_strstreambuf_dtor, &ssb_test3); } START_TEST(msvcirt)

1 0

Iván Matellanes : msvcirt: Implement ostream:: operator<< for pointers.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 7ccc6338bc57c4dcd1be5e214829734f3f07c775 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ccc6338bc57c4dcd1be5e214… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:51 2016 +0100 msvcirt: Implement ostream::operator<< for pointers. Signed-off-by: Iván Matellanes <matellanes.ivan(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 | 16 +++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 40 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index cfea9c1..c6a58fe 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2780,7 +2780,21 @@ ostream* __thiscall ostream_print_double(ostream *this, double d) DEFINE_THISCALL_WRAPPER(ostream_print_ptr, 8) ostream* __thiscall ostream_print_ptr(ostream *this, const void *ptr) { - FIXME("(%p %p) stub\n", this, ptr); + ios *base = ostream_get_ios(this); + char prefix_str[3] = {'0','x',0}, pointer_str[17]; + + TRACE("(%p %p)\n", this, ptr); + + if (ostream_opfx(this)) { + if (ptr && base->flags & FLAGS_uppercase) + prefix_str[1] = 'X'; + + if (sprintf(pointer_str, "%p", ptr) > 0) + ostream_writepad(this, prefix_str, pointer_str); + else + base->state |= IOSTATE_failbit; + ostream_osfx(this); + } return this; } diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index ddb53eb..2e8003e 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -290,6 +290,7 @@ static ostream* (*__thiscall p_ostream_print_str)(ostream*, const char*); static ostream* (*__thiscall p_ostream_print_int)(ostream*, int); static ostream* (*__thiscall p_ostream_print_float)(ostream*, float); static ostream* (*__thiscall p_ostream_print_double)(ostream*, double); +static ostream* (*__thiscall p_ostream_print_ptr)(ostream*, const void*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -477,6 +478,7 @@ static BOOL init(void) SET(p_ostream_print_int, "??6ostream@@QEAAAEAV0@H@Z"); SET(p_ostream_print_float, "??6ostream@@QEAAAEAV0@M@Z"); SET(p_ostream_print_double, "??6ostream@@QEAAAEAV0@N@Z"); + SET(p_ostream_print_ptr, "??6ostream@@QEAAAEAV0@PEBX@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2@YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3@YAXPAX@Z"); @@ -586,6 +588,7 @@ static BOOL init(void) SET(p_ostream_print_int, "??6ostream@@QAEAAV0@H@Z"); SET(p_ostream_print_float, "??6ostream@@QAEAAV0@M@Z"); SET(p_ostream_print_double, "??6ostream@@QAEAAV0@N@Z"); + SET(p_ostream_print_ptr, "??6ostream@@QAEAAV0@PBX@Z"); } SET(p_ios_static_lock, "?x_lockc@ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc@ios@@KAXXZ"); @@ -3042,6 +3045,7 @@ if (0) /* crashes on native */ static void test_ostream_print(void) { + const BOOL is_64 = (sizeof(void*) == 8); ostream os, *pos; strstreambuf ssb, *pssb; LONG length, expected_length; @@ -3054,8 +3058,9 @@ static void test_ostream_print(void) 13.14159f, 0.00013f, 0.000013f, INFINITY, -INFINITY, NAN}; double param_double[] = {1.0, 3.141592653589793238, 314.1592653589793238, 314.159265358979, 1231314.269811862199, 9.961472e6, 8.98846567431e307, DBL_MAX}; + void* param_ptr[] = {NULL, (void*) 0xdeadbeef, (void*) 0x1234cdef, (void*) 0x1, (void*) 0xffffffff}; struct ostream_print_test { - enum { type_chr, type_str, type_int, type_flt, type_dbl } type; + enum { type_chr, type_str, type_int, type_flt, type_dbl, type_ptr } type; int param_index; ios_io_state state; ios_flags flags; @@ -3181,7 +3186,36 @@ static void test_ostream_print(void) {type_dbl, /* 9.961472e6 */ 5, IOSTATE_goodbit, FLAGS_fixed, 500, ' ', 0, "9961472.000000000000000", IOSTATE_goodbit}, /* crashes on XP/2k3 {type_dbl, 8.98846567431e307 6, IOSTATE_goodbit, FLAGS_fixed, 500, ' ', 0, "", IOSTATE_goodbit}, */ /* crashes on XP/2k3 {type_dbl, DBL_MAX 7, IOSTATE_goodbit, FLAGS_fixed|FLAGS_showpos, 500, ' ', 5, " ", IOSTATE_goodbit}, */ - {type_dbl, /* DBL_MAX */ 7, IOSTATE_goodbit, FLAGS_showpoint, 500, ' ', 0, "1.79769313486232e+308", IOSTATE_goodbit} + {type_dbl, /* DBL_MAX */ 7, IOSTATE_goodbit, FLAGS_showpoint, 500, ' ', 0, "1.79769313486232e+308", IOSTATE_goodbit}, + /* void* */ + {type_ptr, /* NULL */ 0, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, + {type_ptr, /* NULL */ 0, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, + {type_ptr, /* NULL */ 0, IOSTATE_goodbit, 0, 6, ' ', 0, + is_64 ? "0x0000000000000000" : "0x00000000", IOSTATE_goodbit}, + {type_ptr, /* 0xdeadbeef */ 1, IOSTATE_goodbit, 0, 6, ' ', 0, + is_64 ? "0x00000000DEADBEEF" : "0xDEADBEEF", IOSTATE_goodbit}, + {type_ptr, /* 0xdeadbeef */ 1, IOSTATE_goodbit, 0, 6, '*', 12, + is_64 ? "0x00000000DEADBEEF" : "**0xDEADBEEF", IOSTATE_goodbit}, + {type_ptr, /* 0xdeadbeef */ 1, IOSTATE_goodbit, FLAGS_internal, 6, ' ', 14, + is_64 ? "0x00000000DEADBEEF" : "0x DEADBEEF", IOSTATE_goodbit}, + {type_ptr, /* 0xdeadbeef */ 1, IOSTATE_goodbit, FLAGS_left, 6, 'x', 11, + is_64 ? "0x00000000DEADBEEF" : "0xDEADBEEFx", IOSTATE_goodbit}, + {type_ptr, /* 0x1234cdef */ 2, IOSTATE_goodbit, FLAGS_dec|FLAGS_showpos, 6, ' ', 0, + is_64 ? "0x000000001234CDEF" : "0x1234CDEF", IOSTATE_goodbit}, + {type_ptr, /* 0x1 */ 3, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase, 6, ' ', 0, + is_64 ? "0x0000000000000001" : "0x00000001", IOSTATE_goodbit}, + {type_ptr, /* 0xffffffff */ 4, IOSTATE_goodbit, FLAGS_hex|FLAGS_showpoint, 6, ' ', 0, + is_64 ? "0x00000000FFFFFFFF" : "0xFFFFFFFF", IOSTATE_goodbit}, + {type_ptr, /* 0xffffffff */ 4, IOSTATE_goodbit, FLAGS_uppercase|FLAGS_fixed, 6, ' ', 0, + is_64 ? "0X00000000FFFFFFFF" : "0XFFFFFFFF", IOSTATE_goodbit}, + {type_ptr, /* 0x1 */ 3, IOSTATE_goodbit, FLAGS_uppercase, 6, ' ', 0, + is_64 ? "0X0000000000000001" : "0X00000001", IOSTATE_goodbit}, + {type_ptr, /* NULL */ 0, IOSTATE_goodbit, FLAGS_uppercase, 6, ' ', 0, + is_64 ? "0x0000000000000000" : "0x00000000", IOSTATE_goodbit}, + {type_ptr, /* NULL */ 0, IOSTATE_goodbit, FLAGS_uppercase|FLAGS_showbase, 12, 'x', 12, + is_64 ? "0x0000000000000000" : "xx0x00000000", IOSTATE_goodbit}, + {type_ptr, /* NULL */ 0, IOSTATE_goodbit, FLAGS_internal|FLAGS_uppercase|FLAGS_showbase, 6, '?', 20, + is_64 ? "0x??0000000000000000" : "0x??????????00000000", IOSTATE_goodbit} }; pssb = call_func1(p_strstreambuf_ctor, &ssb); @@ -3208,6 +3242,8 @@ static void test_ostream_print(void) pos = call_func2_ptr_flt(p_ostream_print_float, &os, param_float[tests[i].param_index]); break; case type_dbl: pos = call_func2_ptr_dbl(p_ostream_print_double, &os, param_double[tests[i].param_index]); break; + case type_ptr: + pos = call_func2(p_ostream_print_ptr, &os, param_ptr[tests[i].param_index]); break; } length = ssb.base.pptr - ssb.base.pbase;

1 0

← Newer
1
2
3
4
5
6
7
8
...
60
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 June 2016