wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Alexander Nicolaysen Sørnes : Control Centre: Make it possible to fix noteLinks
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 34340001458e7e798eb8c0b49491dfd755c2c877 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=34340001458e7e798eb8c0b4… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 22:43:05 2011 +0200 Control Centre: Make it possible to fix noteLinks --- admin.php | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 87 insertions(+), 9 deletions(-) diff --git a/admin.php b/admin.php index d37918c..be72faa 100644 --- a/admin.php +++ b/admin.php @@ -45,6 +45,8 @@ function fixNoteLinks() $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_ALL); echo 'The following notes are set to show for app and all versions: '; + $iCount = 0; + $iSkipped = 0; while(($oRow = mysql_fetch_object($hResult))) { $oNote = new note(null, $oRow); @@ -57,18 +59,32 @@ function fixNoteLinks() foreach($aVersions as $oVersion) { $iVersionId = $oVersion->objectGetId(); - $sFix = "INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"; - echo "$sFix "; + + $hResultTag = query_parameters("SELECT COUNT(*) as count FROM tags_NoteVersion_assignments WHERE tagId = '?' AND taggedId = '?'", $iVersionId, $oRow->noteId); + + $oRowTag = mysql_fetch_object($hResultTag); + + if(!$oRowTag->count) + { + query_parameters("INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"); + $iCount++; + } else + { + $iSkipped++; + } } echo ' '; } + echo " Created $iCount tags ($iSkipped already existed) "; // Notes shown for all versions $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_VERSIONS); echo ' The following notes are set to show for all versions: '; + $iCount = 0; + $iSkipped = 0; while(($oRow = mysql_fetch_object($hResult))) { $oNote = new note(null, $oRow); @@ -81,17 +97,32 @@ function fixNoteLinks() foreach($aVersions as $oVersion) { $iVersionId = $oVersion->objectGetId(); - $sFix = "INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"; - echo "$sFix "; + + $hResultTag = query_parameters("SELECT COUNT(*) as count FROM tags_NoteVersion_assignments WHERE tagId = '?' AND taggedId = '?'", $iVersionId, $oRow->noteId); + + $oRowTag = mysql_fetch_object($hResultTag); + + if(!$oRowTag->count) + { + query_parameters("INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('?','?')", $iVersionId, $iNoteId); + $iCount++; + } else + { + $iSkipped++; + } } echo ' '; } + echo " Created $iCount tags ($iSkipped already existed) "; + // Notes shown for specific versions $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_SPECIFIC_VERSIONS); echo ' The following notes are set to show for specific versions: '; + $iCount = 0; + $iSkipped =0; while(($oRow = mysql_fetch_object($hResult))) { $oNote = new note(null, $oRow); @@ -101,20 +132,34 @@ function fixNoteLinks() echo 'App: '.$oApp->objectMakeLink().' '; echo ' '; - $hResult = query_parameters("SELECT DISTINCT(versionId) FROM appNotes WHERE linkedWith = '?'", $oNote->objectGetId()); + $hResult2 = query_parameters("SELECT DISTINCT(versionId) FROM appNotes WHERE linkedWith = '?'", $oNote->objectGetId()); - while(($oRow = mysql_fetch_object($hResult))) + while(($oRow2 = mysql_fetch_object($hResult2))) { - $iVersionId = $oRow->versionId; - $sFix = "INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"; - echo "$sFix "; + $iVersionId = $oRow2->versionId; + + $hResultTag = query_parameters("SELECT COUNT(*) as count FROM tags_NoteVersion_assignments WHERE tagId = '?' AND taggedId = '?'", $iVersionId, $oRow->noteId); + + $oRowTag = mysql_fetch_object($hResultTag); + + if(!$oRowTag->count) + { + query_parameters("INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('?','?')", $iVersionId, $iNoteId); + $iCount++; + } else + { + $iSkipped++; + } } } + + echo " Created $iCount tags ($iSkipped already existed) "; // Notes shown for app $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_APP); echo ' The following notes are set to show on app page: '; + $iCount = 0; while(($oRow = mysql_fetch_object($hResult))) { $oNote = new note(null, $oRow); @@ -122,7 +167,40 @@ function fixNoteLinks() echo 'ID: '.$oNote->objectGetId().' '; echo 'App: '.$oApp->objectMakeLink().' '; echo ' '; + $iCount++; } + + echo " $iCount in total "; + + // Create links for ordinary notes + echo " Creating tags for ordinar notes "; + $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId > '0' AND linkedWith = '0'"); + + $iTagsCreated = 0; + $iSkipped = 0; + while(($oRow = mysql_fetch_object($hResult))) + { + $hResultTag = query_parameters("SELECT COUNT(*) as count FROM tags_NoteVersion_assignments WHERE tagId = '?' AND taggedId = '?'", $oRow->versionId, $oRow->noteId); + + $oRowTag = mysql_fetch_object($hResultTag); + + if(!$oRowTag->count) + { + query_parameters("INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('?','?')", $oRow->versionId, $oRow->noteId); + $iTagsCreated++; + } else + { + $iSkipped++; + } + } + + echo "Created $iTagsCreated note tags ($iSkipped already existed) "; + + + echo " Deleting note links "; + $hResult = query_parameters("DELETE FROM appNotes WHERE linkedWith != '0'"); + echo "Deleted ".mysql_affected_rows()." links "; + } function showChoices()

