January 2006 - Wine-commits

appdb/include version.php
by WineHQ 28 Jan '06

28 Jan '06

ChangeSet ID: 22585 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 17:06:07 Modified files: include : version.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Version class fixes. Let update() be silent if desired, get rid of redundant message in unqueue(). Patch: http://cvs.winehq.org/patch.py?id=22585 Old revision New revision Changes Path 1.45 1.46 +2 -5 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.45 appdb/include/version.php:1.46 --- appdb/include/version.php:1.45 28 Jan 2006 23: 6: 7 -0000 +++ appdb/include/version.php 28 Jan 2006 23: 6: 7 -0000 @@ -207,7 +207,7 @@ class Version { /** * Update version. */ - function update() + function update($bSilent=false) { $sWhatChanged = ""; @@ -270,7 +270,7 @@ class Version { $sWhatChanged .= "Version was moved from application ".$oAppBefore->sName." to application ".$oAppAfter->sName.".\n\n"; } - if($sWhatChanged) + if($sWhatChanged and !$bSilent) $this->SendNotificationMail("edit",$sWhatChanged); return true; } @@ -367,9 +367,6 @@ class Version { // we send an e-mail to intersted people $this->mailSubmitter("unQueue"); $this->SendNotificationMail(); - - // the version has been unqueued - addmsg("The version has been unqueued.", "green"); } }

1 0

appdb/include application.php
by WineHQ 28 Jan '06

28 Jan '06

ChangeSet ID: 22584 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 17:04:21 Modified files: include : application.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Application class fixes. Let update be silent when we want it to be. Get rid of redundant message in unqueue(). Fix logic in SendNotificationMail(). Patch: http://cvs.winehq.org/patch.py?id=22584 Old revision New revision Changes Path 1.40 1.41 +4 -7 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.40 appdb/include/application.php:1.41 --- appdb/include/application.php:1.40 28 Jan 2006 23: 4:21 -0000 +++ appdb/include/application.php 28 Jan 2006 23: 4:21 -0000 @@ -138,7 +138,7 @@ class Application { * Update application. * Returns true on success and false on failure. */ - function update() + function update($bSilent=false) { $sWhatChanged = ""; @@ -200,7 +200,7 @@ class Application { $oCatAfter = new Category($this->iCatId); $sWhatChanged .= "Vendor was changed from ".$oCatBefore->sName." to ".$oCatAfter->sName.".\n\n"; } - if($sWhatChanged) + if($sWhatChanged and !$bSilent) $this->SendNotificationMail("edit",$sWhatChanged); return true; } @@ -265,9 +265,6 @@ class Application { // we send an e-mail to intersted people $this->mailSubmitter(); $this->SendNotificationMail(); - - // the application has been unqueued - addmsg("The application has been unqueued.", "green"); } } @@ -355,7 +352,7 @@ class Application { switch($sAction) { case "add": - if(!$this->sQueued == 'true') + if($this->sQueued == 'false') // Has been accepted. { $sSubject = $this->sName." has been added by ".$_SESSION['current']->sRealname; $sMsg = APPDB_ROOT."appview.php?appId=".$this->iAppId."\n"; @@ -366,7 +363,7 @@ class Application { $sMsg .= "\n"; } addmsg("The application was successfully added into the database.", "green"); - } else // Application queued. + } else { $sSubject = $this->sName." has been submitted by ".$_SESSION['current']->sRealname; $sMsg .= "This application has been queued.";

1 0

appdb/admin adminTestResults.php
by WineHQ 28 Jan '06

28 Jan '06

