wine-commits October 2007

wine-commits@winehq.org

4 participants
996 discussions

Rob Shearman : advapi32: Add a test for access checks with the INHERIT_ONLY_ACE flag.
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: efed229a085659384caee7e3d0b2506c840033ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=efed229a085659384caee7e3d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 16:19:23 2007 +0100 advapi32: Add a test for access checks with the INHERIT_ONLY_ACE flag. --- dlls/advapi32/tests/security.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 4d62f59..22e7c02 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -894,6 +894,22 @@ static void test_AccessCheck(void) trace("Couldn't get SE_SECURITY_PRIVILEGE (0x%08x), skipping ACCESS_SYSTEM_SECURITY test\n", ret); + /* test INHERIT_ONLY_ACE */ + ret = InitializeAcl(Acl, 256, ACL_REVISION); + ok(ret, "InitializeAcl failed with error %d\n", GetLastError()); + ret = AddAccessAllowedAceEx(Acl, ACL_REVISION, INHERIT_ONLY_ACE, KEY_READ, EveryoneSid); + ok(ret, "AddAccessAllowedAceEx failed with error %d\n", GetLastError()); + + ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, + PrivSet, &PrivSetLen, &Access, &AccessStatus); + ok(ret, "AccessCheck failed with error %d\n", GetLastError()); + err = GetLastError(); + todo_wine + ok(!AccessStatus && err == ERROR_ACCESS_DENIED, "AccessCheck should have failed " + "with ERROR_ACCESS_DENIED, instead of %d\n", err); + todo_wine + ok(!Access, "Should have failed to grant any access, got 0x%08x\n", Access); + CloseHandle(Token); res = DuplicateToken(ProcessToken, SecurityAnonymous, &Token);

1 0

Rob Shearman : server: Make create_mapping use struct object_attributes and set the security descriptor of file mapping objects .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 23df453d383a3a6b52e89f29ddbb1d9cb344b538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23df453d383a3a6b52e89f29d… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 19:09:54 2007 +0100 server: Make create_mapping use struct object_attributes and set the security descriptor of file mapping objects. --- dlls/ntdll/ntdll_misc.h | 5 +++++ dlls/ntdll/sync.c | 21 +++++++++++---------- dlls/ntdll/virtual.c | 16 +++++++++++++++- include/wine/server_protocol.h | 5 ++--- server/mapping.c | 24 ++++++++++++++++++++---- server/protocol.def | 3 +-- server/trace.c | 5 ++--- 7 files changed, 56 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23df453d383a3a6b52e89…

1 0

