October 2016 - Wine-commits

Iván Matellanes : msvcirt: Don' t return negative values in in_avail and out_waiting.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 611b7273863222e7636c5710ece60f12bd196d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=611b7273863222e7636c5710e… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:51 2016 +0200 msvcirt: Don't return negative values in in_avail and out_waiting. 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 | 4 ++-- dlls/msvcirt/tests/msvcirt.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 8dfe988..e9103a9 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -556,7 +556,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_in_avail, 4) int __thiscall streambuf_in_avail(const streambuf *this) { TRACE("(%p)\n", this); - return this->egptr - this->gptr; + return (this->egptr - this->gptr > 0) ? this->egptr - this->gptr : 0; } /* ?out_waiting(a)streambuf@@QBEHXZ */ @@ -565,7 +565,7 @@ DEFINE_THISCALL_WRAPPER(streambuf_out_waiting, 4) int __thiscall streambuf_out_waiting(const streambuf *this) { TRACE("(%p)\n", this); - return this->pptr - this->pbase; + return (this->pptr - this->pbase > 0) ? this->pptr - this->pbase : 0; } /* Unexported */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 113bf0e..7f25cd7 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -200,7 +200,9 @@ static int (*__thiscall p_streambuf_allocate)(streambuf*); static void (*__thiscall p_streambuf_clrclock)(streambuf*); static int (*__thiscall p_streambuf_doallocate)(streambuf*); static void (*__thiscall p_streambuf_gbump)(streambuf*, int); +static int (*__thiscall p_streambuf_in_avail)(const streambuf*); static void (*__thiscall p_streambuf_lock)(streambuf*); +static int (*__thiscall p_streambuf_out_waiting)(const streambuf*); static int (*__thiscall p_streambuf_pbackfail)(streambuf*, int); static void (*__thiscall p_streambuf_pbump)(streambuf*, int); static int (*__thiscall p_streambuf_sbumpc)(streambuf*); @@ -480,7 +482,9 @@ static BOOL init(void) SET(p_streambuf_clrclock, "?clrlock(a)streambuf@@QEAAXXZ"); SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MEAAHXZ"); SET(p_streambuf_gbump, "?gbump(a)streambuf@@IEAAXH(a)Z"); + SET(p_streambuf_in_avail, "?in_avail(a)streambuf@@QEBAHXZ"); SET(p_streambuf_lock, "?lock(a)streambuf@@QEAAXXZ"); + SET(p_streambuf_out_waiting, "?out_waiting(a)streambuf@@QEBAHXZ"); SET(p_streambuf_pbackfail, "?pbackfail(a)streambuf@@UEAAHH(a)Z"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IEAAXH(a)Z"); SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QEAAHXZ"); @@ -657,7 +661,9 @@ static BOOL init(void) SET(p_streambuf_clrclock, "?clrlock(a)streambuf@@QAEXXZ"); SET(p_streambuf_doallocate, "?doallocate(a)streambuf@@MAEHXZ"); SET(p_streambuf_gbump, "?gbump(a)streambuf@@IAEXH(a)Z"); + SET(p_streambuf_in_avail, "?in_avail(a)streambuf@@QBEHXZ"); SET(p_streambuf_lock, "?lock(a)streambuf@@QAEXXZ"); + SET(p_streambuf_out_waiting, "?out_waiting(a)streambuf@@QBEHXZ"); SET(p_streambuf_pbackfail, "?pbackfail(a)streambuf@@UAEHH(a)Z"); SET(p_streambuf_pbump, "?pbump(a)streambuf@@IAEXH(a)Z"); SET(p_streambuf_sbumpc, "?sbumpc(a)streambuf@@QAEHXZ"); @@ -1388,6 +1394,36 @@ static void test_streambuf(void) ok(sb2.gptr == sb2.egptr, "wrong get pointer, expected %p got %p\n", sb2.egptr, sb2.gptr); ok(*sb2.gptr == 'X', "expected 'X' in the get area, got %c\n", *sb2.gptr); + /* out_waiting */ + ret = (int) call_func1(p_streambuf_out_waiting, &sb); + ok(ret == 9, "expected 9 got %d\n", ret); + sb.pptr = sb.pbase; + ret = (int) call_func1(p_streambuf_out_waiting, &sb); + ok(ret == 0, "expected 0 got %d\n", ret); + sb.pptr = sb.pbase - 1; + ret = (int) call_func1(p_streambuf_out_waiting, &sb); + ok(ret == 0, "expected 0 got %d\n", ret); + sb.pptr = NULL; + ret = (int) call_func1(p_streambuf_out_waiting, &sb); + ok(ret == 0, "expected 0 got %d\n", ret); + sb.pptr = sb.epptr; + sb.pbase = NULL; + ret = (int) call_func1(p_streambuf_out_waiting, &sb); + ok(ret == (int)(sb.pptr - sb.pbase), "expected %d got %d\n", (int)(sb.pptr - sb.pbase), ret); + + /* in_avail */ + ret = (int) call_func1(p_streambuf_in_avail, &sb); + ok(ret == 256, "expected 256 got %d\n", ret); + sb.gptr = sb.egptr; + ret = (int) call_func1(p_streambuf_in_avail, &sb); + ok(ret == 0, "expected 0 got %d\n", ret); + sb.gptr = sb.egptr + 1; + ret = (int) call_func1(p_streambuf_in_avail, &sb); + ok(ret == 0, "expected 0 got %d\n", ret); + sb.egptr = NULL; + ret = (int) call_func1(p_streambuf_in_avail, &sb); + ok(ret == 0, "expected 0 got %d\n", ret); + SetEvent(lock_arg.test[3]); WaitForSingleObject(thread, INFINITE);

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class ostrstream.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 1c1df68724c9d51aa41f740381d9efe734f8b9b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c1df68724c9d51aa41f74038… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:52 2016 +0200 msvcirt: Add a partial implementation of class ostrstream. 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 | 85 +++++++++++++++++++++++++++++++++++---------- dlls/msvcirt/msvcirt.spec | 44 +++++++++++------------ dlls/msvcrt20/msvcrt20.spec | 36 +++++++++---------- dlls/msvcrt40/msvcrt40.spec | 36 +++++++++---------- 4 files changed, 125 insertions(+), 76 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1c1df68724c9d51aa41f7…