ChangeSet ID: 22583 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 17:00:35 Modified files: admin : adminTestResults.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Fix spelling of 'testing' Patch: http://cvs.winehq.org/patch.py?id=22583 Old revision New revision Changes Path 1.3 1.4 +2 -2 appdb/admin/adminTestResults.php Index: appdb/admin/adminTestResults.php diff -u -p appdb/admin/adminTestResults.php:1.3 appdb/admin/adminTestResults.php:1.4 --- appdb/admin/adminTestResults.php:1.3 28 Jan 2006 23: 0:35 -0000 +++ appdb/admin/adminTestResults.php 28 Jan 2006 23: 0:35 -0000 @@ -148,7 +148,7 @@ else // if ($_REQUEST['sub']) is not def { //no apps in queue echo html_frame_start("Submitted Testing Results","90%"); - echo '<p><b>The Submitted Testng Results Queue is empty.</b></p>',"\n"; + echo '<p><b>The Submitted Testing Results Queue is empty.</b></p>',"\n"; echo html_frame_end(" "); } else @@ -169,7 +169,7 @@ else // if ($_REQUEST['sub']) is not def { //no rejected test results in queue echo html_frame_start("Rejected Testing Results","90%"); - echo '<p><b>The Rejected Testng Results Queue is empty.</b></p>',"\n"; + echo '<p><b>The Rejected Testing Results Queue is empty.</b></p>',"\n"; echo html_frame_end(" "); } else

1 0

appdb/admin adminAppQueue.php
by WineHQ 28 Jan '06

28 Jan '06

ChangeSet ID: 22582 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 16:59:51 Modified files: admin : adminAppQueue.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> Allow administrators to submit app, version and testresults in one step instead of three. Fix minor vendor logic bug. Patch: http://cvs.winehq.org/patch.py?id=22582 Old revision New revision Changes Path 1.50 1.51 +18 -23 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.50 appdb/admin/adminAppQueue.php:1.51 --- appdb/admin/adminAppQueue.php:1.50 28 Jan 2006 22:59:51 -0000 +++ appdb/admin/adminAppQueue.php 28 Jan 2006 22:59:51 -0000 @@ -132,37 +132,29 @@ if ($_REQUEST['sub']) if($_REQUEST['sub'] == 'add') { - if (($_REQUEST['apptype'] == "application") && is_numeric($_REQUEST['appId'])) // application + $oVersion = new Version($_REQUEST['versionId']); + $oTest = new testData($_REQUEST['iTestingId']); + $oVersion->GetOutputEditorValues(); + $oTest->GetOutputEditorValues(); + if ($_REQUEST['apptype'] == "application") // application { + $oApp = new Application($_REQUEST['appId']); + $oApp->GetOutputEditorValues(); // load the values from $_REQUEST // add new vendor - if($_REQUEST['appVendorName']) + if($_REQUEST['appVendorName'] and !$_REQUEST['appVendorId']) { $oVendor = new Vendor(); $oVendor->create($_REQUEST['appVendorName'],$_REQUEST['appWebpage']); + $oApp->iVendorId = $oVendor->iVendorId; } - - $oApp = new Application($_REQUEST['appId']); - $oApp->GetOutputEditorValues(); - $oApp->update(); + $oApp->update(true); $oApp->unQueue(); - } else if(($_REQUEST['apptype'] == "version") && is_numeric($_REQUEST['versionId'])) // version - { - $oVersion = new Version($_REQUEST['versionId']); - $oVersion->GetOutputEditorValues(); - $oVersion->update(); - $oVersion->unQueue(); - foreach($oVersion->aVersionIds as $iTestingId) - { - $oTest = new Version($iTestingId); - $oTest->GetOutputEditorValues(); - $oTest->iVersionId = $oVersion->iVersionId; - $oTest->iVersionId = $oVersion->iVersionId; - $oTest->Update(); - $oTest->unQueue(); - } } - - redirect(apidb_fullurl("admin/adminAppQueue.php")); + $oVersion->update(true); + $oVersion->unQueue(); + $oTest->update(true); + $oTest->unQueue(); + redirect($_SERVER['PHP_SELF']); } else if ($_REQUEST['sub'] == 'duplicate') { @@ -347,7 +339,10 @@ if ($_REQUEST['sub']) //vendor field if($iVendorId) + { $sVendor = ""; + $oApp->iVendorId = $iVendorId; + } } /* output the appropriate editors depending on whether we are processing an application */

