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

Henri Verbeet : wined3d: Merge surface_base.c into surface.c.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: wine Branch: master Commit: f63a84be61f4ef2958c6e0417f982627403b46e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63a84be61f4ef2958c6e0417… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 25 22:54:13 2011 +0200 wined3d: Merge surface_base.c into surface.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/surface.c | 1959 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface_base.c | 1953 --------------------------------------- dlls/wined3d/wined3d_private.h | 46 - 4 files changed, 1956 insertions(+), 2003 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63a84be61f4ef2958c6e…

1 0

Jerome Leclanche : patches: Use an id anchor instead of a named anchor for #legend.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: tools Branch: master Commit: e2b8aaf69d45b56a8b08213dc7dafa3c76721852 URL: http://source.winehq.org/git/tools.git/?a=commit;h=e2b8aaf69d45b56a8b08213d… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Apr 25 21:31:55 2011 +0100 patches: Use an id anchor instead of a named anchor for #legend. --- patches/update | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/patches/update b/patches/update index 70d05e3..17dc056 100755 --- a/patches/update +++ b/patches/update @@ -171,7 +171,7 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k print INDEX "</table></div>\n"; $row = 0; -print INDEX "<div class=\"legend\"><h2><a name=\"legend\">Legend</a></h2>\n"; +print INDEX "<div class=\"legend\"><h2 id=\"legend\">Legend</h2>\n"; print INDEX "<table class=\"legend\"><tr><th class=\"status\">Status</th><th class=\"causes\">Possible causes</th></tr>\n"; foreach my $status (@legend) {

1 0

Jerome Leclanche : patches: Wrap patch list and legend in #content and #main_content divs.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: tools Branch: master Commit: a6de8ef1aacf2590a44c0173d51fec5ca6569f8e URL: http://source.winehq.org/git/tools.git/?a=commit;h=a6de8ef1aacf2590a44c0173… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Apr 25 21:50:45 2011 +0100 patches: Wrap patch list and legend in #content and #main_content divs. --- patches/update | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/update b/patches/update index 17dc056..66b7963 100755 --- a/patches/update +++ b/patches/update @@ -100,7 +100,7 @@ print INDEX start_html(-title=>"Patches list", -encoding=>"utf-8", -style=>{src=>"patches.css"}); -print INDEX "<div class=\"main\">\n"; +print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", "<th class=\"author\">Author</th>", @@ -180,7 +180,7 @@ foreach my $status (@legend) $row++; } -print INDEX "</table></div>\n"; +print INDEX "</table></div></div></div>\n"; print INDEX end_html; close INDEX;

1 0

Jerome Leclanche : patches: Add the common WineHQ header.
by Alexandre Julliard 26 Apr '11

26 Apr '11

