November 2017 - Wine-Commits

Piotr Caban : vbscript: Add for each tests on array.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: wine Branch: master Commit: c8a94b5d7a39a323f73c2df380c4cfafd9b23ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8a94b5d7a39a323f73c2df38… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Nov 8 15:05:06 2017 +0100 vbscript: Add for each tests on array. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index a904f5d..2af77bd 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1304,6 +1304,35 @@ arr(0) = "not modified" modifyarr(arr) Call todo_wine_ok(arr(0) = "not modified", "arr(0) = " & arr(0)) +for x = 0 to UBound(arr) + arr(x) = x +next +y = 0 +for each x in arr + Call ok(x = y, "x = " & x & ", expected " & y) + Call ok(arr(y) = y, "arr(" & y & ") = " & arr(y)) + arr(y) = 1 + x = 1 + y = y+1 +next +Call ok(y = 4, "y = " & y & " after array enumeration") + +for x=0 to UBound(arr2, 1) + for y=0 to UBound(arr2, 2) + arr2(x, y) = x + y*(UBound(arr2, 1)+1) + next +next +y = 0 +for each x in arr2 + Call ok(x = y, "x = " & x & ", expected " & y) + y = y+1 +next +Call ok(y = 20, "y = " & y & " after array enumeration") + +for each x in noarr + Call ok(false, "Empty array contains: " & x) +next + ' It's allowed to declare non-builtin RegExp class... class RegExp public property get Global()

1 0

Alex Henrie : libport: Move rint fallback implementations from msvcrt to libport.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: wine Branch: master Commit: 06d9c7e25e4ff71731c81f172269c8cd81b0c68a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d9c7e25e4ff71731c81f172… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 6 21:01:13 2017 -0500 libport: Move rint fallback implementations from msvcrt to libport. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 1 + dlls/msvcrt/math.c | 24 ---------------- include/wine/port.h | 24 ++++++++++++++++ libs/port/Makefile.in | 1 + libs/port/rint.c | 66 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 92 insertions(+), 24 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6887bae..26dbb32 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -35,6 +35,7 @@ */ #include "config.h" +#include "wine/port.h" #include <stdarg.h> #include <math.h> diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 60ce4e6..b7288cf 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2604,11 +2604,7 @@ LDOUBLE CDECL MSVCR120_log2l(LDOUBLE x) */ double CDECL MSVCR120_rint(double x) { -#ifdef HAVE_RINT return rint(x); -#else - return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); -#endif } /********************************************************************* @@ -2616,11 +2612,7 @@ double CDECL MSVCR120_rint(double x) */ float CDECL MSVCR120_rintf(float x) { -#ifdef HAVE_RINTF return rintf(x); -#else - return MSVCR120_rint(x); -#endif } /********************************************************************* @@ -2636,11 +2628,7 @@ LDOUBLE CDECL MSVCR120_rintl(LDOUBLE x) */ MSVCRT_long CDECL MSVCR120_lrint(double x) { -#ifdef HAVE_LRINT return lrint(x); -#else - return MSVCR120_rint(x); -#endif } /********************************************************************* @@ -2648,11 +2636,7 @@ MSVCRT_long CDECL MSVCR120_lrint(double x) */ MSVCRT_long CDECL MSVCR120_lrintf(float x) { -#ifdef HAVE_LRINTF return lrintf(x); -#else - return MSVCR120_lrint(x); -#endif } /********************************************************************* @@ -2668,11 +2652,7 @@ MSVCRT_long CDECL MSVCR120_lrintl(LDOUBLE x) */ MSVCRT_longlong CDECL MSVCR120_llrint(double x) { -#ifdef HAVE_LLRINT return llrint(x); -#else - return MSVCR120_rint(x); -#endif } /********************************************************************* @@ -2680,11 +2660,7 @@ MSVCRT_longlong CDECL MSVCR120_llrint(double x) */ MSVCRT_longlong CDECL MSVCR120_llrintf(float x) { -#ifdef HAVE_LLRINTF return llrintf(x); -#else - return MSVCR120_llrint(x); -#endif } /********************************************************************* diff --git a/include/wine/port.h b/include/wine/port.h index 2989b39..addece0 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -272,6 +272,22 @@ int isinf(double x); int isnan(double x); #endif +#ifndef HAVE_LLRINT +__int64 llrint(double x); +#endif + +#ifndef HAVE_LLRINTF +__int64 llrintf(float x); +#endif + +#ifndef HAVE_LRINT +long lrint(double x); +#endif + +#ifndef HAVE_LRINTF +long lrintf(float x); +#endif + #ifndef HAVE_LSTAT int lstat(const char *file_name, struct stat *buf); #endif /* HAVE_LSTAT */ @@ -308,6 +324,14 @@ ssize_t pwrite( int fd, const void *buf, size_t count, off_t offset ); int readlink( const char *path, char *buf, size_t size ); #endif /* HAVE_READLINK */ +#ifndef HAVE_RINT +double rint(double x); +#endif + +#ifndef HAVE_RINTF +float rintf(float x); +#endif + #ifndef HAVE_STATVFS int statvfs( const char *path, struct statvfs *buf ); #endif diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index 9d7e44f..7fefda1 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -96,6 +96,7 @@ C_SRCS = \ pread.c \ pwrite.c \ readlink.c \ + rint.c \ spawn.c \ statvfs.c \ strcasecmp.c \ diff --git a/libs/port/rint.c b/libs/port/rint.c new file mode 100644 index 0000000..a99c00b --- /dev/null +++ b/libs/port/rint.c @@ -0,0 +1,66 @@ +/* + * rint family + * + * Copyright 2017 Alex Henrie + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" +#include "wine/port.h" + +#include <math.h> + +#ifndef HAVE_RINT +double rint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif + +#ifndef HAVE_RINTF +float rintf(float x) +{ + return rintf(x); +} +#endif + +#ifndef HAVE_LRINT +long lrint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif + +#ifndef HAVE_LRINTF +long lrintf(float x) +{ + return lrint(x); +} +#endif + +#ifndef HAVE_LLRINT +__int64 llrint(double x) +{ + return x >= 0 ? floor(x + 0.5) : ceil(x - 0.5); +} +#endif + +#ifndef HAVE_LLRINTF +__int64 llrintf(float x) +{ + return llrint(x); +} +#endif

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: wine Branch: master Commit: babc2951a0f73f5569fd30240ab646d617d8456b URL: http://source.winehq.org/git/wine.git/?a=commit;h=babc2951a0f73f5569fd30240… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Nov 8 09:01:48 2017 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 4c400ac..583287d 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-08-20 08:43+0300\n" +"PO-Revision-Date: 2017-11-08 09:01+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -14912,10 +14912,8 @@ msgid "Expert" msgstr "Ekspertas" #: winemine.rc:72 -#, fuzzy -#| msgid "Result" msgid "Reset Results" -msgstr "Rezultatas" +msgstr "Išvalyti rezultatus" #: winemine.rc:78 msgid "Congratulations!"

1 0

Vijay Kiran Kamuju : msvcp100: Add time_get:: get function with format parameters.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: wine Branch: master Commit: f94f1695184b8b51a8c5c2e10af03284cceafb13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f94f1695184b8b51a8c5c2e10… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Nov 8 10:01:33 2017 +0100 msvcp100: Add time_get::get function with format parameters. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 4 ++-- dlls/msvcp110/msvcp110.spec | 8 ++++---- dlls/msvcp120/msvcp120.spec | 8 ++++---- dlls/msvcp120_app/msvcp120_app.spec | 8 ++++---- dlls/msvcp140/msvcp140.spec | 8 ++++---- dlls/msvcp90/locale.c | 11 +++++++++++ 6 files changed, 29 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f94f1695184b8b51a8c5c…

1 0

Alistair Leslie-Hughes : oledb32: DataConvert support DBTYPE_VARIANT -> DBTYPE_R4.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: wine Branch: master Commit: 4a5759dcc21ceff27c94b246c561b3d25f0e7784 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5759dcc21ceff27c94b246c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 7 23:11:03 2017 +0000 oledb32: DataConvert support DBTYPE_VARIANT -> DBTYPE_R4. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/convert.c | 5 +++++ dlls/oledb32/tests/convert.c | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 7fa4c81..267de1b 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -343,6 +343,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_UI4: hr = VarR4FromUI4(*(DWORD*)src, d); break; case DBTYPE_I8: hr = VarR4FromI8(*(LONGLONG*)src, d); break; case DBTYPE_UI8: hr = VarR4FromUI8(*(ULONGLONG*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_R4)) == S_OK) + *d = V_R4(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> R4\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 708471b..b45775f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2580,6 +2580,15 @@ static void test_converttor4(void) ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 44, "got %ld\n", dst_len); + + dst_len = dst = 0x1234; + V_VT(&v) = VT_I2; + V_I2(&v) = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R4, 0, &dst_len, &v, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %f\n", dst); } static void test_converttor8(void)

