wine-commits October 2017

wine-commits@winehq.org

2 participants
478 discussions

Henri Verbeet : d3d11: Increment the device reference count in d3d11_input_layout_AddRef().
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 2e877152de1aee128968f8525e5d0b73f43010c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e877152de1aee128968f8525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 12 16:17:10 2017 +0200 d3d11: Increment the device reference count in d3d11_input_layout_AddRef(). Since we release it in d3d11_input_layout_Release(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/inputlayout.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d11/inputlayout.c b/dlls/d3d11/inputlayout.c index 2f194e0..784779c 100644 --- a/dlls/d3d11/inputlayout.c +++ b/dlls/d3d11/inputlayout.c @@ -134,6 +134,7 @@ static ULONG STDMETHODCALLTYPE d3d11_input_layout_AddRef(ID3D11InputLayout *ifac if (refcount == 1) { + ID3D11Device_AddRef(layout->device); wined3d_mutex_lock(); wined3d_vertex_declaration_incref(layout->wined3d_decl); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d10: Release the device reference in d3d10_stateblock_Release().
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: dc0310c0296c7589564090fca858cfd158e5944d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0310c0296c7589564090fca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 12 16:17:09 2017 +0200 d3d10: Release the device reference in d3d10_stateblock_Release(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/stateblock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d10/stateblock.c b/dlls/d3d10/stateblock.c index d0efc52..470d325 100644 --- a/dlls/d3d10/stateblock.c +++ b/dlls/d3d10/stateblock.c @@ -274,6 +274,7 @@ static ULONG STDMETHODCALLTYPE d3d10_stateblock_Release(ID3D10StateBlock *iface) if (!refcount) { stateblock_cleanup(stateblock); + ID3D10Device_Release(stateblock->device); HeapFree(GetProcessHeap(), 0, stateblock); }

1 0

Jacek Caban : mshtml/tests: Added script event argument test.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: fa942235114985fe181c4398027a745dcf132bd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa942235114985fe181c43980… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:27:24 2017 +0200 mshtml/tests: Added script event argument test. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 4 +++- dlls/mshtml/tests/winetest.js | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 638545c..cb726c1 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -95,9 +95,11 @@ function test_handler_this() { } function registerHandler(name, target) { - var b = target.attachEvent("onclick", function() { + var b = target.attachEvent("onclick", function(event_arg) { ok(this === window, "this !== window"); calls.push(name+"*"); + with(todo_wine) + ok(event_arg != window.event, "event_arg == window.event"); }); ok(b, "attachEvent failed"); } diff --git a/dlls/mshtml/tests/winetest.js b/dlls/mshtml/tests/winetest.js index 29bdaab..3f1b38b 100644 --- a/dlls/mshtml/tests/winetest.js +++ b/dlls/mshtml/tests/winetest.js @@ -51,3 +51,9 @@ function win_skip(m) { function reportSuccess() { external.reportSuccess(); } + +var todo_wine = { + ok: function(b,m) { + return external.todo_wine_ok(b,m); + } +};

1 0

Jacek Caban : mshtml/tests: Use winetest.js in events.html.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 1824f67a06854a3863ceea26bfa2d0874c8e5acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=1824f67a06854a3863ceea26b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:27:08 2017 +0200 mshtml/tests: Use winetest.js in events.html. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.html | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/dlls/mshtml/tests/events.html b/dlls/mshtml/tests/events.html index 8d5fcc3..638545c 100644 --- a/dlls/mshtml/tests/events.html +++ b/dlls/mshtml/tests/events.html @@ -1,16 +1,11 @@ <html> <head> +<script src="winetest.js" type="text/javascript"></script> +</head> +<head> <script> var testevent_divid2_called = false, testevent_document_called = false, cnt=0; -function ok(b,m) { - return external.ok(b, m); -} - -function broken(expr) { - return external.broken(expr); -} - function ondataavailable_test() { var evobj, div, b = false; @@ -130,7 +125,7 @@ function test_insert_script() { ok(extern_cnt === 1, "extern_cnt = " + extern_cnt); if(e.readyState === "complete") { ok(readystatechange_log === "append,complete", "readystatechange_log = " + readystatechange_log); - external.reportSuccess(); + reportSuccess(); } } @@ -202,7 +197,7 @@ img.src = "http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_ var img_onload_called = false; img.onload = function() { - external.trace("img.onload"); + trace("img.onload"); img_onload_called = true; } </script> @@ -242,7 +237,7 @@ function extern_res_script_readystatechange() { if(elem.readyState != "loading") extern_res_script_rs += elem.readyState + extern_cnt + ","; else - external.trace("Got loading readyState from external res script."); + trace("Got loading readyState from external res script."); } function http_script_readystatechange() {

1 0

Jacek Caban : mshtml: Simplify IHTMLElement::click implementation.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 353d9d826a4b625c45dbeb634385920c7b3ac5f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=353d9d826a4b625c45dbeb634… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 12 14:26:57 2017 +0200 mshtml: Simplify IHTMLElement::click implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 - dlls/mshtml/htmlbody.c | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmlelem.c | 14 +++++++++++++- dlls/mshtml/htmlevent.c | 16 ---------------- dlls/mshtml/htmlevent.h | 1 - dlls/mshtml/htmlform.c | 1 - dlls/mshtml/htmlframe.c | 1 - dlls/mshtml/htmlhead.c | 1 - dlls/mshtml/htmliframe.c | 1 - dlls/mshtml/htmlimg.c | 1 - dlls/mshtml/htmlinput.c | 21 --------------------- dlls/mshtml/htmllink.c | 1 - dlls/mshtml/htmlobject.c | 1 - dlls/mshtml/htmloption.c | 1 - dlls/mshtml/htmlscript.c | 1 - dlls/mshtml/htmlselect.c | 1 - dlls/mshtml/htmlstyleelem.c | 1 - dlls/mshtml/htmltable.c | 1 - dlls/mshtml/htmltablecell.c | 1 - dlls/mshtml/htmltablerow.c | 1 - dlls/mshtml/htmltextarea.c | 1 - dlls/mshtml/mshtml_private.h | 1 - 23 files changed, 13 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=353d9d826a4b625c45dbe…

1 0

Andrey Gusev : ntdll: Remove redundant comparison.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 4895156369d2d90caa70449f98cf72eff2790767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4895156369d2d90caa70449f9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Oct 12 16:14:53 2017 +0300 ntdll: Remove redundant comparison. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loadorder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index 401d256..157d2cb 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -253,7 +253,7 @@ static void init_load_order(void) entry = strW.Buffer; while (*entry) { - while (*entry && *entry == ';') entry++; + while (*entry == ';') entry++; if (!*entry) break; next = strchrW( entry, ';' ); if (next) *next++ = 0;

1 0

Vincent Povirk : twain_32: Detect devices in TWAIN_UserSelect.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: a247605894deb7b78acef14507ea62fbd26c26c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a247605894deb7b78acef1450… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 11 15:46:17 2017 -0500 twain_32: Detect devices in TWAIN_UserSelect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index 1d206c8..9d67dfb 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -266,6 +266,7 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", selected->SupportedGroups, wine_dbgstr_a(selected->ProductName)); + twain_autodetect(); if (!nrdevices) { TRACE("<-- TWRC_FAILURE\n"); DSM_twCC = TWCC_OPERATIONERROR;

1 0

Vincent Povirk : twain_32: Add debug traces to TWAIN_UserSelect.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: wine Branch: master Commit: 7fa90d26db618563d05bb440d1930485b970d229 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fa90d26db618563d05bb440d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Oct 11 15:46:16 2017 -0500 twain_32: Add debug traces to TWAIN_UserSelect. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/twain_32/dsm_ctrl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/twain_32/dsm_ctrl.c b/dlls/twain_32/dsm_ctrl.c index b71c112..1d206c8 100644 --- a/dlls/twain_32/dsm_ctrl.c +++ b/dlls/twain_32/dsm_ctrl.c @@ -263,11 +263,16 @@ TW_UINT16 TWAIN_UserSelect (pTW_IDENTITY pOrigin, TW_MEMREF pData) { pTW_IDENTITY selected = (pTW_IDENTITY)pData; + TRACE("DG_CONTROL/DAT_IDENTITY/MSG_USERSELECT SupportedGroups=0x%x ProductName=%s\n", + selected->SupportedGroups, wine_dbgstr_a(selected->ProductName)); + if (!nrdevices) { + TRACE("<-- TWRC_FAILURE\n"); DSM_twCC = TWCC_OPERATIONERROR; return TWRC_FAILURE; } *selected = devices[0].identity; + TRACE("<-- %s\n", wine_dbgstr_a(selected->ProductName)); DSM_twCC = TWCC_SUCCESS; return TWRC_SUCCESS; }

1 0

Francois Gouget : testbot: Improve the Jobs error handling and documentation.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: tools Branch: master Commit: 006258002477b9b2bc86f03e5641eefc34d6ec32 URL: http://source.winehq.org/git/tools.git/?a=commit;h=006258002477b9b2bc86f03e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:18:03 2017 +0200 testbot: Improve the Jobs error handling and documentation. Specifically in the UpdateStatus(), Cancel() and Restart() methods. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 50 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index 9976794..c26ff92 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -123,6 +123,8 @@ Updates the status of this job and of its steps and tasks. Part of this means checking for failed builds and skipping the subsequent tasks, or detecting dead child processes. +Returns the updated status. + =back =cut @@ -183,9 +185,27 @@ sub UpdateStatus($) return $Status; } +=pod +=over 12 + +=item C<Cancel()> + +Cancels the Job, preserving existing results. + +More precisely, goes through all of that Job's 'queued' and 'running' tasks, +killing all the running ones and marking them, and all the queued tasks, as +'skipped' so they will not be run. The overall Job status will be 'canceled' +unless it was completed already. + +Returns undef if successful, the error message otherwise. + +=back +=cut + sub Cancel($) { my ($self) = @_; + my $ErrMessage; my $Steps = $self->Steps; $Steps->AddFilter("Status", ["queued", "running"]); @@ -198,7 +218,8 @@ sub Cancel($) if ($Task->Status eq "queued") { $Task->Status("skipped"); - $Task->Save(); + my ($EProperty, $EMessage) = $Task->Save(); + $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } elsif (defined $Task->ChildPid) { @@ -207,20 +228,38 @@ sub Cancel($) kill("TERM", $Task->ChildPid); $Task->Status("canceled"); $Task->ChildPid(undef); - $Task->Save(); + my ($EProperty, $EMessage) = $Task->Save(); + $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); my $VM = $Task->VM; $VM->Status('dirty'); - $VM->Save(); + ($EProperty, $EMessage) = $VM->Save(); + $ErrMessage ||= "$EMessage ($EProperty)" if ($EMessage); } } } # Let UpdateStatus() handle updating the overall job status $self->UpdateStatus(); - return undef; + return $ErrMessage; } +=pod +=over 12 + +=item C<Restart()> + +Restarts the Job from scratch. + +More precisely, if the Job is not 'queued' or 'running', goes through all of +its tasks and marks them all as 'queued', deleting any existing result in the +process. + +Returns undef if successful, the error message otherwise. + +=back +=cut + sub Restart($) { my ($self) = @_; @@ -259,7 +298,8 @@ sub Restart($) $self->Status("queued"); $self->Submitted(time); $self->Ended(undef); - $self->Save(); # Save it all + my ($ErrProperty, $ErrMessage) = $self->Save(); # Save it all + return "$ErrMessage ($ErrProperty)" if ($ErrMessage); return undef; }

1 0

Francois Gouget : testbot: Fix Tasks to not use WineTestBot::Log.
by Alexandre Julliard 12 Oct '17

12 Oct '17

Module: tools Branch: master Commit: 1d497afe25f3f633134e2a491b65af62cc0aa83e URL: http://source.winehq.org/git/tools.git/?a=commit;h=1d497afe25f3f633134e2a49… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Oct 11 16:15:30 2017 +0200 testbot: Fix Tasks to not use WineTestBot::Log. The perl modules should return error messages to the callers and let them deal with logging. So don't import WineTestBot::Log globally to ensure any logging really is deliberate. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Tasks.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testbot/lib/WineTestBot/Tasks.pm b/testbot/lib/WineTestBot/Tasks.pm index 3dd5f13..401e275 100644 --- a/testbot/lib/WineTestBot/Tasks.pm +++ b/testbot/lib/WineTestBot/Tasks.pm @@ -40,7 +40,6 @@ use WineTestBot::Config; use WineTestBot::Jobs; use WineTestBot::Steps; use WineTestBot::WineTestBotObjects; -use WineTestBot::Log; use vars qw(@ISA @EXPORT); @@ -109,6 +108,7 @@ sub Run($$) } elsif (!$Pid) { + require WineTestBot::Log; # Capture Perl errors in the task's generic error log my ($JobId, $StepNo, $TaskNo) = @{$self->GetMasterKey()}; my $TaskDir = "$DataDir/jobs/$JobId/$StepNo/$TaskNo"; @@ -124,12 +124,11 @@ sub Run($$) } else { - LogMsg "unable to redirect stderr to '$TaskDir/err': $!\n"; + WineTestBot::Log::LogMsg("unable to redirect stderr to '$TaskDir/err': $!\n"); } $ENV{PATH} = "/usr/bin:/bin"; delete $ENV{ENV}; exec("$BinDir/${ProjectName}$RunScript", "--log-only", $JobId, $StepNo, $TaskNo) or - require WineTestBot::Log; WineTestBot::Log::LogMsg("Unable to exec ${ProjectName}$RunScript: $!\n"); exit(1); } @@ -173,7 +172,8 @@ sub UpdateStatus($$) umask($OldUMask); # This probably indicates a bug in the task script. # Don't requeue the task to avoid an infinite loop. - LogMsg "Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"; + require WineTestBot::Log; + WineTestBot::Log::LogMsg("Child process for task $JobId/$StepNo/$TaskNo died unexpectedly\n"); $self->Status("boterror"); $Status = "boterror";

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
48
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2017