Module: tools Branch: master Commit: ecfd33df042317769353280c7f0242ee492c3233 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ecfd33df042317769353280c… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Mon Apr 25 22:25:19 2011 +0100 patches: Add the common WineHQ header. --- patches/patches.css | 101 ++++++++++++++++++++++++++++++++++++++++++++++++--- patches/update | 10 +++++- 2 files changed, 105 insertions(+), 6 deletions(-) diff --git a/patches/patches.css b/patches/patches.css index 6e0e206..ee1f8d9 100644 --- a/patches/patches.css +++ b/patches/patches.css @@ -1,18 +1,109 @@ /* WineHQ-ish look */ + body { - background-color: #E2E2E2; - color: black; + background-color: #000000; + color: #000000; + background-image: url("http://winehq.org/images/bg.jpg"); + background-repeat: no-repeat; font-family: "bitstream vera sans", "verdana", "arial", "helvetica", sans-serif; - margin: 10px; - font-size: small; + margin: 0; + font-size: 10pt; } a:link { text-decoration: none; } a:visited { text-decoration: none; } a:hover { text-decoration: underline; } +/* wine logo image */ +#logo_glass { + height: 157px; + left: 50px; + position: absolute; + top: 20px; + width: 100px; + z-index: 2; + border: none; +} + +#logo_text { + height: 58px; + left: 110px; + position: absolute; + top: 40px; + width: 186px; + z-index: 3; +} + +#logo_blurb { + color: #999; + font-size: 12px; + left: 130px; + position: absolute; + top: 92px; + z-index: 4; +} + +#tabs { + margin: 0px; + padding: 0px; + position: absolute; + right: 10px; + top: 0px; + z-index: 6; +} + +#tabs ul { + list-style: none; + margin: 0; + padding: 0; +} + +#tabs li { + background-image: url("http://winehq.org/images/tab_u.png"); + background-repeat: no-repeat; + float: left; + height: 28px; + margin: 0px 2px 0px 2px; + padding: 0; + text-align: center; + width: 112px; +} + +#tabs li.s { + background-image: url("http://winehq.org/images/tab_s.png"); +} + +#tabs li.s a { + font-weight: bold; +} + +#tabs li:hover { + background-image: url("http://winehq.org/images/tab_h.png"); +} + +#tabs a { + color: white; + display: block; + font-size: 16px; + height: 23px; + padding-top: 3px; + text-decoration: none; + width: 108px; +} + +#main_content { + padding: 85px 10px 10px 100px; +} +#content { + background-color: white; + border-radius: 7px; + padding: 20px 20px 10px 80px; +} + +img { border: 0; } + div.main, div.legend { - margin: 10px 0 0 0; + margin: 25px 0 0; background-color: white; width: 100%; border: 1px solid #601919; diff --git a/patches/update b/patches/update index 66b7963..f92a64c 100755 --- a/patches/update +++ b/patches/update @@ -100,6 +100,15 @@ print INDEX start_html(-title=>"Patches list", -encoding=>"utf-8", -style=>{src=>"patches.css"}); +print INDEX "<div id=\"logo_glass\"><a href=\"/patches/\"><img src=\"http://winehq.org/images/winehq_logo_glass_sm.png\"></a></div>\n"; +print INDEX "<div id=\"logo_text\"><a href=\"/patches/\"><img src=\"http://winehq.org/images/winehq_logo_text.png\" alt=\"WineHQ\" title=\"WineHQ\"></a></div>\n"; +print INDEX "<div id=\"tabs\"><ul>", + "<li><a href=\"http://www.winehq.org/\">WineHQ</a></li>", + "<li><a href=\"http://wiki.winehq.org/\">Wiki</a></li>", + "<li><a href=\"http://appdb.winehq.org/\">AppDB</a></li>", + "<li><a href=\"http://bugs.winehq.org/\">Bugzilla</a></li>", + "<li><a href=\"http://forums.winehq.org/\">Forums</a></li></ul></div>\n"; +print INDEX "<div id=\"logo_blurb\">Wine source repository – Patch status</div>\n"; print INDEX "<div id=\"main_content\"><div id=\"content\"><div class=\"main\">\n"; print INDEX "<table class=\"main\"><tr><th class=\"id\">ID</th>", "<th class=\"status\">Status</th>", @@ -178,7 +187,6 @@ foreach my $status (@legend) printf INDEX "<tr class=\"%s\"><td class=\"status %s\">%s</td><td class=\"causes\">%s</td></tr>\n", $row & 1 ? "odd" : "even", $status->[0], $status_descr{$status->[0]}, $status->[1]; $row++; - } print INDEX "</table></div></div></div>\n"; print INDEX end_html;

1 0

Alexander Nicolaysen Sørnes : TagAssignmentMgr: Include default values for getTagObject() prototype ( required for some PHP versions)
by Alexander Nicolaysen Sørnes 25 Apr '11

25 Apr '11

Module: appdb Branch: master Commit: 4f4b63facae40b2ade6c227a65cf9845d1a42dc1 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=4f4b63facae40b2ade6c227a… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Tue Apr 26 01:15:35 2011 +0200 TagAssignmentMgr: Include default values for getTagObject() prototype (required for some PHP versions) --- include/tagAssignmentMgr.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/tagAssignmentMgr.php b/include/tagAssignmentMgr.php index 006b2eb..28c1566 100644 --- a/include/tagAssignmentMgr.php +++ b/include/tagAssignmentMgr.php @@ -137,7 +137,7 @@ abstract class TagAssignmentMgr extends ObjectManagerBase return $shErrors; } - protected abstract function getTagObject($iId, $oRow); + protected abstract function getTagObject($iId = null, $oRow = null); } ?> \ No newline at end of file