1 0

Alexander Nicolaysen Sørnes : Tag: Make the class more extandable
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 49cb8686806957d42bae87f4d6c3fb72c0e4e5a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=49cb8686806957d42bae87f4… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 22:33:46 2011 +0200 Tag: Make the class more extandable --- include/tag.php | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/tag.php b/include/tag.php index 117234e..c9fac08 100644 --- a/include/tag.php +++ b/include/tag.php @@ -1,11 +1,13 @@ <?php +require_once(BASE.'include/objectManagerBase.php'); + abstract class Tag extends ObjectManagerBase { - private $bMultipleAssignments; - private $sTextId; - private $sName; - private $sDescription; + protected $bMultipleAssignments; + protected $sTextId; + protected $sName; + protected $sDescription; function Constructor($iId = null, $oRow = null, $sTextId = '') { @@ -158,7 +160,7 @@ abstract class Tag extends ObjectManagerBase public function objectGetEntriesCount() { - $hResult = query_parameters("SELECT COUNT(id) as count FROM ? WHERE state = 'accepted'", $this->objectGetSQLTable()); + $hResult = query_parameters("SELECT COUNT(*) as count FROM ? WHERE state = 'accepted'", $this->objectGetSQLTable()); if(!$hResult) return false; @@ -230,12 +232,11 @@ public function objectGetEntriesCount() return $shRet; } - public function getAssignTagsEditor($iAssignedFor = null) + public function getAssignTagsEditor($iAssignedFor = null, $aSelected = array()) { $shRet = ''; - $aSelected = array(); - if($iAssignedFor) + if(!sizeof($aSelected) && $iAssignedFor) $aSelected = $this->getAssignedTags($iAssignedFor); foreach($this->getTags() as $oTag)

1 0

Alexander Nicolaysen Sørnes : Control Center: Show queries needed to fix note links
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: f024989c2a407d0b16ab63741ad7ca7567148f52 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=f024989c2a407d0b16ab6374… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 18:56:06 2011 +0200 Control Center: Show queries needed to fix note links --- admin.php | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 92 insertions(+), 1 deletions(-) diff --git a/admin.php b/admin.php index 2a4f757..d37918c 100644 --- a/admin.php +++ b/admin.php @@ -39,10 +39,97 @@ function updateVersionMaintainerStates() echo "Updated $i entries"; } +function fixNoteLinks() +{ + // Notes shown for app and all versions + $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_ALL); + + echo 'The following notes are set to show for app and all versions: '; + while(($oRow = mysql_fetch_object($hResult))) + { + $oNote = new note(null, $oRow); + $iNoteId = $oNote->objectGetId(); + $oApp = new Application($oNote->iAppId); + echo 'ID: '.$oNote->objectGetId().' '; + echo 'App: '.$oApp->objectMakeLink().' '; + + $aVersions = $oApp->GetVersions(true); + foreach($aVersions as $oVersion) + { + $iVersionId = $oVersion->objectGetId(); + $sFix = "INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"; + echo "$sFix "; + } + + echo ' '; + } + + + // Notes shown for all versions + $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_VERSIONS); + + echo ' The following notes are set to show for all versions: '; + while(($oRow = mysql_fetch_object($hResult))) + { + $oNote = new note(null, $oRow); + $iNoteId = $oNote->objectGetId(); + $oApp = new Application($oNote->iAppId); + echo 'ID: '.$oNote->objectGetId().' '; + echo 'App: '.$oApp->objectMakeLink().' '; + + $aVersions = $oApp->GetVersions(true); + foreach($aVersions as $oVersion) + { + $iVersionId = $oVersion->objectGetId(); + $sFix = "INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"; + echo "$sFix "; + } + + echo ' '; + } + + // Notes shown for specific versions + $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_SPECIFIC_VERSIONS); + + echo ' The following notes are set to show for specific versions: '; + while(($oRow = mysql_fetch_object($hResult))) + { + $oNote = new note(null, $oRow); + $iNoteId = $oNote->objectGetId(); + $oApp = new Application($oNote->iAppId); + echo 'ID: '.$oNote->objectGetId().' '; + echo 'App: '.$oApp->objectMakeLink().' '; + echo ' '; + + $hResult = query_parameters("SELECT DISTINCT(versionId) FROM appNotes WHERE linkedWith = '?'", $oNote->objectGetId()); + + while(($oRow = mysql_fetch_object($hResult))) + { + $iVersionId = $oRow->versionId; + $sFix = "INSERT INTO tags_NoteVersion_assignments (tagId,taggedId) VALUES('$iVersionId','$iNoteId')"; + echo "$sFix "; + } + } + + // Notes shown for app + $hResult = query_parameters("SELECT * FROM appNotes WHERE versionId = '?'", APPNOTE_SHOW_FOR_APP); + + echo ' The following notes are set to show on app page: '; + while(($oRow = mysql_fetch_object($hResult))) + { + $oNote = new note(null, $oRow); + $oApp = new Application($oNote->iAppId); + echo 'ID: '.$oNote->objectGetId().' '; + echo 'App: '.$oApp->objectMakeLink().' '; + echo ' '; + } +} + function showChoices() { + echo '<a href="admin.php?sAction=fixNoteLinks">Fix/Show note links</a> '; echo '<a href="admin.php?sAction=updateAppMaintainerStates">Update application maintainer states</a> '; - echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a>'; + echo '<a href="admin.php?sAction=updateVersionMaintainerStates">Update version maintainer states</a> '; } switch(getInput('sAction', $aClean)) @@ -55,6 +142,10 @@ switch(getInput('sAction', $aClean)) updateVersionMaintainerStates(); break; + case 'fixNoteLinks': + fixNoteLinks(); + break; + default: showChoices(); break;

1 0

Alexander Nicolaysen Sørnes : comment: Don't log hostname, since we no longer allow anonymouse posts
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 4fd3179f606d28d2df885c74bfe45acb7bd4d95e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4fd3179f606d28d2df885c74… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 15:56:26 2011 +0200 comment: Don't log hostname, since we no longer allow anonymouse posts --- include/comment.php | 8 +++----- include/util.php | 12 ------------ tables/appdb_tables.sql | 1 - 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/include/comment.php b/include/comment.php index 8625236..3532e2c 100644 --- a/include/comment.php +++ b/include/comment.php @@ -19,7 +19,6 @@ class Comment { var $iAppId; var $sDateCreated; - var $sHostname; var $oOwner; @@ -54,7 +53,6 @@ class Comment { $this->sSubject = $oRow->subject; $this->sBody = $oRow->body; $this->sDateCreated = $oRow->time; - $this->sHostname = $oRow->hostname; $this->oOwner = new User($oRow->userId); } } @@ -69,12 +67,12 @@ class Comment { { $hResult = query_parameters("INSERT INTO appComments (parentId, versionId, subject, ". - "body, userId, time, hostname) - VALUES ('?', '?', '?', '?', '?', ?, '?')", + "body, userId, time) + VALUES ('?', '?', '?', '?', '?', ?)", $this->iParentId, $this->iVersionId, $this->sSubject, $this->sBody, $_SESSION['current']->iUserId, - "NOW()", get_remote()); + "NOW()"); if($hResult) { diff --git a/include/util.php b/include/util.php index e856aff..add9963 100644 --- a/include/util.php +++ b/include/util.php @@ -114,18 +114,6 @@ function mysqldatetime_to_unixtimestamp($sDatetime) return strtotime($sDatetime); } -function get_remote() -{ - global $REMOTE_HOST, $REMOTE_ADDR; - - if($REMOTE_HOST) - $ip = $REMOTE_HOST; - else - $ip = $REMOTE_ADDR; - - return $ip; -} - function htmlify_urls($text) { //FIXME: wonder what the syntax is, this doesn't seem to work diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index eb7c5b9..580f551 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -121,7 +121,6 @@ create table appComments ( parentId int default 0, versionId int not null, userId int, - hostname varchar(80), subject varchar(128), body text, key(commentId),

1 0

Alexander Nicolaysen Sørnes : objectManager: Retrieve Common replies from the database
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 852768f9770ff268355ce3308196a3e9ee7b4e2f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=852768f9770ff268355ce330… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 12:54:48 2011 +0200 objectManager: Retrieve Common replies from the database --- include/objectManager.php | 45 +++++++++++++++------------------------------ 1 files changed, 15 insertions(+), 30 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 864845e..00c7251 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -26,10 +26,6 @@ class ObjectManager where we first run the object's getOutputEditorValues() and then objectManager's delete_entry(). */ - // an array of common responses used when replying to - // queued entries - private $aCommonResponses; - /* Remove the cached object of the class we are working with, useful in cases where we modify the object in such a way that it needs to be reloaded */ private function flushCachedObject() @@ -140,27 +136,6 @@ class ObjectManager $this->oTableRow = new OMTableRow(null); $this->sState = 'accepted'; $this->oFilters = null; // We only fill this when needed, as it can be quite slow - - // initialize the common responses array - $this->aCommonResponses = array(); - $this->aCommonResponses[] = "Thank you for your submission."; - $this->aCommonResponses[] = "Please consider filing a bug for the ". - "problem you have with this app, if there are not bugs filed already". - " at http://bugs.winehq.org. If you want some advice or guidance on". - " this, please visit http://forum.winehq.org"; - $this->aCommonResponses[] = "Please do not paste debug output in the AppDB,". - " it belongs only as an attachment on bugzilla."; - $this->aCommonResponses[] = "We appreciate your submission but it". - " needs to be more detailed before it will be most useful to other users of". - " the Application Database.". - " Please try to improve the entry and resubmit."; - $this->aCommonResponses[] = "We appreciate your submission but it". - " requires improvement to its grammar and/or spelling". - " before it will be most useful to other users of". - " the Application Database.". - " Please try to improve the entry and resubmit."; - $this->aCommonResponses[] = "Please do not copy large amount of text from". - " the program's website"; } /* Check whether the associated class has the given method */ @@ -459,16 +434,26 @@ class ObjectManager { ///////////////////////////////////////////////// // output radio buttons for some common responses + + $oTag = new TagCommonReply(null, null, "_show_for_{$this->sClass}"); + $aReplies = $oTag->getTaggedEntries(); + + if(!sizeof($aReplies)) + $sHelp = 'There are no common replies for processing this type of entries'; + else + $sHelp = 'Clicking on a reply will copy it to the E-mail text field'; + echo '<tr valign=top><td class="color0"></td><td class="color0">'. - 'Common replies Clicking on a reply will copy it to the E-mail text field. '. + 'Common replies '.$sHelp.'. '. 'Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'. APPDB_OWNER_EMAIL.'</a> if you want to suggest a new common reply.</td></tr>',"\n"; - foreach($this->aCommonResponses as $iIndex => $sReply) + foreach($aReplies as $oReply) { - echo '<tr valign=top><td class="color0"></td>',"\n"; - echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].innerHTML += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; - echo '</tr>',"\n"; + $sReply = $oReply->getReply(); + echo '<tr valign=top><td class="color0"></td>',"\n"; + echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].innerHTML += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; + echo '</tr>',"\n"; } // end output radio buttons for common responses /////////////////////////////////////////////////

1 0

Alexander Nicolaysen Sørnes : Make it possible to edit Common Replies
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 8fffa02d9d0f5e5019e498b68cdc9a7930b222a4 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=8fffa02d9d0f5e5019e498b6… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 12:35:46 2011 +0200 Make it possible to edit Common Replies --- include/commonReply.php | 149 ++++++++++++++++++++ include/objectManagerBase.php | 53 +++++++ include/sidebar_admin.php | 1 + include/tag.php | 308 +++++++++++++++++++++++++++++++++++++++++ include/tag_CommonReply.php | 16 ++ objectManager.php | 4 + tables/appdb_tables.sql | 38 +++++ 7 files changed, 569 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=8fffa02d9d0f5e5019e4…

1 0

Alexander Nicolaysen Sørnes : objectManager: Make it possible to add more than one common when processing items
by Alexander Nicolaysen Sørnes 23 Apr '11

23 Apr '11

Module: appdb Branch: master Commit: 1812b4778d847493582ee2071ea00327672dae3c URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1812b4778d847493582ee207… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sat Apr 23 16:40:04 2011 +0200 objectManager: Make it possible to add more than one common when processing items --- include/objectManager.php | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 82d1a26..864845e 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -460,19 +460,14 @@ class ObjectManager ///////////////////////////////////////////////// // output radio buttons for some common responses echo '<tr valign=top><td class="color0"></td><td class="color0">'. - 'Common replies Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'. + 'Common replies Clicking on a reply will copy it to the E-mail text field. '. + 'Email <a href="mailto:'.APPDB_OWNER_EMAIL.'">'. APPDB_OWNER_EMAIL.'</a> if you want to suggest a new common reply.</td></tr>',"\n"; - // NOTE: We use the label tag so the user can click anywhere in - // the text of the radio button to select the radio button. - // Otherwise the user has to click on the very small circle portion - // of the button to select it foreach($this->aCommonResponses as $iIndex => $sReply) { echo '<tr valign=top><td class="color0"></td>',"\n"; - echo '<td class="color0"><label for="'.$iIndex.'"><input'. - ' type="radio" name="sOMCommonReply" id="'.$iIndex.'" value="'.$sReply.'">'. - $sReply.'</label></td>',"\n"; + echo '<td class="color0"><a onClick="document.forms[\'sQform\'][\'sReplyText\'].innerHTML += \''.$sReply.' \';">'.$sReply.'</a></td>',"\n"; echo '</tr>',"\n"; } // end output radio buttons for common responses @@ -1401,12 +1396,6 @@ class ObjectManager /* Process form data generated by adding or updating an entry */ public function processForm($aClean) { - // FIXME: hack so if we modify $aClean in here any objects that use the global - // $aClean will see the modified value. Should be replaced when we have - // general purpose objectManager email code in place since the sReplyText value - // is the value we modify and we'll be passing that into methods in the future - global $aClean; - if(!isset($aClean['sSubmit'])) return; @@ -1436,14 +1425,6 @@ class ObjectManager $aClean['sReplyText'] = ""; } - // handle the common response radio button value - // if sReplyText is empty, if sOMCommonReply was set because - // the user selected a radio button then use that text instead - if( isset($aClean['sReplyText']) && $aClean['sReplyText'] == "" && isset($aClean['sOMCommonReply'])) - { - $aClean['sReplyText'] = $aClean['sOMCommonReply']; - } - $oObject->getOutputEditorValues($aClean); /* Check input, if necessary */

1 0

Jacek Caban : shdocvw: Deactivate document in InternetExplorer destructor.
by Alexandre Julliard 22 Apr '11

22 Apr '11

Module: wine Branch: master Commit: fa2e4bb5dec93ccaa1becffe1ec82ebf3765ec6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa2e4bb5dec93ccaa1becffe1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:07:33 2011 +0200 shdocvw: Deactivate document in InternetExplorer destructor. --- dlls/shdocvw/ie.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/ie.c b/dlls/shdocvw/ie.c index 757cbb5..780c2c9 100644 --- a/dlls/shdocvw/ie.c +++ b/dlls/shdocvw/ie.c @@ -80,6 +80,7 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) if(!ref) { if(This->doc_host) { + deactivate_document(&This->doc_host->doc_host); DocHost_Release(&This->doc_host->doc_host); if(This->doc_host) { This->doc_host->ie = NULL;

1 0

Jacek Caban : mshtml: Added proper support for weak references.
by Alexandre Julliard 22 Apr '11

22 Apr '11

Module: wine Branch: master Commit: 86c28c9f89e85e4a0698cb11791878e2edf01b05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c28c9f89e85e4a0698cb117… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 22 14:07:18 2011 +0200 mshtml: Added proper support for weak references. --- dlls/mshtml/mshtml_private.h | 9 ++- dlls/mshtml/nsembed.c | 138 ++++++++++++++++++++++++++++------------- 2 files changed, 101 insertions(+), 46 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 94dddad..1ba297b 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -42,8 +42,10 @@ #define NS_OK ((nsresult)0x00000000L) #define NS_ERROR_FAILURE ((nsresult)0x80004005L) #define NS_ERROR_OUT_OF_MEMORY ((nsresult)0x8007000EL) -#define NS_NOINTERFACE ((nsresult)0x80004002L) #define NS_ERROR_NOT_IMPLEMENTED ((nsresult)0x80004001L) +#define NS_NOINTERFACE ((nsresult)0x80004002L) +#define NS_ERROR_INVALID_POINTER ((nsresult)0x80004003L) +#define NS_ERROR_NULL_POINTER NS_ERROR_INVALID_POINTER #define NS_ERROR_NOT_AVAILABLE ((nsresult)0x80040111L) #define NS_ERROR_INVALID_ARG ((nsresult)0x80070057L) #define NS_ERROR_UNEXPECTED ((nsresult)0x8000ffffL) @@ -451,6 +453,8 @@ struct HTMLDocumentObj { DWORD update; }; +typedef struct nsWeakReference nsWeakReference; + struct NSContainer { nsIWebBrowserChrome nsIWebBrowserChrome_iface; nsIContextMenuListener nsIContextMenuListener_iface; @@ -458,7 +462,6 @@ struct NSContainer { nsIEmbeddingSiteWindow nsIEmbeddingSiteWindow_iface; nsITooltipListener nsITooltipListener_iface; nsIInterfaceRequestor nsIInterfaceRequestor_iface; - nsIWeakReference nsIWeakReference_iface; nsISupportsWeakReference nsISupportsWeakReference_iface; nsIWebBrowser *webbrowser; @@ -471,6 +474,8 @@ struct NSContainer { LONG ref; + nsWeakReference *weak_reference; + NSContainer *parent; HTMLDocumentObj *doc; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index d6d666f..2cac2b2 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -19,6 +19,7 @@ #include "config.h" #include <stdarg.h> +#include <assert.h> #define COBJMACROS @@ -973,6 +974,83 @@ BOOL is_gecko_path(const char *path) return ret; } +struct nsWeakReference { + nsIWeakReference nsIWeakReference_iface; + + LONG ref; + + NSContainer *nscontainer; +}; + +static inline nsWeakReference *impl_from_nsIWeakReference(nsIWeakReference *iface) +{ + return CONTAINING_RECORD(iface, nsWeakReference, nsIWeakReference_iface); +} + +static nsresult NSAPI nsWeakReference_QueryInterface(nsIWeakReference *iface, + nsIIDRef riid, void **result) +{ + nsWeakReference *This = impl_from_nsIWeakReference(iface); + + if(IsEqualGUID(&IID_nsISupports, riid)) { + TRACE("(%p)->(IID_nsISupports %p)\n", This, result); + *result = &This->nsIWeakReference_iface; + }else if(IsEqualGUID(&IID_nsIWeakReference, riid)) { + TRACE("(%p)->(IID_nsIWeakReference %p)\n", This, result); + *result = &This->nsIWeakReference_iface; + }else { + WARN("(%p)->(%s %p)\n", This, debugstr_guid(riid), result); + *result = NULL; + return NS_NOINTERFACE; + } + + nsISupports_AddRef((nsISupports*)*result); + return NS_OK; +} + +static nsrefcnt NSAPI nsWeakReference_AddRef(nsIWeakReference *iface) +{ + nsWeakReference *This = impl_from_nsIWeakReference(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static nsrefcnt NSAPI nsWeakReference_Release(nsIWeakReference *iface) +{ + nsWeakReference *This = impl_from_nsIWeakReference(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + assert(!This->nscontainer); + heap_free(This); + } + + return ref; +} + +static nsresult NSAPI nsWeakReference_QueryReferent(nsIWeakReference *iface, + const nsIID *riid, void **result) +{ + nsWeakReference *This = impl_from_nsIWeakReference(iface); + + if(!This->nscontainer) + return NS_ERROR_NULL_POINTER; + + return nsIWebBrowserChrome_QueryInterface(&This->nscontainer->nsIWebBrowserChrome_iface, riid, result); +} + +static const nsIWeakReferenceVtbl nsWeakReferenceVtbl = { + nsWeakReference_QueryInterface, + nsWeakReference_AddRef, + nsWeakReference_Release, + nsWeakReference_QueryReferent +}; + /********************************************************** * nsIWebBrowserChrome interface */ @@ -1009,9 +1087,6 @@ static nsresult NSAPI nsWebBrowserChrome_QueryInterface(nsIWebBrowserChrome *ifa }else if(IsEqualGUID(&IID_nsIInterfaceRequestor, riid)) { TRACE("(%p)->(IID_nsIInterfaceRequestor %p)\n", This, result); *result = &This->nsIInterfaceRequestor_iface; - }else if(IsEqualGUID(&IID_nsIWeakReference, riid)) { - TRACE("(%p)->(IID_nsIWeakReference %p)\n", This, result); - *result = &This->nsIWeakReference_iface; }else if(IsEqualGUID(&IID_nsISupportsWeakReference, riid)) { TRACE("(%p)->(IID_nsISupportsWeakReference %p)\n", This, result); *result = &This->nsISupportsWeakReference_iface; @@ -1046,6 +1121,10 @@ static nsrefcnt NSAPI nsWebBrowserChrome_Release(nsIWebBrowserChrome *iface) if(!ref) { if(This->parent) nsIWebBrowserChrome_Release(&This->parent->nsIWebBrowserChrome_iface); + if(This->weak_reference) { + This->weak_reference->nscontainer = NULL; + nsIWeakReference_Release(&This->weak_reference->nsIWeakReference_iface); + } heap_free(This); } @@ -1629,44 +1708,6 @@ static const nsIInterfaceRequestorVtbl nsInterfaceRequestorVtbl = { nsInterfaceRequestor_GetInterface }; -static inline NSContainer *impl_from_nsIWeakReference(nsIWeakReference *iface) -{ - return CONTAINING_RECORD(iface, NSContainer, nsIWeakReference_iface); -} - -static nsresult NSAPI nsWeakReference_QueryInterface(nsIWeakReference *iface, - nsIIDRef riid, void **result) -{ - NSContainer *This = impl_from_nsIWeakReference(iface); - return nsIWebBrowserChrome_QueryInterface(&This->nsIWebBrowserChrome_iface, riid, result); -} - -static nsrefcnt NSAPI nsWeakReference_AddRef(nsIWeakReference *iface) -{ - NSContainer *This = impl_from_nsIWeakReference(iface); - return nsIWebBrowserChrome_AddRef(&This->nsIWebBrowserChrome_iface); -} - -static nsrefcnt NSAPI nsWeakReference_Release(nsIWeakReference *iface) -{ - NSContainer *This = impl_from_nsIWeakReference(iface); - return nsIWebBrowserChrome_Release(&This->nsIWebBrowserChrome_iface); -} - -static nsresult NSAPI nsWeakReference_QueryReferent(nsIWeakReference *iface, - const nsIID *riid, void **result) -{ - NSContainer *This = impl_from_nsIWeakReference(iface); - return nsIWebBrowserChrome_QueryInterface(&This->nsIWebBrowserChrome_iface, riid, result); -} - -static const nsIWeakReferenceVtbl nsWeakReferenceVtbl = { - nsWeakReference_QueryInterface, - nsWeakReference_AddRef, - nsWeakReference_Release, - nsWeakReference_QueryReferent -}; - static inline NSContainer *impl_from_nsISupportsWeakReference(nsISupportsWeakReference *iface) { return CONTAINING_RECORD(iface, NSContainer, nsISupportsWeakReference_iface); @@ -1698,8 +1739,18 @@ static nsresult NSAPI nsSupportsWeakReference_GetWeakReference(nsISupportsWeakRe TRACE("(%p)->(%p)\n", This, _retval); - nsIWeakReference_AddRef(&This->nsIWeakReference_iface); - *_retval = &This->nsIWeakReference_iface; + if(!This->weak_reference) { + This->weak_reference = heap_alloc(sizeof(nsWeakReference)); + if(!This->weak_reference) + return NS_ERROR_OUT_OF_MEMORY; + + This->weak_reference->nsIWeakReference_iface.lpVtbl = &nsWeakReferenceVtbl; + This->weak_reference->ref = 1; + This->weak_reference->nscontainer = This; + } + + *_retval = &This->weak_reference->nsIWeakReference_iface; + nsIWeakReference_AddRef(*_retval); return NS_OK; } @@ -1740,7 +1791,6 @@ NSContainer *NSContainer_Create(HTMLDocumentObj *doc, NSContainer *parent) ret->nsIEmbeddingSiteWindow_iface.lpVtbl = &nsEmbeddingSiteWindowVtbl; ret->nsITooltipListener_iface.lpVtbl = &nsTooltipListenerVtbl; ret->nsIInterfaceRequestor_iface.lpVtbl = &nsInterfaceRequestorVtbl; - ret->nsIWeakReference_iface.lpVtbl = &nsWeakReferenceVtbl; ret->nsISupportsWeakReference_iface.lpVtbl = &nsSupportsWeakReferenceVtbl; ret->doc = doc;

1 0

Stefan Dösinger : wined3d: Scale the depthbias factor by the depth buffer's depth.
by Alexandre Julliard 22 Apr '11

22 Apr '11

Module: wine Branch: master Commit: dbc8702e44a987b77cdf9af31b964bb27e86fa92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dbc8702e44a987b77cdf9af31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Apr 20 16:28:05 2011 +0200 wined3d: Scale the depthbias factor by the depth buffer's depth. --- dlls/wined3d/device.c | 5 +++++ dlls/wined3d/state.c | 25 +++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8c443fe..827365a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5941,6 +5941,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZENABLE)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILENABLE)); IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_STENCILWRITEMASK)); + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_DEPTHBIAS)); + } + else if (tmp && tmp->resource.format->depth_size != This->depth_stencil->resource.format->depth_size) + { + IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_DEPTHBIAS)); } return WINED3D_OK; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 88ccd1b..801563e 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1743,14 +1743,17 @@ static void state_scissor(DWORD state, struct wined3d_stateblock *stateblock, st * convert from D3D to GL we need to divide the D3D depth bias by that value. * There's no practical way to retrieve that value from a given GL * implementation, but the D3D application has essentially the same problem, - * which makes a guess of 1e-6f seem reasonable here. Note that - * SLOPESCALEDEPTHBIAS is a scaling factor for the depth slope, and doesn't - * need to be scaled. */ + * which makes a guess of the depth buffer format's highest possible value a + * reasonable guess. Note that SLOPESCALEDEPTHBIAS is a scaling factor for the + * depth slope, and doesn't need to be scaled. */ static void state_depthbias(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { if (stateblock->state.render_states[WINED3DRS_SLOPESCALEDEPTHBIAS] || stateblock->state.render_states[WINED3DRS_DEPTHBIAS]) { + IWineD3DSurfaceImpl *depth = stateblock->device->depth_stencil; + float scale; + union { DWORD d; @@ -1763,7 +1766,21 @@ static void state_depthbias(DWORD state, struct wined3d_stateblock *stateblock, glEnable(GL_POLYGON_OFFSET_FILL); checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL)"); - glPolygonOffset(scale_bias.f, const_bias.f * 1e6f); + if (depth) + { + const struct wined3d_format *fmt = depth->resource.format; + scale = powf(2, fmt->depth_size) - 1; + TRACE("Depth format %s, using depthbias scale of %f\n", + debug_d3dformat(fmt->id), scale); + } + else + { + /* The context manager will reapply this state on a depth stencil change */ + TRACE("No depth stencil, using depthbias scale of 0.0\n"); + scale = 0; + } + + glPolygonOffset(scale_bias.f, const_bias.f * scale); checkGLcall("glPolygonOffset(...)"); } else { glDisable(GL_POLYGON_OFFSET_FILL);

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
94
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2011