1 0

Alistair Leslie-Hughes : oledb32: Fix typo.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: wine Branch: master Commit: 7563a497214796be079416fad92614ce040ed957 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7563a497214796be079416fad… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Nov 7 23:11:05 2017 +0000 oledb32: Fix typo. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/tests/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index b45775f..1d55e7f 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2645,7 +2645,7 @@ static void test_converttor8(void) dst_len = 44; V_VT(&var) = VT_NULL; - hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R4, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R8, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); ok(hr == S_OK, "got %08x\n", hr); ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); ok(dst_len == 44, "got %ld\n", dst_len);

1 0

Alexandre Julliard : patches: Determine signoff information automatically from the patch replies.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: tools Branch: master Commit: a5ffe4fb09403bb2cb1e1ac9dc12cdc4081b4682 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a5ffe4fb09403bb2cb1e1ac9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:19:30 2017 +0100 patches: Determine signoff information automatically from the patch replies. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/patches/update b/patches/update index 9e12c4b..87e640d 100755 --- a/patches/update +++ b/patches/update @@ -99,6 +99,12 @@ sub format_author($) return $str; } +sub uniq +{ + my %seen; + return grep { !$seen{$_}++ } @_; +} + my $js = <<END; function toggle_display(id) { @@ -185,16 +191,6 @@ foreach my $file (readdir DIR) $patch{"review"} = format_author($_); close REVIEW; } - if (open SIGNOFF, "<:raw", "$dir/$file.signoff") - { - while (<SIGNOFF>) - { - chomp; - utf8::decode($_); - push @{$patch{"signoff"}}, format_author($_); - } - close SIGNOFF; - } $patch{"testbot"} = ""; $patch{"testjob"} = ""; $patch{"testurl"} = ""; @@ -243,6 +239,7 @@ foreach my $file (sort keys %patches) # add it to the parent's children and remove it from the list $patch->{"parent"} = $parent; push @{$parent->{"children"}}, $patch; + push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; delete $patches{$file}; } @@ -271,9 +268,10 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { printf INDEX "<td></td>"; } - if (defined($patch->{"signoff"})) + my @signoff = defined($patch->{"signoff"}) ? uniq( @{$patch->{"signoff"}} ) : (); + if (@signoff) { - printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @{$patch->{"signoff"}}; + printf INDEX "<td class=\"checkmark\" onclick=\"toggle_display('$file.signoff')\">%s</td>", "✓" x @signoff; } else { @@ -298,11 +296,11 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k print INDEX "<td></td>"; } print INDEX "</tr>\n"; - if (defined($patch->{"signoff"})) + if (@signoff) { printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", - $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @{$patch->{"signoff"}}); + $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @signoff ); } foreach my $child (@{$patch->{"children"}}) {

1 0

Alexandre Julliard : patches: Display replies under the main patch.
by Alexandre Julliard Nov. 8, 2017

Nov. 8, 2017