Rob Shearman : server: Make create_mutex use struct object_attributes and set the security descriptor of mutex objects .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: 1f86321964d26cdf795c49090245ca7e73462107 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f86321964d26cdf795c49090… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 15:43:05 2007 +0100 server: Make create_mutex use struct object_attributes and set the security descriptor of mutex objects. --- dlls/ntdll/sync.c | 20 +++++++++++++++++--- include/wine/server_protocol.h | 5 ++--- server/mutex.c | 24 ++++++++++++++++++++---- server/protocol.def | 3 +-- server/trace.c | 5 ++--- 5 files changed, 42 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index 10a31d1..6fbcca8 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -415,22 +415,36 @@ NTSTATUS WINAPI NtCreateMutant(OUT HANDLE* MutantHandle, IN const OBJECT_ATTRIBUTES* attr OPTIONAL, IN BOOLEAN InitialOwner) { - NTSTATUS status; - DWORD len = attr && attr->ObjectName ? attr->ObjectName->Length : 0; + NTSTATUS status; + DWORD len = attr && attr->ObjectName ? attr->ObjectName->Length : 0; + struct security_descriptor *sd = NULL; + struct object_attributes objattr; if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; + objattr.rootdir = attr ? attr->RootDirectory : 0; + objattr.sd_len = 0; + if (attr) + { + status = create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); + if (status != STATUS_SUCCESS) return status; + } + SERVER_START_REQ( create_mutex ) { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; req->owned = InitialOwner; + wine_server_add_data( req, &objattr, sizeof(objattr) ); + if (objattr.sd_len) wine_server_add_data( req, sd, objattr.sd_len ); if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); status = wine_server_call( req ); *MutantHandle = reply->handle; } SERVER_END_REQ; + + free_struct_sd( sd ); + return status; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 80ee6f6..8235948 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -914,9 +914,8 @@ struct create_mutex_request struct request_header __header; unsigned int access; unsigned int attributes; - obj_handle_t rootdir; int owned; - /* VARARG(name,unicode_str); */ + /* VARARG(objattr,object_attributes); */ }; struct create_mutex_reply { @@ -4879,6 +4878,6 @@ union generic_reply struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 319 +#define SERVER_PROTOCOL_VERSION 320 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/mutex.c b/server/mutex.c index e128dfc..7064c6f 100644 --- a/server/mutex.c +++ b/server/mutex.c @@ -34,6 +34,7 @@ #include "handle.h" #include "thread.h" #include "request.h" +#include "security.h" struct mutex { @@ -72,7 +73,7 @@ static const struct object_ops mutex_ops = static struct mutex *create_mutex( struct directory *root, const struct unicode_str *name, - unsigned int attr, int owned ) + unsigned int attr, int owned, const struct security_descriptor *sd ) { struct mutex *mutex; @@ -85,6 +86,10 @@ static struct mutex *create_mutex( struct directory *root, const struct unicode_ mutex->owner = NULL; mutex->abandoned = 0; if (owned) mutex_satisfied( &mutex->obj, current ); + if (sd) default_set_sd( &mutex->obj, sd, OWNER_SECURITY_INFORMATION| + GROUP_SECURITY_INFORMATION| + DACL_SECURITY_INFORMATION| + SACL_SECURITY_INFORMATION ); } } return mutex; @@ -191,13 +196,24 @@ DECL_HANDLER(create_mutex) struct mutex *mutex; struct unicode_str name; struct directory *root = NULL; + const struct object_attributes *objattr = get_req_data(); + const struct security_descriptor *sd; reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + + if (!objattr_is_valid( objattr, get_req_data_size() )) + return; + + sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; + + /* get unicode string */ + name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); + name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((mutex = create_mutex( root, &name, req->attributes, req->owned ))) + if ((mutex = create_mutex( root, &name, req->attributes, req->owned, sd ))) { reply->handle = alloc_handle( current->process, mutex, req->access, req->attributes ); release_object( mutex ); diff --git a/server/protocol.def b/server/protocol.def index b2ece5e..e486367 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -781,9 +781,8 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; @REQ(create_mutex) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ int owned; /* initially owned? */ - VARARG(name,unicode_str); /* object name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the mutex */ @END diff --git a/server/trace.c b/server/trace.c index dd2ef1e..377d9de 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1191,10 +1191,9 @@ static void dump_create_mutex_request( const struct create_mutex_request *req ) { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); - fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " owned=%d,", req->owned ); - fprintf( stderr, " name=" ); - dump_varargs_unicode_str( cur_size ); + fprintf( stderr, " objattr=" ); + dump_varargs_object_attributes( cur_size ); } static void dump_create_mutex_reply( const struct create_mutex_reply *req )

1 0

Rob Shearman : server: Make create_semaphore use struct object_attributes and set the security descriptor of semaphore objects .
by Alexandre Julliard 26 Oct '07

26 Oct '07

Module: wine Branch: master Commit: b0e5fb4384163324fb81dda800557408745aa718 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e5fb4384163324fb81dda80… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Oct 25 15:42:53 2007 +0100 server: Make create_semaphore use struct object_attributes and set the security descriptor of semaphore objects. --- dlls/ntdll/sync.c | 16 +++++++++++++++- include/wine/server_protocol.h | 5 ++--- server/protocol.def | 3 +-- server/semaphore.c | 24 ++++++++++++++++++++---- server/trace.c | 5 ++--- 5 files changed, 40 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index b2b3069..10a31d1 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -144,23 +144,37 @@ NTSTATUS WINAPI NtCreateSemaphore( OUT PHANDLE SemaphoreHandle, { DWORD len = attr && attr->ObjectName ? attr->ObjectName->Length : 0; NTSTATUS ret; + struct object_attributes objattr; + struct security_descriptor *sd = NULL; if (MaximumCount <= 0 || InitialCount < 0 || InitialCount > MaximumCount) return STATUS_INVALID_PARAMETER; if (len >= MAX_PATH * sizeof(WCHAR)) return STATUS_NAME_TOO_LONG; + objattr.rootdir = attr ? attr->RootDirectory : 0; + objattr.sd_len = 0; + if (attr) + { + ret = create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); + if (ret != STATUS_SUCCESS) return ret; + } + SERVER_START_REQ( create_semaphore ) { req->access = access; req->attributes = (attr) ? attr->Attributes : 0; - req->rootdir = attr ? attr->RootDirectory : 0; req->initial = InitialCount; req->max = MaximumCount; + wine_server_add_data( req, &objattr, sizeof(objattr) ); + if (objattr.sd_len) wine_server_add_data( req, sd, objattr.sd_len ); if (len) wine_server_add_data( req, attr->ObjectName->Buffer, len ); ret = wine_server_call( req ); *SemaphoreHandle = reply->handle; } SERVER_END_REQ; + + free_struct_sd( sd ); + return ret; } diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 312d822..80ee6f6 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -960,10 +960,9 @@ struct create_semaphore_request struct request_header __header; unsigned int access; unsigned int attributes; - obj_handle_t rootdir; unsigned int initial; unsigned int max; - /* VARARG(name,unicode_str); */ + /* VARARG(objattr,object_attributes); */ }; struct create_semaphore_reply { @@ -4880,6 +4879,6 @@ union generic_reply struct set_completion_info_reply set_completion_info_reply; }; -#define SERVER_PROTOCOL_VERSION 318 +#define SERVER_PROTOCOL_VERSION 319 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 41f71ca..b2ece5e 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -812,10 +812,9 @@ enum event_op { PULSE_EVENT, SET_EVENT, RESET_EVENT }; @REQ(create_semaphore) unsigned int access; /* wanted access rights */ unsigned int attributes; /* object attributes */ - obj_handle_t rootdir; /* root directory */ unsigned int initial; /* initial count */ unsigned int max; /* maximum count */ - VARARG(name,unicode_str); /* object name */ + VARARG(objattr,object_attributes); /* object attributes */ @REPLY obj_handle_t handle; /* handle to the semaphore */ @END diff --git a/server/semaphore.c b/server/semaphore.c index af651e9..a8318cd 100644 --- a/server/semaphore.c +++ b/server/semaphore.c @@ -34,6 +34,7 @@ #include "handle.h" #include "thread.h" #include "request.h" +#include "security.h" struct semaphore { @@ -69,7 +70,8 @@ static const struct object_ops semaphore_ops = static struct semaphore *create_semaphore( struct directory *root, const struct unicode_str *name, - unsigned int attr, unsigned int initial, unsigned int max ) + unsigned int attr, unsigned int initial, unsigned int max, + const struct security_descriptor *sd ) { struct semaphore *sem; @@ -85,6 +87,10 @@ static struct semaphore *create_semaphore( struct directory *root, const struct /* initialize it if it didn't already exist */ sem->count = initial; sem->max = max; + if (sd) default_set_sd( &sem->obj, sd, OWNER_SECURITY_INFORMATION| + GROUP_SECURITY_INFORMATION| + DACL_SECURITY_INFORMATION| + SACL_SECURITY_INFORMATION ); } } return sem; @@ -165,13 +171,23 @@ DECL_HANDLER(create_semaphore) struct semaphore *sem; struct unicode_str name; struct directory *root = NULL; + const struct object_attributes *objattr = get_req_data(); + const struct security_descriptor *sd; reply->handle = 0; - get_req_unicode_str( &name ); - if (req->rootdir && !(root = get_directory_obj( current->process, req->rootdir, 0 ))) + + if (!objattr_is_valid( objattr, get_req_data_size() )) + return; + + sd = objattr->sd_len ? (const struct security_descriptor *)(objattr + 1) : NULL; + + /* get unicode string */ + name.len = ((get_req_data_size() - sizeof(*objattr) - objattr->sd_len) / sizeof(WCHAR)) * sizeof(WCHAR); + name.str = (const WCHAR *)get_req_data() + (sizeof(*objattr) + objattr->sd_len) / sizeof(WCHAR); + if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return; - if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max ))) + if ((sem = create_semaphore( root, &name, req->attributes, req->initial, req->max, sd ))) { reply->handle = alloc_handle( current->process, sem, req->access, req->attributes ); release_object( sem ); diff --git a/server/trace.c b/server/trace.c index 4abdb55..dd2ef1e 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1230,11 +1230,10 @@ static void dump_create_semaphore_request( const struct create_semaphore_request { fprintf( stderr, " access=%08x,", req->access ); fprintf( stderr, " attributes=%08x,", req->attributes ); - fprintf( stderr, " rootdir=%p,", req->rootdir ); fprintf( stderr, " initial=%08x,", req->initial ); fprintf( stderr, " max=%08x,", req->max ); - fprintf( stderr, " name=" ); - dump_varargs_unicode_str( cur_size ); + fprintf( stderr, " objattr=" ); + dump_varargs_object_attributes( cur_size ); } static void dump_create_semaphore_reply( const struct create_semaphore_reply *req )