1 0

Alexander Nicolaysen Sørnes : Allow changing the order in which notes are displayed
by Alexander Nicolaysen Sørnes 25 Apr '11

25 Apr '11

Module: appdb Branch: master Commit: 5f87b343e6d42c161db0e1d773d34ff645580a4f URL: http://source.winehq.org/git/appdb.git/?a=commit;h=5f87b343e6d42c161db0e1d7… Author: Alexander Nicolaysen Sørnes <alexsornes(a)gmail.com> Date: Tue Apr 26 00:51:03 2011 +0200 Allow changing the order in which notes are displayed --- include/tag.php | 27 +++++++- include/tagAssignmentMgr.php | 143 ++++++++++++++++++++++++++++++++++++++++++ include/tag_Note.php | 28 ++++++++- include/version.php | 3 + tables/appdb_tables.sql | 1 + 5 files changed, 198 insertions(+), 4 deletions(-) diff --git a/include/tag.php b/include/tag.php index 3970b01..b9395c8 100644 --- a/include/tag.php +++ b/include/tag.php @@ -50,7 +50,7 @@ abstract class Tag extends ObjectManagerBase return 'tags_'.$this->getTagClass(); } - protected function getSQLTableForAssignments() + public function getSQLTableForAssignments() { return $this->objectGetSQLTable().'_assignments'; } @@ -77,7 +77,21 @@ abstract class Tag extends ObjectManagerBase public function assign($iId) { - $hResult = query_parameters("INSERT INTO ? (tagId, taggedId) VALUES('?', '?')", $this->getSQLTableForAssignments(), $this->iId, $iId); + if($this->isOrdered()) + { + $hResult = query_parameters("SELECT MAX(position) as maxPos FROM ? WHERE tagId = '?'", $this->getSQLTableForAssignments(), $this->iId); + + if(!$hResult) + return false; + + $oRow = mysql_fetch_object($hResult); + $iPos = $oRow->maxPos + 1; + + $hResult = query_parameters("INSERT INTO ? (tagId, taggedId, position) VALUES('?', '?', '?')", $this->getSQLTableForAssignments(), $this->iId, $iId, $iPos); + } else + { + $hResult = query_parameters("INSERT INTO ? (tagId, taggedId) VALUES('?', '?')", $this->getSQLTableForAssignments(), $this->iId, $iId); + } if(!$hResult) return false; @@ -108,7 +122,9 @@ abstract class Tag extends ObjectManagerBase public function getTaggedEntries() { - $hResult = query_parameters("SELECT taggedId FROM ? WHERE tagId = '?' AND state = 'accepted'", $this->getSQLTableForAssignments(), $this->iId); + $sOrderBy = $this->isOrdered() ? 'position ASC' : 'id ASC'; + + $hResult = query_parameters("SELECT taggedId FROM ? WHERE tagId = '?' AND state = 'accepted' ORDER BY $sOrderBy", $this->getSQLTableForAssignments(), $this->iId); if(!$hResult) return array(); @@ -314,6 +330,11 @@ public function objectGetEntriesCount() { return true; } + + protected function isOrdered() + { + return false; + } } ?> \ No newline at end of file diff --git a/include/tagAssignmentMgr.php b/include/tagAssignmentMgr.php new file mode 100644 index 0000000..006b2eb --- /dev/null +++ b/include/tagAssignmentMgr.php @@ -0,0 +1,143 @@ +<?php + +abstract class TagAssignmentMgr extends ObjectManagerBase +{ + protected $aTaggedEntries; + + function Constructor($iId = null, $oRow = null) + { + $this->iId = $iId; + $this->aTaggedEntries = $this->getTagObject($this->iId)->getTaggedEntries(); + } + + protected function objectGetSQLTable() + { + return $this->getTagObject()->getSQLTableForAssignments(); + } + + public function create() + { + return false; + } + + public function update() + { + $i = 0; + + foreach($this->aTaggedEntries as $oTag) + { + $hResult = query_parameters("UPDATE ? SET position = '?' WHERE taggedId = '?'", $this->objectGetSQLTable(), $i, $oTag->objectGetId()); + + if(!$hResult) + return false; + + $i++; + } + + return true; + } + + public function objectGetEntries() + { + return false; + } + + public function objectGetHeader() + { + return null; + } + + public function objectGetTableRow() + { + return null; + } + + public function outputEditor() + { + if(sizeof($this->aTaggedEntries) == 0) + echo 'This page allows you to sort associated entries, but since there are none . . . have fun!<br /><br />'; + else if(sizeof($this->aTaggedEntries) == 1) + echo 'This page allows you to sort associated entries, but since there\'s only one . . . have fun!<br /><br />'; + echo 'The following tags are assigned to this entry; this page allows you to change the order in which they are displayed:<br /><br />'; + + $iSize = min(sizeof($this->aTaggedEntries), 10); + + echo '<div style="float: left;">'; + $i = 0; + $shOptions = ''; + + foreach($this->aTaggedEntries as $oTag) + { + $shOptions .= '<option value="'.$oTag->objectGetId().'">'.$oTag->objectMakeLink()."</option>\n"; + echo '<input type="hidden" name="iTagPlace'.$i.'" value="'.$oTag->objectGetId().'" />'; + $i++; + } + echo "<select size=\"$iSize\" name=\"iTagAssocList\">\n"; + echo $shOptions; + echo '</select></div>'; + echo '<div style="margin-left: 10px; float: left;">'; + echo "<script type=\"text/JavaScript\">\n"; + echo "function swap(index1, index2) {\n"; + echo "var selector = document.forms['sQform']['iTagAssocList'];\n"; + echo "var item1 = selector.options[index1];\n"; + echo "var item2 = selector.options[index2];\n"; + echo "selector.options[index1] = new Option(item2.text, item2.value, item2.defaultSelected, item2.selected);\n"; + echo "selector.options[index2] = item1;\n"; + echo "var hidden1 = document.forms['sQform']['iTagPlace'+index1];\n"; + echo "var hidden2 = document.forms['sQform']['iTagPlace'+index2];\n"; + echo "var tmp = hidden1.value;\n"; + echo "hidden1.value = hidden2.value;\n"; + echo "hidden2.value = tmp;\n"; + echo "}\n"; + echo "function moveUp() {\n"; + echo "var selector = document.forms['sQform']['iTagAssocList'];\n"; + echo "var index = selector.selectedIndex;\n"; + echo "if(index == 0)\n"; + echo " return;\n"; + echo "swap(index, index - 1);\n"; + echo "}\n"; + echo "function moveDown() {\n"; + echo "var selector = document.forms['sQform']['iTagAssocList'];\n"; + echo "var index = selector.selectedIndex;\n"; + echo "if(index + 1 == selector.options.length)\n"; + echo " return;\n"; + echo "swap(index, index + 1);\n"; + echo "}\n"; + echo "</script>\n"; + echo '<button onclick="moveUp()" type="button">Move up</button><br />'; + echo '<button onclick="moveDown()" type="button">Move down</button>'; + echo '</div>'; + } + + public function getOutputEditorValues($aClean) + { + $aDBTags = $this->getTagObject($this->iId)->getTaggedEntries(); + $this->aTaggedEntries = array(); + + for($i = 0; $i < sizeof($aDBTags); $i++) + { + foreach($aDBTags as $oTag) + { + if($oTag->objectGetId() == $aClean['iTagPlace'.$i]) + { + $this->aTaggedEntries[] = $oTag; + break; + } + } + } + + if(sizeof($aDBTags) != sizeof($this->aTaggedEntries)) + $this->aTaggedEntries = $aDBTags; + } + + public function checkOutputEditorInput($aClean) + { + $shErrors = ''; + + return $shErrors; + } + + protected abstract function getTagObject($iId, $oRow); +} + +?> \ No newline at end of file diff --git a/include/tag_Note.php b/include/tag_Note.php index 2644317..c293630 100644 --- a/include/tag_Note.php +++ b/include/tag_Note.php @@ -1,6 +1,7 @@ <?php require_once(BASE.'include/tag.php'); +require_once(BASE.'include/tagAssignmentMgr.php'); class TagNoteVersion extends Tag { @@ -42,7 +43,7 @@ class TagNoteVersion extends Tag return 'appVersion'; } - protected function getSQLTableForAssignments() + public function getSQLTableForAssignments() { return 'tags_NoteVersion_assignments'; } @@ -73,6 +74,31 @@ class TagNoteVersion extends Tag { return 'Note'; } + + protected function isOrdered() + { + return true; + } +} + +class TagNoteVersionAssignMgr extends TagAssignmentMgr +{ + function TagNoteVersionAssignMgr($iId = null, $oRow = null) + { + $this->Constructor($iId, $oRow); + } + + protected function getTagObject($iId = null, $oRow = null) + { + return new TagNoteVersion($iId, $oRow); + } + + public function canEdit() + { + $oVersion = new Version($this->iId); + + return $oVersion->canEdit(); + } } ?> \ No newline at end of file diff --git a/include/version.php b/include/version.php index 6708802..8286c5b 100644 --- a/include/version.php +++ b/include/version.php @@ -1011,6 +1011,9 @@ class version { echo $shAdd.'" />'; echo "\t".'<input type="submit" value="Add note/how-to" class="button">'."\n"; echo '</form>'."\n"; + echo '<form method="post" action="'.BASE.'objectManager.php?sClass=tagNoteVersionAssignMgr&sAction=edit&iId='.$this->iVersionId.'">'; + echo '<input type="submit" value="Manage notes" />'; + echo '</form>'; echo "</td></tr>"; } $oMonitor = new Monitor(); diff --git a/tables/appdb_tables.sql b/tables/appdb_tables.sql index fc4630f..9fb4672 100644 --- a/tables/appdb_tables.sql +++ b/tables/appdb_tables.sql @@ -186,6 +186,7 @@ create table tags_NoteVersion_assignments ( state enum('accepted','queued','rejected','pending','deleted') NOT NULL default 'accepted', tagId int not null, taggedId int not null, + position int not null, key(id) );

