January 2007 - Wine-commits

Alexandre Julliard : server: Avoid crash in alloc_console when the process has no parent.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 31b02bbd1facee6a80d8e3eebc649ec974df17a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31b02bbd1facee6a80d8e3eeb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 4 09:41:14 2007 +0100 server: Avoid crash in alloc_console when the process has no parent. --- server/console.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/console.c b/server/console.c index 5f44827..64601fb 100644 --- a/server/console.c +++ b/server/console.c @@ -1252,12 +1252,20 @@ DECL_HANDLER(alloc_console) struct process *renderer = current->process; struct console_input *console; - process = (req->pid) ? get_process_from_id( req->pid ) : - (struct process *)grab_object( renderer->parent ); + if (req->pid) + { + if (!(process = get_process_from_id( req->pid ))) return; + } + else + { + if (!(process = renderer->parent)) + { + set_error( STATUS_ACCESS_DENIED ); + return; + } + grab_object( process ); + } - reply->handle_in = 0; - reply->event = 0; - if (!process) return; if (process != renderer && process->console) { set_error( STATUS_ACCESS_DENIED );

1 0

Rob Shearman : ole32: Don' t release pUnk in OleCreate if CoCreateInstance failed.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: b8035d2c70edc0456a4f9f53927cd13b8846afc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8035d2c70edc0456a4f9f539… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 3 10:31:08 2007 +0000 ole32: Don't release pUnk in OleCreate if CoCreateInstance failed. --- dlls/ole32/ole2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 249b75b..151957c 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2399,7 +2399,7 @@ HRESULT WINAPI OleCreate( } } - if (FAILED(hres)) + if (FAILED(hres) && pUnk) { IUnknown_Release(pUnk); pUnk = NULL;

1 0

Rob Shearman : kernel32: Be more verbose about the expected and received values for failures in the resource function tests .
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 140a610e2a9de6e2a8ef6745d007433ed76fe080 URL: http://source.winehq.org/git/wine.git/?a=commit;h=140a610e2a9de6e2a8ef6745d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 3 12:59:19 2007 +0000 kernel32: Be more verbose about the expected and received values for failures in the resource function tests. --- dlls/kernel32/tests/resource.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 9a26a12..964f17a 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -211,8 +211,8 @@ void check_empty( IMAGE_RESOURCE_DIRECTO { char *pad; - ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries wrong\n"); - ok( dir->NumberOfIdEntries == 0, "NumberOfIdEntries wrong\n"); + ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries should be 0 instead of %d\n", dir->NumberOfNamedEntries); + ok( dir->NumberOfIdEntries == 0, "NumberOfIdEntries should be 0 instead of %d\n", dir->NumberOfIdEntries); pad = (char*) &dir[1]; @@ -221,8 +221,8 @@ void check_empty( IMAGE_RESOURCE_DIRECTO void check_version( IMAGE_RESOURCE_DIRECTORY *dir ) { - ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries wrong\n"); - todo_wine ok( dir->NumberOfIdEntries == 2, "NumberOfIdEntries wrong\n"); + ok( dir->NumberOfNamedEntries == 0, "NumberOfNamedEntries should be 0 instead of %d\n", dir->NumberOfNamedEntries); + todo_wine ok( dir->NumberOfIdEntries == 2, "NumberOfIdEntries should be 2 instead of %d\n", dir->NumberOfIdEntries); } void check_exe( res_check_func fn )

1 0

Reinhard Karcher : user32: Speed improvement for 16bit comm support.
by Alexandre Julliard 04 Jan '07

04 Jan '07

Module: wine Branch: master Commit: 426ae2f2e29f2cdb0e4bbee0cef9b93e0f243425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=426ae2f2e29f2cdb0e4bbee0c… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Mon Jan 1 17:45:06 2007 +0100 user32: Speed improvement for 16bit comm support. The previous version of this patch wasn't applied correctly. --- dlls/user32/comm16.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/user32/comm16.c b/dlls/user32/comm16.c index 0164196..ebeb97c 100644 --- a/dlls/user32/comm16.c +++ b/dlls/user32/comm16.c @@ -721,7 +721,9 @@ INT16 WINAPI GetCommError16(INT16 cid,LP if (lpStat) { lpStat->status = 0; - SleepEx(1,TRUE); + + if (comm_inbuf(ptr) == 0) + SleepEx(1,TRUE); lpStat->cbOutQue = comm_outbuf(ptr); lpStat->cbInQue = comm_inbuf(ptr);

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ 03 Jan '07

03 Jan '07

ChangeSet ID: 30851 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 20:35:02 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appsubmit.php appview.php browse_by_rating.php browse_newest_apps.php commentview.php deletecomment.php distributionView.php maintainerdelete.php maintainersubmit.php preferences.php screenshots.php search.php testResults.php vendorview.php viewScreenshots.php viewbugs.php votestats.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.php adminCommentView.php adminMaintainerQueue.php adminMaintainers.php adminScreenshots.php adminTestResults.php adminUsers.php deleteAny.php editAppFamily.php editAppNote.php editAppVersion.php editBundle.php editDistribution.php editVendor.php moveAppVersion.php help : index.php include : application.php bugs.php comment.php distribution.php filter.php form_edit.php form_login.php form_new.php incl.php note.php screenshot.php sidebar.php testData.php url.php util.php version.php vote.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix and enable input filtering through include/filter.php Patch: http://cvs.winehq.org/patch.py?id=30851 Old revision New revision Changes Path 1.34 1.35 +0 -1 appdb/account.php 1.33 1.34 +0 -1 appdb/addcomment.php 1.22 1.23 +0 -1 appdb/appbrowse.php 1.28 1.29 +0 -1 appdb/appimage.php 1.57 1.58 +6 -20 appdb/appsubmit.php 1.96 1.97 +0 -8 appdb/appview.php 1.1 1.2 +0 -1 appdb/browse_by_rating.php 1.2 1.3 +0 -1 appdb/browse_newest_apps.php 1.15 1.16 +0 -1 appdb/commentview.php 1.30 1.31 +0 -1 appdb/deletecomment.php 1.22 1.23 +0 -1 appdb/distributionView.php 1.24 1.25 +0 -7 appdb/maintainerdelete.php 1.33 1.34 +0 -7 appdb/maintainersubmit.php 1.33 1.34 +3 -25 appdb/preferences.php 1.41 1.42 +0 -1 appdb/screenshots.php 1.21 1.22 +0 -1 appdb/search.php 1.22 1.23 +2 -10 appdb/testResults.php 1.23 1.24 +0 -1 appdb/vendorview.php 1.7 1.8 +0 -1 appdb/viewScreenshots.php 1.10 1.11 +0 -1 appdb/viewbugs.php 1.27 1.28 +0 -1 appdb/votestats.php 1.30 1.31 +1 -8 appdb/admin/addAppNote.php 1.15 1.16 +0 -8 appdb/admin/addCategory.php 1.30 1.31 +0 -9 appdb/admin/adminAppDataQueue.php 1.69 1.70 +6 -21 appdb/admin/adminAppQueue.php 1.14 1.15 +0 -9 appdb/admin/adminBugs.php 1.16 1.17 +0 -5 appdb/admin/adminCommentView.php 1.35 1.36 +0 -8 appdb/admin/adminMaintainerQueue.php 1.28 1.29 +0 -5 appdb/admin/adminMaintainers.php 1.16 1.17 +0 -9 appdb/admin/adminScreenshots.php 1.17 1.18 +1 -6 appdb/admin/adminTestResults.php 1.13 1.14 +0 -9 appdb/admin/adminUsers.php 1.22 1.23 +0 -8 appdb/admin/deleteAny.php 1.43 1.44 +0 -5 appdb/admin/editAppFamily.php 1.29 1.30 +2 -9 appdb/admin/editAppNote.php 1.41 1.42 +0 -6 appdb/admin/editAppVersion.php 1.15 1.16 +10 -10 appdb/admin/editBundle.php 1.11 1.12 +1 -7 appdb/admin/editDistribution.php 1.15 1.16 +0 -6 appdb/admin/editVendor.php 1.11 1.12 +0 -6 appdb/admin/moveAppVersion.php 1.10 1.11 +5 -5 appdb/help/index.php 1.82 1.83 +5 -11 appdb/include/application.php 1.19 1.20 +4 -6 appdb/include/bugs.php 1.31 1.32 +1 -4 appdb/include/comment.php 1.3 1.4 +2 -6 appdb/include/distribution.php 1.8 1.9 +13 -8 appdb/include/filter.php 1.10 1.11 +0 -3 appdb/include/form_edit.php 1.8 1.9 +0 -4 appdb/include/form_login.php 1.10 1.11 +0 -6 appdb/include/form_new.php 1.38 1.39 +8 -1 appdb/include/incl.php 1.20 1.21 +1 -7 appdb/include/note.php 1.53 1.54 +1 -3 appdb/include/screenshot.php 1.24 1.25 +3 -5 appdb/include/sidebar.php 1.15 1.16 +6 -12 appdb/include/testData.php 1.10 1.11 +2 -6 appdb/include/url.php 1.77 1.78 +40 -38 appdb/include/util.php 1.90 1.91 +5 -9 appdb/include/version.php 1.23 1.24 +1 -5 appdb/include/vote.php

1 0

appdb/admin adminAppQueue.php
by WineHQ 03 Jan '07

03 Jan '07

ChangeSet ID: 30850 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:43:58 Modified files: admin : adminAppQueue.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> If the admin tries to view an application that does not exist, print an error and exit instead of fetching useless data as though there actually was an application. Patch: http://cvs.winehq.org/patch.py?id=30850 Old revision New revision Changes Path 1.68 1.69 +4 -0 appdb/admin/adminAppQueue.php Index: appdb/admin/adminAppQueue.php diff -u -p appdb/admin/adminAppQueue.php:1.68 appdb/admin/adminAppQueue.php:1.69 --- appdb/admin/adminAppQueue.php:1.68 4 Jan 2007 0:43:58 -0000 +++ appdb/admin/adminAppQueue.php 4 Jan 2007 0:43:58 -0000 @@ -145,6 +145,10 @@ if ($aClean['sSub']) $oApp = new Application($aClean['iAppId']); + /* Check that the application actually exists */ + if(!$oApp->iAppId) + util_show_error_page_and_exit("There is no application with that ID."); + // if we are processing a queued application there MUST be an implicitly queued // version to go along with it. $hResult = query_parameters("SELECT versionId from appVersion where appId='?';", $aClean['iAppId']);

1 0

appdb/help maintainer_ratings.help
by WineHQ 03 Jan '07

03 Jan '07

ChangeSet ID: 30849 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:41:58 Modified files: help : maintainer_ratings.help Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Language fixes for maintainer rating help. Also sneak in the work 'flawlessly' in the description of the Platinum rating. It is already mentioned on the front page. Patch: http://cvs.winehq.org/patch.py?id=30849 Old revision New revision Changes Path 1.5 1.6 +12 -12 appdb/help/maintainer_ratings.help Index: appdb/help/maintainer_ratings.help diff -u -p appdb/help/maintainer_ratings.help:1.5 appdb/help/maintainer_ratings.help:1.6 --- appdb/help/maintainer_ratings.help:1.5 4 Jan 2007 0:41:58 -0000 +++ appdb/help/maintainer_ratings.help 4 Jan 2007 0:41:58 -0000 @@ -1,11 +1,11 @@ - + -<h3>Maintainers Ratings Definitions</h3> +<h3>Maintainer Rating Definitions</h3> <p> -The Application Database features a Maintainers rating system that allows you to see -which applications work the best in Wine. This rating system is designed to assist -users by giving a rating based on an "expert's" experience. +The Application Database features a maintainer rating system that allows you to see +which applications work best in Wine. This rating system is designed to assist +users by giving a rating based on an ‘expert’s’ experience. </p> <ul> @@ -13,7 +13,7 @@ users by giving a rating based on an "ex <li class="platinum">Platinum</li> <p> -An application can be rated as Platinum if it installs and runs "out of the box" No changes required to winecfg. +An application can be rated as Platinum if it installs and runs flawlessly ‘out of the box’. No changes required in winecfg. </p> <li class="gold">Gold</li> @@ -25,22 +25,22 @@ Application works flawlessly with some D <li class="silver">Silver</li> <p> -Application works excellently for 'normal' use; a game works fine in single-player but not -in multi-player, Windows Media Player works fine as a plug-in and stand-alone player, but can't handle DRM etc. +Application works excellently for ‘normal’ use; a game works fine in single-player but not +in multi-player, Windows Media Player works fine as a plug-in and stand-alone player, but cannot handle DRM etc. </p> <li class="Bronze">Bronze</li> <p> -Application works, but it has some issues, even for normal use; a game may not redraw properly or display fonts in wrong colours, be a much slower than it should etc. +Application works, but it has some issues, even for normal use; a game may not redraw properly or display fonts in wrong colours, be much slower than it should etc. </p> <li class="Garbage">Garbage</li> <p> -An app gets this rating if it cannot be used for the purpose it was designed for. -There should be at least one bug report in bugzilla if an app gets this rating. -Application doesn't start, or starts but has so many errors that it is nearly impossible to use it. +An application gets this rating if it cannot be used for the purpose it was designed for. +There should be at least one bug report in Bugzilla if it gets this rating. +Application does not start, or starts but has so many errors that it is nearly impossible to use it. </p> </ul>

1 0

appdb/include html.php
by WineHQ 03 Jan '07

03 Jan '07

ChangeSet ID: 30848 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:38:06 Modified files: include : html.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Include the $extra argument in the output HTML. Patch: http://cvs.winehq.org/patch.py?id=30848 Old revision New revision Changes Path 1.10 1.11 +8 -1 appdb/include/html.php Index: appdb/include/html.php diff -u -p appdb/include/html.php:1.10 appdb/include/html.php:1.11 --- appdb/include/html.php:1.10 4 Jan 2007 0:38: 6 -0000 +++ appdb/include/html.php 4 Jan 2007 0:38: 6 -0000 @@ -23,9 +23,16 @@ function do_html_tr($t, $arr, $class, $e if(strlen($class)) $class = " class=\"$class\""; - $str = do_indent("<tr$class>", 1); + /* $extra contains parameters to <tr>, such as valign="top" */ + if(strlen($extra)) + $extra = " $extra"; + + $str = do_indent("<tr$class$extra>", 1); for($i = 0; $i < sizeof($arr); $i++) { + /* If it is not an array, it contains the entire table cell. If it + is an array, [0] holds the main content and [1] the options like + valign="top" */ if(is_array($arr[$i])) { $val = $arr[$i][0];

1 0

appdb/include application.php
by WineHQ 03 Jan '07

03 Jan '07

ChangeSet ID: 30847 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/03 18:36:44 Modified files: include : application.php Log message: "Michael [Plouj] Ploujnikov" <ploujj(a)gmail.com> Fix spelling of the email response in include/application.php Patch: http://cvs.winehq.org/patch.py?id=30847 Old revision New revision Changes Path 1.81 1.82 +1 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.81 appdb/include/application.php:1.82 --- appdb/include/application.php:1.81 4 Jan 2007 0:36:44 -0000 +++ appdb/include/application.php 4 Jan 2007 0:36:44 -0000 @@ -373,7 +373,7 @@ class Application { case "add": $sSubject = "Submitted application accepted"; $sMsg = "The application you submitted (".$this->sName.") has been accepted by ".$_SESSION['current']->sRealname."."; - $sMsg .= "Administrators Responce:\n"; + $sMsg .= "Administrator's Response:\n"; break; case "reject": $sSubject = "Submitted application rejected";

1 0

Reinhard Karcher : server: Fix 0 timeout handling for serial I/O.
by Alexandre Julliard 03 Jan '07

03 Jan '07

Module: wine Branch: master Commit: 41c93895b8274741b5464da873970e28feed8964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41c93895b8274741b5464da87… Author: Reinhard Karcher <rkarcher(a)frey.de> Date: Mon Jan 1 17:47:04 2007 +0100 server: Fix 0 timeout handling for serial I/O. --- server/serial.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/serial.c b/server/serial.c index 03909d0..866547b 100644 --- a/server/serial.c +++ b/server/serial.c @@ -272,7 +272,7 @@ static void serial_queue_async( struct f } add_timeout( &when, timeout ); - if (!create_async( current, &when, queue, apc, user, iosb )) return; + if (!create_async( current, timeout ? &when : NULL, queue, apc, user, iosb )) return; /* Check if the new pending request can be served immediately */ events = check_fd_events( fd, serial_get_poll_events( fd ) );

1 0