April 2013 - Wine-Commits - list.winehq.org

Michael Stefaniuc : dplayx: Move the DirectPlayLobby data fields to the main object.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 2a63cf67abdf571be019408db8f09bb237398f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a63cf67abdf571be019408db… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:14:38 2013 +0200 dplayx: Move the DirectPlayLobby data fields to the main object. --- dlls/dplayx/dplobby.c | 69 +++++++++++------------------------------------- 1 files changed, 16 insertions(+), 53 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 33509a6..7b0c57a 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -63,13 +63,6 @@ struct DPLMSG }; typedef struct DPLMSG* LPDPLMSG; -typedef struct tagDirectPlayLobbyData -{ - HKEY hkCallbackKeyHack; - DWORD dwMsgThread; - DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ -} DirectPlayLobbyData; - typedef struct IDirectPlayLobbyImpl { IDirectPlayLobby IDirectPlayLobby_iface; @@ -81,7 +74,9 @@ typedef struct IDirectPlayLobbyImpl LONG numIfaces; /* "in use interfaces" refcount */ LONG ref, refA, ref2, ref2A, ref3, ref3A; CRITICAL_SECTION lock; - DirectPlayLobbyData* dpl; + HKEY cbkeyhack; + DWORD msgtid; + DPQ_HEAD( DPLMSG ) msgs; /* List of messages received */ } IDirectPlayLobbyImpl; static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby( IDirectPlayLobby *iface ) @@ -114,41 +109,12 @@ static inline IDirectPlayLobbyImpl *impl_from_IDirectPlayLobby3A( IDirectPlayLob return CONTAINING_RECORD( iface, IDirectPlayLobbyImpl, IDirectPlayLobby3A_iface ); } -static BOOL DPL_CreateLobby1( LPVOID lpDPL ) -{ - IDirectPlayLobbyImpl *This = lpDPL; - - This->dpl = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( *(This->dpl) ) ); - if ( This->dpl == NULL ) - { - return FALSE; - } - - DPQ_INIT( This->dpl->msgs ); - - return TRUE; -} - -static BOOL DPL_DestroyLobby1( LPVOID lpDPL ) -{ - IDirectPlayLobbyImpl *This = lpDPL; - - if( This->dpl->dwMsgThread ) - { - FIXME( "Should kill the msg thread\n" ); - } - - DPQ_DELETEQ( This->dpl->msgs, msgs, LPDPLMSG, cbDeleteElemFromHeap ); - - /* Delete the contents */ - HeapFree( GetProcessHeap(), 0, This->dpl ); - - return TRUE; -} - static void dplobby_destroy(IDirectPlayLobbyImpl *obj) { - DPL_DestroyLobby1( obj ); + if ( obj->msgtid ) + FIXME( "Should kill the msg thread\n" ); + + DPQ_DELETEQ( obj->msgs, msgs, LPDPLMSG, cbDeleteElemFromHeap ); obj->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &obj->lock ); HeapFree( GetProcessHeap(), 0, obj ); @@ -995,7 +961,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumLocalApplications( IDirectPlayL EnterCriticalSection( &This->lock ); - memcpy( &This->dpl->hkCallbackKeyHack, &hkServiceProvider, sizeof( hkServiceProvider ) ); + memcpy( &This->cbkeyhack, &hkServiceProvider, sizeof( hkServiceProvider ) ); if( !lpEnumLocalAppCallback( &dplAppInfo, lpContext, dwFlags ) ) { @@ -1182,7 +1148,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; /* Get all the appropriate data from the registry */ - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, clSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, clSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1196,7 +1162,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, cdSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, cdSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1210,7 +1176,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, fileSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, fileSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1224,7 +1190,7 @@ static BOOL CALLBACK RunApplicationA_EnumLocalApplications sizeOfReturnBuffer = 200; - if( RegQueryValueExA( lpData->This->dpl->hkCallbackKeyHack, pathSubKey, + if( RegQueryValueExA( lpData->This->cbkeyhack, pathSubKey, NULL, &returnType, (LPBYTE)returnBuffer, &sizeOfReturnBuffer ) != ERROR_SUCCESS ) { @@ -1433,10 +1399,9 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_RunApplication( IDirectPlayLobby3A &hStart, &hDeath, &hSettingRead ); /* Setup the message thread ID */ - This->dpl->dwMsgThread = - CreateLobbyMessageReceptionThread( hReceiveEvent, hStart, hDeath, hSettingRead ); + This->msgtid = CreateLobbyMessageReceptionThread( hReceiveEvent, hStart, hDeath, hSettingRead ); - DPLAYX_SetLobbyMsgThreadId( newProcessInfo.dwProcessId, This->dpl->dwMsgThread ); + DPLAYX_SetLobbyMsgThreadId( newProcessInfo.dwProcessId, This->msgtid ); LeaveCriticalSection( &This->lock ); @@ -2088,11 +2053,9 @@ HRESULT dplobby_create( REFIID riid, void **ppv ) InitializeCriticalSection( &obj->lock ); obj->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectPlayLobbyImpl.lock"); + DPQ_INIT( obj->msgs ); - if ( DPL_CreateLobby1( obj ) ) - hr = IDirectPlayLobby_QueryInterface( &obj->IDirectPlayLobby3_iface, riid, ppv ); - else - hr = DPERR_NOMEMORY; + hr = IDirectPlayLobby_QueryInterface( &obj->IDirectPlayLobby3_iface, riid, ppv ); IDirectPlayLobby_Release( &obj->IDirectPlayLobby3_iface ); return hr;

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby2.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 185dd369299acf319f051b5e3cafb0fd728bf318 URL: http://source.winehq.org/git/wine.git/?a=commit;h=185dd369299acf319f051b5e3… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:13:45 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby2. --- dlls/dplayx/dplobby.c | 159 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 158 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=185dd369299acf319f051…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobby2A.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 4d9882572c5109fc855d51c084b6a9ac7b987e3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d9882572c5109fc855d51c08… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:12:53 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobby2A. --- dlls/dplayx/dplobby.c | 159 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 158 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4d9882572c5109fc855d5…

1 0

Michael Stefaniuc : dplayx: Add a separate refcount for IDirectPlayLobbyA.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 2314df86dfe38f6b0b4f3996defa28db237c4802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2314df86dfe38f6b0b4f3996d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:12:04 2013 +0200 dplayx: Add a separate refcount for IDirectPlayLobbyA. --- dlls/dplayx/dplobby.c | 150 +++++++++++++++++++++++++++++++++++++++++++- dlls/dplayx/tests/dplayx.c | 2 +- 2 files changed, 149 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2314df86dfe38f6b0b4f3…

1 0

Michael Stefaniuc : dplayx: Assimilate the IDirectPlayLobby3 methods.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: 0870290ca6716838b7ae8ec05b751d02430ccc9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0870290ca6716838b7ae8ec05… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 17 22:07:06 2013 +0200 dplayx: Assimilate the IDirectPlayLobby3 methods. --- dlls/dplayx/dplobby.c | 160 +++++++++++++++++-------------------------------- 1 files changed, 56 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0870290ca6716838b7ae8…

1 0

Detlef Riekenberg : gdiplus/tests: Add tests for GdipSetCustomLineCapWidthScale.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: wine Branch: master Commit: fa5d09105124c122e52f96f0677371579e1d6a32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa5d09105124c122e52f96f06… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Wed Apr 17 22:41:42 2013 +0200 gdiplus/tests: Add tests for GdipSetCustomLineCapWidthScale. --- dlls/gdiplus/tests/customlinecap.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index 218e46d..604589e 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -174,12 +174,45 @@ static void test_scale(void) expect(InvalidParameter, stat); stat = GdipGetCustomLineCapWidthScale(custom, NULL); expect(InvalidParameter, stat); - /* valid args */ + + stat = GdipSetCustomLineCapWidthScale(NULL, 2.0); + expect(InvalidParameter, stat); + + /* valid args: read default */ scale = (REAL)0xdeadbeef; stat = GdipGetCustomLineCapWidthScale(custom, &scale); expect(Ok, stat); expectf(1.0, scale); + /* set and read back some scale values: there is no limit for the scale */ + stat = GdipSetCustomLineCapWidthScale(custom, 2.5); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(2.5, scale); + + stat = GdipSetCustomLineCapWidthScale(custom, 42.0); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(42.0, scale); + + stat = GdipSetCustomLineCapWidthScale(custom, 3000.0); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(3000.0, scale); + + stat = GdipSetCustomLineCapWidthScale(custom, 0.0); + expect(Ok, stat); + scale = (REAL)0xdeadbeef; + stat = GdipGetCustomLineCapWidthScale(custom, &scale); + expect(Ok, stat); + expectf(0.0, scale); + GdipDeleteCustomLineCap(custom); GdipDeletePath(path); }

1 0

Francois Gouget : testbot: Fix handling of tests for dll names containing dots or dashes.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: tools Branch: master Commit: 0a9fded16c707af4b147eb88d25be4eb9ef85426 URL: http://source.winehq.org/git/tools.git/?a=commit;h=0a9fded16c707af4b147eb88… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:24:43 2013 +0200 testbot: Fix handling of tests for dll names containing dots or dashes. Conformance tests for 'dlls' containing dots in their name, 'winspool.drv' for instance, should be allowed. Wine does not support conformance tests for dlls containing dashes in their names however, 'api-ms-*' for instance, so reject those. --- testbot/bin/WineRunBuild.pl | 12 +++++++----- testbot/web/Submit.pl | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index c230316..98a9211 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -202,14 +202,16 @@ foreach my $OtherStep (@{$Job->Steps->GetItems()}) $Run64 = 1 if ($OtherStep->FileType eq "exe64"); my $OtherFileName = $OtherStep->FileName; - if ($OtherFileName =~ m/^([\w_\-]+)(|\.exe)_test(|64)\.exe$/) + if ($OtherFileName =~ m/^([\w_.]+)_test(?:64)?\.exe$/) { - if (defined $BaseName and $BaseName ne $1) + my $OtherBaseName = $1; + $OtherBaseName =~ s/\.exe$//; + if (defined $BaseName and $BaseName ne $OtherBaseName) { - FatalError "$1 doesn't match previously found $BaseName\n", + FatalError "$OtherBaseName doesn't match previously found $BaseName\n", $FullErrFileName, $Job, $Task; } - $BaseName = $1; + $BaseName = $OtherBaseName; } } if (!defined $BaseName) @@ -292,7 +294,7 @@ if ($NewStatus eq "completed") next if ($OtherStep->No == $StepNo); my $OtherFileName = $OtherStep->FileName; - next if ($OtherFileName !~ /^[\w_\-]+(?:|\.exe)_test(?:|64)\.exe$/); + next if ($OtherFileName !~ /^[\w_.]+_test(?:64)?\.exe$/); my $OtherStepDir = "$DataDir/jobs/$JobId/" . $OtherStep->No; mkdir $OtherStepDir; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 42ca77a..f73ae6a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -470,9 +470,9 @@ sub Validate elsif ($self->{Page} == 3 && $self->GetParam("Page") == 3) { if (($self->GetParam("FileType") eq "patchdlls" && - ! ($self->GetParam("TestExecutable") =~ m/^[a-zA-Z0-9_]+_test\.exe/)) || + ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+_test\.exe/)) || ($self->GetParam("FileType") eq "patchprograms") && - ! ($self->GetParam("TestExecutable") =~ m/^[a-zA-Z0-9_]+\.exe_test\.exe/)) + ! ($self->GetParam("TestExecutable") =~ m/^[\w_.]+\.exe_test\.exe/)) { $self->{ErrMessage} = "Invalid name for Test executable"; $self->{ErrField} = "TestExecutable";

1 0

Francois Gouget : testbot/web: Uncheck maintenance and offline VMs for jobs submitted through the web.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: tools Branch: master Commit: 92a374fa4ad5d8aea20eb021cc0126d06734ca04 URL: http://source.winehq.org/git/tools.git/?a=commit;h=92a374fa4ad5d8aea20eb021… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:20:45 2013 +0200 testbot/web: Uncheck maintenance and offline VMs for jobs submitted through the web. Developers will still be able to schedule jobs on them but they will do so knowingly. --- testbot/web/Submit.pl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index bbab0e0..42ca77a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -256,16 +256,20 @@ sub GenerateFields { print " (", $self->CGI->escapeHTML($VM->Description), ")"; } + my $Checked = 1; if ($VM->Status eq 'offline') { print " [offline]"; + $Checked = undef; } elsif ($VM->Status eq 'maintenance') { print " [maintenance]"; + $Checked = undef; } print "</label><div class='ItemValue'><input type='checkbox' name='$FieldName'"; - if ($self->GetParam("Page") == 1 || $self->GetParam($FieldName)) + if ($Checked and + ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) { print " checked='checked'"; }

1 0

Francois Gouget : testbot/Engine: --kill-vms should also shut down idle VMs .
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: tools Branch: master Commit: 206b1f72fa92795c27944715b152e69dc3e3898f URL: http://source.winehq.org/git/tools.git/?a=commit;h=206b1f72fa92795c27944715… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:24:58 2013 +0200 testbot/Engine: --kill-vms should also shut down idle VMs. --- testbot/bin/Engine.pl | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 670945a..2438298 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -180,11 +180,15 @@ sub Cleanup(;$$) if ($VM->IsPoweredOn()) { - next if ($VM->Status eq "idle"); if ($KillVMs) { kill("TERM", $VM->ChildPid) if (defined $VM->ChildPid); } + elsif ($VM->Status eq "idle") + { + # Assume these are still ready for use + next; + } elsif (($VM->Status eq "reverting" or $VM->Status eq "sleeping") and defined $VM->ChildPid and kill(0, $VM->ChildPid)) {

1 0

Francois Gouget : testbot: Simplify and / or optimize some regular expressions.
by Alexandre Julliard April 18, 2013

April 18, 2013

Module: tools Branch: master Commit: a13c885191e14ad205d61e33374aebfe7ee0186b URL: http://source.winehq.org/git/tools.git/?a=commit;h=a13c885191e14ad205d61e33… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 18 19:20:29 2013 +0200 testbot: Simplify and / or optimize some regular expressions. --- testbot/bin/WineSendLog.pl | 6 +++--- testbot/lib/WineTestBot/Patches.pm | 2 +- testbot/web/Submit.pl | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 4e678bd..0b31e7c 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -392,7 +392,8 @@ EOF my ($BotFailure, $MessagesFromErr) = CheckErrLog("$TaskDir/err"); if (! $BotFailure) { - my $Bits = ($StepTask->FileName =~ /_test64\.exe$/ ? 64 : 32); + $StepTask->FileName =~ m/^(.*)_test(64)?\.exe$/; + my ($BaseName, $Bits) = ($1, $2 || "32"); my $LatestName = "$DataDir/latest/" . $StepTask->VM->Name . "_$Bits"; my ($LatestBotFailure, $Dummy) = CheckErrLog("$LatestName.err"); my $MessagesFromLog = ""; @@ -400,9 +401,8 @@ EOF { if (defined($StepTask->CmdLineArg)) { - $StepTask->FileName =~ m/^(.*)_test(64)?\.exe/; $MessagesFromLog = CompareLogs("$LatestName.log", "$TaskDir/log", - $1, $StepTask->CmdLineArg); + $BaseName, $StepTask->CmdLineArg); } } else diff --git a/testbot/lib/WineTestBot/Patches.pm b/testbot/lib/WineTestBot/Patches.pm index 186398d..a478fbf 100644 --- a/testbot/lib/WineTestBot/Patches.pm +++ b/testbot/lib/WineTestBot/Patches.pm @@ -131,7 +131,7 @@ sub Submit my $Line; while (defined($Line = <BODY>)) { - if ($Line =~ m/^\+\+\+ .*\/(dlls|programs)\/([^\/]+)\/tests\/([^\/\s]+)/) + if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { my $FileType = "patch$1"; my $BaseName = $2; diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index 1288bf0..bbab0e0 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -564,7 +564,7 @@ sub DetermineFileType my $PrevMinus = !1; while (defined($Line = <FH>)) { - if ($Line =~ m/^\+\+\+ .*\/(dlls|programs)\/([^\/]+)\/tests\/([^\/\s]+)/) + if ($Line =~ m~^\+\+\+ .*/(dlls|programs)/([^/]+)/tests/([^/\s]+)~) { $FileType = "patch$1"; my $ThisDllBaseName = $2; @@ -875,7 +875,7 @@ sub OnSubmit my $FileName=$self->GetParam("TestExecutable"); if ($Bits eq "64") { - $FileName =~ s/^([a-zA-Z0-9_.]+)_test\.exe/\1_test64.exe/; + $FileName =~ s/_test\.exe$/_test64.exe/; } $TestStep->FileName($FileName); $TestStep->InStaging(!1);

1 0