Module: tools Branch: master Commit: 0d60762f674e42035b8ad788b2a26f49a8b97fe5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0d60762f674e42035b8ad788… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 10:17:12 2017 +0100 patches: Display replies under the main patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/patches.css | 5 +++- patches/update | 84 ++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 75 insertions(+), 14 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index c1ef34f..f7bb560 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -132,15 +132,18 @@ div.buglist { border: 1px solid #601919; } table.main, table.legend { width: 100%; } +table.main { border-collapse: collapse; } table.legend ul { margin: 2px 0; } tr.even { background-color: #fff8f8; } tr.odd { background-color: #f8e8e8; } +.indent { padding: 0 2em; } .id, .status, .testbot { text-align: center; } -.id, .status, .author { white-space: nowrap; padding: 0 3px; } +.id, .status, .author { white-space: nowrap; padding: 2px 3px; } .checkmark { text-align: center; color:green; } +.arrow { text-align: center; padding: 0 0; } .failmark { text-align: center; color: red; } .signoffextra { color: #A50D0D; border: 1px solid #601919; } .sha1 { white-space: nowrap; font-family: monospace; padding: 2px 12px; } diff --git a/patches/update b/patches/update index cdc172d..9e12c4b 100755 --- a/patches/update +++ b/patches/update @@ -90,6 +90,7 @@ my @legend = my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches; +my %messages; sub format_author($) { @@ -126,7 +127,7 @@ print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status< print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; print INDEX "<table id=\"main_table\" class=\"main\"><thead><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", - "<th class=\"author\">Author</th>", + "<th colspan=\"2\" class=\"author\">Author</th>", "<th class=\"subject\">Subject</th>", "<th class=\"author\">Reviewer</th>", "<th class=\"status\">Sign</th>", @@ -144,6 +145,8 @@ foreach my $file (readdir DIR) utf8::decode($_); if (/^Subject: (.*)$/) { $patch{"subject"} = $1; } elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } + elsif (/^Message-Id: (.*)$/) { $patch{"msgid"} = $1; } + elsif (/^In-Reply-To: (.*)$/) { $patch{"reply"} = $1; } last if (/^$/); } while (<PATCH>) @@ -152,8 +155,14 @@ foreach my $file (readdir DIR) if (/^\s*Signed-off-by: (.*)$/) { push @{$patch{"signoff"}}, format_author($1); } last if (/^---$/); } + while (<PATCH>) + { + utf8::decode($_); + if (/^diff --git a\//) { $patch{"has_patch"} = 1; last; } + } close PATCH; + $patch{"id"} = $file; $patch{"status"} = "nil"; if (open STATUS, "<$dir/$file.status") { @@ -208,19 +217,52 @@ foreach my $file (readdir DIR) { $patch{"testbot"} = "Failed"; } + if (defined $patch{"msgid"}) + { + $messages{$patch{"msgid"}} = \%patch; + } $patches{$file} = \%patch; } closedir DIR; +# build mail threads + +foreach my $file (sort keys %patches) +{ + my $patch = $patches{$file}; + next if defined $patch->{"has_patch"}; + next unless defined $patch->{"reply"}; + next unless defined $messages{$patch->{"reply"}}; + my $parent = $messages{$patch->{"reply"}}; + # find top parent + while (!defined($parent->{"has_patch"}) && defined($parent->{"reply"})) + { + $parent = $messages{$parent->{"reply"}}; + } + next unless defined $parent; + # add it to the parent's children and remove it from the list + $patch->{"parent"} = $parent; + push @{$parent->{"children"}}, $patch; + delete $patches{$file}; +} + my $row = 0; foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } keys %patches) { my $patch = $patches{$file}; - printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td><td class=\"author\">%s</td>", - $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}, - escapeHTML($patch->{"author"}); - printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", - escapeHTML($patch->{"subject"}); + + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>", + $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}; + if (defined $patch->{"children"}) + { + printf INDEX "<td class=\"author\">%s</td>", escapeHTML($patch->{"author"}); + printf INDEX "<td class=\"arrow\" onclick=\"toggle_display('$file.reply')\">▼</td>"; + } + else + { + printf INDEX "<td colspan=\"2\" class=\"author\">%s</td>", escapeHTML($patch->{"author"}); + } + printf INDEX "<td class=\"subject\"><a href=\"data/$file\">%s</a></td>", escapeHTML($patch->{"subject"}); if ($patch->{"review"}) { printf INDEX "<td class=\"author\">%s</td>", escapeHTML($patch->{"review"}); @@ -259,9 +301,17 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k if (defined($patch->{"signoff"})) { printf INDEX "<tr class=\"%s\" id=\"$file.signoff\" style=\"display: none;\" onclick=\"toggle_display('$file.signoff')\">" . - "<td colspan=\"4\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", + "<td colspan=\"5\" /><td colspan=\"4\" class=\"signoffextra author\">%s</td></tr>\n", $row & 1 ? "odd" : "even", join("", map { "Signed-off-by: " . escapeHTML($_) . "<br/>"; } @{$patch->{"signoff"}}); } + foreach my $child (@{$patch->{"children"}}) + { + printf INDEX "<tr class=\"%s\" id=\"$file.reply\" style=\"display: none;\" onclick=\"toggle_display('$file.reply')\">" . + "<td colspan=\"2\" /><td colspan=\"2\" class=\"reply author\"><span class=\"indent\" />%s</td> " . + "<td class=\"reply author\"><span class=\"indent\" /><a href=\"data/%s\">%s</a></td> " . + "<td colspan=\"4\" /></tr>\n", + $row & 1 ? "odd" : "even", escapeHTML($child->{"author"}), $child->{"id"}, escapeHTML($child->{"subject"}); + } $row++; } print INDEX "</tbody></table></div>\n"; @@ -284,7 +334,7 @@ my $sorter = <<END; tbody = table.children[1], ths = thead.getElementsByTagName('th'), trs = tbody.getElementsByTagName('tr'), - i, do_reverse, th, sort_func; + i, j, k, id, do_reverse, th, sort_func; for (i = 0; i < ths.length; i++) ths[i].onclick = sort_table; @@ -307,13 +357,20 @@ my $sorter = <<END; do_reverse = 1; th.setAttribute('data-order', do_reverse) - for (j = 0, i = trs.length - 1; i != -1; i--) + for (j = 0, k = 0, i = trs.length - 1; i != -1; i--) { - tr = tbody.removeChild(trs[i]) + tr = tbody.removeChild(trs[0]) if (!tr.getAttribute('id')) + { clone_trs[j++] = tr; - else - sign_trs[text_content(trs[i - 1].children[0])] = tr; /* based on the patch ID */ + id = text_content(tr.children[0]); + k = 0; + } + else if (id) /* based on the patch ID */ + { + if (!k) sign_trs[id] = []; + sign_trs[id][k++] = tr; + } } clone_trs.sort(sorter); @@ -323,7 +380,8 @@ my $sorter = <<END; tbody.appendChild(clone_trs[i]); j = text_content(clone_trs[i].children[0]); if (sign_trs[j]) - tbody.appendChild(sign_trs[j]); + for (k = 0; k < sign_trs[j].length; k++) + tbody.appendChild(sign_trs[j][k]); } }

1 0

Andrey Semakin : winemine: Add Reset Results button.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: b75b6655ef644fed0353bf0947e3929c2976fcd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b75b6655ef644fed0353bf094… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Mon Nov 6 16:13:27 2017 +0500 winemine: Add Reset Results button. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 22 ++++++++++++++-------- po/bg.po | 22 ++++++++++++++-------- po/ca.po | 22 ++++++++++++++-------- po/cs.po | 22 ++++++++++++++-------- po/da.po | 22 ++++++++++++++-------- po/de.po | 22 ++++++++++++++-------- po/el.po | 21 +++++++++++++-------- po/en.po | 20 ++++++++++++-------- po/en_US.po | 20 ++++++++++++-------- po/eo.po | 22 ++++++++++++++-------- po/es.po | 22 ++++++++++++++-------- po/fa.po | 21 +++++++++++++-------- po/fi.po | 22 ++++++++++++++-------- po/fr.po | 22 ++++++++++++++-------- po/he.po | 22 ++++++++++++++-------- po/hi.po | 20 ++++++++++++-------- po/hr.po | 22 ++++++++++++++-------- po/hu.po | 22 ++++++++++++++-------- po/it.po | 22 ++++++++++++++-------- po/ja.po | 22 ++++++++++++++-------- po/ko.po | 22 ++++++++++++++-------- po/lt.po | 22 ++++++++++++++-------- po/ml.po | 20 ++++++++++++-------- po/nb_NO.po | 22 ++++++++++++++-------- po/nl.po | 22 ++++++++++++++-------- po/or.po | 20 ++++++++++++-------- po/pa.po | 20 ++++++++++++-------- po/pl.po | 22 ++++++++++++++-------- po/pt_BR.po | 22 ++++++++++++++-------- po/pt_PT.po | 22 ++++++++++++++-------- po/rm.po | 20 ++++++++++++-------- po/ro.po | 22 ++++++++++++++-------- po/ru.po | 20 ++++++++++++-------- po/sk.po | 22 ++++++++++++++-------- po/sl.po | 22 ++++++++++++++-------- po/sr_RS(a)cyrillic.po | 22 ++++++++++++++-------- po/sr_RS(a)latin.po | 22 ++++++++++++++-------- po/sv.po | 22 ++++++++++++++-------- po/te.po | 20 ++++++++++++-------- po/th.po | 21 +++++++++++++-------- po/tr.po | 22 ++++++++++++++-------- po/uk.po | 22 ++++++++++++++-------- po/wa.po | 20 ++++++++++++-------- po/wine.pot | 20 ++++++++++++-------- po/zh_CN.po | 22 ++++++++++++++-------- po/zh_TW.po | 22 ++++++++++++++-------- programs/winemine/dialog.c | 14 ++++++++++++++ programs/winemine/main.c | 14 ++++++++++++-- programs/winemine/main.h | 2 ++ programs/winemine/resource.h | 1 + programs/winemine/winemine.rc | 23 ++++++++++++----------- 51 files changed, 660 insertions(+), 381 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b75b6655ef644fed0353b…

1 0

Gerald Pfeifer : configure: Use the -Wno-packed-not-aligned compiler option if available.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 6864803f1ab70f9f9e90903b13e67da40973d12a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6864803f1ab70f9f9e90903b1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sat Nov 4 20:06:07 2017 +0100 configure: Use the -Wno-packed-not-aligned compiler option if available. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 25 +++++++++++++++++++++++++ configure.ac | 1 + 2 files changed, 26 insertions(+) diff --git a/configure b/configure index cb21f2a..4a1d0eb 100755 --- a/configure +++ b/configure @@ -14876,6 +14876,31 @@ $as_echo "$ac_cv_cflags__Wignored_qualifiers" >&6; } if test "x$ac_cv_cflags__Wignored_qualifiers" = xyes; then : EXTRACFLAGS="$EXTRACFLAGS -Wignored-qualifiers" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wno-packed-not-aligned" >&5 +$as_echo_n "checking whether the compiler supports -Wno-packed-not-aligned... " >&6; } +if ${ac_cv_cflags__Wno_packed_not_aligned+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_wine_try_cflags_saved=$CFLAGS +CFLAGS="$CFLAGS -Wno-packed-not-aligned" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int main(int argc, char **argv) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_cflags__Wno_packed_not_aligned=yes +else + ac_cv_cflags__Wno_packed_not_aligned=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cflags__Wno_packed_not_aligned" >&5 +$as_echo "$ac_cv_cflags__Wno_packed_not_aligned" >&6; } +if test "x$ac_cv_cflags__Wno_packed_not_aligned" = xyes; then : + EXTRACFLAGS="$EXTRACFLAGS -Wno-packed-not-aligned" +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wshift-overflow=2" >&5 $as_echo_n "checking whether the compiler supports -Wshift-overflow=2... " >&6; } if ${ac_cv_cflags__Wshift_overflow_2+:} false; then : diff --git a/configure.ac b/configure.ac index 29f4cd1..637979a 100644 --- a/configure.ac +++ b/configure.ac @@ -1824,6 +1824,7 @@ then WINE_TRY_CFLAGS([-Wdeclaration-after-statement]) WINE_TRY_CFLAGS([-Wempty-body]) WINE_TRY_CFLAGS([-Wignored-qualifiers]) + WINE_TRY_CFLAGS([-Wno-packed-not-aligned]) WINE_TRY_CFLAGS([-Wshift-overflow=2]) WINE_TRY_CFLAGS([-Wstrict-prototypes]) WINE_TRY_CFLAGS([-Wtype-limits])

1 0

