December 2017 - Wine-Devel - list.winehq.org

Wine Staging (was: WineConf action items)
by Gerald Pfeifer Dec. 4, 2017

Dec. 4, 2017

Vincent Povirk wrote: > I've decided to spend some time researching staging patches and > bringing them to the attention of maintainers or others who may be > able to put in the extra work required to get them in. This is based > on a discussion we had where some people complained about the number > of patches in staging that aren't being merged. That's a great initiative, thanks for doing that, Vincent. On a related note, recently the release of a Wine staging patchset has been trailing the corresponding release of Wine 2.2x for more than a week (for example, it's still not available for Wine 2.22). What's the outlook there? Any chance that patchset can be made available a day or two after Wine goes out (or, ideally, more or less at the same time)? Gerald

2 1

_Cnd_timedwait timeout
by Stefan Dösinger Dec. 4, 2017

Dec. 4, 2017

Hi Daniel and Piotr, I am having a trouble with _Cnd_timedwait and I am trying to understand a few things. The problem I'm running into is that the application I am dealing with passes a timestamp that is 30 days into the future. This overflows in _Xtime_diff_to_millis(2) and the result we get is somewhere in the area of -1708070296. Now _Cnd_timedwait casts this to an ULONGLONG, so I would expect the multiplication to come up with the right result, but no, the function passes a timeout of 170807029600000 to NtWaitForKeyedEvent, which is interpreted as an absolute value in the past and instantly times out. To get the right result I have to assign the result of _Xtime_diff_to_millis to an ULONG and cast this back to a 64 bit signed value - otherwise the multiplication happens in unsigned 32 bit and results in a positive number that will fit in a a signed 64 bit integer with ease. So my two questions are: 1) Why go through _Xtime_diff_to_millis at all? If I understand the server code right NtWaitForKeyedEvent should do the right thing if we pass timeout.QuadPart = sec * 1000 * 1000 * 100 + nsec / 10. And indeed in my quick testing this works for the app and passes the tests. Are there timezone issues? 2) What C integer legalese prevents the current code from working? All the signed/unsigned conversion references I found talk about assignments, not casts in calculations. Cheers, Stefan

3 5

[PATCH] user32/tests: Added some tests for WM_GETTEXTLENGTH/WM_GETTEXT after EM_GETHANDLE was used
by Nikolay Sivov Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/edit.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/user32/tests/edit.c b/dlls/user32/tests/edit.c index 0926a589e2..783ced66c9 100644 --- a/dlls/user32/tests/edit.c +++ b/dlls/user32/tests/edit.c @@ -2735,6 +2735,7 @@ static void test_EM_GETHANDLE(void) { static const char str0[] = "untouched"; static const char str1[] = "1111+1111+1111#"; + static const char str1_1[] = "2111+1111+1111#"; static const char str2[] = "2222-2222-2222-2222#"; static const char str3[] = "3333*3333*3333*3333*3333#"; CHAR current[42]; @@ -2783,6 +2784,33 @@ static void test_EM_GETHANDLE(void) "got %d and \"%s\" (expected %d and \"%s\")\n", len, buffer, lstrlenA(str1), str1); LocalUnlock(hmem); + /* See if WM_GETTEXTLENGTH/WM_GETTEXT still work. */ + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1)) && !lstrcmpA(current, str1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1), str1); + + /* Application altered buffer contents, see if WM_GETTEXTLENGTH/WM_GETTEXT pick that up. */ + buffer = LocalLock(hmem); + ok(buffer != NULL, "got %p (expected != NULL)\n", buffer); + buffer[0] = '2'; + LocalUnlock(hmem); + + len = SendMessageA(hEdit, WM_GETTEXTLENGTH, 0, 0); +todo_wine + ok(len == lstrlenA(str1), "Unexpected text length %d.\n", len); + + lstrcpyA(current, str0); + r = SendMessageA(hEdit, WM_GETTEXT, sizeof(current), (LPARAM)current); +todo_wine + ok((r == lstrlenA(str1_1)) && !lstrcmpA(current, str1_1), + "Unexpected retval %d and text \"%s\" (expected %d and \"%s\")\n", r, current, lstrlenA(str1_1), str1_1); + /* use LocalAlloc first to get a different handle */ halloc = LocalAlloc(LMEM_MOVEABLE, 42); ok(halloc != NULL, "got %p (expected != NULL)\n", halloc); -- 2.15.0