1 0

appdb/ ./appview.php include/testResults.php
by WineHQ 28 Jan '06

28 Jan '06

ChangeSet ID: 22581 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/01/28 16:53:28 Modified files: . : appview.php include : testResults.php Log message: Jason Weisberger <jbdubbs(a)gmail.com> Allow the user to limit or show all of the testing results for a particular version Patch: http://cvs.winehq.org/patch.py?id=22581 Old revision New revision Changes Path 1.77 1.78 +4 -1 appdb/appview.php 1.8 1.9 +41 -9 appdb/include/testResults.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.77 appdb/appview.php:1.78 --- appdb/appview.php:1.77 28 Jan 2006 22:53:28 -0000 +++ appdb/appview.php 28 Jan 2006 22:53:28 -0000 @@ -524,7 +524,10 @@ else if($_REQUEST['versionId']) $oTest = new TestData($_REQUEST['iTestingId']); $iCurrentTest = $oTest->ShowTestResult($oTest->iTestingId,$oVersion->iVersionId); if($iCurrentTest) - $oTest->ShowVersionsTestingTable($oVersion->iVersionId,$iCurrentTest,$_SERVER['PHP_SELF']."?versionId=".$oVersion->iVersionId."&iTestingId="); + $oTest->ShowVersionsTestingTable($oVersion->iVersionId, + $iCurrentTest, + $_SERVER['PHP_SELF']."?versionId=".$oVersion->iVersionId."&iTestingId=", + 5); echo '<form method=post name=message action=testResults.php?sub=view&iVersionId='.$oVersion->iVersionId.'>'; echo '<input type=submit value="Add Testing Data" class="button" />'; echo '</form>'; Index: appdb/include/testResults.php diff -u -p appdb/include/testResults.php:1.8 appdb/include/testResults.php:1.9 --- appdb/include/testResults.php:1.8 28 Jan 2006 22:53:28 -0000 +++ appdb/include/testResults.php 28 Jan 2006 22:53:28 -0000 @@ -347,13 +347,25 @@ class testData{ } // Show the Test results for a application version - function ShowVersionsTestingTable($iVersionId, $iCurrentTest, $link) + function ShowVersionsTestingTable($iVersionId, $iCurrentTest, $link, $iDisplayLimit) { - $hResult = query_appdb("SELECT * - FROM testResults - WHERE versionId = '".$iVersionId."' - ORDER BY testedDate DESC;"); - if(!$hResult || mysql_num_rows($hResult) == 0) + $showAll = $_REQUEST['showAll']; + + $sQuery = "SELECT * + FROM testResults + WHERE versionId = '".$iVersionId."' + ORDER BY testedDate DESC"; + + if(!$showAll) + $sQuery.=" LIMIT 0,".$iDisplayLimit; + + $hResult = query_appdb($sQuery); + if(!$hResult) + return; + + $rowsUsed = mysql_num_rows($hResult); + + if($rowsUsed == 0) return; echo '<p><span class="title">Testing Results</span><br />',"\n"; echo '<table width="100%" border="1" class="historyTable">',"\n"; @@ -376,10 +388,20 @@ class testData{ $oDistribution = new distribution($oTest->iDistributionId); $bgcolor = $oTest->sTestedRating; echo '<tr class='.$bgcolor.'>',"\n"; + if ($oTest->iTestingId == $iCurrentTest) + { echo ' <td align="center" class="color2"><b>Current</b></td>',"\n"; - else - echo ' <td align="center" class="color2">[<a href="'.$link.$oTest->iTestingId.'">Show</a>]</td>',"\n"; + } else + { + echo ' <td align="center" class="color2">[<a href="'.$link.$oTest->iTestingId; + + if(is_string($showAll)) + echo '&showAll='.$showAll.'">Show</a>]</td>',"\n"; + else + echo '">Show</a>]</td>',"\n"; + } + echo ' <td>',"\n"; echo '<a href="'.BASE.'distributionView.php?iDistributionId='.$oTest->iDistributionId.'">',"\n"; echo $oDistribution->sName.'</a>',"\n"; @@ -393,9 +415,19 @@ class testData{ } echo '</table>',"\n"; - + echo '<form method=get action="'.$PHP_SELF.'">'; + echo '<input name="versionId" type=hidden value="',$iVersionId,'" />'; + if($rowsUsed >= $iDisplayLimit && !is_string($showAll)) + echo '<input class="button" name="showAll" type=submit value="Show All Tests" />'; + + if(is_string($showAll)) + { + echo '<input class="button" name="hideAll" type=submit value="Limit to '.$iDisplayLimit.' Tests" />'; + } + echo '</form>'; } + // show the fields for editing function OutputEditor($sDistribution, $bNewDist=false) {