1 0

Iván Matellanes : msvcirt: Implement ostrstream constructors.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 96633cda3f0882b2e83cc7167d4fb6a745d0e827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96633cda3f0882b2e83cc7167… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:53 2016 +0200 msvcirt: Implement ostrstream constructors. 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 | 39 +++++- dlls/msvcirt/tests/msvcirt.c | 287 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 321 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=96633cda3f0882b2e83cc…

1 0

Iván Matellanes : msvcirt/tests: Add tests of ostrstream::pcount.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 2d4e7d405055b3151c4cd5ac9a2c2f6bf0ce3b8a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d4e7d405055b3151c4cd5ac9… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:54 2016 +0200 msvcirt/tests: Add tests of ostrstream::pcount. 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/tests/msvcirt.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index e656866..db3ee3b 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -336,6 +336,7 @@ static ostream* (*__thiscall p_ostrstream_ctor)(ostream*, BOOL); static void (*__thiscall p_ostrstream_dtor)(ios*); static void (*__thiscall p_ostrstream_vbase_dtor)(ostream*); static ostream* (*__thiscall p_ostrstream_assign)(ostream*, const ostream*); +static int (*__thiscall p_ostrstream_pcount)(const ostream*); /* istream */ static istream* (*__thiscall p_istream_copy_ctor)(istream*, const istream*, BOOL); @@ -608,6 +609,7 @@ static BOOL init(void) SET(p_ostrstream_dtor, "??1ostrstream@@UEAA(a)XZ"); SET(p_ostrstream_vbase_dtor, "??_Dostrstream@@QEAAXXZ"); SET(p_ostrstream_assign, "??4ostrstream@@QEAAAEAV0(a)AEBV0@@Z"); + SET(p_ostrstream_pcount, "?pcount(a)ostrstream@@QEBAHXZ"); SET(p_istream_copy_ctor, "??0istream@@IEAA(a)AEBV0@@Z"); SET(p_istream_ctor, "??0istream@@IEAA(a)XZ"); @@ -794,6 +796,7 @@ static BOOL init(void) SET(p_ostrstream_dtor, "??1ostrstream@@UAE(a)XZ"); SET(p_ostrstream_vbase_dtor, "??_Dostrstream@@QAEXXZ"); SET(p_ostrstream_assign, "??4ostrstream@@QAEAAV0(a)ABV0@@Z"); + SET(p_ostrstream_pcount, "?pcount(a)ostrstream@@QBEHXZ"); SET(p_istream_copy_ctor, "??0istream@@IAE(a)ABV0@@Z"); SET(p_istream_ctor, "??0istream@@IAE(a)XZ"); @@ -3996,6 +3999,7 @@ static void test_ostrstream(void) ostream os1, os2, *pos, *pos2; strstreambuf *pssb; char buffer[32]; + int ret; memset(&os1, 0xab, sizeof(ostream)); memset(&os2, 0xab, sizeof(ostream)); @@ -4253,6 +4257,28 @@ static void test_ostrstream(void) ok(os2.base_ios.fill == ' ', "expected 32 got %d\n", os2.base_ios.fill); ok(os2.base_ios.width == 0, "expected 0 got %d\n", os2.base_ios.width); ok(os2.base_ios.do_lock == 0xabababab, "expected %d got %d\n", 0xabababab, os2.base_ios.do_lock); + + /* pcount */ + pos = call_func2(p_ostrstream_ctor, &os1, TRUE); + ok(pos == &os1, "wrong return, expected %p got %p\n", &os1, pos); + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + pssb = (strstreambuf*) os1.base_ios.sb; + pssb->base.pptr = (char*) 5; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 5, "expected 5 got %d\n", ret); + pssb->base.pbase = (char*) 2; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 3, "expected 3 got %d\n", ret); + pssb->base.pptr = NULL; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + if (0) /* crashes on native */ + os1.base_ios.sb = NULL; + pssb->base.pptr = (char*) 1; + ret = (int) call_func1(p_ostrstream_pcount, &os1); + ok(ret == 0, "expected 0 got %d\n", ret); + call_func1(p_ostrstream_vbase_dtor, &os1); } static void test_istream(void)