1 0

Andrew Eikum : mmdevapi: Reimplement using a driver system.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: 50140999287886e4bd441eb72741c73c8c527595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50140999287886e4bd441eb72… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 22 15:25:14 2011 -0500 mmdevapi: Reimplement using a driver system. --- dlls/mmdevapi/Makefile.in | 2 - dlls/mmdevapi/alext.h | 144 ---- dlls/mmdevapi/audio.c | 1909 ------------------------------------------- dlls/mmdevapi/audiovolume.c | 11 - dlls/mmdevapi/devenum.c | 423 +++------- dlls/mmdevapi/main.c | 329 ++------ dlls/mmdevapi/mmdevapi.h | 263 +------ 7 files changed, 220 insertions(+), 2861 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50140999287886e4bd441…

1 0

Andrew Eikum : winealsa.drv: Add mmdevapi driver.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: 86e90c92af8134e1e2cd6d79aaa55e62ffe146b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86e90c92af8134e1e2cd6d79a… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 22 15:25:21 2011 -0500 winealsa.drv: Add mmdevapi driver. Maarten Lankhorst also contributed to this driver. --- dlls/winealsa.drv/Makefile.in | 1 + dlls/winealsa.drv/mmdevdrv.c | 2142 +++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/waveinit.c | 5 - dlls/winealsa.drv/winealsa.drv.spec | 5 + 4 files changed, 2148 insertions(+), 5 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86e90c92af8134e1e2cd6…

