January 2018 - Wine-Devel - list.winehq.org

Re: [PATCH] ole32/tests: Add a trailing '\n' to ok() calls.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH] gdi32/tests: Use the global HeapAlloc() wrappers

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com>

Jan. 31, 2018

Re: [PATCH] dwrite/tests: Use the global HeapAlloc() wrappers

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

Jan. 31, 2018

[PATCH] ole32/tests: Move stream creation to test function that's using it

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/hglobalstream.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ole32/tests/hglobalstream.c b/dlls/ole32/tests/hglobalstream.c index e20d81b8b0..6a0498aa60 100644 --- a/dlls/ole32/tests/hglobalstream.c +++ b/dlls/ole32/tests/hglobalstream.c @@ -43,16 +43,20 @@ do { \ } \ } while(0) -static void test_streamonhglobal(IStream *pStream) +static void test_streamonhglobal(void) { const char data[] = "Test String"; ULARGE_INTEGER ull; + IStream *pStream; LARGE_INTEGER ll; char buffer[128]; ULONG read; STATSTG statstg; HRESULT hr; + hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + ull.QuadPart = sizeof(data); hr = IStream_SetSize(pStream, ull); ok_ole_success(hr, "IStream_SetSize"); @@ -293,6 +297,8 @@ static void test_streamonhglobal(IStream *pStream) hr = IStream_SetSize(pStream, ull); ok(hr == E_OUTOFMEMORY || broken(hr == S_OK), /* win9x */ "IStream_SetSize with large size should have returned E_OUTOFMEMORY instead of 0x%08x\n", hr); + + IStream_Release(pStream); } static HRESULT WINAPI TestStream_QueryInterface(IStream *iface, REFIID riid, void **ppv) @@ -510,14 +516,7 @@ static void test_freed_hglobal(void) START_TEST(hglobalstream) { - HRESULT hr; - IStream *pStream; - - hr = CreateStreamOnHGlobal(NULL, TRUE, &pStream); - ok_ole_success(hr, "CreateStreamOnHGlobal"); - - test_streamonhglobal(pStream); - IStream_Release(pStream); + test_streamonhglobal(); test_copyto(); test_freed_hglobal(); } -- 2.15.1

Jan. 31, 2018

Re: [PATCH] comctl32/tests: Add test for v6 combobox dropdown size

by Nikolay Sivov

On 1/31/2018 2:19 AM, Fabian Maurer wrote: > There seems to be some inconsistency between windows versions, the test > fails for xp and 2003. Should I just check for windows version and > adjust the tests accordingly? If it's not essential to demonstrate new behavior of version 6 implementation, you can as well drop it. Some comments regarding actual patch. > +#define COMBO_YBORDERSIZE() 2 > + Why is it defined like that if it's a constant? Also if it's going to be used in this new test only you can use actual constant variable in new test function. > +static void test_listbox_size(DWORD style) I think it's better to call it test_combo_* to make it clear what's being tested. > + } info_height[] = { ... > + {80, 10, -1, TRUE, TRUE}, > + {100, 900, -1, TRUE, TRUE}, ... > + {100, 12, 30, TRUE, TRUE}, I'm a bit concerned about somewhat long loops this data will cause. Is it really necessary to have that many items? > + hCombo = CreateWindowA("ComboBox", "Combo", WS_VISIBLE | WS_CHILD | style, 5, 5, 100, > + info_test->height_combo, hMainWnd, (HMENU)COMBO_ID, NULL, 0); Since it's v6 only test, this could be WC_COMBOBOXA. > + for(test = 0; test < sizeof(info_height) / sizeof(info_height[0]); test++) ... > + if(info_test->limit != -1) ... > + if( expected_height_list < 0) Please reformat this to use consistent spacing - 1 space after keyword.

Jan. 31, 2018

Re: [PATCH resend 2/2] winex11.drv, winemac.drv: Don't send WM_CANCELMODE on focus loss.

by Dmitry Timoshkov

Zebediah Figura <z.figura12(a)gmail.com> wrote: > --- a/dlls/winex11.drv/event.c > +++ b/dlls/winex11.drv/event.c > @@ -804,7 +804,6 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) > return; > } > if (hwnd != GetForegroundWindow()) return; > - SendMessageW( hwnd, WM_CANCELMODE, 0, 0 ); > > /* don't reset the foreground window, if the window which is > getting the focus is a Wine window */ Menu modal loop depends on this, and probably will be broken if WM_CANCELMODE no longer sent. -- Dmitry.

Jan. 31, 2018

[PATCH] testbot: Better wrap the database backend code.

by Francois Gouget

