October 2007 - Wine-commits

Alexander Nicolaysen Sørnes : Prevent ids from disappearing during form processing
by Chris Morgan 22 Oct '07

22 Oct '07

Module: appdb Branch: master Commit: fe56884a98ac13c2cbe5af26af33063a9089edb9 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=fe56884a98ac13c2cbe5af26… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 22 18:58:15 2007 +0200 Prevent ids from disappearing during form processing --- include/application.php | 4 +++- include/testData.php | 8 ++++++-- include/version.php | 8 ++++++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/application.php b/include/application.php index 47033fa..15bf660 100644 --- a/include/application.php +++ b/include/application.php @@ -618,7 +618,9 @@ class Application { /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ public function GetOutputEditorValues($aValues) { - $this->iAppId = $aValues['iAppId']; + if($aValues['iAppId']) + $this->iAppId = $aValues['iAppId']; + $this->sName = $aValues['sAppName']; $this->sDescription = $aValues['shAppDescription']; $this->iCatId = $aValues['iAppCatId']; diff --git a/include/testData.php b/include/testData.php index 3dd833e..03b56f2 100644 --- a/include/testData.php +++ b/include/testData.php @@ -815,8 +815,12 @@ class testData{ /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ function GetOutputEditorValues($aValues) { - $this->iTestingId = $aValues['iTestingId']; - $this->iVersionId = $aValues['iVersionId']; + if($aValues['iTestingId']) + $this->iTestingId = $aValues['iTestingId']; + + if($aValues['iVersionId']) + $this->iVersionId = $aValues['iVersionId']; + $this->shWhatWorks = $aValues['shWhatWorks']; $this->shWhatDoesnt = $aValues['shWhatDoesnt']; $this->shWhatNotTested = $aValues['shWhatNotTested']; diff --git a/include/version.php b/include/version.php index 6da13c4..63a5e03 100644 --- a/include/version.php +++ b/include/version.php @@ -705,8 +705,12 @@ class version { /* $aValues can be $_REQUEST or any array with the values from outputEditor() */ public function GetOutputEditorValues($aValues) { - $this->iAppId = $aValues['iAppId']; - $this->iVersionId = $aValues['iVersionId']; + if($aValues['iAppId']) + $this->iAppId = $aValues['iAppId']; + + if($aValues['iVersionId']) + $this->iVersionId = $aValues['iVersionId']; + $this->sName = $aValues['sVersionName']; $this->sDescription = $aValues['shVersionDescription']; $this->sTestedRating = $aValues['sMaintainerRating'];

1 0

Alexander Nicolaysen Sørnes : objectManager: Use GetOptionalSetting() in more places
by Chris Morgan 22 Oct '07

22 Oct '07

Module: appdb Branch: master Commit: 9069952d91a871a58a7c9092999e1e63b9659610 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9069952d91a871a58a7c9092… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 22 19:03:37 2007 +0200 objectManager: Use GetOptionalSetting() in more places --- include/objectManager.php | 27 ++++++++------------------- objectManager.php | 4 ---- 2 files changed, 8 insertions(+), 23 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index d888f05..8c49d0c 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -162,6 +162,10 @@ class ObjectManager return; } + // if displaying a queue display the help for the given queue + if($this->getIsQueue()) + $this->GetOptionalSetting("ObjectDisplayQueueProcessingHelp", ""); + $oObject = new $this->sClass(); // Display top of the page selectors for items per page and @@ -199,8 +203,7 @@ class ObjectManager break; } - if(method_exists($oObject, "objectShowAddEntry") && - $oObject->objectShowAddEntry()) + if($this->GetOptionalSetting("objectShowAddEntry", FALSE)) { echo "<br /><center><a href=\"". $this->makeUrl("add", false, @@ -266,9 +269,7 @@ class ObjectManager echo "</table>"; $oObject = new $this->sClass(); - if($oObject->canEdit() && - method_exists($oObject, "objectShowAddEntry") && - $oObject->objectShowAddEntry()) + if($oObject->canEdit() && $this->GetOptionalSetting("objectShowAddEntry", FALSE)) { echo "<br /><br /><a href=\"".$this->makeUrl("add", false, "Add $this->sClass")."\">Add entry</a>\n"; @@ -338,8 +339,7 @@ class ObjectManager if($this->bIsQueue || ($oObject->objectGetSubmitterId() && $oObject->objectGetSubmitterId() != $_SESSION['current']->iUserId)) { /* If it isn't implemented, that means there is no default text */ - if(method_exists(new $this->sClass, "getDefaultReply")) - $sDefaultReply = $oObject->getDefaultReply(); + $sDefaultReply = $this->getOptionalSetting("getDefaultReply", ""); echo html_frame_start("Reply text", "90%", "", 0); echo "<table width='100%' border=0 cellpadding=2 cellspacing=0>\n"; @@ -376,7 +376,7 @@ class ObjectManager echo '<tr valign=top><td class=color3 align=center colspan=2>' ,"\n"; echo '<input name="sSubmit" type="submit" value="Submit" class="button" '. '/>',"\n"; - if(!method_exists(new $this->sClass, "objectHideDelete")) + if(!$this->getOptionalSetting("objectHideDelete", FALSE)) { echo '<input name="sSubmit" type="submit" value="Delete" '. 'class="button" />',"\n"; @@ -412,17 +412,6 @@ class ObjectManager } - /* Display help for queue processing */ - public function display_queue_processing_help() - { - /* No help text defined, so do nothing */ - if(!method_exists(new $this->sClass(), "ObjectDisplayQueueProcessingHelp")) - return FALSE; - - call_user_func(array($this->sClass, - "ObjectDisplayQueueProcessingHelp")); - } - /* Ask whether the user really wants to delete the entry and display a delete reason box */ public function delete_prompt() { diff --git a/objectManager.php b/objectManager.php index 7d5b0ad..4b74ac2 100644 --- a/objectManager.php +++ b/objectManager.php @@ -124,10 +124,6 @@ if($oObject->getId() && $sAction != "add") $oObject->add_entry($aClean, $sErrors); } else { - // if displaying a queue display the help for the given queue - if($oObject->getIsQueue()) - $oObject->display_queue_processing_help(); - $oObject->display_table($aClean); }

1 0

Alexander Nicolaysen Sørnes : Add login link to standard error page login text
by Chris Morgan 22 Oct '07

22 Oct '07

Module: appdb Branch: master Commit: c009863461221e85f67945d3af807ec17dea06f0 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=c009863461221e85f67945d3… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Tue Oct 23 00:41:46 2007 +0200 Add login link to standard error page login text --- include/util.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/util.php b/include/util.php index bc4603f..99362ac 100644 --- a/include/util.php +++ b/include/util.php @@ -5,7 +5,7 @@ function util_show_error_page_and_exit($text = null, $message = null) { if (!$text) { - $text = "You must be logged in to perform that operation."; + $text = "You must be <a href=\"".login_url()."\">logged in</a> to perform that operation."; } header("HTTP/1.0 404 Object not found or user is not logged in"); apidb_header("Oops");

1 0

Alexander Nicolaysen Sørnes : comment: Require versionId and message body to be defined
by Chris Morgan 22 Oct '07

22 Oct '07

Module: appdb Branch: master Commit: b48221cdd4d1238e5974f50039fc266da7fbedca URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b48221cdd4d1238e5974f500… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 22 17:07:31 2007 +0200 comment: Require versionId and message body to be defined --- include/comment.php | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/include/comment.php b/include/comment.php index d26f088..e6646d7 100644 --- a/include/comment.php +++ b/include/comment.php @@ -242,8 +242,8 @@ class Comment { $oM = new objectManager("comment", "Post new ocmment"); $oM->setReturnTo($oVersion->objectMakeUrl()); // reply post buttons - echo " [<a href=\"".$oM->makeUrl("add")."&iAppId=$this->iAppId&iVersionId=$this->iVersionId\"><small>post new</small></a>] \n"; - echo " [<a href=\"".$oM->makeUrl("add")."&iAppId=$this->iAppId&iVersionId=$this->iVersionId&sSubject=". + echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId\"><small>post new</small></a>] \n"; + echo " [<a href=\"".$oM->makeUrl("add")."&iVersionId=$this->iVersionId&sSubject=". urlencode("$sSubject")."&iThread=$this->iCommentId\"><small>reply to this</small></a>] \n"; echo "</td></tr>\n"; @@ -570,13 +570,26 @@ class Comment { switch($sAction) { case "add": - return array("iThread", "iAppId", "iVersionId"); + return array("iThread", "iVersionId"); default: return null; } } + function checkOutputEditorInput($aClean) + { + $sErrors = ""; + + if(!$aClean['iVersionId']) + $sErrors .= "<li>No version id defined; something may have gone wrong with the URL</li>\n"; + + if(!$aClean['sBody']) + $sErrors .= "<li>You need to enter a message!</li>\n"; + + return $sErrors; + } + function outputEditor($aClean) { $sMesTitle = "<b>Post New Comment</b>"; @@ -612,7 +625,6 @@ class Comment { echo html_frame_end(); echo "<input type=\"hidden\" name=\"iThread\" value=\"".$aClean['iThread']."\" />\n"; - echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$aClean['iAppId']."\" />\n"; echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$aClean['iVersionId']."\" />\n"; }

1 0

Alexander Nicolaysen Sørnes : Remove addcomment.php
by Chris Morgan 22 Oct '07

22 Oct '07

Module: appdb Branch: master Commit: 1753ff9757830afea1b7e78d48811cd0d0fdfc32 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1753ff9757830afea1b7e78d… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 22 17:09:24 2007 +0200 Remove addcomment.php --- addcomment.php | 89 -------------------------------------------------------- 1 files changed, 0 insertions(+), 89 deletions(-) diff --git a/addcomment.php b/addcomment.php deleted file mode 100644 index 92bedaf..0000000 --- a/addcomment.php +++ /dev/null @@ -1,89 +0,0 @@ -<?php -/** - * Adds a new comment. - * - * Mandatory parameters: - * - iVersionId, version identifier - * - * Optional parameters: - * - iThread, parent comment identifier - * - sBody, body of the comment - * - sSubject, title of the comment - */ - -// application environment -require("path.php"); -require(BASE."include/incl.php"); -require_once(BASE."include/comment.php"); - -// you must be logged in to submit comments -if(!$_SESSION['current']->isLoggedIn()) -{ - apidb_header("Please login"); - echo "To submit a comment for an application you must be logged in. Please <a href=\"account.php?sCmd=login\">login now</a> or create a <a href=\"account.php?sCmd=new\">new account</a>.","\n"; - exit; -} - -// the user submitted his comment -if(!empty($aClean['sBody'])) -{ - // create a new comment - $oComment = new Comment(); - $oComment->sSubject = $aClean['sSubject']; - $oComment->sBody = $aClean['sBody']; - $oComment->iParentId = $aClean['iThread']; - $oComment->iVersionId = $aClean['iVersionId']; - $oComment->create(); - - $oVersion = new version($oComment->iVersionId); - util_redirect_and_exit($oVersion->objectMakeUrl()); -// let's show the comment form -} else -{ - apidb_header("Add Comment"); - - $mesTitle = "<b>Post New Comment</b>"; - - if($aClean['iThread'] > 0) - { - $hResult = query_parameters("SELECT * FROM appComments WHERE commentId = '?'", - $aClean['iThread']); - $oRow = query_fetch_object($hResult); - if($oRow) - { - $mesTitle = "<b>Replying To ...</b> $oRow->subject\n"; - echo html_frame_start($oRow->subject,500); - echo htmlify_urls($oRow->body), "<br /><br />\n"; - echo html_frame_end(); - } - } - - echo "<p align=\"center\">Enter your comment in the box below."; - echo "</br>Please do not paste large terminal or debug outputs here.</p>"; - - echo "<form method=\"post\" action=\"addcomment.php\">\n"; - - echo html_frame_start($mesTitle,500,"",0); - - echo '<table width="100%" border=0 cellpadding=0 cellspacing=1>',"\n"; - echo "<tr class=\"color0\"><td align=right><b>From:</b> </td>\n"; - echo " <td> ".$_SESSION['current']->sRealname."</td></tr>\n"; - echo "<tr class=\"color0\"><td align=right><b>Subject:</b> </td>\n"; - echo " <td> <input type=\"text\" size=\"35\" name=\"sSubject\" value=\"".$aClean['sSubject']."\" /> </td></tr>\n"; - echo "<tr class=\"color1\"><td colspan=2><textarea name=\"sBody\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$aClean['sBody']."</textarea></td></tr>\n"; - echo "<tr class=\"color1\"><td colspan=2 align=center>\n"; - echo " <input type=\"submit\" value=\"Post Comment\" class=\"button\" />\n"; - echo " <input type=\"reset\" value=\"Reset\" class=\"button\" />\n"; - echo "</td></tr>\n"; - echo "</table>\n"; - - echo html_frame_end(); - - echo "<input type=\"hidden\" name=\"iThread\" value=\"".$aClean['iThread']."\" />\n"; - echo "<input type=\"hidden\" name=\"iAppId\" value=\"".$aClean['iAppId']."\" />\n"; - echo "<input type=\"hidden\" name=\"iVersionId\" value=\"".$aClean['iVersionId']."\" />\n"; - echo "</form>"; -} - -apidb_footer(); -?>

1 0

Alexander Nicolaysen Sørnes : Allow previewing versions
by Chris Morgan 22 Oct '07

22 Oct '07

Module: appdb Branch: master Commit: cdee3a77e9b263c7cc276460ec487dce3ed47dcf URL: http://source.winehq.org/git/appdb.git/?a=commit;h=cdee3a77e9b263c7cc276460… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Oct 22 17:59:40 2007 +0200 Allow previewing versions --- include/version.php | 31 +++++++++++++++++++++---------- include/version_queue.php | 11 ++++++++++- 2 files changed, 31 insertions(+), 11 deletions(-) diff --git a/include/version.php b/include/version.php index 0f91e7e..6da13c4 100644 --- a/include/version.php +++ b/include/version.php @@ -746,7 +746,13 @@ class version { } } - public function display($aVars) + public function objectShowPreview() + { + return TRUE; + } + + /* $oTest can be passed by version_queue to allow previewing a version, in which case the test id may not be defined */ + public function display($aVars, $oTest = null) { /* is this user supposed to view this version? */ if(!$_SESSION['current']->canViewVersion($this)) @@ -760,10 +766,6 @@ class version { if(!$oApp->iAppId) util_show_error_page_and_exit('Internal Database Access Error. No App found.'); - // Oops! Version not found or other error. do something - if(!$this->iVersionId) - util_show_error_page_and_exit('Internal Database Access Error. No Version Found.'); - // show Vote Menu if($_SESSION['current']->isLoggedIn()) apidb_sidebar_add("vote_menu"); @@ -976,10 +978,13 @@ class version { echo "\t<div class='title_class'>\n"; echo "\t\tSelected test results <small><small>(selected in 'Test Results' table below)</small></small>\n"; echo "\t</div>\n"; - $oTest = new testData($iTestingId); + + /* oTest may be passed by version_queue to allow previewing a version which does not exist in the database */ + if(!$oTest && $iTestingId) + $oTest = new testData($iTestingId); /* if $iTestingId wasn't valid then it won't be valid in $oTest */ - if(!$oTest->iTestingId) + if(!$oTest) { /* fetch a new test id for this version */ $iTestingId = testData::getNewestTestIdFromVersionId($this->iVersionId); @@ -999,9 +1004,14 @@ class version { // show the test results table if($oTest->iTestingId) { - $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&iTestingId=", - 5); + $oTest->ShowVersionsTestingTable($this->objectMakeUrl()."&iTestingId=", 5); + } else /* We are previewing the version */ + { + $oTable = $oTest->CreateTestTable(); + $oTable->AddRow($oTest->CreateTestTableRow(0, "")); + echo $oTable->GetString(); } + if($_SESSION['current']->isLoggedIn()) { echo '<form method=post name=sMessage action=objectManager.php?'. @@ -1040,7 +1050,8 @@ class version { } // Comments Section - Comment::view_app_comments($this->iVersionId); + if($this->iVersionId) + Comment::view_app_comments($this->iVersionId); } public static function lookup_name($versionId) diff --git a/include/version_queue.php b/include/version_queue.php index 03fa3f1..e3eaa61 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -162,6 +162,7 @@ class version_queue function getOutputEditorValues($aClean) { + $this->oVersion->iAppId = $aClean['iAppId']; $this->oVersion->getOutputEditorValues($aClean); $this->oTestDataQueue->getOutputEditorValues($aClean); } @@ -214,9 +215,17 @@ class version_queue return $this->oVersion->objectGetTableRow(); } + public function objectShowPreview() + { + return $this->oVersion->objectShowPreview(); + } + function display() { - $this->oVersion->display(); + $aVars = array(); + $aVars['iTestingId'] = 0; + + $this->oVersion->display($aVars, $this->oTestDataQueue->oTestData); } function objectMakeUrl()

1 0

docs/en wineusr-running.sgml
by Dimi Paun 22 Oct '07

22 Oct '07

ChangeSet ID: 1193071310817533356211246 CVSROOT: /cvsroot/wine Module name: docs Changes by: dimi(a)sc8-pr-cvs9.sourceforge.net 2007/10/22 09:41:50 Modified files: en : wineusr-running.sgml Log message: Lei Zhang <thestig(a)google.com> We should mention AUDIODEV, MIXERDEV, and MIDIDEV in the environment variables section. Old revision New revision Changes Path 1.6 1.7 +31 -0 docs/en/wineusr-running.sgml Index: docs/en/wineusr-running.sgml diff -u -p docs/en/wineusr-running.sgml:1.6 docs/en/wineusr-running.sgml:1.7 --- docs/en/wineusr-running.sgml 22 Oct 2007 16:41:50 -0000 +++ /dev/null 22 Oct 2007 16:41:50 -0000 @@ -310,6 +310,37 @@ Path="c:\windows;c:\windows\system;e:\;e linkend="winecfg-dll-overrides">DLL overrides</link> section of this guide. </para> </sect2> + <sect2> + <title>OSS Audio Driver Settings</title> + <para> + If you are using the OSS audio driver and you have multiple devices, + (i.e. /dev/dsp*, /dev/mixer*) you can specify which one you want to + use with the following environment variables: + <itemizedlist> + <listitem> + <para> + AUDIODEV=[audio device] + </para> + </listitem> + <listitem> + <para> + MIXERDEV=[mixer device] + </para> + </listitem> + <listitem> + <para> + MIDIDEV=[MIDI device] + </para> + </listitem> + </itemizedlist> + </para> + <para> + As an example: + </para> + <screen> +<prompt>$</prompt> <userinput>AUDIODEV=/dev/dsp4 MIXERDEV=/dev/mixer1 MIDIDEV=/dev/midi3 wine <replaceable>program_name</replaceable></userinput> + </screen> + </sect2> </sect1> <sect1 id="wineserver-command-line-options">

1 0

David Adam : d3dx8: Implement D3DXQuaternionIsIdentity.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: 604867c9dd5642e5a149be33074532156899437e URL: http://source.winehq.org/git/wine.git/?a=commit;h=604867c9dd5642e5a149be330… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 23:15:18 2007 +0200 d3dx8: Implement D3DXQuaternionIsIdentity. --- dlls/d3dx8/tests/math.c | 17 +++++++++++++++-- include/d3dx8math.inl | 6 ++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 42898c8..c5d731b 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -32,9 +32,10 @@ static void D3X8QuaternionTest(void) { - D3DXQUATERNION expectedquat, gotquat, q, r; + D3DXQUATERNION expectedquat, gotquat, q, r, s; LPD3DXQUATERNION funcpointer; FLOAT expected, got; + BOOL expectedbool, gotbool; q.x = 1.0f, q.y = 2.0f; q.z = 4.0f; q.w = 10.0f; r.x = -3.0f; r.y = 4.0f; r.z = -5.0f; r.w = 7.0; @@ -49,7 +50,6 @@ static void D3X8QuaternionTest(void) funcpointer = D3DXQuaternionConjugate(NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); - /*_______________D3DXQuaternionDot______________________*/ expected = 55.0f; got = D3DXQuaternionDot(&q,&r); @@ -70,6 +70,19 @@ static void D3X8QuaternionTest(void) funcpointer = D3DXQuaternionIdentity(NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXQuaternionIsIdentity________________*/ + s.x = 0.0f; s.y = 0.0f; s.z = 0.0f; s.w = 1.0f; + expectedbool = TRUE; + gotbool = D3DXQuaternionIsIdentity(&s); + ok( expectedbool == gotbool, "Expected boolean : %d, Got bool : %d\n", expectedbool, gotbool); + s.x = 2.3f; s.y = -4.2f; s.z = 1.2f; s.w=0.2f; + expectedbool = FALSE; + gotbool = D3DXQuaternionIsIdentity(&q); + ok( expectedbool == gotbool, "Expected boolean : %d, Got bool : %d\n", expectedbool, gotbool); + /* Test the NULL case */ + gotbool = D3DXQuaternionIsIdentity(NULL); + ok(gotbool == FALSE, "Expected boolean: %d, Got boolean: %d\n", FALSE, gotbool); + /*_______________D3DXQuaternionLength__________________________*/ expected = 11.0f; got = D3DXQuaternionLength(&q); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 0a4b24c..066dce2 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -284,6 +284,12 @@ static inline D3DXQUATERNION* D3DXQuaternionIdentity(D3DXQUATERNION *pout) return pout; } +static inline BOOL D3DXQuaternionIsIdentity(D3DXQUATERNION *pq) +{ + if ( !pq) return FALSE; + return ( (pq->x == 0.0f) && (pq->y == 0.0f) && (pq->z == 0.0f) && (pq->w == 1.0f) ); +} + static inline FLOAT D3DXQuaternionLength(CONST D3DXQUATERNION *pq) { if (!pq) return 0.0f;

1 0

Alex Busenius : user32: Fix segfault when combobox contains a longer text than buffer_limit.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: ca625836defc851dac00c19c3a561e0c0a979c6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca625836defc851dac00c19c3… Author: Alex Busenius <the_unknown(a)gmx.net> Date: Sun Oct 21 13:28:17 2007 +0200 user32: Fix segfault when combobox contains a longer text than buffer_limit. --- dlls/user32/edit.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 6ea843e..ee7e7a4 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3203,7 +3203,11 @@ static void EDIT_EM_ReplaceSel(EDITSTATE *es, BOOL can_undo, LPCWSTR lpsz_replac * such that buffer limit is honored. */ if ((honor_limit) && (size > es->buffer_limit)) { EDIT_NOTIFY_PARENT(es, EN_MAXTEXT); - strl = es->buffer_limit - (tl - (e-s)); + /* Buffer limit can be smaller than the actual length of text in combobox */ + if (es->buffer_limit < (tl - (e-s))) + strl = 0; + else + strl = es->buffer_limit - (tl - (e-s)); } if (!EDIT_MakeFit(es, tl - (e - s) + strl))

1 0

David Adam : d3dx8: Implement D3DX*Minimize.
by Alexandre Julliard 22 Oct '07

22 Oct '07

Module: wine Branch: master Commit: c1892f258ffb012bbdeb4f635427947cebacb5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1892f258ffb012bbdeb4f635… Author: David Adam <David.Adam(a)math.cnrs.fr> Date: Thu Oct 18 19:35:52 2007 +0200 d3dx8: Implement D3DX*Minimize. --- dlls/d3dx8/tests/math.c | 20 ++++++++++++++++++++ include/d3dx8math.inl | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx8/tests/math.c b/dlls/d3dx8/tests/math.c index 1490a66..dd7e26b 100644 --- a/dlls/d3dx8/tests/math.c +++ b/dlls/d3dx8/tests/math.c @@ -253,6 +253,16 @@ static void D3X8Vector3Test(void) funcpointer = D3DXVec3Maximize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec3Minimize__________________________*/ + expectedvec.x = 2.0f; expectedvec.y = -3.0f; expectedvec.z = -4.0f; + D3DXVec3Minimize(&gotvec,&u,&v); + expect_vec3(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec3Minimize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec3Minimize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec3Subtract_______________________*/ expectedvec.x = 7.0f; expectedvec.y = 9.0f; expectedvec.z = 6.0f; D3DXVec3Subtract(&gotvec,&u,&v); @@ -335,6 +345,16 @@ static void D3X8Vector4Test(void) funcpointer = D3DXVec4Maximize(NULL,NULL,NULL); ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); +/*_______________D3DXVec4Minimize__________________________*/ + expectedvec.x = -3.0f; expectedvec.y = 2.0f; expectedvec.z = -5.0f; expectedvec.w = 7.0; + D3DXVec4Minimize(&gotvec,&u,&v); + expect_vec4(expectedvec,gotvec); + /* Tests the case NULL */ + funcpointer = D3DXVec4Minimize(&gotvec,NULL,&v); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + funcpointer = D3DXVec4Minimize(NULL,NULL,NULL); + ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer); + /*_______________D3DXVec4Subtract__________________________*/ expectedvec.x = 4.0f; expectedvec.y = -2.0f; expectedvec.z = 9.0f; expectedvec.w = 3.0f; D3DXVec4Subtract(&gotvec,&u,&v); diff --git a/include/d3dx8math.inl b/include/d3dx8math.inl index 1da846d..ee628d3 100644 --- a/include/d3dx8math.inl +++ b/include/d3dx8math.inl @@ -140,6 +140,15 @@ static inline D3DXVECTOR3* D3DXVec3Maximize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 return pout; } +static inline D3DXVECTOR3* D3DXVec3Minimize(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = min(pv1->x , pv2->x); + pout->y = min(pv1->y , pv2->y); + pout->z = min(pv1->z , pv2->z); + return pout; +} + static inline D3DXVECTOR3* D3DXVec3Subtract(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv1, CONST D3DXVECTOR3 *pv2) { if ( !pout || !pv1 || !pv2) return NULL; @@ -199,6 +208,16 @@ static inline D3DXVECTOR4* D3DXVec4Maximize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 return pout; } +static inline D3DXVECTOR4* D3DXVec4Minimize(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) +{ + if ( !pout || !pv1 || !pv2) return NULL; + pout->x = min(pv1->x , pv2->x); + pout->y = min(pv1->y , pv2->y); + pout->z = min(pv1->z , pv2->z); + pout->w = min(pv1->w , pv2->w); + return pout; +} + static inline D3DXVECTOR4* D3DXVec4Subtract(D3DXVECTOR4 *pout, CONST D3DXVECTOR4 *pv1, CONST D3DXVECTOR4 *pv2) { if ( !pout || !pv1 || !pv2) return NULL;

1 0