1 0

Andrew Eikum : winecoreaudio.drv: Add mmdevapi driver.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: d2f7b628d947338d3a0a0229107365c44d954689 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f7b628d947338d3a0a02291… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 22 15:25:35 2011 -0500 winecoreaudio.drv: Add mmdevapi driver. --- dlls/winecoreaudio.drv/Makefile.in | 3 +- dlls/winecoreaudio.drv/audio.c | 1 - dlls/winecoreaudio.drv/mmdevdrv.c | 2086 +++++++++++++++++++++++++ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 5 + 4 files changed, 2093 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d2f7b628d947338d3a0a0…

1 0

Andrew Eikum : mmdevapi/tests: Add tests for IAudioClient:: GetCurrentPadding.
by Alexandre Julliard 25 Apr '11

25 Apr '11

Module: wine Branch: master Commit: a5cfae6db3d05f7bb4ee37f676074b463ad01e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5cfae6db3d05f7bb4ee37f67… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Apr 22 15:25:43 2011 -0500 mmdevapi/tests: Add tests for IAudioClient::GetCurrentPadding. --- dlls/mmdevapi/tests/render.c | 97 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index f7d7eb1..f8d06c0 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -266,6 +266,8 @@ static void test_references(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&rc); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -293,6 +295,8 @@ static void test_references(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + hr = IAudioClient_GetService(ac, &IID_ISimpleAudioVolume, (void**)&sav); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -320,6 +324,8 @@ static void test_references(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + hr = IAudioClient_GetService(ac, &IID_IAudioClock, (void**)&acl); ok(hr == S_OK, "GetService failed: %08x\n", hr); @@ -357,6 +363,8 @@ static void test_event(void) 0, pwfx, NULL); ok(hr == S_OK, "Initialize failed: %08x\n", hr); + CoTaskMemFree(pwfx); + event = CreateEventW(NULL, FALSE, FALSE, NULL); ok(event != NULL, "CreateEvent failed\n"); @@ -380,6 +388,94 @@ static void test_event(void) CloseHandle(event); } +static void test_padding(void) +{ + HRESULT hr; + IAudioClient *ac; + IAudioRenderClient *arc; + WAVEFORMATEX *pwfx; + REFERENCE_TIME minp, defp; + BYTE *buf; + UINT32 psize, pad, written; + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_GetMixFormat(ac, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + if(hr != S_OK) + return; + + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, pwfx, NULL); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetDevicePeriod(ac, &defp, &minp); + ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); + ok(defp != 0, "Default period is 0\n"); + ok(minp != 0, "Minimum period is 0\n"); + ok(minp <= defp, "Mininum period is greater than default period\n"); + + hr = IAudioClient_GetService(ac, &IID_IAudioRenderClient, (void**)&arc); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + psize = (defp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + + written = 0; + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); + + hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(buf != NULL, "NULL buffer returned\n"); + + hr = IAudioRenderClient_ReleaseBuffer(arc, psize, + AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + written += psize; + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); + + psize = (minp / 10000000.) * pwfx->nSamplesPerSec * pwfx->nBlockAlign; + + hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); + ok(hr == S_OK, "GetBuffer failed: %08x\n", hr); + ok(buf != NULL, "NULL buffer returned\n"); + + hr = IAudioRenderClient_ReleaseBuffer(arc, psize, + AUDCLNT_BUFFERFLAGS_SILENT); + ok(hr == S_OK, "ReleaseBuffer failed: %08x\n", hr); + written += psize; + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); + + /* overfull buffer. requested 1/2s buffer size, so try + * to get a 1/2s buffer, which should fail */ + psize = pwfx->nSamplesPerSec / 2.; + hr = IAudioRenderClient_GetBuffer(arc, psize, &buf); + ok(hr == AUDCLNT_E_BUFFER_TOO_LARGE, "GetBuffer gave wrong error: %08x\n", hr); + + hr = IAudioRenderClient_ReleaseBuffer(arc, psize, 0); + ok(hr == AUDCLNT_E_OUT_OF_ORDER, "ReleaseBuffer gave wrong error: %08x\n", hr); + + hr = IAudioClient_GetCurrentPadding(ac, &pad); + ok(hr == S_OK, "GetCurrentPadding failed: %08x\n", hr); + ok(pad == written, "GetCurrentPadding returned %u, should be %u\n", pad, written); + + CoTaskMemFree(pwfx); + + IAudioRenderClient_Release(arc); + IAudioClient_Release(ac); +} + START_TEST(render) { HRESULT hr; @@ -407,6 +503,7 @@ START_TEST(render) test_audioclient(); test_references(); test_event(); + test_padding(); IMMDevice_Release(dev);

1 0