April 2011 - Wine-commits - list.winehq.org

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 : Note: Use Tag class to associate notes between one or more versions
by Alexander Nicolaysen Sørnes 24 Apr '11

24 Apr '11

Module: appdb Branch: master Commit: 691caffa5b45aa6d0c5d452d37c1399eadf3eaee URL: http://source.winehq.org/git/appdb.git/?a=commit;h=691caffa5b45aa6d0c5d452d… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Sun Apr 24 22:43:28 2011 +0200 Note: Use Tag class to associate notes between one or more versions --- include/note.php | 406 ++++++---------------------------------------- tables/appdb_tables.sql | 14 ++- 2 files changed, 66 insertions(+), 354 deletions(-) Diff: http://source.winehq.org/git/appdb.git/?a=commitdiff;h=691caffa5b45aa6d0c5d…

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

Alexandre Julliard : server: Set the fd user when duplicating a mapping file descriptor into a new file .
by Alexandre Julliard 22 Apr '11

22 Apr '11

Module: wine Branch: master Commit: f2b34dddfb0ff4d390c9d576570c94467d8cc447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2b34dddfb0ff4d390c9d5765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 22 17:07:45 2011 +0200 server: Set the fd user when duplicating a mapping file descriptor into a new file. --- server/file.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/server/file.c b/server/file.c index fe88495..fcfd572 100644 --- a/server/file.c +++ b/server/file.c @@ -162,6 +162,7 @@ struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, unsigne release_object( file ); return NULL; } + set_fd_user( file->fd, &file_fd_ops, &file->obj ); } return file; }

1 0

Stefan Dösinger : d3d: Map D3DRS_ZBIAS to WINED3DRS_DEPTHBIAS.
by Alexandre Julliard 22 Apr '11

22 Apr '11

