August 2009 - Wine-commits - list.winehq.org

Juan Lang : secur32: Sanity check handle index before indexing table.
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 3a493d7782b56ce0c55cda60271be75843d7104d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a493d7782b56ce0c55cda602… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Aug 4 10:44:06 2009 -0700 secur32: Sanity check handle index before indexing table. --- dlls/secur32/schannel.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 8f127e6..b9644e3 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -165,6 +165,7 @@ static void *schan_free_handle(ULONG_PTR handle_idx, enum schan_handle_type type void *object; if (handle_idx == SCHAN_INVALID_HANDLE) return NULL; + if (handle_idx >= schan_handle_count) return NULL; handle = &schan_handle_table[handle_idx]; if (handle->type != type) { @@ -185,6 +186,7 @@ static void *schan_get_object(ULONG_PTR handle_idx, enum schan_handle_type type) struct schan_handle *handle; if (handle_idx == SCHAN_INVALID_HANDLE) return NULL; + if (handle_idx >= schan_handle_count) return NULL; handle = &schan_handle_table[handle_idx]; if (handle->type != type) {

1 0

Alexandre Julliard : ntdll: Don' t switch from small to large block when HEAP_REALLOC_IN_PLACE_ONLY is specified .
by Alexandre Julliard 06 Aug '09

06 Aug '09

Module: wine Branch: master Commit: 7f64b8a9a98c849debcc779582607aaa0bf77390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f64b8a9a98c849debcc77958… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 5 20:35:36 2009 +0200 ntdll: Don't switch from small to large block when HEAP_REALLOC_IN_PLACE_ONLY is specified. --- dlls/ntdll/heap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 23c0ca2..14cac32 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1564,6 +1564,7 @@ PVOID WINAPI RtlReAllocateHeap( HANDLE heap, ULONG flags, PVOID ptr, SIZE_T size if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE && (flags & HEAP_GROWABLE)) { + if (flags & HEAP_REALLOC_IN_PLACE_ONLY) goto oom; if (!(ret = allocate_large_block( heapPtr, flags, size ))) goto oom; notify_alloc( ret, size, flags & HEAP_ZERO_MEMORY ); memcpy( ret, pArena + 1, oldActualSize );

1 0

Scott Ritchie : Link to wiki fun projects page instead of static
by Jeremy Newman 06 Aug '09

06 Aug '09

Module: website Branch: master Commit: d49fbf7e3843050884d4059c8fa195c6a113b6ce URL: http://source.winehq.org/git/website.git/?a=commit;h=d49fbf7e3843050884d405… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Aug 6 10:36:14 2009 -0500 Link to wiki fun projects page instead of static --- templates/en/devel.template | 2 +- templates/en/fun_projects.template | 579 ------------------------------------ 2 files changed, 1 insertions(+), 580 deletions(-) Diff: http://source.winehq.org/git/website.git/?a=commitdiff;h=d49fbf7e3843050884…

1 0

Scott Ritchie : Fix broken link on About page to licensing wiki page
by Jeremy Newman 06 Aug '09

06 Aug '09

Module: website Branch: master Commit: 3216d627991be8f58bc592509f8c144a9b26aac5 URL: http://source.winehq.org/git/website.git/?a=commit;h=3216d627991be8f58bc592… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Aug 6 10:40:13 2009 -0500 Fix broken link on About page to licensing wiki page --- templates/en/about.template | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index 84eca9d..292cf12 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -9,7 +9,7 @@ <h3>Open Source and User Driven</h3> -<p>Wine will always be <a href="" title="Wine licensing">free software</a>. Approximately half of Wine's source code is written by volunteers. The rest is sponsored by commercial interests, especially <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a> who sell a supported version of Wine.</p> +<p>Wine will always be <a href="http://wiki.winehq.org/Licensing" title="Wine licensing">free software</a>. Approximately half of Wine's source code is written by volunteers. The rest is sponsored by commercial interests, especially <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a> who sell a supported version of Wine.</p> <p>Wine is heavily reliant on its user community. User tests fill our <a href="http://appdb.winehq.org/" title="Wine Application Database">Application Database</a> to track how well programs work, and all the answers in the <a href="http://forums.winehq.org/" title="WineHQ Forums">forums</a> come from volunteers.</p>

1 0

Scott Ritchie : Set about page to use h3 instead of h2 as text is too large
by Jeremy Newman 06 Aug '09

06 Aug '09

Module: website Branch: master Commit: 15c528191d911e119789ee4c1c0589e6b38d1648 URL: http://source.winehq.org/git/website.git/?a=commit;h=15c528191d911e119789ee… Author: Scott Ritchie <scott(a)open-vote.org> Date: Thu Aug 6 10:34:09 2009 -0500 Set about page to use h3 instead of h2 as text is too large --- templates/en/about.template | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/en/about.template b/templates/en/about.template index a46466e..84eca9d 100644 --- a/templates/en/about.template +++ b/templates/en/about.template @@ -7,13 +7,13 @@ <p>Wine is still under active development. Not every program works yet, however there are already <a href="http://wiki.winehq.org/UsageStatistics" title="Wine Usage Statistics">several million people</a> using Wine to run their software.</p> -<h2>Open Source and User Driven</h2> +<h3>Open Source and User Driven</h3> <p>Wine will always be <a href="" title="Wine licensing">free software</a>. Approximately half of Wine's source code is written by volunteers. The rest is sponsored by commercial interests, especially <a href="http://www.codeweavers.com/products/" title="Codeweavers Crossover Office">Codeweavers</a> who sell a supported version of Wine.</p> <p>Wine is heavily reliant on its user community. User tests fill our <a href="http://appdb.winehq.org/" title="Wine Application Database">Application Database</a> to track how well programs work, and all the answers in the <a href="http://forums.winehq.org/" title="WineHQ Forums">forums</a> come from volunteers.</p> -<h2>Learn more:</h2> +<h3>Learn more:</h3> <ul> <li><a href="http://wiki.winehq.org/ImportanceOfWine">Why Wine is so Important</a></li> <li><a href="http://wiki.winehq.org/Debunking_Wine_Myths">Common Myths about Wine</a></li>

1 0

Alexander Nicolaysen Sørnes : category: Make currently viewed category the default parent for new categories
by Alexander Nicolaysen Sørnes 06 Aug '09

06 Aug '09

Module: appdb Branch: master Commit: 2772130cba777553c5f8abeec082f28d52e7a089 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=2772130cba777553c5f8abee… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Aug 6 13:47:35 2009 +0200 category: Make currently viewed category the default parent for new categories --- include/category.php | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/include/category.php b/include/category.php index 45b8010..daab5be 100644 --- a/include/category.php +++ b/include/category.php @@ -313,12 +313,28 @@ class Category { return 0; } - function outputEditor() + function objectGetCustomVars($sAction) + { + switch($sAction) + { + case 'add': + return array('iParentId'); + + default: + return null; + } + } + + function outputEditor($aValues = null) { $aCategories = category::getOrderedList(true); $aCatNames = array(); $aCatIds = array(); + $iParentId = $this->iParentId; + if(!$iParentId && $aValues) + $iParentId = getInput('iParentId', $aValues); + foreach($aCategories as $oCategory) { $aCatNames[] = $oCategory->sName; @@ -341,7 +357,7 @@ class Category { <tr> <td width=\"15%\" class=\"box-label\"><b>Parent</b></td> <td class=\"box-body\"> - ".html_select("iParentId",$aCatIds,$this->iParentId, $aCatNames)." + ".html_select("iParentId",$aCatIds,$iParentId, $aCatNames)." </td> </tr> </table>"; @@ -394,7 +410,7 @@ class Category { $oM = new objectManager('category', '', $this->iCatId); $oM->setReturnTo($this->objectMakeUrl()); echo "<p>\n"; - echo '<a href="'.$oM->makeUrl('add', null, 'Add Category').'">Add</a>'; + echo '<a href="'.$oM->makeUrl('add', null, 'Add Category')."&iParentId={$this->iCatId}\">Add</a>";; if($this->iCatId) // We can't edit the 'Main' category { echo '     ';

1 0

Alexander Nicolaysen Sørnes : category: Show more output when viewing empty categories
by Alexander Nicolaysen Sørnes 06 Aug '09

06 Aug '09

Module: appdb Branch: master Commit: 55e325dc80d5547bf4ab9552f2f21e152ca81696 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=55e325dc80d5547bf4ab9552… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Aug 5 19:57:54 2009 +0200 category: Show more output when viewing empty categories --- include/category.php | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/include/category.php b/include/category.php index 8b7713e..76eccc5 100644 --- a/include/category.php +++ b/include/category.php @@ -405,12 +405,13 @@ class Category { echo "</p>\n"; } + // Output sub-categories if($aSubs) { echo html_frame_start("",'98%','',2); echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; echo html_frame_end(); - + echo html_frame_start("","98%","",0); $oTable = new Table(); @@ -467,7 +468,6 @@ class Category { } - // list applications in this category $aApps = $this->aApplicationsIds; if($aApps) @@ -525,6 +525,18 @@ class Category { echo html_frame_end( count($aApps) . " applications in this category"); } + + // Show a message if this category is empty + if(!$aApps && !$aSubs) + { + echo html_frame_start("",'98%','',2); + echo "<p><b>Category: ". $sCatFullPath ."</b><br>\n"; + echo html_frame_end(); + + echo html_frame_start('','90%','',2); + echo 'This category has no sub-categories or applications'; + echo html_frame_end(); + } } }

1 0

Alexander Nicolaysen Sørnes : category: Remove reference to appbrowse.php, fix variable naming
by Alexander Nicolaysen Sørnes 06 Aug '09

06 Aug '09

Module: appdb Branch: master Commit: 6b9332ab2fdee89c7e873622f2c63b0f9e346c87 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=6b9332ab2fdee89c7e873622… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.(none)> Date: Wed Aug 5 20:29:40 2009 +0200 category: Remove reference to appbrowse.php, fix variable naming --- include/category.php | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/category.php b/include/category.php index 76eccc5..45b8010 100644 --- a/include/category.php +++ b/include/category.php @@ -241,37 +241,37 @@ class Category { /** * create the Category: line at the top of appdb pages$ */ - function make_cat_path($path, $appId = '', $versionId = '') + function make_cat_path($aPath, $iAppId = '', $iVersionId = '') { - $str = ""; - $catCount = 0; - while(list($iCatIdx, list($iCatId, $name)) = each($path)) + $sStr = ""; + $iCatCount = 0; + while(list($iCatIdx, list($iCatId, $sName)) = each($aPath)) { - if($name == "ROOT") - $catname = "Main"; + if($sName == "ROOT") + $sCatname = "Main"; else - $catname = $name; + $sCatname = $sName; - if ($catCount > 0) $str .= " > "; - $str .= html_ahref($catname,"appbrowse.php?catId=$iCatId"); - $catCount++; + if ($iCatCount > 0) $sStr .= " > "; + $sStr .= html_ahref($sCatname,"objectManager.php?sClass=category&iId=$iCatId&sAction=view&sTitle=Browse+Applications"); + $iCatCount++; } - if(!empty($appId)) + if($iAppId) { - $oApp = new Application($appId); - if(!empty($versionId)) + $oApp = new Application($iAppId); + if($iVersionId) { - $oVersion = new Version($versionId); - $str .= " > ".$oApp->objectMakeLink(); - $str .= " > ".$oVersion->sName; + $oVersion = new Version($iVersionId); + $sStr .= " > ".$oApp->objectMakeLink(); + $sStr .= " > ".$oVersion->sName; } else { - $str .= " > ".$oApp->sName; + $sStr .= " > ".$oApp->sName; } } - return $str; + return $sStr; } public function objectGetState()

1 0

Alistair Leslie-Hughes : shlwapi: Correct AssocCreate tests.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 31dab8f0dbbceb2bb52c524bd119c5e3bc0cd8d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31dab8f0dbbceb2bb52c524bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 5 14:19:38 2009 +1000 shlwapi: Correct AssocCreate tests. --- dlls/shlwapi/tests/assoc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/assoc.c b/dlls/shlwapi/tests/assoc.c index fd2b868..a6f5e2d 100644 --- a/dlls/shlwapi/tests/assoc.c +++ b/dlls/shlwapi/tests/assoc.c @@ -252,11 +252,11 @@ static void test_assoc_create(void) ok(hr == E_INVALIDARG, "Unexpected result : %08x\n", hr); hr = pAssocCreate(CLSID_QueryAssociations, &IID_NULL, (LPVOID*)&pqa); - ok(hr == CLASS_E_CLASSNOTAVAILABLE || hr == E_NOTIMPL /* win98 */ + ok(hr == CLASS_E_CLASSNOTAVAILABLE || hr == E_NOTIMPL || hr == E_NOINTERFACE , "Unexpected result : %08x\n", hr); hr = pAssocCreate(IID_NULL, &IID_IQueryAssociations, (LPVOID*)&pqa); - ok(hr == CLASS_E_CLASSNOTAVAILABLE || hr == E_NOTIMPL /* win98 */ + ok(hr == CLASS_E_CLASSNOTAVAILABLE || hr == E_NOTIMPL || hr == E_INVALIDARG , "Unexpected result : %08x\n", hr); hr = pAssocCreate(CLSID_QueryAssociations, &IID_IQueryAssociations, (LPVOID*)&pqa);

1 0

Austin English : wine.inf: Add HKCU\AppEvents\Schemes registry key.
by Alexandre Julliard 05 Aug '09

05 Aug '09

Module: wine Branch: master Commit: 0bbb924db207ddb680d01a8779d741fd0db890b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bbb924db207ddb680d01a877… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 28 16:52:51 2009 -0500 wine.inf: Add HKCU\AppEvents\Schemes registry key. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 7639cd4..038e631 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -557,6 +557,7 @@ HKLM,Software\Microsoft\Rpc\SecurityService,68,2,"netlogon.dll" HKLM,Software\Microsoft\Rpc\SecurityService,9,2,"secur32.dll" HKLM,System\CurrentControlSet\Control\Session Manager,,,"" HKLM,System\CurrentControlSet\Control\VMM32Files,,,"" +HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,"" HKCU,Software\Microsoft\Protected Storage System Provider,,,"" HKCU,Software\Wine\MSHTML,"GeckoUrl",,"http://source.winehq.org/winegecko.php" HKLM,HARDWARE\DEVICEMAP\PARALLEL PORTS,,,""

1 0