1 0

Alexander Nicolaysen Sørnes : Sort versions by name in application view
by Chris Morgan 25 Oct '07

25 Oct '07

Module: appdb Branch: master Commit: 3a551d606b1113278d6e70c8549b25797d01bc31 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=3a551d606b1113278d6e70c8… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Fri Oct 26 00:13:45 2007 +0200 Sort versions by name in application view --- include/application.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/application.php b/include/application.php index 8daf89e..beba629 100644 --- a/include/application.php +++ b/include/application.php @@ -107,7 +107,7 @@ class Application { $sObsolete = ""; $sQuery = "SELECT versionId FROM appVersion WHERE - appId = '?'$sObsolete"; + appId = '?'$sObsolete ORDER by versionName"; $hResult = query_parameters($sQuery, $this->iAppId); return $hResult; }

1 0

Alexander Nicolaysen Sørnes : vendor: Only show unqueued apps
by Chris Morgan 25 Oct '07

25 Oct '07

Module: appdb Branch: master Commit: 39e2f1d59d1b6ad9e472516c01474a2e89c184e2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=39e2f1d59d1b6ad9e472516c… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 14:59:54 2007 +0200 vendor: Only show unqueued apps --- include/vendor.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/vendor.php b/include/vendor.php index 59919c9..4ec6597 100644 --- a/include/vendor.php +++ b/include/vendor.php @@ -343,7 +343,9 @@ class Vendor { foreach($this->aApplicationsIds as $iAppId) { $oApp = new Application($iAppId); - echo '<li>'.$oApp->objectMakeLink().'</li>',"\n"; + + if($oApp->sQueued == "false") + echo '<li>'.$oApp->objectMakeLink().'</li>',"\n"; } echo '</ol>',"\n"; }

1 0

Alexander Nicolaysen Sørnes : Support previewing version when submitting application
by Chris Morgan 25 Oct '07

25 Oct '07

Module: appdb Branch: master Commit: dba90a092432b392eb3c98d59481821ba40018bb URL: http://source.winehq.org/git/appdb.git/?a=commit;h=dba90a092432b392eb3c98d5… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 11:57:18 2007 +0200 Support previewing version when submitting application --- include/application_queue.php | 44 ++++++++++++++++++++++++++++++++++++++-- include/version.php | 17 +++++++++++---- 2 files changed, 53 insertions(+), 8 deletions(-) diff --git a/include/application_queue.php b/include/application_queue.php index 883e126..93e1171 100644 --- a/include/application_queue.php +++ b/include/application_queue.php @@ -160,7 +160,7 @@ class application_queue return FALSE; } - function outputEditor() + function outputEditor($aClean = array()) { /* We ask the user for the application name first so as to avoid duplicate submissons; a list of potential duplicates is displayed on the next page */ @@ -203,6 +203,23 @@ class application_queue $this->oVersionQueue->oVersion->iVersionId, $aClean); $this->oVersionQueue->oTestDataQueue->outputEditor(); + + /* Allow the user to choose whether to preview the application view + or the version view. Application view is default */ + echo html_frame_start("Select What to Preview"); + $sPreviewVersion = $aClean['bPreviewVersion'] ? $aClean['bPreviewVersion'] : ""; + + $shPreviewApp = ''; + $shPreviewVersion = ''; + + if($sPreviewVersion == "true") + $shPreviewVersion = ' checked="checked"'; + else + $shPreviewApp = ' checked="checked"'; + + echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewApp value=\"false\" /> Preview application<br />\n"; + echo "<input type=\"radio\" name=\"bPreviewVersion\"$shPreviewVersion value=\"true\" /> Preview version\n"; + echo html_frame_end(); } } @@ -297,13 +314,34 @@ class application_queue echo "</table>"; } - function display() + function objectGetCustomVars($sAction) + { + switch($sAction) + { + case "preview": + return array("bPreviewVersion"); + + default: + return 0; + } + } + + function display($aClean = array()) { /* Cache the version object if it is not in the database */ if(!$this->oVersionQueue->objectGetId()) $this->oApp->aVersions = array($this->oVersionQueue->oVersion); - $this->oApp->display(); + $sPreviewVersion = $aClean['bPreviewVersion'] ? $aClean['bPreviewVersion'] : ""; + + if($sPreviewVersion == "true") + { + $this->oVersionQueue->oVersion->oApp = $this->oApp; + $this->oVersionQueue->display(); + } else + { + $this->oApp->display(); + } } function objectMakeUrl() diff --git a/include/version.php b/include/version.php index efa8b72..3b9bd2f 100644 --- a/include/version.php +++ b/include/version.php @@ -26,6 +26,7 @@ define("LICENSE_RETAIL", "Retail"); class version { var $iVersionId; var $iAppId; + var $oApp; /* Parento object */ var $sName; var $sDescription; var $sTestedRelease; @@ -759,6 +760,16 @@ class version { return TRUE; } + /* Not standard OM function yet, but will be in the future */ + public function objectGetParent() + { + /* No id so we can't query the DB, but perhaps an entry is cached? */ + if(!$this->iAppId) + return $this->oApp; + + return new application($this->iAppId); + } + public function display($aVars = array()) { /* is this user supposed to view this version? */ @@ -767,11 +778,7 @@ class version { $iTestingId = $aVars['iTestingId'] ? $aVars['iTestingId'] : 0; - $oApp = new Application($this->iAppId); - - // Oops! application not found or other error. do something - if(!$oApp->iAppId) - util_show_error_page_and_exit('Internal Database Access Error. No App found.'); + $oApp = $this->objectGetParent(); // show Vote Menu if($_SESSION['current']->isLoggedIn())

1 0

Alexander Nicolaysen Sørnes : version: Add and use aTestResults member
by Chris Morgan 25 Oct '07

25 Oct '07

Module: appdb Branch: master Commit: 69d584ed85e1fba3285015d472136cfca5c8dca2 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=69d584ed85e1fba3285015d4… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Thu Oct 25 11:10:32 2007 +0200 version: Add and use aTestResults member --- include/version.php | 42 ++++++++++++++++++++++++++++++------------ include/version_queue.php | 7 +++---- 2 files changed, 33 insertions(+), 16 deletions(-) diff --git a/include/version.php b/include/version.php index 9d97553..efa8b72 100644 --- a/include/version.php +++ b/include/version.php @@ -34,6 +34,9 @@ class version { var $iSubmitterId; var $sQueued; var $sLicense; + var $aTestResults; /* Array of test result objects. Especially useful when + we want to preview a version before submitting it; + in that case there is no data in the database */ var $iObsoleteBy; /* Whether this version is marked as obsolete, and if so which version its votes should be moved to. */ var $iMaintainerRequest; /* Temporary variable for version submisson. @@ -46,6 +49,7 @@ class version { */ public function Version($iVersionId = null, $oRow = null) { + $this->aTestResults = array(); // should always be an array // we are working on an existing version if(!$iVersionId && !$oRow) return; @@ -755,14 +759,13 @@ class version { 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) + public function display($aVars = array()) { /* is this user supposed to view this version? */ if(!$_SESSION['current']->canViewVersion($this)) util_show_error_page_and_exit("Something went wrong with the application or version id"); - $iTestingId = $aVars['iTestingId']; + $iTestingId = $aVars['iTestingId'] ? $aVars['iTestingId'] : 0; $oApp = new Application($this->iAppId); @@ -983,16 +986,17 @@ class version { echo "\t\tSelected test results <small><small>(selected in 'Test Results' table below)</small></small>\n"; echo "\t</div>\n"; - /* oTest may be passed by version_queue to allow previewing a version which does not exist in the database */ - if(!$oTest && $iTestingId) + /* Set if the use chose to display a particular test report */ + if($iTestingId) $oTest = new testData($iTestingId); - - /* if $iTestingId wasn't valid then it won't be valid in $oTest */ - if(!$oTest) + else if($this->iVersionId) /* Let's query for the latest rest report */ { - /* fetch a new test id for this version */ $iTestingId = testData::getNewestTestIdFromVersionId($this->iVersionId); $oTest = new testData($iTestingId); + } else /* Perhaps we have a cached entry? There should be */ + { + $aTests = $this->getTestResults(); + $oTest = $aTests[0]; } echo "<div class='info_contents'>\n"; @@ -1577,9 +1581,14 @@ class version { "From that page you can edit, delete or approve it into the AppDB.</p>\n"; } - public function objectGetChildren() + public function getTestResults() { - $aChildren = array(); + /* If we don't have an id we can query the database, but perhaps we + have some cached entries? */ + if(!$this->iVersionId) + return $this->aTestResults; + + $aTests = array(); /* Find test results */ $sQuery = "SELECT * FROM testResults WHERE versionId = '?'"; @@ -1589,8 +1598,17 @@ class version { return FALSE; while($oRow = mysql_fetch_object($hResult)) + $aTests[] = new testData(0, $oRow); + + return $aTests; + } + + public function objectGetChildren() + { + $aChildren = array(); + + foreach($this->getTestResults() as $oTest) { - $oTest = new testData(0, $oRow); $aChildren += $oTest->objectGetChildren(); $aChildren[] = $oTest; } diff --git a/include/version_queue.php b/include/version_queue.php index e3eaa61..4451586 100644 --- a/include/version_queue.php +++ b/include/version_queue.php @@ -222,10 +222,9 @@ class version_queue function display() { - $aVars = array(); - $aVars['iTestingId'] = 0; - - $this->oVersion->display($aVars, $this->oTestDataQueue->oTestData); + /* Cache the test result object as it's not in the DB */ + $this->oVersion->aTestResults[] = $this->oTestDataQueue->oTestData; + $this->oVersion->display(); } function objectMakeUrl()

1 0

Jeremy Newman : adding an index CGI script for the tools website
by Jeremy Newman 25 Oct '07

25 Oct '07

Module: tools Branch: master Commit: f6524a41508b0c9728111bd0b039c6fad521115c URL: http://source.winehq.org/git/tools.git/?a=commit;h=f6524a41508b0c9728111bd0… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Oct 25 14:16:14 2007 -0500 adding an index CGI script for the tools website --- winetest/site | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 59 insertions(+), 0 deletions(-) diff --git a/winetest/site b/winetest/site new file mode 100755 index 0000000..95dd829 --- /dev/null +++ b/winetest/site @@ -0,0 +1,59 @@ +#!/usr/bin/perl + +# +# WineTest Index Script +# by Jeremy Newman <jnewman(a)codeweavers.com> +# + +# load CGI object +use CGI qw(:standard); +my $q = new CGI; + +# change url based on testing vars +if ($q->param('testing')) { + + # read testing dir + opendir(DIR, "./data/"); + my @files = readdir(DIR); + closedir(DIR); + splice(@files,0,2); + @files = sort {lc($a) cmp lc($b)} @files; + + # get only dirs + my @newFiles = (); + for (my $c = 0; $c < $#files; $c++) { + if (-d "./data/".$files[$c]) { + push(@newFiles, $files[$c]); + } + } + @files = @newFiles; + + # get current pos + my $curPos = 0; + for (my $c = 0; $c < $#files; $c++) { + if ($q->param('current') eq $files[$c]) { + $curPos = $c; + } + } + + # perform redirect based on vars + if ($curPos == 0 and $q->param('testing') eq "prev") { + print "Location: http://test.winehq.org/data/".$files[$#files]."\n\n"; + exit(); + } elsif ($curPos == $#files and $q->param('testing') eq "next") { + print "Location: http://test.winehq.org/data/".$files[0]."\n\n"; + exit(); + } elsif ($q->param('testing') eq "prev" and $files[$curPos - 1]) { + print "Location: http://test.winehq.org/data/".$files[$curPos - 1]."\n\n"; + exit(); + } elsif ($q->param('testing') eq "next" and $files[$curPos + 1]) { + print "Location: http://test.winehq.org/data/".$files[$curPos + 1]."\n\n"; + exit(); + } +} + +# redirect to data dir when no vars present +print "Location: http://test.winehq.org/data/\n\n"; + +# done +exit();

1 0

Andrew Talbot : xcopy: Fix some memory leaks.
by Alexandre Julliard 25 Oct '07

25 Oct '07

Module: wine Branch: master Commit: a8df7fddd54b865564a230e8aa13c45a655e48ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8df7fddd54b865564a230e8a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Wed Oct 24 22:02:43 2007 +0100 xcopy: Fix some memory leaks. --- programs/xcopy/xcopy.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/xcopy/xcopy.c b/programs/xcopy/xcopy.c index a88a0ad..6a1e8bf 100644 --- a/programs/xcopy/xcopy.c +++ b/programs/xcopy/xcopy.c @@ -507,6 +507,7 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, BOOL copiedFile = FALSE; DWORD destAttribs, srcAttribs; BOOL skipFile; + int ret = 0; /* Allocate some working memory on heap to minimize footprint */ finddata = HeapAlloc(GetProcessHeap(), 0, sizeof(WIN32_FIND_DATA)); @@ -718,7 +719,8 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, if (flags & OPT_IGNOREERRORS) { skipFile = TRUE; } else { - return RC_WRITEERROR; + ret = RC_WRITEERROR; + goto cleanup; } } @@ -780,12 +782,14 @@ static int XCOPY_DoCopy(WCHAR *srcstem, WCHAR *srcspec, } } +cleanup: + /* free up memory */ HeapFree(GetProcessHeap(), 0, finddata); HeapFree(GetProcessHeap(), 0, inputpath); HeapFree(GetProcessHeap(), 0, outputpath); - return 0; + return ret; } /* =========================================================================

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2007