Module: wine Branch: master Commit: 96b758f7b37033bf382ce40dd3310965d3ac3f76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96b758f7b37033bf382ce40dd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 21 22:36:11 2011 +0200 d3d: Map D3DRS_ZBIAS to WINED3DRS_DEPTHBIAS. ZBIAS was removed in d3d9 and replaced with DEPTHBIAS. Currently wined3d implements both independently which will cause trouble if we want to set the depthbias value depending on the depth stencil format. --- dlls/d3d8/device.c | 32 ++++++++++++++++++++++++++++++-- dlls/ddraw/device.c | 28 ++++++++++++++++++++++++++++ dlls/wined3d/state.c | 32 +------------------------------- dlls/wined3d/stateblock.c | 1 - dlls/wined3d/utils.c | 1 - include/wine/wined3d.idl | 1 - 6 files changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 976e71f..47a727d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1373,11 +1373,25 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderState(IDirect3DDevice8 *ifac { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); HRESULT hr; + union + { + DWORD d; + float f; + } wined3d_value; TRACE("iface %p, state %#x, value %#x.\n", iface, State, Value); wined3d_mutex_lock(); - hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, State, Value); + switch (State) + { + case D3DRS_ZBIAS: + wined3d_value.f = Value / -16.0f; + hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, WINED3DRS_DEPTHBIAS, wined3d_value.d); + break; + + default: + hr = IWineD3DDevice_SetRenderState(This->WineD3DDevice, State, Value); + } wined3d_mutex_unlock(); return hr; @@ -1388,11 +1402,25 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetRenderState(IDirect3DDevice8 *ifac { IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); HRESULT hr; + union + { + DWORD d; + float f; + } wined3d_value; TRACE("iface %p, state %#x, value %p.\n", iface, State, pValue); wined3d_mutex_lock(); - hr = IWineD3DDevice_GetRenderState(This->WineD3DDevice, State, pValue); + switch (State) + { + case D3DRS_ZBIAS: + hr = IWineD3DDevice_GetRenderState(This->WineD3DDevice, WINED3DRS_DEPTHBIAS, &wined3d_value.d); + if (SUCCEEDED(hr)) *pValue = -wined3d_value.f * 16.0f; + break; + + default: + hr = IWineD3DDevice_GetRenderState(This->WineD3DDevice, State, pValue); + } wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index b1b4cf6..1c2b89c 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -2374,6 +2374,20 @@ IDirect3DDeviceImpl_7_GetRenderState(IDirect3DDevice7 *iface, hr = DDERR_INVALIDPARAMS; break; + case D3DRENDERSTATE_ZBIAS: + { + union + { + DWORD d; + float f; + } wined3d_value; + + hr = IWineD3DDevice_GetRenderState(This->wineD3DDevice, + WINED3DRS_DEPTHBIAS, + &wined3d_value.d); + if (SUCCEEDED(hr)) *Value = -wined3d_value.f * 16.0f; + } + default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) @@ -2688,6 +2702,20 @@ IDirect3DDeviceImpl_7_SetRenderState(IDirect3DDevice7 *iface, hr = DDERR_INVALIDPARAMS; break; + case D3DRENDERSTATE_ZBIAS: + { + union + { + DWORD d; + float f; + } wined3d_value; + wined3d_value.f = Value / -16.0; + hr = IWineD3DDevice_SetRenderState(This->wineD3DDevice, + WINED3DRS_DEPTHBIAS, + wined3d_value.d); + break; + } + default: if (RenderStateType >= D3DRENDERSTATE_STIPPLEPATTERN00 && RenderStateType <= D3DRENDERSTATE_STIPPLEPATTERN31) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9d54076..88ccd1b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1383,36 +1383,6 @@ static void state_linepattern(DWORD state, struct wined3d_stateblock *stateblock } } -static void state_zbias(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) -{ - union { - DWORD d; - float f; - } tmpvalue; - - if (stateblock->state.render_states[WINED3DRS_ZBIAS]) - { - tmpvalue.d = stateblock->state.render_states[WINED3DRS_ZBIAS]; - TRACE("ZBias value %f\n", tmpvalue.f); - glPolygonOffset(0, -tmpvalue.f); - checkGLcall("glPolygonOffset(0, -Value)"); - glEnable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glEnable(GL_POLYGON_OFFSET_FILL);"); - glEnable(GL_POLYGON_OFFSET_LINE); - checkGLcall("glEnable(GL_POLYGON_OFFSET_LINE);"); - glEnable(GL_POLYGON_OFFSET_POINT); - checkGLcall("glEnable(GL_POLYGON_OFFSET_POINT);"); - } else { - glDisable(GL_POLYGON_OFFSET_FILL); - checkGLcall("glDisable(GL_POLYGON_OFFSET_FILL);"); - glDisable(GL_POLYGON_OFFSET_LINE); - checkGLcall("glDisable(GL_POLYGON_OFFSET_LINE);"); - glDisable(GL_POLYGON_OFFSET_POINT); - checkGLcall("glDisable(GL_POLYGON_OFFSET_POINT);"); - } -} - - static void state_normalize(DWORD state, struct wined3d_stateblock *stateblock, struct wined3d_context *context) { if(isStateDirty(context, STATE_VDECL)) { @@ -5061,7 +5031,6 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_SUBPIXEL), { STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_SUBPIXELX), { STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }, WINED3D_GL_EXT_NONE }, - { STATE_RENDER(WINED3DRS_ZBIAS), { STATE_RENDER(WINED3DRS_ZBIAS), state_zbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_STIPPLEENABLE), { STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), { STATE_RENDER(WINED3DRS_MIPMAPLODBIAS), state_mipmaplodbias }, WINED3D_GL_EXT_NONE }, { STATE_RENDER(WINED3DRS_ANISOTROPY), { STATE_RENDER(WINED3DRS_ANISOTROPY), state_anisotropy }, WINED3D_GL_EXT_NONE }, @@ -5793,6 +5762,7 @@ static void validate_state_table(struct StateEntry *state_table) { 17, 18}, { 21, 21}, { 42, 45}, + { 47, 47}, { 61, 127}, {149, 150}, {169, 169}, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 79fbb2e..b1b823a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1141,7 +1141,6 @@ void stateblock_init_default_state(struct wined3d_stateblock *stateblock) tmpfloat.f = 1.0f; state->render_states[WINED3DRS_FOGDENSITY] = tmpfloat.d; state->render_states[WINED3DRS_EDGEANTIALIAS] = FALSE; - state->render_states[WINED3DRS_ZBIAS] = 0; state->render_states[WINED3DRS_RANGEFOGENABLE] = FALSE; state->render_states[WINED3DRS_STENCILENABLE] = FALSE; state->render_states[WINED3DRS_STENCILFAIL] = WINED3DSTENCILOP_KEEP; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 00ef23a..096b483 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1962,7 +1962,6 @@ const char *debug_d3drenderstate(WINED3DRENDERSTATETYPE state) D3DSTATE_TO_STR(WINED3DRS_EDGEANTIALIAS); D3DSTATE_TO_STR(WINED3DRS_COLORKEYENABLE); D3DSTATE_TO_STR(WINED3DRS_MIPMAPLODBIAS); - D3DSTATE_TO_STR(WINED3DRS_ZBIAS); D3DSTATE_TO_STR(WINED3DRS_RANGEFOGENABLE); D3DSTATE_TO_STR(WINED3DRS_ANISOTROPY); D3DSTATE_TO_STR(WINED3DRS_FLUSHBATCH); diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index d536004..2406540 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -319,7 +319,6 @@ typedef enum _WINED3DRENDERSTATETYPE WINED3DRS_EDGEANTIALIAS = 40, /* d3d7, d3d8 */ WINED3DRS_COLORKEYENABLE = 41, /* d3d7 */ WINED3DRS_MIPMAPLODBIAS = 46, /* d3d7 */ - WINED3DRS_ZBIAS = 47, /* d3d7, d3d8 */ WINED3DRS_RANGEFOGENABLE = 48, WINED3DRS_ANISOTROPY = 49, /* d3d7 */ WINED3DRS_FLUSHBATCH = 50, /* d3d7 */

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