1 0

lostwages/templates/en status_dlls.template
by Jeremy Newman 27 Jan '06

27 Jan '06

ChangeSet ID: 22580 CVSROOT: /opt/cvs-commit Module name: lostwages Changes by: jnewman(a)winehq.org 2006/01/27 14:39:12 Modified files: templates/en : status_dlls.template Log message: Tom Wickline <twickline(a)gmail.com> fix documentation link for security.dll Patch: http://cvs.winehq.org/patch.py?id=22580 Old revision New revision Changes Path 1.34 1.35 +1 -1 lostwages/templates/en/status_dlls.template Index: lostwages/templates/en/status_dlls.template diff -u -p lostwages/templates/en/status_dlls.template:1.34 lostwages/templates/en/status_dlls.template:1.35 --- lostwages/templates/en/status_dlls.template:1.34 27 Jan 2006 20:39:12 -0000 +++ lostwages/templates/en/status_dlls.template 27 Jan 2006 20:39:12 -0000 @@ -532,7 +532,7 @@ </tr> <tr> <td>security.dll</td> - <td class="nonexistent">Nonexistent</td> + <td class="adequate"><a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/secauthn/s…">MSDN: Authentication Functions</a></td> <td>None</td> <td class="pct5">5% complete</td> <td>Robert Shearman</td>

1 0

