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

Michael Stefaniuc : shell32: Avoid using CopyRect().
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: ee3deec635b03f0508f3d087ab1999b889c2205b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee3deec635b03f0508f3d087a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jun 22 11:54:09 2016 +0200 shell32: Avoid using CopyRect(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/ebrowser.c | 7 +++---- dlls/shell32/shlmenu.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c index 0cee30f..bbccf88 100644 --- a/dlls/shell32/ebrowser.c +++ b/dlls/shell32/ebrowser.c @@ -498,7 +498,7 @@ static LRESULT navpane_splitter_beginresize(ExplorerBrowserImpl *This, HWND hwnd SetCapture(hwnd); - CopyRect(&This->splitter_rc, &This->navpane.rc); + This->splitter_rc = This->navpane.rc; This->splitter_rc.left = This->splitter_rc.right - SPLITTER_WIDTH; splitter_draw(GetParent(hwnd), &This->splitter_rc); @@ -516,8 +516,7 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L dx = (SHORT)LOWORD(lParam); TRACE("%d.\n", dx); - CopyRect(&rc, &This->navpane.rc); - + rc = This->navpane.rc; new_width = This->navpane.width + dx; if(new_width > NP_MIN_WIDTH && This->sv_rc.right - new_width > SV_MIN_WIDTH) { @@ -525,7 +524,7 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L rc.left = rc.right - SPLITTER_WIDTH; splitter_draw(GetParent(hwnd), &This->splitter_rc); splitter_draw(GetParent(hwnd), &rc); - CopyRect(&This->splitter_rc, &rc); + This->splitter_rc = rc; } return TRUE; diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c index 694b5d1..7a960ad 100644 --- a/dlls/shell32/shlmenu.c +++ b/dlls/shell32/shlmenu.c @@ -613,7 +613,7 @@ LRESULT WINAPI FileMenu_DrawItem( clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor (COLOR_MENU)); } - CopyRect(&TextRect, &(lpdis->rcItem)); + TextRect = lpdis->rcItem; /* add the menubitmap */ menuinfo = FM_GetMenuInfo(pMyItem->hMenu);

1 0

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

22 Jun '16

Module: wine Branch: master Commit: 81cf0b2c487e7281ed9ab40cbfd5471fa5c6847d URL: http://source.winehq.org/git/wine.git/?a=commit;h=81cf0b2c487e7281ed9ab40cb… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:47 2016 +0100 msvcirt: Implement ostream::operator<< for characters. 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 | 12 ++++++-- dlls/msvcirt/tests/msvcirt.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+), 3 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index ce5c021..a09b4d6 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2599,7 +2599,14 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char DEFINE_THISCALL_WRAPPER(ostream_print_char, 8) ostream* __thiscall ostream_print_char(ostream *this, char c) { - FIXME("(%p %c) stub\n", this, c); + const char c_str[2] = {c, 0}; + + TRACE("(%p %c)\n", this, c); + + if (ostream_opfx(this)) { + ostream_writepad(this, "", c_str); + ostream_osfx(this); + } return this; } @@ -2608,8 +2615,7 @@ ostream* __thiscall ostream_print_char(ostream *this, char c) DEFINE_THISCALL_WRAPPER(ostream_print_unsigned_char, 8) ostream* __thiscall ostream_print_unsigned_char(ostream *this, unsigned char c) { - FIXME("(%p %c) stub\n", this, c); - return this; + return ostream_print_char(this, c); } /* ??6ostream@@QAEAAV0(a)PBC@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 428ddf3..2d776ad 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -270,6 +270,7 @@ static ostream* (*__thiscall p_ostream_seekp_offset)(ostream*, streamoff, ios_se static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos); static streampos (*__thiscall p_ostream_tellp)(ostream*); static ostream* (*__thiscall p_ostream_writepad)(ostream*, const char*, const char*); +static ostream* (*__thiscall p_ostream_print_char)(ostream*, char); /* Emulate a __thiscall */ #ifdef __i386__ @@ -444,6 +445,7 @@ static BOOL init(void) SET(p_ostream_seekp, "?seekp(a)ostream@@QEAAAEAV1(a)J@Z"); SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); SET(p_ostream_writepad, "?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z"); + SET(p_ostream_print_char, "??6ostream@@QEAAAEAV0(a)D@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -548,6 +550,7 @@ static BOOL init(void) SET(p_ostream_seekp, "?seekp(a)ostream@@QAEAAV1(a)J@Z"); SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); SET(p_ostream_writepad, "?writepad(a)ostream@@AAEAAV1(a)PBD0@Z"); + SET(p_ostream_print_char, "??6ostream@@QAEAAV0(a)D@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -3002,6 +3005,72 @@ if (0) /* crashes on native */ ok(_unlink(filename2) == 0, "Couldn't unlink file named '%s'\n", filename2); } +static void test_ostream_print(void) +{ + ostream os, *pos; + strstreambuf ssb, *pssb; + LONG length, expected_length; + int i; + + char param_char[] = {'a', '9', 'e'}; + struct ostream_print_test { + enum { type_chr } type; + int param_index; + ios_io_state state; + ios_flags flags; + int precision; + int fill; + int width; + const char *expected_text; + ios_io_state expected_flags; + } tests[] = { + /* char */ + {type_chr, /* 'a' */ 0, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, + {type_chr, /* 'a' */ 0, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, 0, 6, ' ', 0, "a", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, 0, 6, ' ', 4, " a", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, 0, 6, 'x', 3, "xxa", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_left, 6, ' ', 4, "a ", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_left|FLAGS_internal, 6, ' ', 4, " a", IOSTATE_goodbit}, + {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_internal|FLAGS_hex|FLAGS_showbase, 6, ' ', 4, " a", IOSTATE_goodbit}, + {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase|FLAGS_uppercase, 6, 'i', 2, "i9", IOSTATE_goodbit}, + {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_showpos|FLAGS_scientific, 0, 'i', 2, "i9", IOSTATE_goodbit}, + {type_chr, /* 'e' */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", 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); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); i++) { + os.base_ios.state = tests[i].state; + os.base_ios.flags = tests[i].flags; + os.base_ios.precision = tests[i].precision; + os.base_ios.fill = tests[i].fill; + os.base_ios.width = tests[i].width; + ssb.base.pptr = ssb.base.pbase; + + switch (tests[i].type) { + case type_chr: + pos = call_func2(p_ostream_print_char, &os, (int) param_char[tests[i].param_index]); break; + } + + length = ssb.base.pptr - ssb.base.pbase; + expected_length = strlen(tests[i].expected_text); + ok(pos == &os, "Test %d: wrong return, expected %p got %p\n", i, &os, pos); + ok(os.base_ios.state == tests[i].expected_flags, "Test %d: expected %d got %d\n", i, + tests[i].expected_flags, os.base_ios.state); + ok(os.base_ios.width == 0, "Test %d: expected 0 got %d\n", i, os.base_ios.width); + ok(expected_length == length, "Test %d: wrong output length, expected %d got %d\n", i, expected_length, length); + ok(!strncmp(tests[i].expected_text, ssb.base.pbase, length), + "Test %d: wrong output, expected '%s' got '%s'\n", i, tests[i].expected_text, ssb.base.pbase); + } + + call_func1(p_ostream_vbase_dtor, &os); + call_func1(p_strstreambuf_dtor, &ssb); +} + START_TEST(msvcirt) { if(!init()) @@ -3013,6 +3082,7 @@ START_TEST(msvcirt) test_stdiobuf(); test_ios(); test_ostream(); + test_ostream_print(); FreeLibrary(msvcrt); FreeLibrary(msvcirt);

1 0

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

22 Jun '16

Module: wine Branch: master Commit: 65935c4c881bc3304b588d13c3d9ed3b49246db7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65935c4c881bc3304b588d13c… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:48 2016 +0100 msvcirt: Implement ostream::operator<< for strings. 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 | 9 ++++++--- dlls/msvcirt/tests/msvcirt.c | 21 +++++++++++++++++++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index a09b4d6..9ec61c3 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2625,7 +2625,11 @@ ostream* __thiscall ostream_print_unsigned_char(ostream *this, unsigned char c) DEFINE_THISCALL_WRAPPER(ostream_print_str, 8) ostream* __thiscall ostream_print_str(ostream *this, const char *str) { - FIXME("(%p %s) stub\n", this, str); + TRACE("(%p %s)\n", this, str); + if (ostream_opfx(this)) { + ostream_writepad(this, "", str); + ostream_osfx(this); + } return this; } @@ -2634,8 +2638,7 @@ ostream* __thiscall ostream_print_str(ostream *this, const char *str) DEFINE_THISCALL_WRAPPER(ostream_print_unsigned_str, 8) ostream* __thiscall ostream_print_unsigned_str(ostream *this, const unsigned char *str) { - FIXME("(%p %s) stub\n", this, str); - return this; + return ostream_print_str(this, (const char*) str); } /* ??6ostream@@QAEAAV0(a)F@Z */ diff --git a/dlls/msvcirt/tests/msvcirt.c b/dlls/msvcirt/tests/msvcirt.c index 2d776ad..2ce59e4 100644 --- a/dlls/msvcirt/tests/msvcirt.c +++ b/dlls/msvcirt/tests/msvcirt.c @@ -271,6 +271,7 @@ static ostream* (*__thiscall p_ostream_seekp)(ostream*, streampos); static streampos (*__thiscall p_ostream_tellp)(ostream*); static ostream* (*__thiscall p_ostream_writepad)(ostream*, const char*, const char*); static ostream* (*__thiscall p_ostream_print_char)(ostream*, char); +static ostream* (*__thiscall p_ostream_print_str)(ostream*, const char*); /* Emulate a __thiscall */ #ifdef __i386__ @@ -446,6 +447,7 @@ static BOOL init(void) SET(p_ostream_tellp, "?tellp(a)ostream@@QEAAJXZ"); SET(p_ostream_writepad, "?writepad(a)ostream@@AEAAAEAV1(a)PEBD0@Z"); SET(p_ostream_print_char, "??6ostream@@QEAAAEAV0(a)D@Z"); + SET(p_ostream_print_str, "??6ostream@@QEAAAEAV0(a)PEBD@Z"); } else { p_operator_new = (void*)GetProcAddress(msvcrt, "??2(a)YAPAXI@Z"); p_operator_delete = (void*)GetProcAddress(msvcrt, "??3(a)YAXPAX@Z"); @@ -551,6 +553,7 @@ static BOOL init(void) SET(p_ostream_tellp, "?tellp(a)ostream@@QAEJXZ"); SET(p_ostream_writepad, "?writepad(a)ostream@@AAEAAV1(a)PBD0@Z"); SET(p_ostream_print_char, "??6ostream@@QAEAAV0(a)D@Z"); + SET(p_ostream_print_str, "??6ostream@@QAEAAV0(a)PBD@Z"); } SET(p_ios_static_lock, "?x_lockc(a)ios@@0U_CRT_CRITICAL_SECTION@@A"); SET(p_ios_lockc, "?lockc(a)ios@@KAXXZ"); @@ -3013,8 +3016,9 @@ static void test_ostream_print(void) int i; char param_char[] = {'a', '9', 'e'}; + const char* param_str[] = {"Test", "800", "3.14159", " Test"}; struct ostream_print_test { - enum { type_chr } type; + enum { type_chr, type_str } type; int param_index; ios_io_state state; ios_flags flags; @@ -3035,7 +3039,18 @@ static void test_ostream_print(void) {type_chr, /* 'a' */ 0, IOSTATE_goodbit, FLAGS_internal|FLAGS_hex|FLAGS_showbase, 6, ' ', 4, " a", IOSTATE_goodbit}, {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_oct|FLAGS_showbase|FLAGS_uppercase, 6, 'i', 2, "i9", IOSTATE_goodbit}, {type_chr, /* '9' */ 1, IOSTATE_goodbit, FLAGS_showpos|FLAGS_scientific, 0, 'i', 2, "i9", IOSTATE_goodbit}, - {type_chr, /* 'e' */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit} + {type_chr, /* 'e' */ 2, IOSTATE_goodbit, FLAGS_left|FLAGS_right|FLAGS_uppercase, 0, '*', 8, "e*******", IOSTATE_goodbit}, + /* const char* */ + {type_str, /* "Test" */ 0, IOSTATE_badbit, 0, 6, ' ', 0, "", IOSTATE_badbit|IOSTATE_failbit}, + {type_str, /* "Test" */ 0, IOSTATE_eofbit, 0, 6, ' ', 0, "", IOSTATE_eofbit|IOSTATE_failbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, 0, 6, ' ', 0, "Test", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, 0, 6, ' ', 6, " Test", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, FLAGS_internal, 6, 'x', 6, "xxTest", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, FLAGS_left, 6, ' ', 5, "Test ", IOSTATE_goodbit}, + {type_str, /* "Test" */ 0, IOSTATE_goodbit, FLAGS_left|FLAGS_hex|FLAGS_showpoint, 6, '?', 6, "Test??", IOSTATE_goodbit}, + {type_str, /* "800" */ 1, IOSTATE_goodbit, FLAGS_showbase|FLAGS_showpos, 6, ' ', 4, " 800", IOSTATE_goodbit}, + {type_str, /* "3.14159" */ 2, IOSTATE_goodbit, FLAGS_scientific, 2, 'x', 2, "3.14159", IOSTATE_goodbit}, + {type_str, /* " Test" */ 3, IOSTATE_goodbit, FLAGS_skipws, 6, 'x', 2, " Test", IOSTATE_goodbit} }; pssb = call_func1(p_strstreambuf_ctor, &ssb); @@ -3054,6 +3069,8 @@ static void test_ostream_print(void) switch (tests[i].type) { case type_chr: pos = call_func2(p_ostream_print_char, &os, (int) param_char[tests[i].param_index]); break; + case type_str: + pos = call_func2(p_ostream_print_str, &os, param_str[tests[i].param_index]); break; } length = ssb.base.pptr - ssb.base.pbase;

1 0

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

22 Jun '16

Module: wine Branch: master Commit: c969efcaf219300244bbd460f028acb56982630a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c969efcaf219300244bbd460f… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Jun 22 13:59:49 2016 +0100 msvcirt: Implement ostream::operator<< for integers. 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 | 51 +++++++++++++++++++++++++++++++++++++------- dlls/msvcirt/tests/msvcirt.c | 43 +++++++++++++++++++++++++++++++++++-- 2 files changed, 84 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c969efcaf219300244bbd…

1 0

Jacek Caban : secur32/tests: Don' t load secur32.dll function dynamically in negotiate.c.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 8a29c57fd234be6f51d322fc5d4a7ca1c9bfa38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a29c57fd234be6f51d322fc5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 21 19:12:00 2016 +0200 secur32/tests: Don't load secur32.dll function dynamically in negotiate.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/Makefile.in | 2 +- dlls/secur32/tests/negotiate.c | 97 +++++++++++------------------------------- 2 files changed, 26 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a29c57fd234be6f51d32…

1 0

Alexandre Julliard : gdi32: Fix setting the path flags in PolyPolyline and PolyPolygon.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: e68d68fb7d9e6e61d37f597c194e74689b767d89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e68d68fb7d9e6e61d37f597c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 14:27:28 2016 +0900 gdi32: Fix setting the path flags in PolyPolyline and PolyPolygon. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index c6b87d4..ede3d61 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -1298,16 +1298,24 @@ static BOOL pathdrv_Polygon( PHYSDEV dev, const POINT *pts, INT cbPoints ) static BOOL pathdrv_PolyPolygon( PHYSDEV dev, const POINT* pts, const INT* counts, UINT polygons ) { struct path_physdev *physdev = get_path_physdev( dev ); - UINT poly; + UINT poly, count; BYTE *type; - for(poly = 0; poly < polygons; poly++) { - type = add_log_points( physdev, pts, counts[poly], PT_LINETO ); - if (!type) return FALSE; + if (!polygons) return FALSE; + for (poly = count = 0; poly < polygons; poly++) + { + if (counts[poly] < 2) return FALSE; + count += counts[poly]; + } + + type = add_log_points( physdev, pts, count, PT_LINETO ); + if (!type) return FALSE; + + /* make the first point of each polyline a PT_MOVETO, and close the last one */ + for (poly = 0; poly < polygons; type += counts[poly++]) + { type[0] = PT_MOVETO; - /* win98 adds an extra line to close the figure for some reason */ - add_log_points( physdev, pts, 1, PT_LINETO | PT_CLOSEFIGURE ); - pts += counts[poly]; + type[counts[poly] - 1] = PT_LINETO | PT_CLOSEFIGURE; } return TRUE; } @@ -1322,13 +1330,18 @@ static BOOL pathdrv_PolyPolyline( PHYSDEV dev, const POINT* pts, const DWORD* co UINT poly, count; BYTE *type; - for (poly = count = 0; poly < polylines; poly++) count += counts[poly]; + if (!polylines) return FALSE; + for (poly = count = 0; poly < polylines; poly++) + { + if (counts[poly] < 2) return FALSE; + count += counts[poly]; + } type = add_log_points( physdev, pts, count, PT_LINETO ); if (!type) return FALSE; /* make the first point of each polyline a PT_MOVETO */ - for (poly = 0; poly < polylines; poly++, type += counts[poly]) *type = PT_MOVETO; + for (poly = 0; poly < polylines; type += counts[poly++]) *type = PT_MOVETO; return TRUE; }

1 0

Alexandre Julliard : gdi32: Start a new path stroke when the current position differs from the last.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 84ce9dfba714fbc1e9849b94c79020d583098cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ce9dfba714fbc1e9849b94c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 22 14:29:10 2016 +0900 gdi32: Start a new path stroke when the current position differs from the last. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index ede3d61..0d4ad59 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -282,7 +282,9 @@ static BOOL start_new_stroke( struct path_physdev *physdev ) struct gdi_path *path = physdev->path; if (!path->newStroke && path->count && - !(path->flags[path->count - 1] & PT_CLOSEFIGURE)) + !(path->flags[path->count - 1] & PT_CLOSEFIGURE) && + path->points[path->count - 1].x == path->pos.x && + path->points[path->count - 1].y == path->pos.y) return TRUE; path->newStroke = FALSE; @@ -1234,11 +1236,7 @@ static BOOL pathdrv_PolyDraw( PHYSDEV dev, const POINT *pts, const BYTE *types, /* fall through */ default: /* restore original position */ - if (path->pos.x != orig_pos.x || path->pos.y != orig_pos.y) - { - path->newStroke = TRUE; - path->pos = orig_pos; - } + path->pos = orig_pos; return FALSE; }

1 0

Michael Stefaniuc : gdi32/tests: Use SetRect() instead of open coding it.
by Alexandre Julliard 22 Jun '16

22 Jun '16

Module: wine Branch: master Commit: 6d21655ed9396c0813f1be942080c5a4f65965b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d21655ed9396c0813f1be942… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jun 21 14:13:43 2016 +0200 gdi32/tests: Use SetRect() instead of open coding it. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index bcd085c..7e2e66d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -3097,8 +3097,7 @@ static void test_SetWinMetaFileBits(void) if (!wmfDC) return; SetWindowExtEx(wmfDC, 100, 100, NULL); - rect.left = rect.top = 0; - rect.right = rect.bottom = 50; + SetRect(&rect, 0, 0, 50, 50); FillRect(wmfDC, &rect, GetStockObject(BLACK_BRUSH)); wmf = CloseMetaFile(wmfDC); ok(wmf != NULL, "Metafile creation failed\n");

1 0

Julian Rüger : German translation for release 1.8.3
by Jeremy Newman 22 Jun '16

22 Jun '16

Module: website Branch: master Commit: 6b5343ba2560151412c55a9ce04ce5620dbc3c0a URL: http://source.winehq.org/git/website.git/?a=commit;h=6b5343ba2560151412c55a… Author: Julian Rüger <jr98(a)gmx.net> Date: Tue Jun 21 23:58:45 2016 +0200 German translation for release 1.8.3 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016061601.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/news/de/2016061601.xml b/news/de/2016061601.xml new file mode 100644 index 0000000..c401ee3 --- /dev/null +++ b/news/de/2016061601.xml @@ -0,0 +1,14 @@ +<news> +<date>16. Juni 2016</date> +<title>Wine 1.8.3 freigegeben</title> +<body> + Die Wartungsversion 1.8.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.8.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Diverse Fehlerkorrekturen.</li> + <li>Viele NVidia-Karten wurden zur GPU-Beschreibungstabelle hinzugefügt.</li> + <li>Updates der National-Language-Supportdateien.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.8/wine-1.8.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

Nikolay Sivov : msscript: Update to IViewObjectEx.
by Alexandre Julliard 21 Jun '16

21 Jun '16

Module: wine Branch: master Commit: 33c2a22f662830c52f7347a0ddb96901cad11dd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c2a22f662830c52f7347a0d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jun 21 13:41:35 2016 +0300 msscript: Update to IViewObjectEx. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 120 +++++++++++++++++++++++++++++-------- dlls/msscript.ocx/tests/msscript.c | 8 +++ 2 files changed, 103 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=33c2a22f662830c52f734…

1 0