Józef Kucia : wined3d: Invalidate pixel shader only when rasterization is toggled.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 4cfa13c5335b06d1c877994d9309da7a984498cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfa13c5335b06d1c877994d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:17 2017 +0100 wined3d: Invalidate pixel shader only when rasterization is toggled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 6 ++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 99f3ce2..95e79f7 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -648,7 +648,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - if (shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + if (is_rasterization_disabled(shader)) { glEnable(GL_RASTERIZER_DISCARD); checkGLcall("enable rasterizer discard"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6d0e6a1..0ff9ee4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -266,6 +266,7 @@ struct glsl_context_data { struct glsl_shader_prog_link *glsl_program; GLenum vertex_color_clamp; + BOOL rasterization_disabled; }; struct glsl_ps_compiled_shader @@ -8062,7 +8063,6 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; - const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -8089,9 +8089,9 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - if (so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + if (is_rasterization_disabled(shader)) { - shader_glsl_generate_stream_output_setup(priv, shader, so_desc); + shader_glsl_generate_stream_output_setup(priv, shader, &shader->u.gs.so_desc); } else { @@ -10013,7 +10013,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } /* A pixel shader is not used when rasterization is disabled. */ - if (gshader && gshader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + if (is_rasterization_disabled(gshader)) { ps_id = 0; ps_list = NULL; @@ -11366,7 +11366,13 @@ static void glsl_vertex_pipe_hs(struct wined3d_context *context, static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + struct glsl_context_data *ctx_data = context->shader_backend_data; + BOOL rasterization_disabled; + + rasterization_disabled = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); + if (ctx_data->rasterization_disabled != rasterization_disabled) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + ctx_data->rasterization_disabled = rasterization_disabled; if (state->shader[WINED3D_SHADER_TYPE_DOMAIN]) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31d83c7..5368be4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4325,6 +4325,12 @@ static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struc return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); } +static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader) +{ + return geometry_shader + && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) {

1 0

Józef Kucia : d3d11/tests: Add test for stream output components.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 9b8404bfda69c5011fd173657ed18ff0f9e19349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8404bfda69c5011fd173657… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:16 2017 +0100 d3d11/tests: Add test for stream output components. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b8404bfda69c5011fd17…

1 0

Andrey Semakin : winemine: Add WM_RBUTTONUP to cases of TestMines().
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: dc3293612db9ac6ff621d68d9b134e0d8d065209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3293612db9ac6ff621d68d9… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sun Nov 5 19:24:25 2017 +0500 winemine: Add WM_RBUTTONUP to cases of TestMines(). Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 27fc159..c7d4925 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -743,9 +743,9 @@ static void TestMines( BOARD *p_board, POINT pt, int msg ) case WM_RBUTTONDOWN: AddFlag( p_board, col, row ); break; - default: - WINE_TRACE("Unknown message type received in TestMines\n"); - break; + + case WM_RBUTTONUP: + return; } if( draw )

1 0

Piotr Caban : oleaut32: Ignore underflows in VarR8FromStr.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 409bafcc73d05adb4e67882f4ecdfc22632389dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=409bafcc73d05adb4e67882f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 7 16:22:57 2017 +0100 oleaut32: Ignore underflows in VarR8FromStr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 5 +++++ dlls/oleaut32/tests/vartype.c | 1 + dlls/oleaut32/variant.c | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d8a6ebf..429ffbb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1947,6 +1947,11 @@ static void test_VarNumFromParseNum(void) /* Currency is preferred over decimal */ SETRGB(0, 1); CONVERT(1,0,0,1,0,0, VTBIT_CY|VTBIT_DECIMAL); EXPECT_CY(1); + + /* Underflow test */ + SETRGB(0, 1); CONVERT(1,0,NUMPRS_EXPONENT,1,0,-94938484, VTBIT_R4); EXPECT_R4(0.0); + SETRGB(0, 1); CONVERT(1,0,NUMPRS_EXPONENT,1,0,-94938484, VTBIT_R8); EXPECT_R8(0.0); + SETRGB(0, 1); CONVERT(1,0,NUMPRS_EXPONENT,1,0,-94938484, VTBIT_CY); EXPECT_CY(0); } diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index be6ec91..6348fee 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2729,6 +2729,7 @@ static void test_VarR8FromStr(void) CONVERT_STR(VarR8FromStr,"0.5",LOCALE_NOUSEROVERRIDE); EXPECT(0.5); CONVERT_STR(VarR8FromStr,"0.6",LOCALE_NOUSEROVERRIDE); EXPECT(0.6); CONVERT_STR(VarR8FromStr,"1.5",LOCALE_NOUSEROVERRIDE); EXPECT(1.5); + CONVERT_STR(VarR8FromStr,"1e-94938484",LOCALE_NOUSEROVERRIDE); EXPECT(0); /* We already have exhaustive tests for number parsing, so skip those tests here */ } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a760a65..a1feb27 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2392,8 +2392,8 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, { if (whole < dblMinimums[10] && whole != 0) { - dwVtBits &= ~(VTBIT_R4|VTBIT_R8|VTBIT_CY); /* Underflow */ - bOverflow = TRUE; + whole = 0; /* ignore underflow */ + divisor10 = 0; break; } whole = whole / dblMultipliers[10]; @@ -2403,8 +2403,8 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, { if (whole < dblMinimums[divisor10] && whole != 0) { - dwVtBits &= ~(VTBIT_R4|VTBIT_R8|VTBIT_CY); /* Underflow */ - bOverflow = TRUE; + whole = 0; /* ignore underflow */ + divisor10 = 0; } else whole = whole / dblMultipliers[divisor10];

1 0

Józef Kucia : wined3d: Disable pixel shader when rasterization is disabled.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 57433da776d31c356fbfe242e4fcbe8f59a2bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57433da776d31c356fbfe242e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:14 2017 +0100 wined3d: Disable pixel shader when rasterization is disabled. Allows us to split shader output variables when rasterization is disabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 91a6c6e..11d9146 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9926,7 +9926,13 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const gs_id = find_glsl_geometry_shader(context, priv, gshader, &args); } - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) + /* A pixel shader is not used when rasterization is disabled. */ + if (gshader && gshader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + { + ps_id = 0; + ps_list = NULL; + } + else if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) { ps_id = ctx_data->glsl_program->ps.id; ps_list = &ctx_data->glsl_program->ps.shader_entry; @@ -11274,6 +11280,8 @@ static void glsl_vertex_pipe_hs(struct wined3d_context *context, static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + if (state->shader[WINED3D_SHADER_TYPE_DOMAIN]) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN; else if (state->shader[WINED3D_SHADER_TYPE_VERTEX]

1 0

Andrey Semakin : winemine: Save board without need to correctly finish the app.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 1392ab11122848de566424a6fee589d653237f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1392ab11122848de566424a6f… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Mon Nov 6 14:23:19 2017 +0500 winemine: Save board without need to correctly finish the app. Thus player will never lose his best time even if app crashes. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index c7d4925..d8201b3 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -178,6 +178,8 @@ static void SaveBoard( BOARD *p_board ) RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); + + WINE_TRACE("Board has been saved.\n"); } static void DestroyBoard( BOARD *p_board ) @@ -823,6 +825,7 @@ static void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_CONGRATS), hWnd, CongratsDlgProc, (LPARAM) p_board); + SaveBoard( p_board ); DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_TIMES), hWnd, TimesDlgProc, (LPARAM) p_board); }

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeSetCompositingMode.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: baba9a8e4830bf00a68ce09cd86b39f4ec581220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baba9a8e4830bf00a68ce09cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 7 12:28:02 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeSetCompositingMode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c28ce4b..d764412 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2857,6 +2857,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetSmoothingMode(real_metafile->playback_graphics, (flags >> 1) & 0xff); } + case EmfPlusRecordTypeSetCompositingMode: + { + return GdipSetCompositingMode(real_metafile->playback_graphics, flags & 0xff); + } case EmfPlusRecordTypeObject: { return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data);

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillClosedCurve.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 784fe04994f1558ea67b16990ef2690c8c83ca18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784fe04994f1558ea67b16990… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 7 12:28:01 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillClosedCurve. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 989ecd0..c28ce4b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -487,6 +487,20 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFillClosedCurve +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + float Tension; + DWORD Count; + union + { + EmfPlusPointR7 pointsR[1]; + EmfPlusPoint points[1]; + EmfPlusPointF pointsF[1]; + } PointData; +} EmfPlusFillClosedCurve; + typedef struct EmfPlusFillEllipse { EmfPlusRecordHeader Header; @@ -2982,6 +2996,86 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillClosedCurve: + { + static const UINT fixed_part_size = FIELD_OFFSET(EmfPlusFillClosedCurve, PointData) - + sizeof(EmfPlusRecordHeader); + EmfPlusFillClosedCurve *fill = (EmfPlusFillClosedCurve *)header; + GpSolidFill *solidfill = NULL; + GpFillMode mode; + GpBrush *brush; + UINT size, i; + + if (dataSize <= fixed_part_size) + return InvalidParameter; + + if (fill->Count == 0) + return InvalidParameter; + + if (flags & 0x800) /* P */ + size = (fixed_part_size + sizeof(EmfPlusPointR7) * fill->Count + 3) & ~3; + else if (flags & 0x4000) /* C */ + size = fixed_part_size + sizeof(EmfPlusPoint) * fill->Count; + else + size = fixed_part_size + sizeof(EmfPlusPointF) * fill->Count; + + if (dataSize != size) + return InvalidParameter; + + mode = flags & 0x200 ? FillModeWinding : FillModeAlternate; /* W */ + + if (flags & 0x8000) /* S */ + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & (0x800 | 0x4000)) + { + GpPointF *points = GdipAlloc(fill->Count * sizeof(*points)); + if (points) + { + if (flags & 0x800) /* P */ + { + for (i = 1; i < fill->Count; i++) + { + points[i].X = points[i - 1].X + fill->PointData.pointsR[i].X; + points[i].Y = points[i - 1].Y + fill->PointData.pointsR[i].Y; + } + } + else + { + for (i = 0; i < fill->Count; i++) + { + points[i].X = fill->PointData.points[i].X; + points[i].Y = fill->PointData.points[i].Y; + } + } + + stat = GdipFillClosedCurve2(real_metafile->playback_graphics, brush, + points, fill->Count, fill->Tension, mode); + GdipFree(points); + } + else + stat = OutOfMemory; + } + else + stat = GdipFillClosedCurve2(real_metafile->playback_graphics, brush, + (const GpPointF *)fill->PointData.pointsF, fill->Count, fill->Tension, mode); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeFillEllipse: { EmfPlusFillEllipse *fill = (EmfPlusFillEllipse *)header;

1 0

Józef Kucia : wined3d: Handle stream output components when rasterization is disabled.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: b9464cfdc250a521b4f0823e4252cec36361896c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9464cfdc250a521b4f0823e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:15 2017 +0100 wined3d: Handle stream output components when rasterization is disabled. Geometry shader outputs can be freely split when there is no pixel shader. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 104 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 11d9146..6d0e6a1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -838,14 +838,23 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 if (e->component_idx || e->component_count != 4) { - FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); - append_transform_feedback_skip_components(varyings, &count, - &strings, &length, buffer, e->component_count); - continue; - } + if (so_desc->rasterizer_stream_idx != WINED3D_NO_RASTERIZER_STREAM) + { + FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); + append_transform_feedback_skip_components(varyings, &count, + &strings, &length, buffer, e->component_count); + continue; + } - string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); - append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + string_buffer_sprintf(buffer, "shader_in_out.reg%u_%u_%u", + e->register_idx, e->component_idx, e->component_idx + e->component_count - 1); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } + else + { + string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } } if (buffer_idx < so_desc->buffer_stride_count @@ -7119,6 +7128,75 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl return ret; } +static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *priv, + const struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc) +{ + struct wined3d_string_buffer *buffer = &priv->shader_buffer; + unsigned int i; + + shader_addline(buffer, "out shader_in_out\n{\n"); + for (i = 0; i < so_desc->element_count; ++i) + { + const struct wined3d_stream_output_element *e = &so_desc->elements[i]; + + if (e->stream_idx) + { + FIXME("Unhandled stream %u.\n", e->stream_idx); + continue; + } + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + continue; + + if (e->component_idx || e->component_count != 4) + { + if (e->component_count == 1) + shader_addline(buffer, "float"); + else + shader_addline(buffer, "vec%u", e->component_count); + shader_addline(buffer, " reg%u_%u_%u;\n", + e->register_idx, e->component_idx, e->component_idx + e->component_count - 1); + } + else + { + shader_addline(buffer, "vec4 reg%u;\n", e->register_idx); + } + } + shader_addline(buffer, "} shader_out;\n"); + + shader_addline(buffer, "void setup_gs_output(in vec4 outputs[%u])\n{\n", + shader->limits->packed_output); + for (i = 0; i < so_desc->element_count; ++i) + { + const struct wined3d_stream_output_element *e = &so_desc->elements[i]; + + if (e->stream_idx) + { + FIXME("Unhandled stream %u.\n", e->stream_idx); + continue; + } + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + continue; + + if (e->component_idx || e->component_count != 4) + { + DWORD write_mask; + char str_mask[6]; + + write_mask = ((1u << e->component_count) - 1) << e->component_idx; + shader_glsl_write_mask_to_str(write_mask, str_mask); + shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", + e->register_idx, e->component_idx, e->component_idx + e->component_count - 1, + e->register_idx, str_mask); + } + else + { + shader_addline(buffer, "shader_out.reg%u = outputs[%u];\n", + e->register_idx, e->register_idx); + } + } + shader_addline(buffer, "}\n"); +} + static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const DWORD *interpolation_mode) @@ -7984,6 +8062,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; + const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -8010,8 +8089,15 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, - gl_info, TRUE, args->interpolation_mode); + if (so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + { + shader_glsl_generate_stream_output_setup(priv, shader, so_desc); + } + else + { + shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, + gl_info, TRUE, args->interpolation_mode); + } shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, NULL, NULL))) return 0;

1 0

Jacek Caban : mshtml: Merge hlink.c into persist.c.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 2de948e86c184ee4b9d958e7878ee31f8c15496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de948e86c184ee4b9d958e78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 7 14:28:15 2017 +0100 mshtml: Merge hlink.c into persist.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/hlink.c | 123 ------------------------------------------- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/persist.c | 86 ++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 126 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 097ba70..f281c52 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ conpoint.c \ dispex.c \ editor.c \ - hlink.c \ htmlanchor.c \ htmlarea.c \ htmlattr.c \ diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c deleted file mode 100644 index 7ce0423..0000000 --- a/dlls/mshtml/hlink.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2005-2006 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" - -#include "wine/debug.h" - -#include "mshtml_private.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); - -/********************************************************** - * IHlinkTarget implementation - */ - -static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface) -{ - return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface); -} - -static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - return htmldoc_query_interface(This, riid, ppv); -} - -static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - return htmldoc_addref(This); -} - -static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - return htmldoc_release(This); -} - -static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%p)\n", This, pihlbc); - return E_NOTIMPL; -} - -static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%p)\n", This, ppihlbc); - return E_NOTIMPL; -} - -static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - - TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); - - if(grfHLNF) - FIXME("Unsupported grfHLNF=%08x\n", grfHLNF); - if(pwzJumpLocation) - FIXME("JumpLocation not supported\n"); - - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); - - return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); -} - -static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign, - IMoniker **ppimkLocation) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); - return E_NOTIMPL; -} - -static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation, - LPWSTR *ppwzFriendlyName) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName); - return E_NOTIMPL; -} - -static const IHlinkTargetVtbl HlinkTargetVtbl = { - HlinkTarget_QueryInterface, - HlinkTarget_AddRef, - HlinkTarget_Release, - HlinkTarget_SetBrowseContext, - HlinkTarget_GetBrowseContext, - HlinkTarget_Navigate, - HlinkTarget_GetMoniker, - HlinkTarget_GetFriendlyName -}; - -void HTMLDocument_Hlink_Init(HTMLDocument *This) -{ - This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl; -} diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 55d55f7..0752730 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4866,7 +4866,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) HTMLDocument_View_Init(doc); HTMLDocument_Window_Init(doc); HTMLDocument_Service_Init(doc); - HTMLDocument_Hlink_Init(doc); ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocument_cpc); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8965d46..9fff0d2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -869,7 +869,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_View_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Window_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Service_Init(HTMLDocument*) DECLSPEC_HIDDEN; -void HTMLDocument_Hlink_Init(HTMLDocument*) DECLSPEC_HIDDEN; void TargetContainer_Init(HTMLDocumentObj*) DECLSPEC_HIDDEN; void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index fa1bb6e..55cb5b0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -1137,6 +1137,91 @@ static const IPersistHistoryVtbl PersistHistoryVtbl = { PersistHistory_GetPositionCookie }; +/********************************************************** + * IHlinkTarget implementation + */ + +static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface); +} + +static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%p)\n", This, pihlbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%p)\n", This, ppihlbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + + TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); + + if(grfHLNF) + FIXME("Unsupported grfHLNF=%08x\n", grfHLNF); + if(pwzJumpLocation) + FIXME("JumpLocation not supported\n"); + + if(!This->doc_obj->client) + return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + + return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); +} + +static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign, + IMoniker **ppimkLocation) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation, + LPWSTR *ppwzFriendlyName) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName); + return E_NOTIMPL; +} + +static const IHlinkTargetVtbl HlinkTargetVtbl = { + HlinkTarget_QueryInterface, + HlinkTarget_AddRef, + HlinkTarget_Release, + HlinkTarget_SetBrowseContext, + HlinkTarget_GetBrowseContext, + HlinkTarget_Navigate, + HlinkTarget_GetMoniker, + HlinkTarget_GetFriendlyName +}; + void HTMLDocument_Persist_Init(HTMLDocument *This) { This->IPersistMoniker_iface.lpVtbl = &PersistMonikerVtbl; @@ -1144,4 +1229,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This) This->IMonikerProp_iface.lpVtbl = &MonikerPropVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IPersistHistory_iface.lpVtbl = &PersistHistoryVtbl; + This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl; }

