January 2007 - Wine-commits

Rob Shearman : rpcrt4: Handle security quality of service flags relevant to the ncacn_np protocol .
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 0debcf5b1e1525b189918458044a6a6b4ddbe604 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0debcf5b1e1525b1899184580… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 19 07:01:23 2007 -0600 rpcrt4: Handle security quality of service flags relevant to the ncacn_np protocol. --- dlls/rpcrt4/rpc_transport.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 7f6d8a2..9c07d7d 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -162,8 +162,33 @@ static RPC_STATUS rpcrt4_conn_open_pipe( TRACE("connecting to %s\n", pname); while (TRUE) { + DWORD dwFlags = 0; + if (Connection->QOS) + { + switch (Connection->QOS->qos->ImpersonationType) + { + dwFlags = SECURITY_SQOS_PRESENT; + case RPC_C_IMP_LEVEL_DEFAULT: + /* FIXME: what to do here? */ + break; + case RPC_C_IMP_LEVEL_ANONYMOUS: + dwFlags |= SECURITY_ANONYMOUS; + break; + case RPC_C_IMP_LEVEL_IDENTIFY: + dwFlags |= SECURITY_IDENTIFICATION; + break; + case RPC_C_IMP_LEVEL_IMPERSONATE: + dwFlags |= SECURITY_IMPERSONATION; + break; + case RPC_C_IMP_LEVEL_DELEGATE: + dwFlags |= SECURITY_DELEGATION; + break; + } + if (Connection->QOS->qos->IdentityTracking == RPC_C_QOS_IDENTIFY_DYNAMIC) + dwFlags |= SECURITY_CONTEXT_TRACKING; + } pipe = CreateFileA(pname, GENERIC_READ|GENERIC_WRITE, 0, NULL, - OPEN_EXISTING, 0, 0); + OPEN_EXISTING, dwFlags, 0); if (pipe != INVALID_HANDLE_VALUE) break; err = GetLastError(); if (err == ERROR_PIPE_BUSY) {

1 0

Rob Shearman : kernel32: Handle the SECURITY_* flags passed into CreateFileW by filling out the SECURITY_QUALITY_OF_SERVICE structure and passing it to NtCreateFile .
by Alexandre Julliard 22 Jan '07

22 Jan '07

Module: wine Branch: master Commit: 8132707bce02a70dab50062d7f038380ed885179 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8132707bce02a70dab50062d7… Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Jan 19 07:00:29 2007 -0600 kernel32: Handle the SECURITY_* flags passed into CreateFileW by filling out the SECURITY_QUALITY_OF_SERVICE structure and passing it to NtCreateFile. Print a fixme in NtCreateFile if the SECURITY_QUALITY_OF_SERVICE structure is specified, since it isn't handled yet. --- dlls/kernel32/file.c | 12 +++++++++++- dlls/ntdll/file.c | 4 ++++ 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 5a0c5cb..f92d37a 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1281,6 +1281,7 @@ HANDLE WINAPI CreateFileW( LPCWSTR filen static const WCHAR bkslashes_with_dotW[] = {'\\','\\','.','\\',0}; static const WCHAR coninW[] = {'C','O','N','I','N','$',0}; static const WCHAR conoutW[] = {'C','O','N','O','U','T','$',0}; + SECURITY_QUALITY_OF_SERVICE qos; static const UINT nt_disposition[5] = { @@ -1406,7 +1407,16 @@ HANDLE WINAPI CreateFileW( LPCWSTR filen attr.Attributes = OBJ_CASE_INSENSITIVE; attr.ObjectName = &nameW; attr.SecurityDescriptor = sa ? sa->lpSecurityDescriptor : NULL; - attr.SecurityQualityOfService = NULL; + if (attributes & SECURITY_SQOS_PRESENT) + { + qos.Length = sizeof(qos); + qos.ImpersonationLevel = (attributes >> 16) & 0x3; + qos.ContextTrackingMode = attributes & SECURITY_CONTEXT_TRACKING ? SECURITY_DYNAMIC_TRACKING : SECURITY_STATIC_TRACKING; + qos.EffectiveOnly = attributes & SECURITY_EFFECTIVE_ONLY ? TRUE : FALSE; + attr.SecurityQualityOfService = &qos; + } + else + attr.SecurityQualityOfService = NULL; if (sa && sa->bInheritHandle) attr.Attributes |= OBJ_INHERIT; diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index a79d227..a9b9142 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -162,6 +162,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha if (attr->ObjectName->Length > sizeof(pipeW) && !memicmpW( attr->ObjectName->Buffer, pipeW, sizeof(pipeW)/sizeof(WCHAR) )) { + if (attr->SecurityQualityOfService) + FIXME("SecurityQualityOfService ignored\n"); SERVER_START_REQ( open_named_pipe ) { req->access = access; @@ -182,6 +184,8 @@ NTSTATUS WINAPI NtCreateFile( PHANDLE ha if (attr->ObjectName->Length > sizeof(mailslotW) && !memicmpW( attr->ObjectName->Buffer, mailslotW, sizeof(mailslotW)/sizeof(WCHAR) )) { + if (attr->SecurityQualityOfService) + FIXME("SecurityQualityOfService ignored\n"); SERVER_START_REQ( open_mailslot ) { req->access = access & GENERIC_WRITE;

1 0

appdb/include version.php
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30905 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/21 12:53:13 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Re-enable voting Patch: http://cvs.winehq.org/patch.py?id=30905 Old revision New revision Changes Path 1.101 1.102 +11 -0 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.101 appdb/include/version.php:1.102 --- appdb/include/version.php:1.101 21 Jan 2007 18:53:13 -0000 +++ appdb/include/version.php 21 Jan 2007 18:53:13 -0000 @@ -698,6 +698,11 @@ class Version { 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"); + + // header apidb_header("Viewing App- ".$oApp->sName." Version - ".$this->sName); @@ -722,6 +727,12 @@ class Version { // main URL echo " <tr class=\"color1\"><td><b>URL</b></td><td>".$appLinkURL."</td></tr>\n"; + // Votes + echo html_tr(array( + "<b>Votes</b>", + vote_count_version_total($this->iVersionId)), + "color0"); + if($this->sTestedRating != "/" && $this->sTestedRating) $sMaintainerColor = $this->sTestedRating; else

1 0

appdb/admin addAppNote.php
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30904 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/21 12:23:48 Modified files: admin : addAppNote.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fixed missed OutputEditor() to outputEditor() reference Patch: http://cvs.winehq.org/patch.py?id=30904 Old revision New revision Changes Path 1.31 1.32 +1 -1 appdb/admin/addAppNote.php Index: appdb/admin/addAppNote.php diff -u -p appdb/admin/addAppNote.php:1.31 appdb/admin/addAppNote.php:1.32 --- appdb/admin/addAppNote.php:1.31 21 Jan 2007 18:23:48 -0000 +++ appdb/admin/addAppNote.php 21 Jan 2007 18:23:48 -0000 @@ -47,7 +47,7 @@ else if($aClean['sSub'] == 'Preview' OR echo "<form method=post action='addAppNote.php'>\n"; - $oNote->OutputEditor(); + $oNote->outputEditor(); echo '<center>'; echo '<input type="submit" name="sSub" value="Preview">&nbsp',"\n";

1 0

appdb/include version.php
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30903 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/21 12:22:41 Modified files: include : version.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Small fixes for license handling - Rename MakeLicenseList to makeLIcenseList - Print the selected argument once - Add optional parameter for matching selected license Patch: http://cvs.winehq.org/patch.py?id=30903 Old revision New revision Changes Path 1.100 1.101 +8 -3 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.100 appdb/include/version.php:1.101 --- appdb/include/version.php:1.100 21 Jan 2007 18:22:41 -0000 +++ appdb/include/version.php 21 Jan 2007 18:22:41 -0000 @@ -609,7 +609,7 @@ class Version { // version license echo html_tr(array( array("<b>License</b>", "class=\"color0\""), - $this->MakeLicenseList())); + $this->makeLicenseList())); // version description echo '<tr valign=top><td class=color0><b>Version description</b></td>',"\n"; @@ -1083,8 +1083,11 @@ class Version { return $sResult; } - function MakeLicenseList() + function makeLicenseList($sLicense = NULL) { + if(!$sLicense) + $sLicense = $this->sLicense; + $sReturn = "<select name=\"sLicense\">\n"; $sReturn .= "<option value=\"\">Choose . . .</option>\n"; $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREEWARE, @@ -1093,8 +1096,10 @@ class Version { for($i = 0; $i < $iMax; $i++) { - if($aLicense[$i] == $this->sLicense) + if($aLicense[$i] == $sLicense) $sSelected = " selected=\"selected\""; + else + $sSelected = ""; $sReturn .= "<option value=\"$aLicense[$i]\"$sSelected>". "$aLicense[$i]</option>\n";

1 0

appdb/ ./index.php ./votestats.php help/voting ...
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30902 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/21 12:06:54 Modified files: . : index.php votestats.php help : voting.help include : application.php util.php version.php vote.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Make votes version specific Patch: http://cvs.winehq.org/patch.py?id=30902 Old revision New revision Changes Path 1.41 1.42 +7 -8 appdb/index.php 1.28 1.29 +13 -9 appdb/votestats.php 1.4 1.5 +8 -10 appdb/help/voting.help 1.88 1.89 +1 -7 appdb/include/application.php 1.79 1.80 +5 -5 appdb/include/util.php 1.99 1.100 +20 -2 appdb/include/version.php 1.24 1.25 +28 -23 appdb/include/vote.php 1.29 1.30 +2 -2 appdb/tables/appdb_tables.sql

1 0

appdb/include version.php
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30901 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/20 22:31:55 Modified files: include : version.php Log message: "Michael Ploujnikov" <ploujj(a)gmail.com> Add a missing space to license WhatChanged Patch: http://cvs.winehq.org/patch.py?id=30901 Old revision New revision Changes Path 1.98 1.99 +1 -1 appdb/include/version.php Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.98 appdb/include/version.php:1.99 --- appdb/include/version.php:1.98 21 Jan 2007 4:31:55 -0000 +++ appdb/include/version.php 21 Jan 2007 4:31:55 -0000 @@ -200,7 +200,7 @@ class Version { $this->sLicense, $this->iVersionId)) return FALSE; - $sWhatChanged .= "License was changed from $oVersion->sLicense to". + $sWhatChanged .= "License was changed from $oVersion->sLicense to ". "$this->sLicense.\n\n"; }

1 0

appdb/ include/version.php tables/appdb_tables.sql
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30900 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/20 18:37:06 Modified files: include : version.php tables : appdb_tables.sql Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Track versions' license Patch: http://cvs.winehq.org/patch.py?id=30900 Old revision New revision Changes Path 1.97 1.98 +60 -6 appdb/include/version.php 1.28 1.29 +1 -0 appdb/tables/appdb_tables.sql Index: appdb/include/version.php diff -u -p appdb/include/version.php:1.97 appdb/include/version.php:1.98 --- appdb/include/version.php:1.97 21 Jan 2007 0:37: 6 -0000 +++ appdb/include/version.php 21 Jan 2007 0:37: 6 -0000 @@ -12,6 +12,12 @@ require_once(BASE."include/util.php"); require_once(BASE."include/testData.php"); require_once(BASE."include/downloadurl.php"); +define("LICENSE_OPENSOURCE", "Open Source"); +define("LICENSE_FREEWARE", "Freeware"); +define("LICENSE_SHAREWARE", "Shareware"); +define("LICENSE_DEMO", "Demo"); +define("LICENSE_RETAIL", "Retail"); + /** * Version class for handling versions. */ @@ -26,6 +32,7 @@ class Version { var $iSubmitterId; var $sDate; var $sQueued; + var $sLicense; var $iMaintainerRequest; /* Temporary variable for version submisson. Indicates whether the user wants to become a maintainer of the version being submitted. @@ -62,6 +69,7 @@ class Version { $this->sTestedRelease = $oRow->maintainer_release; $this->sTestedRating = $oRow->maintainer_rating; $this->sQueued = $oRow->queued; + $this->sLicense = $oRow->license; } } } @@ -82,12 +90,14 @@ class Version { else $this->sQueued = 'false'; - $hResult = query_parameters("INSERT INTO appVersion (versionName, description, maintainer_release,". - "maintainer_rating, appId, submitterId, queued) VALUES ". - "('?', '?', '?', '?', '?', '?', '?')", - $this->sName, $this->sDescription, $this->sTestedRelease, - $this->sTestedRating, $this->iAppId, $_SESSION['current']->iUserId, - $this->sQueued); + $hResult = query_parameters("INSERT INTO appVersion + (versionName, description, maintainer_release, + maintainer_rating, appId, submitterId, queued, license) + VALUES ('?', '?', '?', '?', '?', '?', '?', '?')", + $this->sName, $this->sDescription, $this->sTestedRelease, + $this->sTestedRating, $this->iAppId, + $_SESSION['current']->iUserId, $this->sQueued, + $this->sLicense); if($hResult) { @@ -183,6 +193,17 @@ class Version { $sWhatChanged .= "Version was moved from application ".$oAppBefore->sName." to application ".$oAppAfter->sName.".\n\n"; } + if ($this->sLicense && ($this->sLicense!=$oVersion->sLicense)) + { + if(!query_parameters("UPDATE appVersion SET license = '?' + WHERE versionId = '?'", + $this->sLicense, $this->iVersionId)) + return FALSE; + + $sWhatChanged .= "License was changed from $oVersion->sLicense to". + "$this->sLicense.\n\n"; + } + if($sWhatChanged and !$bSilent) $this->SendNotificationMail("edit",$sWhatChanged); return true; @@ -585,6 +606,11 @@ class Version { echo '<tr valign=top><td class="color0"><b>Version name</b></td>',"\n"; echo '<td><input size="20" type="text" name="sVersionName" value="'.$this->sName.'"></td></tr>',"\n"; + // version license + echo html_tr(array( + array("<b>License</b>", "class=\"color0\""), + $this->MakeLicenseList())); + // version description echo '<tr valign=top><td class=color0><b>Version description</b></td>',"\n"; echo '<td><p><textarea cols="80" rows="20" id="version_editor" name="shVersionDescription">',"\n"; @@ -652,6 +678,7 @@ class Version { $this->sDescription = $aValues['shVersionDescription']; $this->sTestedRating = $aValues['sMaintainerRating']; $this->sTestedRelease = $aValues['sMaintainerRelease']; + $this->sLicense = $aValues['sLicense']; $this->iMaintainerRequest = $aValues['iMaintainerRequest']; } @@ -687,6 +714,10 @@ class Version { echo '<table width="250" border="0" cellpadding="3" cellspacing="1">',"\n"; echo "<tr class=\"color0\" valign=\"top\"><td width=\"100\"> <b>Name</b></td><td width=\"100%\">".$oApp->sName."</td>\n"; echo "<tr class=\"color1\" valign=\"top\"><td><b>Version</b></td><td>".$this->sName."</td></tr>\n"; + echo html_tr(array( + "<b>License</b>", + $this->sLicense), + "color0"); // main URL echo " <tr class=\"color1\"><td><b>URL</b></td><td>".$appLinkURL."</td></tr>\n"; @@ -1033,6 +1064,29 @@ class Version { return $sResult; } + + function MakeLicenseList() + { + $sReturn = "<select name=\"sLicense\">\n"; + $sReturn .= "<option value=\"\">Choose . . .</option>\n"; + $aLicense = array(LICENSE_RETAIL, LICENSE_OPENSOURCE, LICENSE_FREEWARE, + LICENSE_DEMO, LICENSE_SHAREWARE); + $iMax = count($aLicense); + + for($i = 0; $i < $iMax; $i++) + { + if($aLicense[$i] == $this->sLicense) + $sSelected = " selected=\"selected\""; + + $sReturn .= "<option value=\"$aLicense[$i]\"$sSelected>". + "$aLicense[$i]</option>\n"; + } + + $sReturn .= "</select>\n"; + + return $sReturn; + } + } ?> Index: appdb/tables/appdb_tables.sql diff -u -p appdb/tables/appdb_tables.sql:1.28 appdb/tables/appdb_tables.sql:1.29 --- appdb/tables/appdb_tables.sql:1.28 21 Jan 2007 0:37: 6 -0000 +++ appdb/tables/appdb_tables.sql 21 Jan 2007 0:37: 6 -0000 @@ -58,6 +58,7 @@ create table appVersion ( submitTime timestamp(14) NOT NULL, submitterId int(11) NOT NULL default '0', queued enum('true','false','rejected') NOT NULL default 'false', + license enum('Retail','Open Source','Freeware','Demo','Shareware'), key(versionId), index(appId) );

1 0

appdb/. appsubmit.php
by WineHQ 21 Jan '07

21 Jan '07

ChangeSet ID: 30899 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/20 18:10:14 Modified files: . : appsubmit.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Prompt for appname first upon app submission Patch: http://cvs.winehq.org/patch.py?id=30899 Old revision New revision Changes Path 1.62 1.63 +26 -2 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.62 appdb/appsubmit.php:1.63 --- appdb/appsubmit.php:1.62 21 Jan 2007 0:10:14 -0000 +++ appdb/appsubmit.php 21 Jan 2007 0:10:14 -0000 @@ -73,6 +73,22 @@ function newSubmission($errors) echo "<p>After your application has been added, you will be able to submit screenshots for it, post"; echo " messages in its forums or become a maintainer to help others trying to run the application.</p>"; } + +function promptForAppName() +{ + apidb_header("Enter app name"); + + echo "First, please enter the name of the application you wish to add. "; + echo "This will allow you to determine whether there is already an entry for it "; + echo "in the database.\n"; + echo "<form method=\"post\" action=\"".$_SERVER['PHP_SELF']."\">\n"; + echo "<input type=\"text\" name=\"sAppName\" size=\"60\" />\n"; + echo "<input type=\"submit\" value=\"Proceed\" />\n"; + echo "<input type=\"hidden\" name=\"sSub\" value=\"view\" />\n"; + echo "<input type=\"hidden\" name=\"sAppType\" value=\"application\" />\n"; + echo "</form>\n"; +} + //deny access if not logged on if(!$_SESSION['current']->isLoggedIn()) util_show_error_page_and_exit("Insufficient privileges to create application. Are you sure you are logged in?"); @@ -250,8 +266,13 @@ if ($aClean['sSub']) util_redirect_and_exit($_SERVER['PHP_SELF']); } - if ($aClean['sSub'] == 'view') + + if ($aClean['sSub'] == 'view' && + ($aClean['sAppName'] || $aClean['sAppType'] != "application")) { + /* The appname is already entered in the potential duplicates step */ + $oApp->sName = $aClean['sAppName']; + $x = new TableVE("view"); apidb_header("Application Queue"); @@ -394,7 +415,10 @@ if ($aClean['sSub']) echo html_frame_end(" "); apidb_footer(); } - else + else if ($aClean['sSub'] == 'view' && !$aClean['sAppName']) + { + promptForAppName(); + } else { // error no sub! addmsg("Internal Routine Not Found!!", "red");

1 0

appdb/. appsubmit.php
by WineHQ 20 Jan '07

20 Jan '07

ChangeSet ID: 30898 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2007/01/20 16:57:00 Modified files: . : appsubmit.php Log message: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Fix naming of newSubmition Patch: http://cvs.winehq.org/patch.py?id=30898 Old revision New revision Changes Path 1.61 1.62 +3 -3 appdb/appsubmit.php Index: appdb/appsubmit.php diff -u -p appdb/appsubmit.php:1.61 appdb/appsubmit.php:1.62 --- appdb/appsubmit.php:1.61 20 Jan 2007 22:57: 0 -0000 +++ appdb/appsubmit.php 20 Jan 2007 22:57: 0 -0000 @@ -40,7 +40,7 @@ function get_vendor_from_keywords($sKeyw return($aKeywords[$iLastElt]); } -function newSubmition($errors) +function newSubmission($errors) { global $aClean; // show add to queue form @@ -281,7 +281,7 @@ if ($aClean['sSub']) echo "</td></tr></table></div>\n\n"; } else { - newSubmition(''); + newSubmission(''); } // vendor/alt vendor fields // if user selected a predefined vendorId: @@ -336,7 +336,7 @@ if ($aClean['sSub']) echo "</td></tr></table></div>\n\n"; } else { - newSubmition($errors); + newSubmission($errors); } } if(!empty($errors))

1 0