ObjectModel::BackEnd no longer exposes its global active backends variable. Also provide a way to close all database connections so the code does not have to assume we only have the 'WineTestBot' one which would defeat the point of the BackEnd module. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 4 ++-- testbot/lib/ObjectModel/BackEnd.pm | 33 +++++++++++++++++++++++++-- testbot/lib/ObjectModel/DBIBackEnd.pm | 10 ++++---- testbot/lib/WineTestBot/VMs.pm | 4 ++-- testbot/lib/WineTestBot/WineTestBotObjects.pm | 4 ++-- 5 files changed, 42 insertions(+), 13 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 827879cf..d6375647 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -309,8 +309,8 @@ sub HandleJobStatusChange($$$) if ($OldStatus eq "running" && $NewStatus ne "running") { - # Make sure the child process does not inherit the database connection - $ActiveBackEnds{'WineTestBot'}->Close(); + # Make sure the child process does not inherit the database connections + CloseAllDBBackEnds(); my $Pid = fork; if (!defined $Pid) diff --git a/testbot/lib/ObjectModel/BackEnd.pm b/testbot/lib/ObjectModel/BackEnd.pm index 6c5c813d..0bb48cf7 100644 --- a/testbot/lib/ObjectModel/BackEnd.pm +++ b/testbot/lib/ObjectModel/BackEnd.pm @@ -30,11 +30,11 @@ should provide. =cut -use vars qw(@ISA @EXPORT %ActiveBackEnds); +use vars qw(@ISA @EXPORT); require Exporter; @ISA = qw(Exporter); -(a)EXPORT = qw(%ActiveBackEnds); +(a)EXPORT = qw(&AddDBBackEnd &GetDBBackEnd &RemoveDBBackEnd &CloseAllDBBackEnds); sub new($@) { @@ -51,4 +51,33 @@ sub _initialize($) #my ($self) = @_; } + +my %_ActiveBackEnds; + +sub AddDBBackEnd($$) +{ + my ($Name, $BackEnd) = @_; + $_ActiveBackEnds{$Name} = $BackEnd; +} + +sub GetDBBackEnd($) +{ + my ($Name) = @_; + return $_ActiveBackEnds{$Name}; +} + +sub RemoveDBBackEnd($) +{ + my ($Name) = @_; + delete $_ActiveBackEnds{$Name}; +} + +sub CloseAllDBBackEnds() +{ + foreach my $BackEnd (values %_ActiveBackEnds) + { + $BackEnd->Close(); + } +} + 1; diff --git a/testbot/lib/ObjectModel/DBIBackEnd.pm b/testbot/lib/ObjectModel/DBIBackEnd.pm index 565d4a8e..d4b07777 100644 --- a/testbot/lib/ObjectModel/DBIBackEnd.pm +++ b/testbot/lib/ObjectModel/DBIBackEnd.pm @@ -604,12 +604,12 @@ sub Close($) } } -sub UseDBIBackEnd($$@) +sub UseDBIBackEnd($$$$$$) { - my $class = shift; - my $DbSelector = shift; + my ($class, $DbSelector, $DbSource, $DbUser, $DbPassword, $DbArgs) = @_; - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector} = $class->new(); - $ObjectModel::BackEnd::ActiveBackEnds{$DbSelector}->{ConnectArgs} = \@_; + my $BackEnd = $class->new(); + $BackEnd->{ConnectArgs} = [$DbSource, $DbUser, $DbPassword, $DbArgs]; + AddDBBackEnd($DbSelector, $BackEnd); } 1; diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index 2ba6b4b5..bb9a8328 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -344,8 +344,8 @@ sub Run($$$$$) # So set ChildPid in the parent and synchronize with the child so it only # starts once this is done. - # Make sure the child process will use its own database connection - $self->GetBackEnd()->Close(); + # Make sure the child process will use its own database connections + CloseAllDBBackEnds(); use Fcntl; my ($fd_read, $fd_write); diff --git a/testbot/lib/WineTestBot/WineTestBotObjects.pm b/testbot/lib/WineTestBot/WineTestBotObjects.pm index b46fa41d..20ff6b1e 100644 --- a/testbot/lib/WineTestBot/WineTestBotObjects.pm +++ b/testbot/lib/WineTestBot/WineTestBotObjects.pm @@ -37,7 +37,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } @@ -61,7 +61,7 @@ require Exporter; sub GetBackEnd($) { #my ($self) = @_; - return $ActiveBackEnds{'WineTestBot'}; + return GetDBBackEnd('WineTestBot'); } 1; -- 2.15.1

Jan. 31, 2018

[PATCH] dxgi: Fix a trailing '\n' in a FIXME().

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/dxgi/factory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 267b11b9d91..832e2cb132d 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -379,7 +379,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusEvent(IDXGIFac static void STDMETHODCALLTYPE dxgi_factory_UnregisterStereoStatus(IDXGIFactory4 *iface, DWORD cookie) { - FIXME("iface %p, cookie %#x stub!n", iface, cookie); + FIXME("iface %p, cookie %#x stub!\n", iface, cookie); } static HRESULT STDMETHODCALLTYPE dxgi_factory_RegisterStereoStatusWindow(IDXGIFactory4 *iface, -- 2.15.1

Jan. 31, 2018

[PATCH] ole32/tests: Add a trailing '\n' to ok() calls.

by Francois Gouget

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/ole32/tests/compobj.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index aef10376d1c..f1e0134731c 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -2795,7 +2795,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) ok(hr == S_OK, "CoInitializeEx failed with error 0x%08x\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); - ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x", hr); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); hr = CoMarshalInterface(stream, &IID_IUnknown, &Test_Unknown, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hr == S_OK, "CoMarshalInterface should have returned S_OK instead of 0x%08x\n", hr); @@ -2806,7 +2806,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) PostThreadMessageW(GetCurrentThreadId(), WM_QUIT, 0, 0); hr = CoRegisterMessageFilter(&MessageFilter, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); thread = CreateThread(NULL, 0, cowait_unmarshal_thread, stream, 0, &tid); ok(thread != NULL, "CreateThread failed, error %u\n", GetLastError()); @@ -2817,7 +2817,7 @@ static DWORD CALLBACK test_CoWaitForMultipleHandles_thread(LPVOID arg) CloseHandle(thread); hr = CoRegisterMessageFilter(NULL, NULL); - ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x", hr); + ok(hr == S_OK, "CoRegisterMessageFilter failed: %08x\n", hr); IStream_Release(stream); -- 2.15.1

Jan. 31, 2018

Re: [PATCH resend 1/2] user32: Kill focus before minimizing a window.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at https://testbot.winehq.org/JobDetails.pl?Key=35661 Your paranoid android. === w1064 (32 bit win) === win.c:2331: Test failed: expected !100 win.c:2331: Test failed: expected !100

Jan. 31, 2018