1 0

Piotr Caban : oleaut32: Fix automatic value getting in ITypeInfo::Invoke.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 61c18632b84e97918b13bebfc0b9dbbd4adb7a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=61c18632b84e97918b13bebfc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 7 13:30:14 2017 +0100 oleaut32: Fix automatic value getting in ITypeInfo::Invoke. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/test_reg.idl | 11 ++++ dlls/oleaut32/tests/typelib.c | 116 ++++++++++++++++++++++++++++++++++++++- dlls/oleaut32/typelib.c | 2 +- 3 files changed, 125 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 179d8c5..c9be76b 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -131,6 +131,15 @@ library register_test } [ + uuid(fed318b2-c2ed-11e7-abc4-cec278b6b50a) + ] + interface ICollection : IDispatch + { + [id(DISPID_VALUE)] + HRESULT Item([in] int i, [out, retval] int *p); + } + + [ uuid(f1b68c3b-02a3-4110-bc4c-cf9bc7e7f177) ] interface IInvokeTest : IDispatch @@ -143,6 +152,8 @@ library register_test LONG testprop2([in] IUnknown *i); [id(3)] HRESULT testfunc([in] int i, [out, retval] int *p); + [propget, id(4)] + HRESULT testget([out, retval] ICollection **p); } /* uuid is same as for test_struct2 in test_tlb.idl, fields are different */ diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index bb70164..950ea43 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -98,6 +98,91 @@ static const BOOL abi_supports_stdcall = TRUE; static const BOOL abi_supports_stdcall = FALSE; #endif +static HRESULT WINAPI collection_QueryInterface(ICollection *iface, REFIID riid, void **ret) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IDispatch) || + IsEqualIID(riid, &IID_ICollection)) + { + *ret = iface; + return S_OK; + } + + return E_NOINTERFACE; +} + +static ULONG WINAPI collection_AddRef(ICollection *iface) +{ + return 2; +} + +static ULONG WINAPI collection_Release(ICollection *iface) +{ + return 1; +} + +static HRESULT WINAPI collection_GetTypeInfoCount(ICollection *iface, UINT *cnt) +{ + ok(0, "unexpected call\n"); + *cnt = 0; + return E_NOTIMPL; +} + +static HRESULT WINAPI collection_GetTypeInfo(ICollection *iface, UINT index, LCID lcid, ITypeInfo **ti) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI collection_GetIDsOfNames(ICollection *iface, REFIID riid, LPOLESTR *names, + UINT cnt, LCID lcid, DISPID *dispid) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI collection_Invoke(ICollection *iface, DISPID dispid, REFIID riid, + LCID lcid, WORD flags, DISPPARAMS *dispparams, VARIANT *res, EXCEPINFO *ei, UINT *argerr) +{ + if(dispid != DISPID_VALUE) { + ok(0, "unexpected call\n"); + return E_NOTIMPL; + } + + ok(flags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET), "flags = %x\n", flags); + ok(dispparams != NULL, "dispparams == NULL\n"); + ok(!dispparams->rgdispidNamedArgs, "dispparams->rgdispidNamedArgs != NULL\n"); + ok(dispparams->cArgs == 1, "dispparams->cArgs = %d\n", dispparams->cArgs); + ok(!dispparams->cNamedArgs, "dispparams->cNamedArgs = %d\n", dispparams->cNamedArgs); + ok(V_VT(dispparams->rgvarg) == VT_I4, "V_VT(dispparams->rgvarg) = %d\n", V_VT(dispparams->rgvarg)); + ok(V_I4(dispparams->rgvarg) == 7, "V_I4(dispparams->rgvarg) = %d\n", V_I4(dispparams->rgvarg)); + ok(res != NULL, "res == NULL\n"); + ok(V_VT(res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(res)); + + V_VT(res) = VT_I4; + V_I4(res) = 15; + return S_OK; +} + +static HRESULT WINAPI collection_Item(ICollection *iface, int i, int *p) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const ICollectionVtbl collectionvtbl = { + collection_QueryInterface, + collection_AddRef, + collection_Release, + collection_GetTypeInfoCount, + collection_GetTypeInfo, + collection_GetIDsOfNames, + collection_Invoke, + collection_Item +}; + +static ICollection collection = { &collectionvtbl }; + static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret) { if (IsEqualIID(riid, &IID_IUnknown) || @@ -169,6 +254,13 @@ static HRESULT WINAPI invoketest_testfunc(IInvokeTest *iface, int i, int *p) return S_OK; } +static HRESULT WINAPI invoketest_testget(IInvokeTest *iface, ICollection **p) +{ + *p = &collection; + ICollection_AddRef(&collection); + return S_OK; +} + static const IInvokeTestVtbl invoketestvtbl = { invoketest_QueryInterface, invoketest_AddRef, @@ -180,7 +272,8 @@ static const IInvokeTestVtbl invoketestvtbl = { invoketest_get_test, invoketest_putref_testprop, invoketest_putref_testprop2, - invoketest_testfunc + invoketest_testfunc, + invoketest_testget }; static IInvokeTest invoketest = { &invoketestvtbl }; @@ -968,6 +1061,22 @@ static void test_TypeInfo(void) ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + /* call propget with DISPATCH_METHOD|DISPATCH_PROPERTYGET flags */ + V_VT(&args[0]) = VT_I4; + V_I4(&args[0]) = 7; + + dispparams.cArgs = 1; + dispparams.rgvarg = args; + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 4, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 15, "got %d\n", V_I4(&res)); + + /* DISPATCH_PROPERTYPUTREF */ l = 1; V_VT(&args[0]) = VT_I4|VT_BYREF; @@ -4837,7 +4946,7 @@ static void test_register_typelib(BOOL system_registration) { TYPEKIND kind; WORD flags; - } attrs[13] = + } attrs[] = { { TKIND_INTERFACE, 0 }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, @@ -4851,6 +4960,7 @@ static void test_register_typelib(BOOL system_registration) { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE }, { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, + { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE }, { TKIND_RECORD, 0 } }; @@ -4886,7 +4996,7 @@ static void test_register_typelib(BOOL system_registration) ok(hr == S_OK, "got %08x\n", hr); count = ITypeLib_GetTypeInfoCount(typelib); - ok(count == 13, "got %d\n", count); + ok(count == 14, "got %d\n", count); for(i = 0; i < count; i++) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 86da3e3..388f108 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -7496,7 +7496,7 @@ static HRESULT WINAPI ITypeInfo_fnInvoke( * pointer to be valid */ VariantInit(pVarResult); hres = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, - GetSystemDefaultLCID(), INVOKE_PROPERTYGET, + GetSystemDefaultLCID(), wFlags, pDispParams, pVarResult, pExcepInfo, pArgErr); IDispatch_Release(pDispatch); }

