July 2009 - Wine-Commits - list.winehq.org

Alexander Nicolaysen Sørnes : note: Remove obsolete line from update()
by Alexander Nicolaysen Sørnes July 23, 2009

July 23, 2009

Module: appdb Branch: master Commit: 0f82fb839c1311a274f07a266564ac2ce570cf82 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=0f82fb839c1311a274f07a26… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 16:24:08 2009 +0200 note: Remove obsolete line from update() --- include/note.php | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/note.php b/include/note.php index b6153d5..ea4098b 100644 --- a/include/note.php +++ b/include/note.php @@ -117,7 +117,6 @@ class Note { $sVersionBefore = Version::lookup_name($oNote->iVersionId); $sVersionAfter = Version::lookup_name($this->iVersionId); $sWhatChanged .= "Version was changed from ".$sVersionBefore." to ".$sVersionAfter.".\n\n"; - $this->iVersionId = $iVersionId; } if($sWhatChanged) $this->SendNotificationMail("edit",$sWhatChanged);

1 0

Alexander Nicolaysen Sørnes : url: Fix moving to a new version
by Alexander Nicolaysen Sørnes July 23, 2009

July 23, 2009

Module: appdb Branch: master Commit: 8be4e24864a190c5885f8d730fba1c07a9d3e37c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8be4e24864a190c5885f8d73… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 15:33:47 2009 +0200 url: Fix moving to a new version --- include/url.php | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/include/url.php b/include/url.php index 93e11ae..0419168 100644 --- a/include/url.php +++ b/include/url.php @@ -138,6 +138,10 @@ class Url { if(!$this->iUrlId) return FALSE; + $oUrl = new url($this->iUrlId); + + if($this->iVersionId && !$iVersionId) + $iVersionId = $this->iVersionId; $sWhatChanged = ""; @@ -159,7 +163,7 @@ class Url { $this->sUrl = $sUrl; } - if ($iVersionId && $iVersionId!=$this->iVersionId) + if ($iVersionId && $iVersionId!=$oUrl->iVersionId) { if (!query_parameters("UPDATE appData SET versionId = '?' WHERE id = '?'", $iVersionId, $this->iUrlId)) @@ -519,8 +523,10 @@ class Url { public function objectSetParent($iNewId, $sClass = '') { - $oAppData = new appData($this->iUrlId, null, $this); - return $oAppData->objectSetParent($iNewId, $sClass); + if($this->iVersionId) + $this->iVersionId = $iNewId; + else + $this->iAppId = $iNewId; } function objectGetChildren($bIncludeDeleted = false)

1 0

Alexander Nicolaysen Sørnes : downloadurl: Fix moving to a new version
by Alexander Nicolaysen Sørnes July 23, 2009

July 23, 2009

Module: appdb Branch: master Commit: a2cedc2edcf178e18053f690df685ff37450ba88 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=a2cedc2edcf178e18053f690… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 15:31:11 2009 +0200 downloadurl: Fix moving to a new version --- include/downloadurl.php | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/downloadurl.php b/include/downloadurl.php index 152fbc4..9883fc0 100644 --- a/include/downloadurl.php +++ b/include/downloadurl.php @@ -71,8 +71,10 @@ class downloadurl public function objectSetParent($iNewId, $sClass = '') { - $oAppData = new appData($this->iId, null, $this); - return $oAppData->objectSetParent($iNewId, $sClass); + if($this->iVersionId) + $this->iVersionId = $iNewId; + else + $this->iAppId = $iNewId; } function objectGetChildren($bIncludeDeleted = false) @@ -365,8 +367,8 @@ class downloadurl } $hResult = query_parameters("UPDATE appData SET - description = '?', url = '?' WHERE id = '?'", - $this->sDescription, $this->sUrl, $this->iId); + description = '?', url = '?', versionId = '?' WHERE id = '?'", + $this->sDescription, $this->sUrl, $this->iVersionId, $this->iId); if(!$hResult) return FALSE;

1 0

Alexander Nicolaysen Sørnes : screenshot : Fix objectSetParent()
by Alexander Nicolaysen Sørnes July 23, 2009

July 23, 2009

Module: appdb Branch: master Commit: 62b1c7406db3f3a623379dfa8fb3bd7feab8050e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=62b1c7406db3f3a623379dfa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 15:23:49 2009 +0200 screenshot: Fix objectSetParent() --- include/screenshot.php | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index 97e393c..2f542f5 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -302,8 +302,10 @@ class screenshot public function objectSetParent($iNewId, $sClass = '') { - $oAppData = new appData($this->iScreenshotId, null, $this); - return $oAppData->objectSetParent($iNewId, $sClass); + if($this->iVersionId) + $this->iVersionId = $iNewId; + else + $this->iAppId = $iNewId; } function objectGetChildren($bIncludeDeleted = false)

1 0

Alexander Nicolaysen Sørnes : Implement version::objectMoveChildren() on top of version:: objectGetChildren()
by Alexander Nicolaysen Sørnes July 23, 2009

July 23, 2009

Module: appdb Branch: master Commit: e9c4d2ef169894438c86f0c79aec46a6d168b993 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=e9c4d2ef169894438c86f0c7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Jul 23 01:40:25 2009 +0200 Implement version::objectMoveChildren() on top of version::objectGetChildren() --- include/appData.php | 16 ++++++++++ include/bugs.php | 24 ++++++++++++++- include/comment.php | 35 +++++++++++++++++++++- include/downloadurl.php | 11 ++++++- include/maintainer.php | 41 ++++++++++++++++++++++++- include/monitor.php | 39 ++++++++++++++++++++++++- include/note.php | 16 ++++++++++ include/screenshot.php | 12 +++++++ include/url.php | 12 +++++++ include/version.php | 74 +++++++++++++++++++++------------------------- 10 files changed, 232 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=e9c4d2ef169894438c86…

1 0

Alexander Nicolaysen Sørnes : screenshot : Link to the actual image in notification mails
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: bd7081ebb457dcba46782cbe085c0d78379df8e7 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=bd7081ebb457dcba46782cbe… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 22:06:14 2009 +0200 screenshot: Link to the actual image in notification mails --- include/screenshot.php | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/include/screenshot.php b/include/screenshot.php index e4ecf4b..e906899 100644 --- a/include/screenshot.php +++ b/include/screenshot.php @@ -406,7 +406,12 @@ class screenshot { $oVersion = new version($this->iVersionId); $sAppName = version::fullName($this->iVersionId); - $sMsg = $oVersion->objectMakeUrl()."\n"; + + if(!$bDeleted) + $sMsg = $this->objectMakeUrl()."\n"; + else + $sMsg = $oVersion->objectMakeUrl()."\n"; + if(!$bDeleted) { if(!$this->bQueued) @@ -771,8 +776,7 @@ class screenshot function objectMakeUrl() { - /* STUB */ - return TRUE; + return APPDB_ROOT."appimage.php?iId={$this->iScreenshotId}"; } function allowAnonymousSubmissions()

1 0

Alexander Nicolaysen Sørnes : voteInspector: Show e-mail addresses
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 1de14734d08e582fa4cedd1396490ec00a93cde3 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1de14734d08e582fa4cedd13… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 22:00:12 2009 +0200 voteInspector: Show e-mail addresses --- include/vote.php | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/vote.php b/include/vote.php index bc293bb..c19874f 100644 --- a/include/vote.php +++ b/include/vote.php @@ -310,6 +310,7 @@ class voteInspector $oTableRow->AddTextCell('Delete account'); $oTableRow->AddTextCell('User'); $oTableRow->AddTextCell('ID'); + $oTableRow->AddTextCell('E-mail'); $oTableRow->AddTextCell('Created'); $oTableRow->AddTextCell('Votes'); $oTableRow->AddTextCell('Privileges'); @@ -331,6 +332,7 @@ class voteInspector $oTableRow->AddTextCell($shDelete); $oTableRow->AddTextCell($oVoter->objectMakeLink()); $oTableRow->AddTextCell($oVoter->iUserId); + $oTableRow->AddTextCell($oVoter->sEmail); $oTableRow->AddTextCell($oVoter->sDateCreated); $oTableRow->AddTextCell($oRow->count);

1 0

Alexander Nicolaysen Sørnes : voteInspector: Make it possible to delete user accounts
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 5062357ff96f6622a8335ec7ce658bee4cc65c80 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5062357ff96f6622a8335ec7… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 21:42:14 2009 +0200 voteInspector: Make it possible to delete user accounts --- include/vote.php | 73 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 67 insertions(+), 6 deletions(-) diff --git a/include/vote.php b/include/vote.php index 4f486b6..bc293bb 100644 --- a/include/vote.php +++ b/include/vote.php @@ -233,11 +233,14 @@ class voteManager class voteInspector { private $iVersionId; + private $aDeleteVoters; function voteInspector($iVersionId = null) { if(is_numeric($iVersionId)) $this->iVersionId = $iVersionId; + + $this->aDeleteVoters = array(); } public function objectGetId() @@ -255,16 +258,37 @@ class voteInspector return $_SESSION['current']->hasPriv('admin'); } + public function objectGetSubmitterId() + { + return -1; + } + + public function getVotes() + { + return query_parameters("SELECT userId, COUNT(userId) as count FROM appVotes WHERE + versionId = '?' + GROUP BY userId", $this->iVersionId); + } + + public function getVoteCount() + { + return vote_count_version_total($this->iVersionId); + } + + public function getVoterCount() + { + return mysql_num_rows($this->getVotes()); + } + public function outputEditor() { $oVersion = new version($this->iVersionId); - echo 'Inspecting votes for ' . version::fullNameLink($this->iVersionId); - echo ' '; + echo 'Inspecting votes for ' . version::fullNameLink($this->iVersionId).' '; + echo 'Total votes: '.$this->getVoteCount().' '; + echo 'To delete bogus user accounts, select them and press the Delete button below. '; - $hResult = query_parameters("SELECT userId, COUNT(userId) as count FROM appVotes WHERE - versionId = '?' - GROUP BY userId", $this->iVersionId); + $hResult = $this->getVotes(); if(!$hResult) { @@ -283,6 +307,7 @@ class voteInspector $oTableRow = new TableRow(); $oTableRow->setClass('color4'); + $oTableRow->AddTextCell('Delete account'); $oTableRow->AddTextCell('User'); $oTableRow->AddTextCell('ID'); $oTableRow->AddTextCell('Created'); @@ -297,6 +322,13 @@ class voteInspector $oVoter = new user($oRow->userId); $oTableRow = new TableRow(); $oTableRow->setClass(($i % 2) ? 'color0' : 'color1'); + + if($oVoter->hasPriv('admin')) + $shDelete = ''; + else + $shDelete = "<input type=\"checkbox\" name=\"iDelSlot$i\" value=\"{$oVoter->iUserId}\" />"; + + $oTableRow->AddTextCell($shDelete); $oTableRow->AddTextCell($oVoter->objectMakeLink()); $oTableRow->AddTextCell($oVoter->iUserId); $oTableRow->AddTextCell($oVoter->sDateCreated); @@ -342,7 +374,14 @@ class voteInspector public function getOutputEditorValues($aValues) { - + $iVoters = $this->getVoterCount(); + $this->aDeleteVoters = array(); + + for($i = 0; $i < $iVoters; $i++) + { + if(($iVoterId = getInput("iDelSlot$i", $aValues))) + $this->aDeleteVoters[] = new user($iVoterId); + } } public function create() @@ -354,6 +393,28 @@ class voteInspector { return true; } + + public function objectGetMail($sAction, $bMailSubmitter, $bParentAction) + { + $sSubject = ''; + $sMsg = ''; + $aMailTo = null; + + return array($sSubject, $sMsg, $aMailTo); + } + + public function delete() + { + $bSuccess = true; + + foreach($this->aDeleteVoters as $oVoter) + { + if(!$oVoter->delete()) + $bSuccess = false; + } + + return $bSuccess; + } } /**

1 0

Alexander Nicolaysen Sørnes : voteInspector: Show number of comments
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: f5498d7d79e7b79a19312cf39cbd3c5fe872a8eb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f5498d7d79e7b79a19312cf3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:57:35 2009 +0200 voteInspector: Show number of comments --- include/vote.php | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/include/vote.php b/include/vote.php index 53ad01c..4f486b6 100644 --- a/include/vote.php +++ b/include/vote.php @@ -288,7 +288,8 @@ class voteInspector $oTableRow->AddTextCell('Created'); $oTableRow->AddTextCell('Votes'); $oTableRow->AddTextCell('Privileges'); - $oTableRow->AddTextCell('# of test results'); + $oTableRow->AddTextCell('Test data'); + $oTableRow->AddTextcell('Comments'); $oTable->AddRow($oTableRow); for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) @@ -324,6 +325,15 @@ class voteInspector $sSubmitted = 'DB failure'; $oTableRow->AddTextCell($sSubmitted); + + $hSubResult = query_parameters("SELECT COUNT(commentId) as count FROM appComments WHERE userId = '?'", $oVoter->iUserId); + + if($hSubResult && ($oSubRow = mysql_fetch_object($hSubResult))) + $sSubmitted = $oSubRow->count; + else + $sSubmitted = 'DB failure'; + + $oTableRow->AddTextCell($sSubmitted); $oTable->AddRow($oTableRow); }

1 0

Alexander Nicolaysen Sørnes : voteInspector: Show number of test results per user
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 8b561a2ccec9f0cddbf39bddce681d792e189639 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8b561a2ccec9f0cddbf39bdd… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:44:14 2009 +0200 voteInspector: Show number of test results per user --- include/vote.php | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/include/vote.php b/include/vote.php index 692c2ab..53ad01c 100644 --- a/include/vote.php +++ b/include/vote.php @@ -288,6 +288,7 @@ class voteInspector $oTableRow->AddTextCell('Created'); $oTableRow->AddTextCell('Votes'); $oTableRow->AddTextCell('Privileges'); + $oTableRow->AddTextCell('# of test results'); $oTable->AddRow($oTableRow); for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) @@ -314,6 +315,15 @@ class voteInspector } $oTableRow->AddTextCell($sPrivs); + + $hSubResult = query_parameters("SELECT COUNT(testingId) AS count FROM testResults WHERE submitterId = '?' AND state != 'deleted'", $oVoter->iUserId); + + if($hSubResult && ($oSubRow = mysql_fetch_object($hSubResult))) + $sSubmitted = $oSubRow->count; + else + $sSubmitted = 'DB failure'; + + $oTableRow->AddTextCell($sSubmitted); $oTable->AddRow($oTableRow); }

1 0

Alexander Nicolaysen Sørnes : voteInspector: View the info in objectManager's edit mode
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 028d51d85dbc16a2f3f592ccf85ed9c58a79c817 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=028d51d85dbc16a2f3f592cc… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:30:18 2009 +0200 voteInspector: View the info in objectManager's edit mode --- include/version.php | 2 +- include/vote.php | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/include/version.php b/include/version.php index b2c1798..7d4aa55 100644 --- a/include/version.php +++ b/include/version.php @@ -875,7 +875,7 @@ class version { if($_SESSION['current']->hasPriv('admin')) { $oMVoteInspector = new objectManager('voteInspector', 'Vote inspector'); - $shVoteLink .= '   <a href="'.$oMVoteInspector->makeUrl('view',$this->iVersionId).'">Inspect</a>'; + $shVoteLink .= '   <a href="'.$oMVoteInspector->makeUrl('edit',$this->iVersionId).'">Inspect</a>'; } $shVoteText = vote_count_version_total($this->iVersionId).$shVoteLink; diff --git a/include/vote.php b/include/vote.php index 193c3b8..692c2ab 100644 --- a/include/vote.php +++ b/include/vote.php @@ -250,7 +250,12 @@ class voteInspector return 'accepted'; } - public function display() + public function canEdit() + { + return $_SESSION['current']->hasPriv('admin'); + } + + public function outputEditor() { $oVersion = new version($this->iVersionId); @@ -314,6 +319,21 @@ class voteInspector echo $oTable->getString(); } + + public function getOutputEditorValues($aValues) + { + + } + + public function create() + { + return true; + } + + public function update() + { + return true; + } } /**

1 0

Alexander Nicolaysen Sørnes : objectManager: Only show the edit screen if the user has sufficient rights
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 1dfb1a24c607620339bf0587f65234aa6766858a URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1dfb1a24c607620339bf0587… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:29:48 2009 +0200 objectManager: Only show the edit screen if the user has sufficient rights --- include/objectManager.php | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 0e1f0df..4235279 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -393,6 +393,10 @@ class ObjectManager return; } + /* Only show the edit screen if the user has sufficient rights */ + if(!$oObject->canEdit()) + $this->error_exit('You do not have sufficient privileges to edit this entry'); + /* Display errors, if any, and fetch form data */ if($this->displayErrors($sErrors)) {

1 0

Alexander Nicolaysen Sørnes : Add vote inspector tool
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 7b82cd1ef419ad87132bdc8743795e1c5dc2d1e6 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7b82cd1ef419ad87132bdc87… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 20:11:07 2009 +0200 Add vote inspector tool --- include/version.php | 8 ++++ include/vote.php | 89 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 0 deletions(-) diff --git a/include/version.php b/include/version.php index ae0bc3e..b2c1798 100644 --- a/include/version.php +++ b/include/version.php @@ -870,6 +870,14 @@ class version { else $shVoteLink = ''; + // Allow admins to see which users have voted, in order to identify + // bogus votes + if($_SESSION['current']->hasPriv('admin')) + { + $oMVoteInspector = new objectManager('voteInspector', 'Vote inspector'); + $shVoteLink .= '   <a href="'.$oMVoteInspector->makeUrl('view',$this->iVersionId).'">Inspect</a>'; + } + $shVoteText = vote_count_version_total($this->iVersionId).$shVoteLink; } else { diff --git a/include/vote.php b/include/vote.php index 36367e3..193c3b8 100644 --- a/include/vote.php +++ b/include/vote.php @@ -228,6 +228,95 @@ class voteManager } /** + * used by admins to check whether votes for a version are legit + */ +class voteInspector +{ + private $iVersionId; + + function voteInspector($iVersionId = null) + { + if(is_numeric($iVersionId)) + $this->iVersionId = $iVersionId; + } + + public function objectGetId() + { + return $this->iVersionId; + } + + public function objectGetState() + { + return 'accepted'; + } + + public function display() + { + $oVersion = new version($this->iVersionId); + + echo 'Inspecting votes for ' . version::fullNameLink($this->iVersionId); + echo ' '; + + $hResult = query_parameters("SELECT userId, COUNT(userId) as count FROM appVotes WHERE + versionId = '?' + GROUP BY userId", $this->iVersionId); + + if(!$hResult) + { + echo 'Failed to get list of votes'; + return; + } + + if(mysql_num_rows($hResult) == 0) + { + echo 'There are no votes for this version'; + return; + } + + $oTable = new Table(); + $oTable->setCellPadding(3); + + $oTableRow = new TableRow(); + $oTableRow->setClass('color4'); + $oTableRow->AddTextCell('User'); + $oTableRow->AddTextCell('ID'); + $oTableRow->AddTextCell('Created'); + $oTableRow->AddTextCell('Votes'); + $oTableRow->AddTextCell('Privileges'); + $oTable->AddRow($oTableRow); + + for($i = 0; $oRow = mysql_fetch_object($hResult); $i++) + { + $oVoter = new user($oRow->userId); + $oTableRow = new TableRow(); + $oTableRow->setClass(($i % 2) ? 'color0' : 'color1'); + $oTableRow->AddTextCell($oVoter->objectMakeLink()); + $oTableRow->AddTextCell($oVoter->iUserId); + $oTableRow->AddTextCell($oVoter->sDateCreated); + $oTableRow->AddTextCell($oRow->count); + + $sPrivs = ''; + if($oVoter->hasPriv('admin')) + $sPrivs .= 'Admin '; + + if($oVoter->isMaintainer($this->iVersionId)) + $sPrivs .= 'Maintainer of this version '; + + if($oVoter->isMaintainer()) + { + $oM = new objectManager('maintainerView', 'View maintainership info'); + $sPrivs .= '<a href="'.$oM->makeUrl('view',$oVoter->iUserId).'">Maintainer (other entries)</a> '; + } + + $oTableRow->AddTextCell($sPrivs); + $oTable->AddRow($oTableRow); + } + + echo $oTable->getString(); + } +} + +/** * count the number of votes for appId by userId */ function vote_count($iVersionId, $iUserId = null)

1 0

Alexander Nicolaysen Sørnes : cron: Add a script to remove votes for deleted versions
by Alexander Nicolaysen Sørnes July 22, 2009

July 22, 2009

Module: appdb Branch: master Commit: 95d93a09c2d7ae8a8c2f4f33e462c22ec9130048 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=95d93a09c2d7ae8a8c2f4f33… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jul 22 17:07:35 2009 +0200 cron: Add a script to remove votes for deleted versions --- cron/cleanup.php | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 7c1fb25..79b7173 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -28,6 +28,9 @@ removeScreenshotsWithMissingFiles(); /* status since they aren't really maintaining the application/version */ maintainerCheck(); +/* remove votes for versions that have been deleted */ +cleanupVotes(); + /* Updates the rating info for all versions based on test results */ //updateRatings(); @@ -294,6 +297,45 @@ function maintainerCheck() maintainer::notifyMaintainersOfQueuedData(); } +/* remove votes for versions that have been deleted */ +function cleanupVotes() +{ + $hResult = mysql_query("SELECT appVotes.* FROM appVotes,appVersion WHERE + appVotes.versionId = appVersion.versionId + AND appVersion.state = 'deleted'"); + + if(!$hResult) + return; + + $iDeleted = 0; + $iFailed = 0; + + while($oRow = mysql_fetch_object($hResult)) + { + $oVote = new vote(null, $oRow); + if($oVote->delete()) + $iDeleted++; + else + $iFailed++; + } + + $sEmails = user::get_notify_email_address_list(null, null); // only admins + + if($sEmails) + { + global $sEmailSubject; + $sSubject = $sEmailSubject . 'Vote Cleanup'; + $sPlural = ($iDeleted == 1) ? '' : 's'; + $sMsg = "Removed $iDeleted vote$sPlural cast for deleted versions\n"; + if($iFailed) + { + $sPlural = ($iFailed == 1) ? '' : 's'; + $sMsg .= "WARNING: Failed to delete $iFailed vote$sPlural\n"; + } + mail_appdb($sEmails, $sSubject, $sMsg); + } +} + function updateRatings() { $hResult = query_parameters("SELECT * FROM appVersion");

1 0

Alexandre Julliard : winhttp: Avoid casting away const.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: af77e9b388cf53ac379ed572d2383e1e3a5e3b13 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af77e9b388cf53ac379ed572d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 14:48:09 2009 +0200 winhttp: Avoid casting away const. --- dlls/winhttp/session.c | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 81113e4..27509e1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -886,16 +886,16 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY) { BOOL sane = FALSE; + LPWSTR proxy = NULL; + LPWSTR proxy_bypass = NULL; /* Sanity-check length of proxy string */ if ((BYTE *)len - buf + *len <= size) { sane = TRUE; - info->lpszProxy = GlobalAlloc( 0, - (*len + 1) * sizeof(WCHAR) ); - if (info->lpszProxy) - copy_char_to_wchar_sz( (BYTE *)(len + 1), - *len, (LPWSTR)info->lpszProxy ); + proxy = GlobalAlloc( 0, (*len + 1) * sizeof(WCHAR) ); + if (proxy) + copy_char_to_wchar_sz( (BYTE *)(len + 1), *len, proxy ); len = (DWORD *)((BYTE *)(len + 1) + *len); } if (sane) @@ -903,19 +903,19 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) /* Sanity-check length of proxy bypass string */ if ((BYTE *)len - buf + *len <= size) { - info->lpszProxyBypass = GlobalAlloc( 0, - (*len + 1) * sizeof(WCHAR) ); - if (info->lpszProxyBypass) - copy_char_to_wchar_sz( (BYTE *)(len + 1), - *len, (LPWSTR)info->lpszProxyBypass ); + proxy_bypass = GlobalAlloc( 0, (*len + 1) * sizeof(WCHAR) ); + if (proxy_bypass) + copy_char_to_wchar_sz( (BYTE *)(len + 1), *len, proxy_bypass ); } else { sane = FALSE; - GlobalFree( (LPWSTR)info->lpszProxy ); - info->lpszProxy = NULL; + GlobalFree( proxy ); + proxy = NULL; } } + info->lpszProxy = proxy; + info->lpszProxyBypass = proxy_bypass; if (sane) { got_from_reg = TRUE;

1 0

Luke Benstead : ntdll: Add semi-stub implementation for SystemExecutionState query.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 8ed1f0547e8e2ae906fde0063cadcda1c89541c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ed1f0547e8e2ae906fde0063… Author: Luke Benstead <kazade(a)gmail.com> Date: Tue Jul 14 17:02:59 2009 +0100 ntdll: Add semi-stub implementation for SystemExecutionState query. --- dlls/ntdll/nt.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c index c457028..c7d931c 100644 --- a/dlls/ntdll/nt.c +++ b/dlls/ntdll/nt.c @@ -1328,6 +1328,15 @@ NTSTATUS WINAPI NtPowerInformation( PowerCaps->DefaultLowLatencyWake = PowerSystemUnspecified; return STATUS_SUCCESS; } + case SystemExecutionState: { + PULONG ExecutionState = lpOutputBuffer; + FIXME("semi-stub: SystemExecutionState\n"); + if (lpInputBuffer != NULL) + return STATUS_INVALID_PARAMETER; + /* FIXME: The actual state should be the value set by SetThreadExecutionState which is not currently implemented. */ + *ExecutionState = ES_USER_PRESENT; + return STATUS_SUCCESS; + } default: /* FIXME: Needed by .NET Framework */ WARN("Unimplemented NtPowerInformation action: %d\n", InformationLevel);

1 0

Henri Verbeet : wined3d: Try to reuse the thread' s current context in FindContext().
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: e5d621c0813e795cd63755f90dcfbb8579a77006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d621c0813e795cd63755f90… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:10 2009 +0200 wined3d: Try to reuse the thread's current context in FindContext(). --- dlls/wined3d/context.c | 47 +++++++++++++++++++++++++++++++++-------------- 1 files changed, 33 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2c61268..d82d2dc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1603,16 +1603,30 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { IWineD3DSwapChain *swapchain = NULL; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; + struct WineD3DContext *current_context = context_get_current(); BOOL oldRenderOffscreen = This->render_offscreen; const struct StateEntry *StateTable = This->StateTable; const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; - if (!target) target = This->activeContext->current_rt; + if (!target) + { + if (current_context + && ((IWineD3DSurfaceImpl *)current_context->surface)->resource.wineD3DDevice == This) + { + target = current_context->current_rt; + } + else + { + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[0]; + if (swapchain->backBuffer) target = swapchain->backBuffer[0]; + else target = swapchain->frontBuffer; + } + } - if (This->activeContext->current_rt == target && This->activeContext->tid == tid) + if (current_context && current_context->current_rt == target) { - return This->activeContext; + return current_context; } if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { @@ -1678,9 +1692,10 @@ retry: else { /* Stay with the currently active context. */ - if (This->activeContext && This->activeContext->tid == tid) + if (current_context + && ((IWineD3DSurfaceImpl *)current_context->surface)->resource.wineD3DDevice == This) { - context = This->activeContext; + context = current_context; } else { @@ -1835,6 +1850,7 @@ static void apply_draw_buffer(IWineD3DDeviceImpl *This, IWineD3DSurface *target, * *****************************************************************************/ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextUsage usage) { + struct WineD3DContext *current_context = context_get_current(); DWORD tid = GetCurrentThreadId(); DWORD i, dirtyState, idx; BYTE shift; @@ -1849,23 +1865,26 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU gl_info = context->gl_info; /* Activate the opengl context */ - if(last_device != This || context != This->activeContext) { + if (context != current_context) + { if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); else This->frag_pipe->enable_extension((IWineD3DDevice *)This, !context->last_was_blit); - if(This->activeContext->vshader_const_dirty) { - memset(This->activeContext->vshader_const_dirty, 1, - sizeof(*This->activeContext->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); + if (context->vshader_const_dirty) + { + memset(context->vshader_const_dirty, 1, + sizeof(*context->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); This->highest_dirty_vs_const = GL_LIMITS(vshader_constantsF); } - if(This->activeContext->pshader_const_dirty) { - memset(This->activeContext->pshader_const_dirty, 1, - sizeof(*This->activeContext->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); + if (context->pshader_const_dirty) + { + memset(context->pshader_const_dirty, 1, + sizeof(*context->pshader_const_dirty) * GL_LIMITS(pshader_constantsF)); This->highest_dirty_ps_const = GL_LIMITS(pshader_constantsF); } - This->activeContext = context; - context_set_last_device(This); } + This->activeContext = context; + context_set_last_device(This); switch (usage) { case CTXUSAGE_CLEAR:

1 0

Henri Verbeet : wined3d: Move some context selection code from ActivateContext() to FindContext().
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 9ceda3a6fdc25fcb994f74fd3763f695ba5c0222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ceda3a6fdc25fcb994f74fd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:09 2009 +0200 wined3d: Move some context selection code from ActivateContext() to FindContext(). --- dlls/wined3d/context.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 89d79a6..2c61268 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1608,6 +1608,13 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf const struct GlPixelFormatDesc *old, *new; struct WineD3DContext *context; + if (!target) target = This->activeContext->current_rt; + + if (This->activeContext->current_rt == target && This->activeContext->tid == tid) + { + return This->activeContext; + } + if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { TRACE("Rendering onscreen\n"); @@ -1763,6 +1770,9 @@ retry: This->isInDraw = oldInDraw; } + context->draw_buffer_dirty = TRUE; + context->current_rt = target; + return context; } @@ -1834,17 +1844,7 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU TRACE("(%p): Selecting context for render target %p, thread %d\n", This, target, tid); - if (!target) target = This->activeContext->current_rt; - - if (This->activeContext->current_rt != target || This->activeContext->tid != tid) - { - context = FindContext(This, target, tid); - context->draw_buffer_dirty = TRUE; - context->current_rt = target; - } else { - /* Stick to the old context */ - context = This->activeContext; - } + context = FindContext(This, target, tid); gl_info = context->gl_info;

1 0

Henri Verbeet : wined3d: Simplify FindContext() a bit.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 219d3abdd18022644836490718ec2eab5f296f0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=219d3abdd1802264483649071… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:08 2009 +0200 wined3d: Simplify FindContext() a bit. --- dlls/wined3d/context.c | 141 +++++++++++++++++++++--------------------------- 1 files changed, 61 insertions(+), 80 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 0be356a..89d79a6 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1603,10 +1603,10 @@ static WineD3DContext *findThreadContextForSwapChain(IWineD3DSwapChain *swapchai static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, DWORD tid) { IWineD3DSwapChain *swapchain = NULL; BOOL readTexture = wined3d_settings.offscreen_rendering_mode != ORM_FBO && This->render_offscreen; - WineD3DContext *context = This->activeContext; BOOL oldRenderOffscreen = This->render_offscreen; const struct StateEntry *StateTable = This->StateTable; const struct GlPixelFormatDesc *old, *new; + struct WineD3DContext *context; if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) { TRACE("Rendering onscreen\n"); @@ -1625,97 +1625,78 @@ static inline WineD3DContext *FindContext(IWineD3DDeviceImpl *This, IWineD3DSurf } } IWineD3DSwapChain_Release(swapchain); - - if(oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); - } - - } else { + } + else + { TRACE("Rendering offscreen\n"); This->render_offscreen = TRUE; - switch(wined3d_settings.offscreen_rendering_mode) { - case ORM_FBO: - /* FBOs do not need a different context. Stay with whatever context is active at the moment */ - if (This->activeContext && This->activeContext->tid == tid) - { - context = This->activeContext; - } else { - /* This may happen if the app jumps straight into offscreen rendering - * Start using the context of the primary swapchain. tid == 0 is no problem - * for findThreadContextForSwapChain. - * - * Can also happen on thread switches - in that case findThreadContextForSwapChain - * is perfect to call. - */ - context = findThreadContextForSwapChain(This->swapchains[0], tid); - } - break; - - case ORM_PBUFFER: +retry: + if (wined3d_settings.offscreen_rendering_mode == ORM_PBUFFER) + { + IWineD3DSurfaceImpl *targetimpl = (IWineD3DSurfaceImpl *)target; + if (!This->pbufferContext + || This->pbufferWidth < targetimpl->currentDesc.Width + || This->pbufferHeight < targetimpl->currentDesc.Height) { - IWineD3DSurfaceImpl *targetimpl = (IWineD3DSurfaceImpl *) target; - if(This->pbufferContext == NULL || - This->pbufferWidth < targetimpl->currentDesc.Width || - This->pbufferHeight < targetimpl->currentDesc.Height) { - if(This->pbufferContext) { - DestroyContext(This, This->pbufferContext); - } - - /* The display is irrelevant here, the window is 0. But CreateContext needs a valid X connection. - * Create the context on the same server as the primary swapchain. The primary swapchain is exists at this point. - */ - This->pbufferContext = CreateContext(This, targetimpl, - ((IWineD3DSwapChainImpl *) This->swapchains[0])->context[0]->win_handle, - TRUE /* pbuffer */, &((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms); - This->pbufferWidth = targetimpl->currentDesc.Width; - This->pbufferHeight = targetimpl->currentDesc.Height; - } - - if(This->pbufferContext) { - if(This->pbufferContext->tid != 0 && This->pbufferContext->tid != tid) { - FIXME("The PBuffr context is only supported for one thread for now!\n"); - } - This->pbufferContext->tid = tid; - context = This->pbufferContext; - break; - } else { - ERR("Failed to create a buffer context and drawable, falling back to back buffer offscreen rendering\n"); - wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - } + if (This->pbufferContext) DestroyContext(This, This->pbufferContext); + + /* The display is irrelevant here, the window is 0. But + * CreateContext needs a valid X connection. Create the context + * on the same server as the primary swapchain. The primary + * swapchain is exists at this point. */ + This->pbufferContext = CreateContext(This, targetimpl, + ((IWineD3DSwapChainImpl *)This->swapchains[0])->context[0]->win_handle, + TRUE /* pbuffer */, &((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms); + This->pbufferWidth = targetimpl->currentDesc.Width; + This->pbufferHeight = targetimpl->currentDesc.Height; } - case ORM_BACKBUFFER: - /* Stay with the currently active context for back buffer rendering */ - if (This->activeContext && This->activeContext->tid == tid) + if (This->pbufferContext) + { + if (This->pbufferContext->tid && This->pbufferContext->tid != tid) { - context = This->activeContext; - } else { - /* This may happen if the app jumps straight into offscreen rendering - * Start using the context of the primary swapchain. tid == 0 is no problem - * for findThreadContextForSwapChain. - * - * Can also happen on thread switches - in that case findThreadContextForSwapChain - * is perfect to call. - */ - context = findThreadContextForSwapChain(This->swapchains[0], tid); + FIXME("The PBuffer context is only supported for one thread for now!\n"); } - break; + This->pbufferContext->tid = tid; + context = This->pbufferContext; + } + else + { + ERR("Failed to create a buffer context and drawable, falling back to back buffer offscreen rendering.\n"); + wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; + goto retry; + } } - - if(!oldRenderOffscreen) { - Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); - Context_MarkStateDirty(context, STATE_VDECL, StateTable); - Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); - Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); - Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + else + { + /* Stay with the currently active context. */ + if (This->activeContext && This->activeContext->tid == tid) + { + context = This->activeContext; + } + else + { + /* This may happen if the app jumps straight into offscreen rendering + * Start using the context of the primary swapchain. tid == 0 is no problem + * for findThreadContextForSwapChain. + * + * Can also happen on thread switches - in that case findThreadContextForSwapChain + * is perfect to call. */ + context = findThreadContextForSwapChain(This->swapchains[0], tid); + } } } + if (This->render_offscreen != oldRenderOffscreen) + { + Context_MarkStateDirty(context, WINED3DTS_PROJECTION, StateTable); + Context_MarkStateDirty(context, STATE_VDECL, StateTable); + Context_MarkStateDirty(context, STATE_VIEWPORT, StateTable); + Context_MarkStateDirty(context, STATE_SCISSORRECT, StateTable); + Context_MarkStateDirty(context, STATE_FRONTFACE, StateTable); + } + /* To compensate the lack of format switching with some offscreen rendering methods and on onscreen buffers * the alpha blend state changes with different render target formats. */ old = ((IWineD3DSurfaceImpl *)context->current_rt)->resource.format_desc;

1 0

Henri Verbeet : wined3d: Get rid of getActiveContext().
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: ce436a76e237c362029bb590406aed001a715a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce436a76e237c362029bb5904… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:07 2009 +0200 wined3d: Get rid of getActiveContext(). --- dlls/wined3d/context.c | 4 ---- dlls/wined3d/gl_compat.c | 36 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 18 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 777b907..0be356a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1986,7 +1986,3 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU FIXME("Unexpected context usage requested\n"); } } - -WineD3DContext *getActiveContext(void) { - return last_device->activeContext; -} diff --git a/dlls/wined3d/gl_compat.c b/dlls/wined3d/gl_compat.c index dbd496b..2726173 100644 --- a/dlls/wined3d/gl_compat.c +++ b/dlls/wined3d/gl_compat.c @@ -147,7 +147,7 @@ static void WINE_GLAPI wine_glGetDoublev(GLenum pname, GLdouble* params) { static void (WINE_GLAPI *old_fogcoord_glEnable) (GLenum cap) = NULL; static void WINE_GLAPI wine_glEnable(GLenum cap) { if(cap == GL_FOG) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->fog_enabled = 1; if(ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) return; } @@ -157,7 +157,7 @@ static void WINE_GLAPI wine_glEnable(GLenum cap) { static void (WINE_GLAPI *old_fogcoord_glDisable) (GLenum cap) = NULL; static void WINE_GLAPI wine_glDisable(GLenum cap) { if(cap == GL_FOG) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->fog_enabled = 0; if(ctx->gl_fog_source != GL_FRAGMENT_DEPTH_EXT) return; } @@ -166,8 +166,9 @@ static void WINE_GLAPI wine_glDisable(GLenum cap) { static void (WINE_GLAPI *old_fogcoord_glFogi) (GLenum pname, GLint param) = NULL; static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { + struct WineD3DContext *ctx = context_get_current(); + if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = param; if(param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -177,9 +178,9 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { } } else { if(pname == GL_FOG_START) { - getActiveContext()->fogstart = param; + ctx->fogstart = param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = param; + ctx->fogend = param; } old_fogcoord_glFogi(pname, param); } @@ -187,8 +188,8 @@ static void WINE_GLAPI wine_glFogi(GLenum pname, GLint param) { static void (WINE_GLAPI *old_fogcoord_glFogiv) (GLenum pname, const GLint *param) = NULL; static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { + struct WineD3DContext *ctx = context_get_current(); if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = *param; if(*param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -198,9 +199,9 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { } } else { if(pname == GL_FOG_START) { - getActiveContext()->fogstart = *param; + ctx->fogstart = *param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = *param; + ctx->fogend = *param; } old_fogcoord_glFogiv(pname, param); } @@ -208,8 +209,8 @@ static void WINE_GLAPI wine_glFogiv(GLenum pname, const GLint *param) { static void (WINE_GLAPI *old_fogcoord_glFogf) (GLenum pname, GLfloat param) = NULL; static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { + struct WineD3DContext *ctx = context_get_current(); if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = (GLint) param; if(param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -219,9 +220,9 @@ static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { } } else { if(pname == GL_FOG_START) { - getActiveContext()->fogstart = param; + ctx->fogstart = param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = param; + ctx->fogend = param; } old_fogcoord_glFogf(pname, param); } @@ -229,8 +230,8 @@ static void WINE_GLAPI wine_glFogf(GLenum pname, GLfloat param) { static void (WINE_GLAPI *old_fogcoord_glFogfv) (GLenum pname, const GLfloat *param) = NULL; static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { + struct WineD3DContext *ctx = context_get_current(); if(pname == GL_FOG_COORDINATE_SOURCE_EXT) { - WineD3DContext *ctx = getActiveContext(); ctx->gl_fog_source = (GLint) *param; if(*param == GL_FRAGMENT_DEPTH_EXT) { if(ctx->fog_enabled) old_fogcoord_glEnable(GL_FOG); @@ -240,15 +241,14 @@ static void WINE_GLAPI wine_glFogfv(GLenum pname, const GLfloat *param) { } } else { if(pname == GL_FOG_COLOR) { - WineD3DContext *ctx = getActiveContext(); ctx->fogcolor[0] = param[0]; ctx->fogcolor[1] = param[1]; ctx->fogcolor[2] = param[2]; ctx->fogcolor[3] = param[3]; } else if(pname == GL_FOG_START) { - getActiveContext()->fogstart = *param; + ctx->fogstart = *param; } else if(pname == GL_FOG_END) { - getActiveContext()->fogend = *param; + ctx->fogend = *param; } old_fogcoord_glFogfv(pname, param); } @@ -269,7 +269,7 @@ static void (WINE_GLAPI *old_fogcoord_glFogCoordfvEXT) (const GLfloat *f) = NULL static void (WINE_GLAPI *old_fogcoord_glFogCoorddvEXT) (const GLdouble *f) = NULL; static void WINE_GLAPI wine_glVertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); if(ctx->gl_fog_source == GL_FOG_COORDINATE_EXT && ctx->fog_enabled) { GLfloat c[4] = {ctx->color[0], ctx->color[1], ctx->color[2], ctx->color[3]}; GLfloat i; @@ -299,7 +299,7 @@ static void WINE_GLAPI wine_glVertex3fv(const GLfloat *pos) { } static void wine_glColor4f(GLfloat r, GLfloat g, GLfloat b, GLfloat a) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->color[0] = r; ctx->color[1] = g; ctx->color[2] = b; @@ -327,7 +327,7 @@ static void wine_glColor4ub(GLubyte r, GLubyte g, GLubyte b, GLubyte a) { * precision function */ static void wine_glFogCoordfEXT(GLfloat f) { - WineD3DContext *ctx = getActiveContext(); + struct WineD3DContext *ctx = context_get_current(); ctx->fog_coord_value = f; } static void wine_glFogCoorddEXT(GLdouble f) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index dd170cb..363eb13 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1263,7 +1263,6 @@ typedef enum ContextUsage { } ContextUsage; void ActivateContext(IWineD3DDeviceImpl *device, IWineD3DSurface *target, ContextUsage usage); -WineD3DContext *getActiveContext(void); WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms); void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context); void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource, WINED3DRESOURCETYPE type);

1 0

Henri Verbeet : wined3d: Avoid destroying contexts that are current in another thread.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 377cda97e75588afd8bc4af0a126ae9f8ea2a6a8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=377cda97e75588afd8bc4af0a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 10:41:06 2009 +0200 wined3d: Avoid destroying contexts that are current in another thread. --- dlls/wined3d/context.c | 130 ++++++++++++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 +- 2 files changed, 89 insertions(+), 45 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5e43467..777b907 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -558,6 +558,59 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource } } +static void context_destroy_gl_resources(struct WineD3DContext *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct fbo_entry *entry, *entry2; + BOOL has_glctx; + + has_glctx = pwglMakeCurrent(context->hdc, context->glCtx); + if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n"); + + ENTER_GL(); + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { + if (!has_glctx) entry->id = 0; + context_destroy_fbo_entry(context, entry); + } + if (has_glctx) + { + if (context->src_fbo) + { + TRACE("Destroy src FBO %d\n", context->src_fbo); + context_destroy_fbo(context, &context->src_fbo); + } + if (context->dst_fbo) + { + TRACE("Destroy dst FBO %d\n", context->dst_fbo); + context_destroy_fbo(context, &context->dst_fbo); + } + if (context->dummy_arbfp_prog) + { + GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); + } + } + + LEAVE_GL(); + + if (!pwglMakeCurrent(NULL, NULL)) + { + ERR("Failed to disable GL context.\n"); + } + + if (context->isPBuffer) + { + GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); + GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); + } + else + { + ReleaseDC(context->win_handle, context->hdc); + } + + pwglDeleteContext(context->glCtx); +} + DWORD context_get_tls_idx(void) { return wined3d_context_tls_idx; @@ -583,6 +636,20 @@ BOOL context_set_current(struct WineD3DContext *ctx) return TRUE; } + if (old) + { + if (old->destroyed) + { + TRACE("Switching away from destroyed context %p.\n", old); + context_destroy_gl_resources(old); + HeapFree(GetProcessHeap(), 0, old); + } + else + { + old->current = 0; + } + } + if (ctx) { TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); @@ -591,6 +658,7 @@ BOOL context_set_current(struct WineD3DContext *ctx) ERR("Failed to make GL context %p current on device context %p.\n", ctx->glCtx, ctx->hdc); return FALSE; } + ctx->current = 1; } else { @@ -1205,7 +1273,6 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con { if (This->contexts[i] == context) { - HeapFree(GetProcessHeap(), 0, context); found = TRUE; break; } @@ -1251,65 +1318,40 @@ static void RemoveContextFromArray(IWineD3DDeviceImpl *This, WineD3DContext *con * context: Context to destroy * *****************************************************************************/ -void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { - const struct wined3d_gl_info *gl_info = context->gl_info; - struct fbo_entry *entry, *entry2; - BOOL has_glctx; +void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) +{ + BOOL destroy; TRACE("Destroying ctx %p\n", context); - /* The correct GL context needs to be active to cleanup the GL resources below */ - has_glctx = pwglMakeCurrent(context->hdc, context->glCtx); - context_set_last_device(NULL); - - if (!has_glctx) WARN("Failed to activate context. Window already destroyed?\n"); + if (context->tid == GetCurrentThreadId() || !context->current) + { + context_destroy_gl_resources(context); + destroy = TRUE; - ENTER_GL(); + context_set_last_device(NULL); - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) { - if (!has_glctx) entry->id = 0; - context_destroy_fbo_entry(context, entry); - } - if (has_glctx) - { - if (context->src_fbo) - { - TRACE("Destroy src FBO %d\n", context->src_fbo); - context_destroy_fbo(context, &context->src_fbo); - } - if (context->dst_fbo) + if (This->activeContext == context) { - TRACE("Destroy dst FBO %d\n", context->dst_fbo); - context_destroy_fbo(context, &context->dst_fbo); + This->activeContext = NULL; + TRACE("Destroying the active context.\n"); } - if (context->dummy_arbfp_prog) + + if (!context_set_current(NULL)) { - GL_EXTCALL(glDeleteProgramsARB(1, &context->dummy_arbfp_prog)); + ERR("Failed to clear current D3D context.\n"); } } - - LEAVE_GL(); - - if (This->activeContext == context) - { - This->activeContext = NULL; - TRACE("Destroying the active context.\n"); - } - - if (!context_set_current(NULL)) + else { - ERR("Failed to clear current D3D context.\n"); + context->destroyed = 1; + destroy = FALSE; } - if(context->isPBuffer) { - GL_EXTCALL(wglReleasePbufferDCARB(context->pbuffer, context->hdc)); - GL_EXTCALL(wglDestroyPbufferARB(context->pbuffer)); - } else ReleaseDC(context->win_handle, context->hdc); - pwglDeleteContext(context->glCtx); - HeapFree(GetProcessHeap(), 0, context->vshader_const_dirty); HeapFree(GetProcessHeap(), 0, context->pshader_const_dirty); RemoveContextFromArray(This, context); + if (destroy) HeapFree(GetProcessHeap(), 0, context); } /* GL locking is done by the caller */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 63c71d4..dd170cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1219,7 +1219,9 @@ struct WineD3DContext WORD isPBuffer : 1; WORD fog_enabled : 1; WORD num_untracked_materials : 2; /* Max value 2 */ - WORD padding : 3; + WORD current : 1; + WORD destroyed : 1; + WORD padding : 1; BYTE texShaderBumpMap; /* MAX_TEXTURES, 8 */ BYTE lastWasPow2Texture; /* MAX_TEXTURES, 8 */ DWORD numbered_array_mask;

1 0

Henri Verbeet : wined3d: Keep track of a thread's wined3d context.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 1a43030664e796da843316d12d3bf3300ab66c0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a43030664e796da843316d12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 22 14:03:36 2009 +0200 wined3d: Keep track of a thread's wined3d context. --- dlls/wined3d/context.c | 75 ++++++++++++++++++++++++++++----------- dlls/wined3d/directx.c | 5 +++ dlls/wined3d/wined3d_main.c | 32 +++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++ 4 files changed, 95 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index de428cd..5e43467 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); * change the opengl context. This flag allows to keep track which device is active */ static IWineD3DDeviceImpl *last_device; +static DWORD wined3d_context_tls_idx; void context_set_last_device(IWineD3DDeviceImpl *device) { @@ -557,6 +558,53 @@ void context_resource_released(IWineD3DDevice *iface, IWineD3DResource *resource } } +DWORD context_get_tls_idx(void) +{ + return wined3d_context_tls_idx; +} + +void context_set_tls_idx(DWORD idx) +{ + wined3d_context_tls_idx = idx; +} + +struct WineD3DContext *context_get_current(void) +{ + return TlsGetValue(wined3d_context_tls_idx); +} + +BOOL context_set_current(struct WineD3DContext *ctx) +{ + struct WineD3DContext *old = context_get_current(); + + if (old == ctx) + { + TRACE("Already using D3D context %p.\n", ctx); + return TRUE; + } + + if (ctx) + { + TRACE("Switching to D3D context %p, GL context %p, device context %p.\n", ctx, ctx->glCtx, ctx->hdc); + if (!pwglMakeCurrent(ctx->hdc, ctx->glCtx)) + { + ERR("Failed to make GL context %p current on device context %p.\n", ctx->glCtx, ctx->hdc); + return FALSE; + } + } + else + { + TRACE("Clearing current D3D context.\n"); + if (!pwglMakeCurrent(NULL, NULL)) + { + ERR("Failed to clear current GL context.\n"); + return FALSE; + } + } + + return TlsSetValue(wined3d_context_tls_idx, ctx); +} + /***************************************************************************** * Context_MarkStateDirty * @@ -1038,7 +1086,8 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar list_init(&ret->fbo_list); /* Set up the context defaults */ - if(pwglMakeCurrent(hdc, ctx) == FALSE) { + if (!context_set_current(ret)) + { ERR("Cannot activate context to set up defaults\n"); goto out; } @@ -1247,10 +1296,9 @@ void DestroyContext(IWineD3DDeviceImpl *This, WineD3DContext *context) { TRACE("Destroying the active context.\n"); } - /* Cleanup the GL context */ - if (!pwglMakeCurrent(NULL, NULL)) + if (!context_set_current(NULL)) { - ERR("Failed to disable GL context.\n"); + ERR("Failed to clear current D3D context.\n"); } if(context->isPBuffer) { @@ -1779,24 +1827,9 @@ void ActivateContext(IWineD3DDeviceImpl *This, IWineD3DSurface *target, ContextU /* Activate the opengl context */ if(last_device != This || context != This->activeContext) { - BOOL ret; - - /* Prevent an unneeded context switch as those are expensive */ - if(context->glCtx && (context->glCtx == pwglGetCurrentContext())) { - TRACE("Already using gl context %p\n", context->glCtx); - } - else { - TRACE("Switching gl ctx to %p, hdc=%p ctx=%p\n", context, context->hdc, context->glCtx); + if (!context_set_current(context)) ERR("Failed to activate the new context.\n"); + else This->frag_pipe->enable_extension((IWineD3DDevice *)This, !context->last_was_blit); - ret = pwglMakeCurrent(context->hdc, context->glCtx); - if(ret == FALSE) { - ERR("Failed to activate the new context\n"); - } else if(!context->last_was_blit) { - This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); - } else { - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); - } - } if(This->activeContext->vshader_const_dirty) { memset(This->activeContext->vshader_const_dirty, 1, sizeof(*This->activeContext->vshader_const_dirty) * GL_LIMITS(vshader_constantsF)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3036bfc..9daffaa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -274,6 +274,11 @@ static BOOL WineD3D_CreateFakeGLContext(struct wined3d_fake_gl_ctx *ctx) } /* Make it the current GL context. */ + if (!context_set_current(NULL)) + { + ERR_(d3d_caps)("Failed to clear current D3D context.\n"); + } + if (!pwglMakeCurrent(ctx->dc, ctx->gl_ctx)) { ERR_(d3d_caps)("Failed to make fake GL context current.\n"); diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f996aec..045eea0 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -97,6 +97,7 @@ static void CDECL wined3d_do_nothing(void) static BOOL wined3d_init(HINSTANCE hInstDLL) { + DWORD wined3d_context_tls_idx; HMODULE mod; char buffer[MAX_PATH+10]; DWORD size = sizeof(buffer); @@ -105,6 +106,15 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) DWORD len, tmpvalue; WNDCLASSA wc; + wined3d_context_tls_idx = TlsAlloc(); + if (wined3d_context_tls_idx == TLS_OUT_OF_INDEXES) + { + DWORD err = GetLastError(); + ERR("Failed to allocate context TLS index, err %#x.\n", err); + return FALSE; + } + context_set_tls_idx(wined3d_context_tls_idx); + /* We need our own window class for a fake window which we use to retrieve GL capabilities */ /* We might need CS_OWNDC in the future if we notice strange things on Windows. * Various articles/posts about OpenGL problems on Windows recommend this. */ @@ -122,6 +132,11 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) if (!RegisterClassA(&wc)) { ERR("Failed to register window class 'WineD3D_OpenGL'!\n"); + if (!TlsFree(wined3d_context_tls_idx)) + { + DWORD err = GetLastError(); + ERR("Failed to free context TLS index, err %#x.\n", err); + } return FALSE; } @@ -322,6 +337,14 @@ static BOOL wined3d_init(HINSTANCE hInstDLL) static BOOL wined3d_destroy(HINSTANCE hInstDLL) { + DWORD wined3d_context_tls_idx = context_get_tls_idx(); + + if (!TlsFree(wined3d_context_tls_idx)) + { + DWORD err = GetLastError(); + ERR("Failed to free context TLS index, err %#x.\n", err); + } + HeapFree(GetProcessHeap(), 0, wined3d_settings.logo); UnregisterClassA(WINED3D_OPENGL_WINDOW_CLASS_NAME, hInstDLL); @@ -341,6 +364,15 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) case DLL_PROCESS_DETACH: return wined3d_destroy(hInstDLL); + case DLL_THREAD_DETACH: + { + if (!context_set_current(NULL)) + { + ERR("Failed to clear current context.\n"); + } + return TRUE; + } + default: return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b7085c5..63c71d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1271,6 +1271,10 @@ void context_attach_depth_stencil_fbo(struct WineD3DContext *context, void context_attach_surface_fbo(const struct WineD3DContext *context, GLenum fbo_target, DWORD idx, IWineD3DSurface *surface); void context_set_last_device(IWineD3DDeviceImpl *device); +struct WineD3DContext *context_get_current(void); +DWORD context_get_tls_idx(void); +BOOL context_set_current(struct WineD3DContext *ctx); +void context_set_tls_idx(DWORD idx); void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain); HRESULT create_primary_opengl_context(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain);

1 0

Piotr Caban : jscript: Throw TypeErrors when _value functions are used as a function.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 8dd1d9b92e45ae4d9a4e783251ae4e76d7c86210 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dd1d9b92e45ae4d9a4e78325… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 22 13:02:30 2009 +0200 jscript: Throw TypeErrors when _value functions are used as a function. --- dlls/jscript/array.c | 2 ++ dlls/jscript/bool.c | 14 ++++++++++++-- dlls/jscript/date.c | 13 +++++++++++-- dlls/jscript/error.c | 13 +++++++++++-- dlls/jscript/number.c | 2 ++ dlls/jscript/object.c | 2 ++ dlls/jscript/regexp.c | 13 +++++++++++-- dlls/jscript/string.c | 2 ++ dlls/jscript/tests/api.js | 2 ++ 9 files changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 0af6df1..b2bd5b2 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -770,6 +770,8 @@ static HRESULT Array_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS TRACE("\n"); switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); case INVOKE_PROPERTYGET: return array_join(dispex, lcid, ((ArrayInstance*)dispex)->length, default_separatorW, retv, ei, sp); default: diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 2b5152a..bfacebf 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -116,8 +116,18 @@ static HRESULT Bool_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT Bool_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; + } static const builtin_prop_t Bool_props[] = { diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index b33be0b..5085f21 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2040,8 +2040,17 @@ static HRESULT Date_getYear(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT Date_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static const builtin_prop_t Date_props[] = { diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 49bdb07..fb37fba 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -141,8 +141,17 @@ static HRESULT Error_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, static HRESULT Error_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static void Error_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index 28049a9..0aeeab6 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -241,6 +241,8 @@ static HRESULT Number_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM NumberInstance *number = (NumberInstance*)dispex; switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); case DISPATCH_PROPERTYGET: *retv = number->num; break; diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 8e0aad6..737230a 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -120,6 +120,8 @@ static HRESULT Object_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); case DISPATCH_PROPERTYGET: V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocString(default_valueW); diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 9722919..a4d640e 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3516,8 +3516,17 @@ static HRESULT RegExp_test(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS static HRESULT RegExp_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static void RegExp_destructor(DispatchEx *dispex) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index a0ca268..6695bf8 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1485,6 +1485,8 @@ static HRESULT String_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM TRACE("\n"); switch(flags) { + case INVOKE_FUNC: + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); case DISPATCH_PROPERTYGET: { BSTR str = SysAllocString(This->str); if(!str) diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2ed8bda..7428413 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1315,5 +1315,7 @@ exception_test(function() {arr.toString = Number.prototype.toString; arr.toStrin exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); exception_test(function() {not_existing_variable.something();}, "TypeError", -2146823279); exception_test(function() {arr.toString = Function.prototype.toString; arr.toString();}, "TypeError", -2146823286); +exception_test(function() {date();}, "TypeError", -2146823286); +exception_test(function() {arr();}, "TypeError", -2146823286); reportSuccess();

1 0

Piotr Caban : jscript: Throw error in to_primitive function.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 412e0af26f05aaad53731fecbd9045e696bb6452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=412e0af26f05aaad53731fecb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 22 13:02:24 2009 +0200 jscript: Throw error in to_primitive function. --- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/jsutils.c | 8 ++++---- dlls/jscript/resource.h | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 5e53f6d..df8ee2f 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -22,6 +22,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { + IDS_TO_PRIMITIVE "Error converting object to primitive type" IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index d5ffa7f..10d4f51 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -211,7 +211,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret if(SUCCEEDED(hres)) { hres = jsdisp_call(jsdisp, id, ctx->lcid, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); if(FAILED(hres)) { - FIXME("throw TypeError\n"); + WARN("call error - forwarding exception\n"); jsdisp_release(jsdisp); return hres; } @@ -227,7 +227,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret if(SUCCEEDED(hres)) { hres = jsdisp_call(jsdisp, id, ctx->lcid, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); if(FAILED(hres)) { - FIXME("throw TypeError\n"); + WARN("call error - forwarding exception\n"); jsdisp_release(jsdisp); return hres; } @@ -241,8 +241,8 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret jsdisp_release(jsdisp); - FIXME("throw TypeError\n"); - return E_FAIL; + WARN("failed\n"); + return throw_type_error(ctx, ei, IDS_TO_PRIMITIVE, NULL); } default: FIXME("Unimplemented for vt %d\n", V_VT(v)); diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 91d14d3..0f5af9b 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -18,6 +18,7 @@ #include <windef.h> +#define IDS_TO_PRIMITIVE 0x0001 #define IDS_INVALID_CALL_ARG 0x0005 #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1

1 0

Piotr Caban : jscript: Throw TypeError in Function_toString.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: fba4e3767ff2b15aad2cf70e19683464c5239ef4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fba4e3767ff2b15aad2cf70e1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 22 13:02:19 2009 +0200 jscript: Throw TypeError in Function_toString. --- dlls/jscript/function.c | 6 ++---- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index dac8d3e..6ac668c 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -272,10 +272,8 @@ static HRESULT Function_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISP TRACE("\n"); - if(!is_class(dispex, JSCLASS_FUNCTION)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } + if(!is_class(dispex, JSCLASS_FUNCTION)) + return throw_type_error(dispex->ctx, ei, IDS_NOT_FUNC, NULL); function = (FunctionInstance*)dispex; diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index e0825e9..5e53f6d 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -25,6 +25,7 @@ STRINGTABLE DISCARDABLE IDS_INVALID_CALL_ARG "Invalid procedure call or argument" IDS_NO_PROPERTY "Object doesn't support this property or method" IDS_ARG_NOT_OPT "Argument not optional" + IDS_NOT_FUNC "Function expected" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" IDS_UNDEFINED "'|' is undefined" diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 3aa014e..91d14d3 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -21,6 +21,7 @@ #define IDS_INVALID_CALL_ARG 0x0005 #define IDS_NO_PROPERTY 0x01B6 #define IDS_ARG_NOT_OPT 0x01c1 +#define IDS_NOT_FUNC 0x138A #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 #define IDS_UNDEFINED 0x1391 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b663dad..2ed8bda 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1314,5 +1314,6 @@ exception_test(function() {arr.test();}, "TypeError", -2146827850); exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError", -2146823287); exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); exception_test(function() {not_existing_variable.something();}, "TypeError", -2146823279); +exception_test(function() {arr.toString = Function.prototype.toString; arr.toString();}, "TypeError", -2146823286); reportSuccess();

1 0

Piotr Caban : jscript: Throw 'undefined object' error.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: d8e841ca505ac53ace3374a59204c73d04b8419c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e841ca505ac53ace3374a59… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 22 13:01:59 2009 +0200 jscript: Throw 'undefined object' error. --- dlls/jscript/engine.c | 9 ++++----- dlls/jscript/error.c | 6 +++--- dlls/jscript/jscript_En.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 10004a7..c79c48f 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -433,7 +433,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so } /* ECMA-262 3rd Edition 10.1.4 */ -static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, exprval_t *ret) +static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, jsexcept_t *ei, exprval_t *ret) { scope_chain_t *scope; named_item_t *item; @@ -518,8 +518,7 @@ static HRESULT identifier_eval(exec_ctx_t *ctx, BSTR identifier, DWORD flags, ex return S_OK; } - WARN("Could not find identifier %s\n", debugstr_w(identifier)); - return E_FAIL; + return throw_type_error(ctx->var_disp->ctx, ei, IDS_UNDEFINED, identifier); } /* ECMA-262 3rd Edition 12.1 */ @@ -855,7 +854,7 @@ HRESULT forin_statement_eval(exec_ctx_t *ctx, statement_t *_stat, return_type_t TRACE("iter %s\n", debugstr_w(str)); if(stat->variable) - hres = identifier_eval(ctx, identifier, 0, &exprval); + hres = identifier_eval(ctx, identifier, 0, NULL, &exprval); else hres = expr_eval(ctx, stat->expr, EXPR_NEWREF, &rt->ei, &exprval); if(SUCCEEDED(hres)) { @@ -1596,7 +1595,7 @@ HRESULT identifier_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD f if(!identifier) return E_OUTOFMEMORY; - hres = identifier_eval(ctx, identifier, flags, ret); + hres = identifier_eval(ctx, identifier, flags, ei, ret); SysFreeString(identifier); return hres; diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index d160dd6..49bdb07 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -415,17 +415,17 @@ static HRESULT throw_error(script_ctx_t *ctx, jsexcept_t *ei, UINT id, const WCH DispatchEx *err; HRESULT hres; - TRACE("\n"); - LoadStringW(jscript_hinstance, id, buf, sizeof(buf)/sizeof(WCHAR)); if(str) pos = strchrW(buf, '|'); if(pos) { int len = strlenW(str); - memmove(pos+len, pos+1, strlenW(pos+1)*sizeof(WCHAR)); + memmove(pos+len, pos+1, (strlenW(pos+1)+1)*sizeof(WCHAR)); memcpy(pos, str, len*sizeof(WCHAR)); } + WARN("%s\n", debugstr_w(buf)); + id |= 0x800A0000; hres = create_error(ctx, constr, &id, buf, &err); if(FAILED(hres)) diff --git a/dlls/jscript/jscript_En.rc b/dlls/jscript/jscript_En.rc index 8a0a9a9..e0825e9 100644 --- a/dlls/jscript/jscript_En.rc +++ b/dlls/jscript/jscript_En.rc @@ -27,6 +27,7 @@ STRINGTABLE DISCARDABLE IDS_ARG_NOT_OPT "Argument not optional" IDS_NOT_DATE "'[object]' is not a date object" IDS_NOT_NUM "Number expected" + IDS_UNDEFINED "'|' is undefined" IDS_NOT_BOOL "Boolean object expected" IDS_INVALID_LENGTH "Array length must be a finite positive integer" } diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index 8caff6a..3aa014e 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -23,5 +23,6 @@ #define IDS_ARG_NOT_OPT 0x01c1 #define IDS_NOT_DATE 0x138E #define IDS_NOT_NUM 0x1389 +#define IDS_UNDEFINED 0x1391 #define IDS_NOT_BOOL 0x1392 #define IDS_INVALID_LENGTH 0x13A5 diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c20cd8b..b663dad 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1313,5 +1313,6 @@ exception_test(function() {date.setTime();}, "TypeError", -2146827839); exception_test(function() {arr.test();}, "TypeError", -2146827850); exception_test(function() {arr.toString = Number.prototype.toString; arr.toString();}, "TypeError", -2146823287); exception_test(function() {(new Number(3)).toString(1);}, "TypeError", -2146828283); +exception_test(function() {not_existing_variable.something();}, "TypeError", -2146823279); reportSuccess();

1 0

Alexandre Julliard : ole32/tests: Avoid depending on the heap allocation order for the CoGetObjectContext test .
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: d61764299932d09c375758f342d052aaf7abcae0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d61764299932d09c375758f34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 22 13:26:34 2009 +0200 ole32/tests: Avoid depending on the heap allocation order for the CoGetObjectContext test. --- dlls/ole32/tests/compobj.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1435984..44a2521 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -1351,18 +1351,18 @@ static void test_CoGetContextToken(void) refs = IUnknown_AddRef((IUnknown *)token); ok(refs == 1, "Expected 1, got %u\n", refs); - refs = IUnknown_Release((IUnknown *)token); - ok(refs == 0, "Expected 0, got %u\n", refs); - hr = pCoGetObjectContext(&IID_IObjContext, (void **)&ctx); ok(hr == S_OK, "Expected S_OK, got 0x%08x\n", hr); todo_wine ok(ctx == (IObjContext *)token, "Expected interface pointers to be the same\n"); refs = IUnknown_AddRef((IUnknown *)ctx); - ok(refs == 2, "Expected 1, got %u\n", refs); + todo_wine ok(refs == 3, "Expected 3, got %u\n", refs); refs = IUnknown_Release((IUnknown *)ctx); - ok(refs == 1, "Expected 0, got %u\n", refs); + todo_wine ok(refs == 2, "Expected 2, got %u\n", refs); + + refs = IUnknown_Release((IUnknown *)token); + todo_wine ok(refs == 1, "Expected 1, got %u\n", refs); /* CoGetContextToken does not add a reference */ token = 0; @@ -1377,6 +1377,9 @@ static void test_CoGetContextToken(void) refs = IUnknown_Release((IUnknown *)ctx); ok(refs == 1, "Expected 0, got %u\n", refs); + refs = IUnknown_Release((IUnknown *)ctx); + ok(refs == 0, "Expected 0, got %u\n", refs); + CoUninitialize(); }

1 0

Marcus Meissner : winhttp: Check for NULL return from heap_alloc (Coverity) .
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: ee59879da046898c18fcd3a9eaa5cafb3052b607 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee59879da046898c18fcd3a9e… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jul 22 09:59:31 2009 +0200 winhttp: Check for NULL return from heap_alloc (Coverity). --- dlls/winhttp/request.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 344bb14..83d6117 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -765,6 +765,7 @@ static LPWSTR concatenate_string_list( LPCWSTR *list, int len ) len++; str = heap_alloc( len * sizeof(WCHAR) ); + if (!str) return NULL; *str = 0; for( t = list; *t ; t++ ) @@ -789,6 +790,7 @@ static LPWSTR build_header_request_string( request_t *request, LPCWSTR verb, /* allocate space for an array of all the string pointers to be added */ len = (request->num_headers) * 4 + 10; req = heap_alloc( len * sizeof(LPCWSTR) ); + if (!req) return NULL; /* add the verb, path and HTTP version string */ n = 0; @@ -820,6 +822,7 @@ static LPWSTR build_header_request_string( request_t *request, LPCWSTR verb, req[n] = NULL; requestString = concatenate_string_list( req, 4 ); heap_free( req ); + if (!requestString) return NULL; /* * Set (header) termination string for request

1 0

Paul Vriens : winhttp/tests: Fix a test failure on some W2K/XP systems.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 47535030cc999075640562809bdda389798110cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=47535030cc999075640562809… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 22 12:06:41 2009 +0200 winhttp/tests: Fix a test failure on some W2K/XP systems. --- dlls/winhttp/tests/winhttp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 76e08e0..67ac504 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -942,7 +942,8 @@ static void test_set_default_proxy_config(void) info.lpszProxy = wideString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + ok((!ret && GetLastError() == ERROR_INVALID_PARAMETER) || + broken(ret), /* Earlier winhttp versions on W2K/XP */ "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); info.lpszProxy = normalString;

1 0

Vladimir Pankratov : winecfg: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 43f36486e44998952fd92f71443fe0723a0bc715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43f36486e44998952fd92f714… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:41 2009 +0500 winecfg: Convert the Russian resources to UTF-8. --- programs/winecfg/Ru.rc | 333 ++++++++++++++++++++++++------------------------ 1 files changed, 168 insertions(+), 165 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=43f36486e44998952fd92…

1 0

Vladimir Pankratov : uninstaller: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 98035890d8255e4d2630226b69f6ded3bea4b32f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98035890d8255e4d2630226b6… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:18 2009 +0500 uninstaller: Convert the Russian resources to UTF-8. --- programs/uninstaller/Ru.rc | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/uninstaller/Ru.rc b/programs/uninstaller/Ru.rc index 512b8f6..4e74ee8 100644 --- a/programs/uninstaller/Ru.rc +++ b/programs/uninstaller/Ru.rc @@ -20,9 +20,12 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE { - IDS_APPNAME, "�� WINE" - IDS_UNINSTALLFAILED, "�� '%s', �� -�� .\r\n�� ?" + IDS_APPNAME, "Удаление приложений WINE" + IDS_UNINSTALLFAILED, "Ошибка выполнения команды удаления '%s', возможно из-за потери файлов приложения.\r\nУдалить информацию об установке из реестра?" }

1 0

Vladimir Pankratov : view: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: e6f1619209cf9287a03a9c3df8ed665c65767c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6f1619209cf9287a03a9c3df… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:25 2009 +0500 view: Convert the Russian resources to UTF-8. --- programs/view/Ru.rc | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/programs/view/Ru.rc b/programs/view/Ru.rc index 9d4d39e..c914434 100644 --- a/programs/view/Ru.rc +++ b/programs/view/Ru.rc @@ -20,6 +20,9 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT /* @@ -30,19 +33,19 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT VIEW MENU BEGIN - POPUP "&��" + POPUP "&Файл" BEGIN - MENUITEM "&��", IDM_OPEN - MENUITEM "�&��", IDM_EXIT + MENUITEM "&Открыть", IDM_OPEN + MENUITEM "В&ыход", IDM_EXIT END - POPUP "&��" + POPUP "&Положение" BEGIN - MENUITEM "&�� ", IDM_SET_EXT_TO_WIN + MENUITEM "&Расширить по окну", IDM_SET_EXT_TO_WIN MENUITEM SEPARATOR - MENUITEM "�&��", IDM_LEFT - MENUITEM "�&��", IDM_RIGHT - MENUITEM "�&��", IDM_UP - MENUITEM "�&��", IDM_DOWN + MENUITEM "В&лево", IDM_LEFT + MENUITEM "В&право", IDM_RIGHT + MENUITEM "В&верх", IDM_UP + MENUITEM "В&низ", IDM_DOWN END END @@ -67,5 +70,5 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "�� " + IDS_DESCRIPTION "Просмоторщик обычных метафайлов" END

1 0

Vladimir Pankratov : wineboot: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 15b5324d6a3d161813cba26e2630da1c00b735ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b5324d6a3d161813cba26e2… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:33:32 2009 +0500 wineboot: Convert the Russian resources to UTF-8. --- programs/wineboot/wineboot_Ru.rc | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/wineboot/wineboot_Ru.rc b/programs/wineboot/wineboot_Ru.rc index b1ab0ca..ef777bc 100644 --- a/programs/wineboot/wineboot_Ru.rc +++ b/programs/wineboot/wineboot_Ru.rc @@ -21,17 +21,20 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT IDD_ENDTASK DIALOG DISCARDABLE 0, 0, 186, 71 STYLE DS_MODALFRAME | DS_NOIDLEMSG | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "�� " +CAPTION "Ожидание программы" FONT 8, "MS Shell Dlg" BEGIN - DEFPUSHBUTTON "��",IDCANCEL,129,49,50,15 - PUSHBUTTON "�� ",IDOK,51,49,71,15 - LTEXT "�� , �� .", + DEFPUSHBUTTON "Отмена",IDCANCEL,129,49,50,15 + PUSHBUTTON "Завершить Процесс",IDOK,51,49,71,15 + LTEXT "Происходит смена пользователя или выключение, но эта программа не отвечает.", IDC_STATIC,7,7,172,19 - LTEXT "�� , �� .", + LTEXT "Если закрыть программу прямо сейчас, то можно потерять все несохраненные данные.", IDC_STATIC,7,28,172,15 END

1 0

Vladimir Pankratov : taskmgr: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: c8308d61b593263d9e808b4c6edb336d80264eb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8308d61b593263d9e808b4c6… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:32:44 2009 +0500 taskmgr: Convert the Russian resources to UTF-8. --- programs/taskmgr/Ru.rc | 493 ++++++++++++++++++++++++++++-------------------- 1 files changed, 286 insertions(+), 207 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c8308d61b593263d9e808…

1 0

Vladimir Pankratov : start: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: c3e58fc4044e1d3cc430e4530661a2555dccbde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e58fc4044e1d3cc430e4530… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:32:31 2009 +0500 start: Convert the Russian resources to UTF-8. --- programs/start/Ru.rc | 47 +++++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 22 deletions(-) diff --git a/programs/start/Ru.rc b/programs/start/Ru.rc index f30af43..48248ee 100644 --- a/programs/start/Ru.rc +++ b/programs/start/Ru.rc @@ -20,34 +20,37 @@ #include "resources.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -STRINGTABLE DISCARDABLE LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE { -STRING_USAGE, "�� ,\n\ -�� .\n\n\ -��:\n\ -start [options] ��_��_�� [...]\n\ -start [options] ��_��_��\n\ +STRING_USAGE, "Запускает программы или открывает документы приложением,\n\ +обычно используемым для файлов с данным расширением.\n\n\ +Использование:\n\ +start [options] имя_файла_программы [...]\n\ +start [options] имя_файла_документа\n\ \n\ -��:\n\ -/M[inimized] �� .\n\ -/MAX[imized] �� .\n\ -/R[estored] �� (�� ).\n\ -/W[ait] �� .\n\ -/Unix �� Unix �� .\n\ +Опции:\n\ +/M[inimized] Запустить программу минимизированной.\n\ +/MAX[imized] Запустить программу максимизированной.\n\ +/R[estored] Запустить программу нормально (не максимизированно и не минимизированно).\n\ +/W[ait] Ожидать завершения запущенной программы и выйти с кодом её выхода.\n\ +/Unix Использовать путь Unix для запуска програмы как виндовс проводник.\n\ /ProgIDOpen Open a document using the following progID.\n\ -/L �� .\n\ +/L Показать лицензию конечного пользователя.\n\ \n\ -start.exe �� 0.2 Copyright (C) 2003, Dan Kegel\n\ -Start �� -�� ; �� /L.\n\ -�� , � �� \n\ -��; �� /L.\n\ +start.exe версия 0.2 Copyright (C) 2003, Dan Kegel\n\ +Start идет БЕЗ КАКИХ-ЛИБО ГАРАНТИЙ; подробности при запуске с опцией /L.\n\ +Это свободная программа, и вы можете её распространять на определённых\n\ +условиях; подробности при запуске с опцией /L.\n\ " -STRING_LICENSE, "start.exe �� 0.2 Copyright (C) 2003, Dan Kegel\n\ -�� GNU Lesser Public License\n\ -� �� .\n\ +STRING_LICENSE, "start.exe версия 0.2 Copyright (C) 2003, Dan Kegel\n\ +Это программа распространяется по лицензии GNU Lesser Public License\n\ +и является свободным программным продуктом.\n\ \n\ This program is free software; you can redistribute it and/or\n\ modify it under the terms of the GNU Lesser Public License\n\ @@ -66,7 +69,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.\n\ See the COPYING.LIB file for license information.\n\ " -STRING_EXECFAIL "�� .\n�� ShellExecuteEx ��" +STRING_EXECFAIL "Приложение не может быть запущено или не ассоциировано приложений с типом данного документа.\nВызов ShellExecuteEx провалился" -STRING_UNIXFAIL "�� UNIX � �� DOS." +STRING_UNIXFAIL "Невозможно перевести имя программы UNIX в имя DOS." }

1 0

Vladimir Pankratov : regedit: Convert the Russian resources to UTF-8.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: b989203e357e94e68689315edfe192a946b2c28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b989203e357e94e68689315ed… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Wed Jul 22 15:31:59 2009 +0500 regedit: Convert the Russian resources to UTF-8. --- programs/regedit/Ru.rc | 271 ++++++++++++++++++++++++------------------------ 1 files changed, 137 insertions(+), 134 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b989203e357e94e686893…

1 0

Hans Leidekker : wininet: Correct handling of redirected HEAD requests.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: fa4c25ddf4641a77829769dc43ecb0b25d15229d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa4c25ddf4641a77829769dc4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 22 11:56:33 2009 +0200 wininet: Correct handling of redirected HEAD requests. --- dlls/wininet/http.c | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b4f7924..693a44f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -79,6 +79,7 @@ static const WCHAR szProxy_Authorization[] = { 'P','r','o','x','y','-','A','u',' static const WCHAR szStatus[] = { 'S','t','a','t','u','s',0 }; static const WCHAR szKeepAlive[] = {'K','e','e','p','-','A','l','i','v','e',0}; static const WCHAR szGET[] = { 'G','E','T', 0 }; +static const WCHAR szHEAD[] = { 'H','E','A','D', 0 }; static const WCHAR szCrLf[] = {'\r','\n', 0}; static const WCHAR szAccept[] = { 'A','c','c','e','p','t',0 }; @@ -909,9 +910,11 @@ static BOOL HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PTR dwBufferSize=sizeof(szNewLocation); if (HTTP_HttpQueryInfoW(lpwhr, HTTP_QUERY_LOCATION, szNewLocation, &dwBufferSize, NULL)) { - /* redirects are always GETs */ - HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); - lpwhr->lpszVerb = heap_strdupW(szGET); + if (strcmpW(lpwhr->lpszVerb, szGET) && strcmpW(lpwhr->lpszVerb, szHEAD)) + { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + lpwhr->lpszVerb = heap_strdupW(szGET); + } HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) { @@ -2526,6 +2529,7 @@ static void HTTP_DrainContent(http_request_t *req) NETCON_close(&req->netConnection); return; } + if (!strcmpW(req->lpszVerb, szHEAD)) return; do { @@ -3790,10 +3794,11 @@ BOOL WINAPI HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, if ((dwStatusCode==HTTP_STATUS_REDIRECT || dwStatusCode==HTTP_STATUS_MOVED) && HTTP_HttpQueryInfoW(lpwhr,HTTP_QUERY_LOCATION,szNewLocation,&dwBufferSize,NULL)) { - /* redirects are always GETs */ - HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); - lpwhr->lpszVerb = heap_strdupW(szGET); - + if (strcmpW(lpwhr->lpszVerb, szGET) && strcmpW(lpwhr->lpszVerb, szHEAD)) + { + HeapFree(GetProcessHeap(), 0, lpwhr->lpszVerb); + lpwhr->lpszVerb = heap_strdupW(szGET); + } HTTP_DrainContent(lpwhr); if ((new_url = HTTP_GetRedirectURL( lpwhr, szNewLocation ))) {

1 0

Juan Lang : winhttp: Remove no-longer-used #defines.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 336ee2861d4253a1d53917db2f6d5083d803cf94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=336ee2861d4253a1d53917db2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:55:58 2009 -0700 winhttp: Remove no-longer-used #defines. --- dlls/winhttp/net.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 50842a8..6f2d5f5 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -58,9 +58,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); -#define DEFAULT_SEND_TIMEOUT 30 -#define DEFAULT_RECEIVE_TIMEOUT 30 - #ifndef HAVE_GETADDRINFO /* critical section to protect non-reentrant gethostbyname() */

1 0

Juan Lang : winhttp: Remove calls to SSL_CTX_set_timeout, as they affect the session's lifetime, not the read timeout.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 1229aa723a7e38194beb43f632bf67af8342986c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1229aa723a7e38194beb43f63… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:53:54 2009 -0700 winhttp: Remove calls to SSL_CTX_set_timeout, as they affect the session's lifetime, not the read timeout. --- dlls/winhttp/net.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 94bfd89..50842a8 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -100,8 +100,6 @@ MAKE_FUNCPTR( SSL_write ); MAKE_FUNCPTR( SSL_read ); MAKE_FUNCPTR( SSL_get_verify_result ); MAKE_FUNCPTR( SSL_get_peer_certificate ); -MAKE_FUNCPTR( SSL_CTX_get_timeout ); -MAKE_FUNCPTR( SSL_CTX_set_timeout ); MAKE_FUNCPTR( SSL_CTX_set_default_verify_paths ); MAKE_FUNCPTR( BIO_new_fp ); @@ -218,8 +216,6 @@ BOOL netconn_init( netconn_t *conn, BOOL secure ) LOAD_FUNCPTR( SSL_read ); LOAD_FUNCPTR( SSL_get_verify_result ); LOAD_FUNCPTR( SSL_get_peer_certificate ); - LOAD_FUNCPTR( SSL_CTX_get_timeout ); - LOAD_FUNCPTR( SSL_CTX_set_timeout ); LOAD_FUNCPTR( SSL_CTX_set_default_verify_paths ); #undef LOAD_FUNCPTR @@ -482,11 +478,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) if (conn->secure) { #ifdef SONAME_LIBSSL - long timeout; - - timeout = pSSL_CTX_get_timeout( ctx ); - pSSL_CTX_set_timeout( ctx, DEFAULT_RECEIVE_TIMEOUT ); - while (recvd < *buflen) { int dummy; @@ -502,7 +493,6 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) } if (buffer[recvd] != '\r') recvd++; } - pSSL_CTX_set_timeout( ctx, timeout ); if (ret) { buffer[recvd++] = 0;

1 0

Juan Lang : winhttp: Use connection' s timeout rather than default timeout when reading a line.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 2418e82810a6caa594a7071dc5d85ef4e73b3ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2418e82810a6caa594a7071dc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:53:11 2009 -0700 winhttp: Use connection's timeout rather than default timeout when reading a line. --- dlls/winhttp/net.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 181ff02..94bfd89 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -519,9 +519,16 @@ BOOL netconn_get_next_line( netconn_t *conn, char *buffer, DWORD *buflen ) pfd.events = POLLIN; while (recvd < *buflen) { - if (poll( &pfd, 1, DEFAULT_RECEIVE_TIMEOUT * 1000 ) > 0) + int timeout, res; + struct timeval tv; + socklen_t len = sizeof(tv); + + if ((res = getsockopt( conn->socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&tv, &len ) != -1)) + timeout = tv.tv_sec * 1000 + tv.tv_usec / 1000; + else + timeout = -1; + if (poll( &pfd, 1, timeout ) > 0) { - int res; if ((res = recv( conn->socket, &buffer[recvd], 1, 0 )) <= 0) { if (res == -1) set_last_error( sock_get_error( errno ) );

1 0

Juan Lang : winhttp: Set a socket's timeouts when it's created.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 80100334f1e3c8f31430af93e0935926ff7f3507 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80100334f1e3c8f31430af93e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:52:47 2009 -0700 winhttp: Set a socket's timeouts when it's created. --- dlls/winhttp/request.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5704417..344bb14 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -920,6 +920,8 @@ static BOOL open_connection( request_t *request ) heap_free( addressW ); return FALSE; } + netconn_set_timeout( &request->netconn, TRUE, request->send_timeout ); + netconn_set_timeout( &request->netconn, FALSE, request->recv_timeout ); if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen )) { netconn_close( &request->netconn );

1 0

Juan Lang : winhttp: Store send and receive timeouts in request_t, and only set them in a netconn_t if it's connected.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 64d69b55f95303a10c439062b634eaf5583aa1ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=64d69b55f95303a10c439062b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 21 13:52:22 2009 -0700 winhttp: Store send and receive timeouts in request_t, and only set them in a netconn_t if it's connected. --- dlls/winhttp/session.c | 15 +++++++++++++-- dlls/winhttp/winhttp_private.h | 2 ++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 683a6fb..81113e4 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -33,6 +33,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(winhttp); +#define DEFAULT_SEND_TIMEOUT 30000 +#define DEFAULT_RECEIVE_TIMEOUT 30000 + void set_last_error( DWORD error ) { /* FIXME */ @@ -633,6 +636,8 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o list_add_head( &connect->hdr.children, &request->hdr.entry ); if (!netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE )) goto end; + request->send_timeout = DEFAULT_SEND_TIMEOUT; + request->recv_timeout = DEFAULT_RECEIVE_TIMEOUT; if (!verb || !verb[0]) verb = getW; if (!(request->verb = strdupW( verb ))) goto end; @@ -1178,10 +1183,16 @@ BOOL WINAPI WinHttpSetTimeouts( HINTERNET handle, int resolve, int connect, int } if (send < 0) send = 0; - if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + request->send_timeout = send; if (receive < 0) receive = 0; - if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + request->recv_timeout = receive; + + if (netconn_connected( &request->netconn )) + { + if (netconn_set_timeout( &request->netconn, TRUE, send )) ret = FALSE; + if (netconn_set_timeout( &request->netconn, FALSE, receive )) ret = FALSE; + } release_object( &request->hdr ); return ret; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2431d7c..97c8f90 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -139,6 +139,8 @@ typedef struct LPWSTR version; LPWSTR raw_headers; netconn_t netconn; + int send_timeout; + int recv_timeout; LPWSTR status_text; DWORD content_length; /* total number of bytes to be read (per chunk) */ DWORD content_read; /* bytes read so far */

1 0

Dmitry Timoshkov : user32: Pass the same PRF_ flags from WM_PRINT to WM_PRINTCLIENT.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 19e4cfd003373ecf2bee39002835a705f7dc31ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=19e4cfd003373ecf2bee39002… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 22 15:22:35 2009 +0900 user32: Pass the same PRF_ flags from WM_PRINT to WM_PRINTCLIENT. --- dlls/user32/defwnd.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index bf30c97..19d6ab2 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -216,7 +216,7 @@ static void DEFWND_Print( HWND hwnd, HDC hdc, ULONG uFlags) * Client area */ if ( uFlags & PRF_CLIENT) - SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); + SendMessageW(hwnd, WM_PRINTCLIENT, (WPARAM)hdc, uFlags); }

1 0

Francois Gouget : notepad: Remove spaces before '\n'.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 108a930e670dfd8f5760f59d355fa7f35ae9d27d URL: http://source.winehq.org/git/wine.git/?a=commit;h=108a930e670dfd8f5760f59d3… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:53:14 2009 +0200 notepad: Remove spaces before '\n'. --- programs/notepad/Ko.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index 56167de..94f1d10 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -127,9 +127,9 @@ STRING_UNICODE_LE, " STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ -��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ�� \n\ +��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ��\n\ �� ϸ� �� ս�� Դϴ�.\n\ -�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ� \n\ +�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ�\n\ �ɼ� �� ϳ�� Ͻʽÿ�t.\n\ ��Ͻðڽ��ϱ�?" }

1 0

Francois Gouget : appwiz.cpl: Make sure we have a space before the ellipses in Slovenian resources.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 548b06aae971428a973a1ef8961420ee9aa0f068 URL: http://source.winehq.org/git/wine.git/?a=commit;h=548b06aae971428a973a1ef89… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:53:07 2009 +0200 appwiz.cpl: Make sure we have a space before the ellipses in Slovenian resources. --- dlls/appwiz.cpl/Si.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Si.rc b/dlls/appwiz.cpl/Si.rc index d936cf9..dc37ae0 100644 --- a/dlls/appwiz.cpl/Si.rc +++ b/dlls/appwiz.cpl/Si.rc @@ -40,7 +40,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Instalacijski programi\0*instal*.exe;*setup*.exe;*.msi\0Programi (*.exe)\0*.exe\0Vse datoteke (*.*)\0*.*\0\0" IDS_REMOVE, "&Odstrani ..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "&Modify/Remove ..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -55,7 +55,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Naslednji programi omogočajo samodejno odstranitev. Za odstranitev programa oz. spremembo nameščenih komponent izberite program s seznama in kliknite 'Dodaj/Odstrani'.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Informacije ...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Modify ...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Odstrani ...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Francois Gouget : taskmgr: Remove space before ellipsis.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 045dc433debf4ca9980a250b5d98f327c76227a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=045dc433debf4ca9980a250b5… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:52:49 2009 +0200 taskmgr: Remove space before ellipsis. --- programs/taskmgr/No.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index cc61a18..598b567 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -497,7 +497,7 @@ BEGIN IDS_VIEW_SMALL "S&må ikoner" IDS_VIEW_DETAILS "&Detaljer" IDS_WINDOWS "&Vinduer" - IDS_VIEW_SELECTCOLUMNS "Velg &kolonner ..." + IDS_VIEW_SELECTCOLUMNS "Velg &kolonner..." IDS_OPTIONS_SHOW16BITTASKS "Vi&s 16 bit-jobber" IDS_VIEW_CPUHISTORY "&Prosessorhistorikk" IDS_VIEW_CPUHISTORY_ONEGRAPHALL "Én graf, alle pr&osessorer"

1 0

Francois Gouget : shell32: Add a trailing '\n' to a WARN().
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: fb0e107b1863f963e7074786e9a3363a5ac638cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb0e107b1863f963e7074786e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Jul 22 08:52:07 2009 +0200 shell32: Add a trailing '\n' to a WARN(). --- dlls/shell32/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/control.c b/dlls/shell32/control.c index e7c7d95..9b566b6 100644 --- a/dlls/shell32/control.c +++ b/dlls/shell32/control.c @@ -97,7 +97,7 @@ CPlApplet* Control_LoadApplet(HWND hWnd, LPCWSTR cmd, CPanel* panel) sizeof(*applet) + (applet->count - 1) * sizeof(NEWCPLINFOW)); if (!(applet->cmd = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(cmd)+1) * sizeof(WCHAR)))) { - WARN("Cannot allocate memory for applet path"); + WARN("Cannot allocate memory for applet path\n"); goto theError; }

1 0

Nikolay Sivov : comctl32/listview: LVM_SETITEMSTATE - select all item case tests.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: af0f00b671864059cdaa890b5eaa40b8b70ebac1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0f00b671864059cdaa890b5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jul 21 22:06:18 2009 +0400 comctl32/listview: LVM_SETITEMSTATE - select all item case tests. --- dlls/comctl32/tests/listview.c | 56 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b886d86..6454187 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -205,6 +205,29 @@ static const struct message ownderdata_select_focus_parent_seq[] = { { 0 } }; +static const struct message ownerdata_select_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + +static const struct message select_all_parent_seq[] = { + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, + { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, + { 0 } +}; + static const struct message textcallback_set_again_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGING }, { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, @@ -1916,6 +1939,20 @@ static void test_multiselect(void) } item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); expect(items,item_count); + + /* select all, check notifications */ + ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + + ok_sequence(sequences, PARENT_SEQ_INDEX, select_all_parent_seq, + "select all notification", FALSE); + /* deselect all items */ ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); @@ -2385,7 +2422,7 @@ static void test_ownerdata(void) /* check notifications after focused/selected changed */ hwnd = create_listview_control(LVS_OWNERDATA); ok(hwnd != NULL, "failed to create a listview window\n"); - res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 1, 0); + res = SendMessageA(hwnd, LVM_SETITEMCOUNT, 20, 0); ok(res != 0, "Expected LVM_SETITEMCOUNT to succeed\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2409,6 +2446,23 @@ static void test_ownerdata(void) ok_sequence(sequences, PARENT_SEQ_INDEX, ownderdata_select_focus_parent_seq, "ownerdata focus notification", TRUE); + + /* select all, check notifications */ + item.stateMask = LVIS_SELECTED; + item.state = 0; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + res = SendMessageA(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, res); + + ok_sequence(sequences, PARENT_SEQ_INDEX, ownerdata_select_all_parent_seq, + "ownerdata select all notification", TRUE); + DestroyWindow(hwnd); /* check notifications on LVM_GETITEM */

1 0

Mike Kaplinskiy : ws2_32/tests: Fix the last failures on NT4.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: 7b683a9008697c948d58e88cc70d94a5b857ab39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b683a9008697c948d58e88cc… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Tue Jul 21 22:25:45 2009 -0400 ws2_32/tests: Fix the last failures on NT4. --- dlls/ws2_32/tests/sock.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 21502c2..b1b85fe 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2777,7 +2777,19 @@ static void test_AcceptEx(void) bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); - ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + ok((bret == FALSE && WSAGetLastError() == WSAEINVAL) || broken(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) /* NT4 */, + "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); + if (bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING) { + /* We need to cancel this call, otherwise things fail */ + bret = CancelIo((HANDLE) listener); + ok(bret, "Failed to cancel failed test. Bailing...\n"); + if (!bret) return; + + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + } iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError());

1 0

Owen Rudge : winhlp32: Ensure win-> page is not NULL when selecting Help on Help.
by Alexandre Julliard July 22, 2009

July 22, 2009

Module: wine Branch: master Commit: b4f2c5528311782446be534db3ec04aeb86fa414 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4f2c5528311782446be534db… Author: Owen Rudge <owen(a)owenrudge.net> Date: Wed Jul 22 00:48:28 2009 -0300 winhlp32: Ensure win->page is not NULL when selecting Help on Help. --- programs/winhlp32/macro.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/winhlp32/macro.c b/programs/winhlp32/macro.c index c2fc3cc..fdec6b3 100644 --- a/programs/winhlp32/macro.c +++ b/programs/winhlp32/macro.c @@ -446,10 +446,13 @@ static void CALLBACK MACRO_GotoMark(LPCSTR str) void CALLBACK MACRO_HelpOn(void) { - LPCSTR file; + WINHELP_WINDOW *win = MACRO_CurrentWindow(); + LPCSTR file = NULL; WINE_TRACE("()\n"); - file = MACRO_CurrentWindow()->page->file->help_on_file; + if (win && win->page && win->page->file) + file = win->page->file->help_on_file; + if (!file) file = (Globals.wVersion > 4) ? "winhlp32.hlp" : "winhelp.hlp";

1 0