Huw Davies : msxml: Issue a fixme if the interface is not implemented.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: e1e1f79288e57af5049ad1065692e19cf373e260 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=e1e1f79288e57af5049ad10… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Jan 27 19:22:56 2006 +0100 msxml: Issue a fixme if the interface is not implemented. --- dlls/msxml3/domdoc.c | 3 +++ dlls/msxml3/element.c | 3 +++ dlls/msxml3/factory.c | 1 + dlls/msxml3/node.c | 1 + dlls/msxml3/nodelist.c | 3 +++ dlls/msxml3/nodemap.c | 3 +++ dlls/msxml3/parseerror.c | 3 +++ 7 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 5b27b28..33cdaf5 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -95,7 +95,10 @@ static HRESULT WINAPI domdoc_QueryInterf return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; + } IXMLDOMDocument_AddRef( iface ); diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 9f4ba3e..33c905d 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -74,7 +74,10 @@ static HRESULT WINAPI domelem_QueryInter return IUnknown_QueryInterface(This->node_unk, riid, ppvObject); } else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; + } IXMLDOMElement_AddRef( iface ); diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index f825879..126e70d 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -63,6 +63,7 @@ static HRESULT WINAPI xmlcf_QueryInterfa return S_OK; } + FIXME("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 607056c..58bdd92 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -775,6 +775,7 @@ static HRESULT WINAPI Internal_QueryInte *ppvObject = &This->lpVtbl; else { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index db4e370..806985c 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -167,7 +167,10 @@ static HRESULT WINAPI xmlnodelist_QueryI *ppvObject = iface; } else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; + } IXMLDOMNodeList_AddRef( iface ); diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index 6580667..5166020 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -64,7 +64,10 @@ static HRESULT WINAPI xmlnodemap_QueryIn *ppvObject = iface; } else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; + } IXMLDOMElement_AddRef( iface ); diff --git a/dlls/msxml3/parseerror.c b/dlls/msxml3/parseerror.c index 359ce64..acde7cc 100644 --- a/dlls/msxml3/parseerror.c +++ b/dlls/msxml3/parseerror.c @@ -63,7 +63,10 @@ static HRESULT WINAPI parseError_QueryIn *ppvObject = iface; } else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; + } IXMLDOMParseError_AddRef( iface );

1 0

Dmitry Timoshkov : gdi: Add test case for creating pens, make it pass under Wine for
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 9aa555623a054eb7d9e7bdf2f3d99ddf00793c62 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9aa555623a054eb7d9e7bdf… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri Jan 27 19:22:38 2006 +0100 gdi: Add test case for creating pens, make it pass under Wine for cosmetic pens. --- dlls/gdi/pen.c | 36 ++++++-- dlls/gdi/tests/gdiobj.c | 223 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=9aa555623a054eb7d9e…

1 0

Mike McCormack : kernel: Partially implement ReadDirectoryChangesW using NtNotifyChangeDirectoryFile.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 700575955782bed874734610476aab6c8826f775 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=700575955782bed87473461… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 27 19:19:46 2006 +0100 kernel: Partially implement ReadDirectoryChangesW using NtNotifyChangeDirectoryFile. --- dlls/kernel/change.c | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/kernel/change.c b/dlls/kernel/change.c index 1f1b162..b2fed36 100644 --- a/dlls/kernel/change.c +++ b/dlls/kernel/change.c @@ -31,7 +31,6 @@ #include "winerror.h" #include "winternl.h" #include "kernel_private.h" -#include "wine/server.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(file); @@ -129,9 +128,31 @@ BOOL WINAPI ReadDirectoryChangesW( HANDL DWORD filter, LPDWORD returned, LPOVERLAPPED overlapped, LPOVERLAPPED_COMPLETION_ROUTINE completion ) { - FIXME( "%p %p 0x%08lx %d 0x%08lx %p %p %p\n", handle, buffer, len, subtree, filter, + IO_STATUS_BLOCK io; + NTSTATUS status; + BOOL ret = TRUE; + HANDLE event; + + TRACE("%p %p %08lx %d %08lx %p %p %p\n", handle, buffer, len, subtree, filter, returned, overlapped, completion ); - SetLastError( ERROR_INVALID_FUNCTION ); - return FALSE; + if (overlapped) + event = overlapped->hEvent; + else + event = CreateEventW( NULL, 0, 0, NULL ); + + status = NtNotifyChangeDirectoryFile( handle, event, NULL, NULL, + &io, buffer, len, filter, subtree ); + if (status != STATUS_PENDING) + { + SetLastError( RtlNtStatusToDosError(status) ); + ret = FALSE; + } + else if (!overlapped) + WaitForSingleObject( event, INFINITE ); + + if (!overlapped) + CloseHandle( event ); + + return ret; }

1 0

Juan Lang : iphlpapi: Reimplement interface enumeration.
by Alexandre Julliard 27 Jan '06

27 Jan '06

Module: wine Branch: refs/heads/master Commit: 540dca3259ffdb4c608ca7482af69a532d80e989 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=540dca3259ffdb4c608ca74… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Fri Jan 27 19:19:32 2006 +0100 iphlpapi: Reimplement interface enumeration. Implement interface enumeration based on if_nameindex, based on a suggestion by Michael Ost --- dlls/iphlpapi/ifenum.c | 378 +++++++++-------------------------------- dlls/iphlpapi/ifenum.h | 16 -- dlls/iphlpapi/iphlpapi_main.c | 17 +- 3 files changed, 99 insertions(+), 312 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=540dca3259ffdb4c608…

1 0