1 0

Alexandre Julliard : user32: Pass the text length explicitly to EDIT_EM_ReplaceSel.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 9215aabd2ef84821ff3fb81c379c0986e3d9371a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9215aabd2ef84821ff3fb81c3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 7 21:20:24 2017 +0100 user32: Pass the text length explicitly to EDIT_EM_ReplaceSel. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 63 ++++++++++++++++++++++-------------------------------- 1 file changed, 25 insertions(+), 38 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index ee9b45e..c93d3c3 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -176,7 +176,6 @@ typedef struct (LPARAM)(es->hwndSelf)); \ } while(0) -static const WCHAR empty_stringW[] = {0}; static LRESULT EDIT_EM_PosFromChar(EDITSTATE *es, INT index, BOOL after_wrap); /********************************************************************* @@ -2560,9 +2559,9 @@ static LRESULT EDIT_EM_GetSel(const EDITSTATE *es, PUINT start, PUINT end) * FIXME: handle ES_NUMBER and ES_OEMCONVERT here * */ -static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replace, BOOL send_update, BOOL honor_limit) +static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, const WCHAR *lpsz_replace, UINT strl, + BOOL send_update, BOOL honor_limit) { - UINT strl = strlenW(lpsz_replace); UINT tl = get_text_length(es); UINT utl; UINT s; @@ -3043,7 +3042,7 @@ static BOOL EDIT_EM_Undo(EDITSTATE *es) EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); EDIT_EM_EmptyUndoBuffer(es); - EDIT_EM_ReplaceSel(es, TRUE, utext, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, utext, ulength, TRUE, TRUE); EDIT_EM_SetSel(es, es->undo_position, es->undo_position + es->undo_insert_count, FALSE); /* send the notification after the selection start and end are set */ EDIT_NOTIFY_PARENT(es, EN_CHANGE); @@ -3077,7 +3076,7 @@ static inline BOOL EDIT_IsInsideDialog(EDITSTATE *es) static void EDIT_WM_Paste(EDITSTATE *es) { HGLOBAL hsrc; - LPWSTR src, new_src, ptr; + LPWSTR src, ptr; int len; /* Protect read-only edit control from modification */ @@ -3087,25 +3086,19 @@ static void EDIT_WM_Paste(EDITSTATE *es) OpenClipboard(es->hwndSelf); if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { src = GlobalLock(hsrc); - + len = strlenW(src); /* Protect single-line edit against pasting new line character */ if (!(es->style & ES_MULTILINE) && ((ptr = strchrW(src, '\n')))) { len = ptr - src; if (len && src[len - 1] == '\r') --len; - new_src = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)); - if (new_src != NULL) { - lstrcpynW(new_src, src, len+1); - EDIT_EM_ReplaceSel(es, TRUE, new_src, TRUE, TRUE); - HeapFree(GetProcessHeap(), 0, new_src); - } - } else - EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); + } + EDIT_EM_ReplaceSel(es, TRUE, src, len, TRUE, TRUE); GlobalUnlock(hsrc); } else if (es->style & ES_PASSWORD) { /* clear selected text in password edit box even with empty clipboard */ - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); } CloseClipboard(); } @@ -3151,7 +3144,7 @@ static inline void EDIT_WM_Clear(EDITSTATE *es) if(es->style & ES_READONLY) return; - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); } @@ -3193,18 +3186,18 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) EDIT_MoveHome(es, FALSE, FALSE); EDIT_MoveDown_ML(es, FALSE); } else { - static const WCHAR cr_lfW[] = {'\r','\n',0}; - EDIT_EM_ReplaceSel(es, TRUE, cr_lfW, TRUE, TRUE); + static const WCHAR cr_lfW[] = {'\r','\n'}; + EDIT_EM_ReplaceSel(es, TRUE, cr_lfW, 2, TRUE, TRUE); } } break; case '\t': if ((es->style & ES_MULTILINE) && !(es->style & ES_READONLY)) { - static const WCHAR tabW[] = {'\t',0}; + static const WCHAR tabW[] = {'\t'}; if (EDIT_IsInsideDialog(es)) break; - EDIT_EM_ReplaceSel(es, TRUE, tabW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, tabW, 1, TRUE, TRUE); } break; case VK_BACK: @@ -3241,12 +3234,8 @@ static LRESULT EDIT_WM_Char(EDITSTATE *es, WCHAR c) if( (es->style & ES_NUMBER) && !( c >= '0' && c <= '9') ) break; - if (!(es->style & ES_READONLY) && (c >= ' ') && (c != 127)) { - WCHAR str[2]; - str[0] = c; - str[1] = '\0'; - EDIT_EM_ReplaceSel(es, TRUE, str, TRUE, TRUE); - } + if (!(es->style & ES_READONLY) && (c >= ' ') && (c != 127)) + EDIT_EM_ReplaceSel(es, TRUE, &c, 1, TRUE, TRUE); break; } return 1; @@ -3904,14 +3893,14 @@ static void EDIT_WM_SetText(EDITSTATE *es, LPCWSTR text, BOOL unicode) if (text) { TRACE("%s\n", debugstr_w(text)); - EDIT_EM_ReplaceSel(es, FALSE, text, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, text, strlenW(text), FALSE, FALSE); if(!unicode) HeapFree(GetProcessHeap(), 0, textW); } else { TRACE("<NULL>\n"); - EDIT_EM_ReplaceSel(es, FALSE, empty_stringW, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, NULL, 0, FALSE, FALSE); } es->x_offset = 0; es->flags &= ~EF_MODIFIED; @@ -4325,7 +4314,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) return; } - lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen + sizeof(WCHAR)); + lpCompStr = HeapAlloc(GetProcessHeap(),0,buflen); if (!lpCompStr) { ERR("Unable to allocate IME CompositionString\n"); @@ -4334,7 +4323,6 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) if (buflen) ImmGetCompositionStringW(hIMC, GCS_COMPSTR, lpCompStr, buflen); - lpCompStr[buflen/sizeof(WCHAR)] = 0; if (CompFlag & GCS_COMPATTR) { @@ -4371,7 +4359,7 @@ static void EDIT_GetCompositionStr(HIMC hIMC, LPARAM CompFlag, EDITSTATE *es) else es->selection_end = es->selection_start; - EDIT_EM_ReplaceSel(es, FALSE, lpCompStr, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, FALSE, lpCompStr, buflen / sizeof(WCHAR), TRUE, TRUE); es->composition_len = abs(es->composition_start - es->selection_end); es->selection_start = es->composition_start; @@ -4392,7 +4380,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) return; } - lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen+sizeof(WCHAR)); + lpResultStr = HeapAlloc(GetProcessHeap(),0, buflen); if (!lpResultStr) { ERR("Unable to alloc buffer for IME string\n"); @@ -4400,7 +4388,6 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) } ImmGetCompositionStringW(hIMC, GCS_RESULTSTR, lpResultStr, buflen); - lpResultStr[buflen/sizeof(WCHAR)] = 0; /* check for change in composition start */ if (es->selection_end < es->composition_start) @@ -4408,7 +4395,7 @@ static void EDIT_GetResultStr(HIMC hIMC, EDITSTATE *es) es->selection_start = es->composition_start; es->selection_end = es->composition_start + es->composition_len; - EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, lpResultStr, buflen / sizeof(WCHAR), TRUE, TRUE); es->composition_start = es->selection_end; es->composition_len = 0; @@ -4422,7 +4409,7 @@ static void EDIT_ImeComposition(HWND hwnd, LPARAM CompFlag, EDITSTATE *es) if (es->composition_len == 0 && es->selection_start != es->selection_end) { - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); es->composition_start = es->selection_end; } @@ -4587,7 +4574,7 @@ static LRESULT EDIT_WM_Create(EDITSTATE *es, LPCWSTR name) EDIT_SetRectNP(es, &clientRect); if (name && *name) { - EDIT_EM_ReplaceSel(es, FALSE, name, FALSE, FALSE); + EDIT_EM_ReplaceSel(es, FALSE, name, strlenW(name), FALSE, FALSE); /* if we insert text to the editline, the text scrolls out * of the window, as the caret is placed after the insert * pos normally; thus we reset es->selection... to 0 and @@ -4771,7 +4758,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B MultiByteToWideChar(CP_ACP, 0, textA, -1, textW, countW); } - EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, (BOOL)wParam, textW, strlenW(textW), TRUE, TRUE); result = 1; if(!unicode) @@ -5175,7 +5162,7 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B case WM_IME_ENDCOMPOSITION: if (es->composition_len > 0) { - EDIT_EM_ReplaceSel(es, TRUE, empty_stringW, TRUE, TRUE); + EDIT_EM_ReplaceSel(es, TRUE, NULL, 0, TRUE, TRUE); es->selection_end = es->selection_start; es->composition_len= 0; }

1 0

Piotr Caban : vbscript: Add UBound implementation.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: e95492bc83c65b1d84c4976338be909a3d05bf64 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95492bc83c65b1d84c497633… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 6 16:53:08 2017 +0100 vbscript: Add UBound implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 38 +++++++++++++++++++++++++++++++++++--- dlls/vbscript/tests/api.vbs | 10 ++++++++++ 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index f523820..a5df54a 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -822,8 +822,40 @@ static HRESULT Global_LBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA static HRESULT Global_UBound(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SAFEARRAY *sa; + HRESULT hres; + LONG ubound; + int dim; + + assert(args_cnt == 1 || args_cnt == 2); + + TRACE("%s %s\n", debugstr_variant(arg), args_cnt == 2 ? debugstr_variant(arg + 1) : "1"); + + switch(V_VT(arg)) { + case VT_VARIANT|VT_ARRAY: + sa = V_ARRAY(arg); + break; + case VT_VARIANT|VT_ARRAY|VT_BYREF: + sa = *V_ARRAYREF(arg); + break; + default: + FIXME("arg %s not supported\n", debugstr_variant(arg)); + return E_NOTIMPL; + } + + if(args_cnt == 2) { + hres = to_int(arg + 1, &dim); + if(FAILED(hres)) + return hres; + }else { + dim = 1; + } + + hres = SafeArrayGetUBound(sa, dim, &ubound); + if(FAILED(hres)) + return hres; + + return return_int(res, ubound); } static HRESULT Global_RGB(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) @@ -2256,7 +2288,7 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_RND, Global_Rnd, 0, 1}, {DISPID_GLOBAL_TIMER, Global_Timer, 0, 0}, {DISPID_GLOBAL_LBOUND, Global_LBound, 0, 1}, - {DISPID_GLOBAL_UBOUND, Global_UBound, 0, 1}, + {DISPID_GLOBAL_UBOUND, Global_UBound, 0, 1, 2}, {DISPID_GLOBAL_RGB, Global_RGB, 0, 3}, {DISPID_GLOBAL_LEN, Global_Len, 0, 1}, {DISPID_GLOBAL_LENB, Global_LenB, 0, 1}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index baa0553..8ebbfb6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -227,6 +227,16 @@ new_array = x x(0) = "new value" Call ok(new_array(0) = "a1", "new_array(0) = " & new_array(0)) +Call ok(getVT(UBound(x)) = "VT_I4", "getVT(UBound(x)) = " & getVT(UBound(x))) +Call ok(UBound(x) = 2, "UBound(x) = " & UBound(x)) +Call ok(getVT(UBound(x, 1)) = "VT_I4", "getVT(UBound(x, 1)) = " & getVT(UBound(x, 1))) +Call ok(UBound(x, 1) = 2, "UBound(x) = " & UBound(x, 1)) + +Dim arr2(2, 4) +Call ok(UBound(arr2) = 2, "UBound(x) = " & UBound(x)) +Call ok(UBound(arr2, 1) = 2, "UBound(x) = " & UBound(x)) +Call ok(UBound(arr2, 2) = 4, "UBound(x) = " & UBound(x)) + Dim newObject Set newObject = New ValClass newObject.myval = 1

1 0

Stefan Dösinger : d3d9/tests: Windows 10 17.09 added an undocumented query type.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: d334097c0947fdd8dd2466460128ce85c9c9ab01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d334097c0947fdd8dd2466460… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Nov 6 19:03:39 2017 +0100 d3d9/tests: Windows 10 17.09 added an undocumented query type. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/query.c | 6 +++++- dlls/d3d9/tests/device.c | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 335a960..df7eb6e 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -187,7 +187,11 @@ HRESULT query_init(struct d3d9_query *query, struct d3d9_device *device, D3DQUER if (type > D3DQUERYTYPE_MEMORYPRESSURE) { - WARN("Invalid query type %#x.\n", type); + if (type == 0x16) + FIXME("Undocumented query %#x created.\n", type); + else + WARN("Invalid query type %#x.\n", type); + return D3DERR_NOTAVAILABLE; } diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8f9985c..82ced83 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5561,7 +5561,9 @@ static void test_query_support(void) for (i = 0; i < 40; ++i) { - if (D3DQUERYTYPE_VCACHE <= i && i <= D3DQUERYTYPE_MEMORYPRESSURE) + /* Windows 10 17.09 (build 16299.19) added an undocumented query with an enum value of 0x16 (=22). + * It returns D3D_OK when asking for support and E_FAIL when trying to actually create it. */ + if ((D3DQUERYTYPE_VCACHE <= i && i <= D3DQUERYTYPE_MEMORYPRESSURE) || i == 0x16) continue; hr = IDirect3DDevice9_CreateQuery(device, i, NULL);

1 0

Rafał Harabień : user32: Protect single-line edit against pasting new line character.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 6653d430236d829ab499be858d3ef4fdccb0517d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6653d430236d829ab499be858… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Sun Nov 5 19:28:38 2017 +0100 user32: Protect single-line edit against pasting new line character. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 18 +++++++++-- dlls/user32/tests/edit.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 00a7fba..ee9b45e 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3077,7 +3077,8 @@ static inline BOOL EDIT_IsInsideDialog(EDITSTATE *es) static void EDIT_WM_Paste(EDITSTATE *es) { HGLOBAL hsrc; - LPWSTR src; + LPWSTR src, new_src, ptr; + int len; /* Protect read-only edit control from modification */ if(es->style & ES_READONLY) @@ -3086,7 +3087,20 @@ static void EDIT_WM_Paste(EDITSTATE *es) OpenClipboard(es->hwndSelf); if ((hsrc = GetClipboardData(CF_UNICODETEXT))) { src = GlobalLock(hsrc); - EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); + + /* Protect single-line edit against pasting new line character */ + if (!(es->style & ES_MULTILINE) && ((ptr = strchrW(src, '\n')))) { + len = ptr - src; + if (len && src[len - 1] == '\r') + --len; + new_src = HeapAlloc(GetProcessHeap(), 0, (len+1) * sizeof(WCHAR)); + if (new_src != NULL) { + lstrcpynW(new_src, src, len+1); + EDIT_EM_ReplaceSel(es, TRUE, new_src, TRUE, TRUE); + HeapFree(GetProcessHeap(), 0, new_src); + } + } else + EDIT_EM_ReplaceSel(es, TRUE, src, TRUE, TRUE); GlobalUnlock(hsrc); } else if (es->style & ES_PASSWORD) { diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index b9aa1c9..d842dce 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -867,7 +867,7 @@ static LRESULT CALLBACK edit3_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR return DefWindowProcA(hWnd, msg, wParam, lParam); } -/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notificatisons sent in response +/* Test behaviour of WM_SETTEXT, WM_REPLACESEL and notifications sent in response * to these messages. */ static void test_edit_control_3(void) @@ -969,6 +969,19 @@ static void test_edit_control_3(void) ok(lstrlenA(str) == len, "text shouldn't have been truncated\n"); test_notify(1, 0, 1); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); + zero_notify(); + SendMessageA(hWnd, EM_REPLACESEL, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + + zero_notify(); + SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)str2); + len = SendMessageA(hWnd, WM_GETTEXTLENGTH, 0, 0); + ok(lstrlenA(str2) == len, "text shouldn't have been truncated\n"); + test_notify(1, 0, 1); + SendMessageA(hWnd, EM_SETLIMITTEXT, 5, 0); SendMessageA(hWnd, WM_SETTEXT, 0, (LPARAM)""); @@ -2831,6 +2844,74 @@ static void test_EM_GETHANDLE(void) DestroyWindow(hEdit); } +static void test_paste(void) +{ + HWND hEdit, hMultilineEdit; + HANDLE hmem, hmem_ret; + char *buffer; + int r, len; + static const char *str = "this is a simple text"; + static const char *str2 = "first line\r\nsecond line"; + + hEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL, 0); + hMultilineEdit = create_editcontrol(ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE, 0); + + /* Prepare clipboard data with simple text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste single line */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str) == len, "expected %d, got %d\n", strlen(str), len); + + /* Prepare clipboard data with multiline text */ + hmem = GlobalAlloc(GMEM_MOVEABLE, 255); + ok(hmem != NULL, "got %p (expected != NULL)\n", hmem); + buffer = GlobalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + strcpy(buffer, str2); + GlobalUnlock(hmem); + + r = OpenClipboard(hEdit); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + r = EmptyClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + hmem_ret = SetClipboardData(CF_TEXT, hmem); + ok(hmem_ret == hmem, "expected %p, got %p\n", hmem, hmem_ret); + r = CloseClipboard(); + ok(r == TRUE, "expected %d, got %d\n", TRUE, r); + + /* Paste multiline text in singleline edit - should be cut */ + SendMessageA(hEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hEdit, WM_PASTE, 0, 0); + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen("first line") == len, "expected %d, got %d\n", strlen("first line"), len); + + /* Paste multiline text in multiline edit */ + SendMessageA(hMultilineEdit, WM_SETTEXT, 0, (LPARAM)""); + r = SendMessageA(hMultilineEdit, WM_PASTE, 0, 0); + len = SendMessageA(hMultilineEdit, WM_GETTEXTLENGTH, 0, 0); + ok(strlen(str2) == len, "expected %d, got %d\n", strlen(str2), len); + + /* Cleanup */ + DestroyWindow(hEdit); + DestroyWindow(hMultilineEdit); +} START_TEST(edit) { @@ -2871,6 +2952,7 @@ START_TEST(edit) win_skip("EndMenu is not available\n"); test_EM_GETHANDLE(); + test_paste(); UnregisterWindowClasses(); }

1 0