1 0

[Tools] testbot/Janitor: Import File::Path. It's needed for rmtree().
by Francois Gouget Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index fd1b256b..c07c21bd 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -37,6 +37,8 @@ sub BEGIN } } +use File::Path; + use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Log; -- 2.15.0

1 0

[PATCH] testbot: Don't try to use the Message-Id if the email had none.
by Francois Gouget Dec. 4, 2017

Dec. 4, 2017

This can happen if one directly feeds the output of git format-patch to the TestBot through formail, which can be useful for testing. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Patches.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index b5320dc2..42118e61 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -101,9 +101,12 @@ sub FromSubmission($$) $self->Subject(substr($Subject, 0, $PropertyDescriptor->GetMaxLength())); my $MessageId = $Head->get("Message-Id"); - $MessageId =~ s/\s*\n\s*/ /gs; - $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); - $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + if ($MessageId) + { + $MessageId =~ s/\s*\n\s*/ /gs; + $PropertyDescriptor = $self->GetPropertyDescriptorByName("MessageId"); + $self->MessageId(substr($MessageId, 0, $PropertyDescriptor->GetMaxLength())); + } $self->Disposition("Processing"); } -- 2.15.0

1 0

[PATCH] appwiz.cpl: move WineHQ URLs to https (try 2)
by Austin English Dec. 4, 2017

Dec. 4, 2017

Try 2: Don't update winegecko/winemono download URLs, only the wiki links Signed-off-by: Austin English <austinenglish(a)gmail.com> --- dlls/appwiz.cpl/appwiz.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/appwiz.rc b/dlls/appwiz.cpl/appwiz.rc index 5c8b31b525..589f27548f 100644 --- a/dlls/appwiz.cpl/appwiz.rc +++ b/dlls/appwiz.cpl/appwiz.rc @@ -102,7 +102,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a Gecko package which is needed for applications embedding HTML " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> for details.", + "See <a href=\"https://wiki.winehq.org/Gecko\">https://wiki.winehq.org/Gecko</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP @@ -117,7 +117,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Wine could not find a wine-mono package which is needed for .NET applications " \ "to work correctly. Wine can automatically download and install it for you.\n\n" \ "Note: it is recommended to use your distribution's packages instead. " \ - "See <a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for details.", + "See <a href=\"https://wiki.winehq.org/Mono\">https://wiki.winehq.org/Mono</a> for details.", ID_DWL_STATUS, "SysLink", 0, 10, 10, 240, 65 CONTROL "", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 DEFPUSHBUTTON "&Install", ID_DWL_INSTALL, 200, 76, 50, 14, WS_GROUP | WS_TABSTOP -- 2.13.6

1 0

[PATCH] mshtml: Avoid potential moniker instance leak
by Nikolay Sivov Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/persist.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 25767ef57c..b82750a85e 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -918,10 +918,9 @@ static HRESULT WINAPI PersistStreamInit_Load(IPersistStreamInit *iface, IStream prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, TRUE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); - hres = channelbsc_load_stream(This->window->pending_window, mon, pStm); IMoniker_Release(mon); return hres; } @@ -976,10 +975,9 @@ static HRESULT WINAPI PersistStreamInit_InitNew(IPersistStreamInit *iface) prepare_for_binding(This, mon, FALSE); hres = set_moniker(This->window, mon, NULL, NULL, NULL, FALSE); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) + hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); - hres = channelbsc_load_stream(This->window->pending_window, mon, NULL); IMoniker_Release(mon); return hres; } -- 2.15.0

2 1

[PATCH 6/6] mshtml/tests: Added more event object tests.
by Jacek Caban Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/events.js | 256 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 255 insertions(+), 1 deletion(-)

1 0

[PATCH 5/6] mshtml: Expose IDocumentEvent to scripts.
by Jacek Caban Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 4 +++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/documentmode.js | 1 + 3 files changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 4/6] mshtml: Added IDOMEvent::dispatchEvent implementation.
by Jacek Caban Dec. 4, 2017

Dec. 4, 2017

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 46 ++++++++++++++++++++++++++++++++++------------ dlls/mshtml/tests/events.c | 11 +++++++++++ 2 files changed, 45 insertions(+), 12 deletions(-)

1 0