1 0

Iván Matellanes : msvcirt: Add a partial implementation of class istrstream.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 56c5e4210926a1b5e2619520f7c12b62a96c0340 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56c5e4210926a1b5e2619520f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:55 2016 +0200 msvcirt: Add a partial implementation of class istrstream. 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 | 59 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcirt/msvcirt.spec | 40 +++++++++++++++--------------- dlls/msvcrt20/msvcrt20.spec | 40 +++++++++++++++--------------- dlls/msvcrt40/msvcrt40.spec | 40 +++++++++++++++--------------- 4 files changed, 119 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=56c5e4210926a1b5e2619…

1 0

Iván Matellanes : msvcirt: Implement istrstream constructors.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 44d52f2b72642ef32cd1422e31e4fb8da59e929f URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d52f2b72642ef32cd1422e3… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Oct 19 14:00:56 2016 +0200 msvcirt: Implement istrstream constructors. 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 | 21 +++- dlls/msvcirt/tests/msvcirt.c | 260 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 277 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44d52f2b72642ef32cd14…

1 0

Andrey Gusev : user32: Add support for WS_EX_RIGHT style.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 535f1de80db22e5ba76af5cb69ae61524224eb31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=535f1de80db22e5ba76af5cb6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 20 16:53:00 2016 +0300 user32: Add support for WS_EX_RIGHT style. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/button.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 166b1a4..e85e30d 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -844,6 +844,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) HFONT hFont; LONG state = get_button_state( hwnd ); LONG style = GetWindowLongW( hwnd, GWL_STYLE ); + LONG ex_style = GetWindowLongW( hwnd, GWL_EXSTYLE ); HWND parent; HRGN hrgn; @@ -872,7 +873,7 @@ static void CB_Paint( HWND hwnd, HDC hDC, UINT action ) (WPARAM)hDC, (LPARAM)hwnd ); hrgn = set_control_clipping( hDC, &client ); - if (style & BS_LEFTTEXT) + if (style & BS_LEFTTEXT || ex_style & WS_EX_RIGHT) { rtext.right -= checkBoxWidth + text_offset; rbox.left = rbox.right - checkBoxWidth;

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: 6dde77fcacebc0f9942da82ae49082ce680fc556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6dde77fcacebc0f9942da82ae… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 20 16:29:03 2016 +0200 po: Update French translation. Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fr.po | 165 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 80 insertions(+), 85 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6dde77fcacebc0f9942da…

1 0

Pierre Schweitzer : mpr: Implement connected resources enumeration.
by Alexandre Julliard 21 Oct '16

21 Oct '16

Module: wine Branch: master Commit: d9c9d9b10f58844a780d8bfc9ed1b6713e37d487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c9d9b10f58844a780d8bfc9… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Mon Sep 12 21:48:51 2016 +0200 mpr: Implement connected resources enumeration. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mpr/wnet.c | 188 ++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 176 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9c9d9b10f58844a780d8…

1 0

Frédéric Delanoy : French translation for release 1.9.21
by Jeremy Newman 20 Oct '16

20 Oct '16

Module: website Branch: master Commit: 801d281f53ee1b1705bcc62bbf039328d8d3c6b1 URL: http://source.winehq.org/git/website.git/?a=commit;h=801d281f53ee1b1705bcc6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 20 13:43:01 2016 +0200 French translation for release 1.9.21 Signed-off-by: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/fr/2016101401.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/fr/2016101401.xml b/news/fr/2016101401.xml new file mode 100644 index 0000000..4e77439 --- /dev/null +++ b/news/fr/2016101401.xml @@ -0,0 +1,14 @@ +<news> +<date>14 octobre 2016</date> +<title>Sortie de Wine 1.9.21</title> +<body> +La version de développement 1.9.21 de Wine est disponible. +<a href="{$root}/announce/1.9.21">Nouveautés</a> de cette version : +<ul> + <li>Version initiale du minipilote HID.</li> + <li>Prise en charge des listes dans le contrôle RichEdit.</li> + <li>Améliorations dans la zone de notifications système.</li> + <li>Diverses corrections de bugs.</li> +</ul> +Le <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.21.tar.bz2">code source</a> est disponible dès à présent. Les paquets binaires sont en cours de construction, et apparaîtront sous peu sur leurs <a href="{$root}/download">sites de téléchargement</a> respectifs. +</body></news>

1 0