July 2006 - Wine-Commits - list.winehq.org

James Hawkins : advapi32: Add tests for LookupAccountSid.
by Alexandre Julliard July 7, 2006

July 7, 2006

Module: wine Branch: refs/heads/master Commit: ce58c3589ca98cfaeafb5f2b5e8902732483b315 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ce58c3589ca98cfaeafb5f2… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jul 5 19:53:52 2006 -0700 advapi32: Add tests for LookupAccountSid. --- dlls/advapi32/security.c | 12 ++++++------ dlls/advapi32/tests/security.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 0644f15..0a78668 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1485,15 +1485,15 @@ LookupAccountSidA( domain,domainSize,domainSize?*domainSize:0, name_use); - if (accountSize) *accountSize = strlen(ac)+1; + *accountSize = strlen(ac)+1; if (account && (*accountSize > strlen(ac))) strcpy(account, ac); - if (domainSize) *domainSize = strlen(dm)+1; + *domainSize = strlen(dm)+1; if (domain && (*domainSize > strlen(dm))) strcpy(domain,dm); - if (name_use) *name_use = SidTypeUser; + *name_use = SidTypeUser; return TRUE; } @@ -1527,15 +1527,15 @@ LookupAccountSidW( domain,domainSize,domainSize?*domainSize:0, name_use); - if (accountSize) *accountSize = strlenW(ac)+1; + *accountSize = strlenW(ac)+1; if (account && (*accountSize > strlenW(ac))) strcpyW(account, ac); - if (domainSize) *domainSize = strlenW(dm)+1; + *domainSize = strlenW(dm)+1; if (domain && (*domainSize > strlenW(dm))) strcpyW(domain,dm); - if (name_use) *name_use = SidTypeUser; + *name_use = SidTypeUser; return TRUE; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index fe573ea..7c800b9 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -772,6 +772,34 @@ static void test_token_attr(void) } } +static void test_LookupAccountSid(void) +{ + SID_IDENTIFIER_AUTHORITY SIDAuthNT = { SECURITY_NT_AUTHORITY }; + char account[MAX_PATH], domain[MAX_PATH]; + DWORD acc_size, dom_size; + PSID pUsersSid = NULL; + SID_NAME_USE use; + BOOL ret; + + /* native windows crashes if account size, domain size, or name use is NULL */ + + ret = AllocateAndInitializeSid(&SIDAuthNT, 2, SECURITY_BUILTIN_DOMAIN_RID, + DOMAIN_ALIAS_RID_USERS, 0, 0, 0, 0, 0, 0, &pUsersSid); + ok(ret, "AllocateAndInitializeSid failed with error %ld\n", GetLastError()); + + /* try NULL account */ + acc_size = MAX_PATH; + dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, pUsersSid, NULL, &acc_size, domain, &dom_size, &use); + ok(ret, "Expected TRUE, got FALSE\n"); + + /* try NULL domain */ + acc_size = MAX_PATH; + dom_size = MAX_PATH; + ret = LookupAccountSid(NULL, pUsersSid, account, &acc_size, NULL, &dom_size, &use); + ok(ret, "Expected TRUE, got FALSE\n"); +} + START_TEST(security) { init(); @@ -782,4 +810,5 @@ START_TEST(security) test_FileSecurity(); test_AccessCheck(); test_token_attr(); + test_LookupAccountSid(); }

1 0

Dmitry Timoshkov : winex11.drv: Add window style and visibility status to the take focus event trace.
by Alexandre Julliard July 7, 2006

July 7, 2006

Module: wine Branch: refs/heads/master Commit: 8fb90dea3cc8bbfd244aa9e6f6428a2c3744ee08 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=8fb90dea3cc8bbfd244aa9e… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 5 16:57:44 2006 +0900 winex11.drv: Add window style and visibility status to the take focus event trace. --- dlls/winex11.drv/event.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index ae72f16..aa9c1d6 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -424,9 +424,9 @@ static void handle_wm_protocols( HWND hw Time event_time = (Time)event->data.l[1]; HWND last_focus = x11drv_thread_data()->last_focus; - TRACE( "got take focus msg for %p, enabled=%d, focus=%p, active=%p, fg=%p, last=%p\n", - hwnd, IsWindowEnabled(hwnd), GetFocus(), GetActiveWindow(), - GetForegroundWindow(), last_focus ); + TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08lx), focus=%p, active=%p, fg=%p, last=%p\n", + hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), + GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); if (can_activate_window(hwnd)) {

1 0

appdb/. appview.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26259 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 23:51:41 Modified files: . : appview.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Enable filtering in appview.php Patch: http://cvs.winehq.org/patch.py?id=26259 Old revision New revision Changes Path 1.89 1.90 +3 -8 appdb/appview.php Index: appdb/appview.php diff -u -p appdb/appview.php:1.89 appdb/appview.php:1.90 --- appdb/appview.php:1.89 7 Jul 2006 4:51:41 -0000 +++ appdb/appview.php 7 Jul 2006 4:51:41 -0000 @@ -20,6 +20,7 @@ // application environment include("path.php"); require(BASE."include/incl.php"); +require(BASE."include/filter.php"); require(BASE."include/application.php"); require(BASE."include/appdb.php"); require(BASE."include/vote.php"); @@ -29,13 +30,6 @@ require(BASE."include/mail.php"); require(BASE."include/monitor.php"); require_once(BASE."include/testResults.php"); -$aClean = array(); //array of filtered user input - -$aClean['iAppId'] = makeSafe($_REQUEST['iAppId']); -$aClean['iVersionId'] = makeSafe($_REQUEST['iVersionId']); -$aClean['sSub'] = makeSafe($_REQUEST['sSub']); -$aClean['iBuglinkId'] = makeSafe($_REQUEST['iBuglinkId']); - $oApp = new Application($aClean['iAppId']); $oVersion = new Version($aClean['iVersionId']); @@ -94,7 +88,8 @@ function display_bundle($iAppId) echo html_frame_end(); } -if(!is_numeric($aClean['iAppId']) && !is_numeric($aClean['iVersionId'])) +// if both iAppId and iVersionId are empty we have a problem +if(empty($aClean['iAppId']) && empty($aClean['iVersionId'])) util_show_error_page_and_exit("Something went wrong with the application or version id"); if ($aClean['sSub'])

1 0

appdb/include filter.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26258 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 23:49:32 Modified files: include : filter.php Log message: Tony Lambregts <tony.lambregts(a)gmail.com> filter_gpc() should ignore any bugzilla parameters to avoid errors when these cookies are set Patch: http://cvs.winehq.org/patch.py?id=26258 Old revision New revision Changes Path 1.3 1.4 +12 -1 appdb/include/filter.php Index: appdb/include/filter.php diff -u -p appdb/include/filter.php:1.3 appdb/include/filter.php:1.4 --- appdb/include/filter.php:1.3 7 Jul 2006 4:49:32 -0000 +++ appdb/include/filter.php 7 Jul 2006 4:49:32 -0000 @@ -42,8 +42,19 @@ function filter_gpc() util_show_error_page_and_exit("Fatal error: ".$aKeys[$i]." should be an array."); break; default: - if($aKeys[$i]!="whq_appdb" && $aKeys[$i]!="MAX_FILE_SIZE") // whq_appdb is the name of the session cookie + if($aKeys[$i]!="whq_appdb" && // don't filter the appdb session cookie + + // or any bugzilla cookies + $aKeys[$i]!="BUGLIST" && + $aKeys[$i]!="DEFAULTFORMAT" && + $aKeys[$i]!="Bugzilla_login" && + $aKeys[$i]!="LASTORDER" && + $aKeys[$i]!="Bugzilla_logincookie" && + $aKeys[$i]!="DEFAULTFORMAT" && + $aKeys[$i]!="MAX_FILE_SIZE") + { util_show_error_page_and_exit("Fatal error: type of variable ".$aKeys[$i]." is not recognized."); + } break; } }

1 0

appdb/include incl.php
by WineHQ July 7, 2006

July 7, 2006

ChangeSet ID: 26257 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 21:36:34 Modified files: include : incl.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Add backwards compatibility code to copy old style $_REQUEST variables to the new style to allow old appdb urls in emails, in bugzilla and from google to continue working Patch: http://cvs.winehq.org/patch.py?id=26257 Old revision New revision Changes Path 1.32 1.33 +43 -0 appdb/include/incl.php Index: appdb/include/incl.php diff -u -p appdb/include/incl.php:1.32 appdb/include/incl.php:1.33 --- appdb/include/incl.php:1.32 7 Jul 2006 2:36:34 -0000 +++ appdb/include/incl.php 7 Jul 2006 2:36:34 -0000 @@ -34,6 +34,49 @@ if(get_magic_quotes_gpc()) exit; } +/** + * rename $_REQUEST variables to preserve backwards compatibility + * with bugzilla links and urls in emails and on google from before our + * mass rename of GPC variables to use our coding standard prefixing + * + * NOTE: we may be able to remove these backwareds compatibility changes + * in a few years, check in mid 2007 to see how many old + * links are still poping up in google then + */ +if(isset($_REQUEST['versionId'])) +{ + $_REQUEST['iVersionId'] = $_REQUEST['versionId']; + unset($_REQUEST['versionId']); +} +if(isset($_REQUEST['appId'])) +{ + $_REQUEST['iAppId'] = $_REQUEST['appId']; + unset($_REQUEST['appId']); +} +if(isset($_REQUEST['buglinkId'])) +{ + $_REQUEST['iBuglinkId'] = $_REQUEST['buglinkId']; + unset($_REQUEST['buglinkId']); +} +if(isset($_REQUEST['catId'])) +{ + $_REQUEST['iCatId'] = $_REQUEST['catId']; + unset($_REQUEST['catId']); +} +if(isset($_REQUEST['sub'])) +{ + $_REQUEST['sSub'] = $_REQUEST['sub']; + unset($_REQUEST['sub']); +} +if(isset($_REQUEST['topic'])) +{ + $_REQUEST['sTopic'] = $_REQUEST['topic']; + unset($_REQUEST['topic']); +} +/* End backwards compatibility code */ + + + // create arrays $sidebar_func_list = array(); $help_list = array();

1 0

appdb/include comment.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26256 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 18:49:51 Modified files: include : comment.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Switch a few more variables over to the new naming scheme, fix deleting comments and replying to comments Patch: http://cvs.winehq.org/patch.py?id=26256 Old revision New revision Changes Path 1.24 1.25 +4 -4 appdb/include/comment.php Index: appdb/include/comment.php diff -u -p appdb/include/comment.php:1.24 appdb/include/comment.php:1.25 --- appdb/include/comment.php:1.24 6 Jul 2006 23:49:51 -0000 +++ appdb/include/comment.php 6 Jul 2006 23:49:51 -0000 @@ -238,7 +238,7 @@ function view_app_comment($oRow) // reply post buttons echo " [<a href=\"addcomment.php?iAppId=$oRow->appId&iVersionId=$oRow->versionId\"><small>post new</small></a>] \n"; echo " [<a href=\"addcomment.php?iAppId=$oRow->appId&iVersionId=$oRow->versionId&sSubject=". - urlencode("$subject")."&thread=$oRow->commentId\"><small>reply to this</small></a>] \n"; + urlencode("$subject")."&iThread=$oRow->commentId\"><small>reply to this</small></a>] \n"; echo "</td></tr>\n"; @@ -248,8 +248,8 @@ function view_app_comment($oRow) || $_SESSION['current']->isSuperMaintainer($oRow->appId)) { echo "<tr>"; - echo "<td><form method=\"post\" name=\"message\" action=\"".BASE."deletecomment.php\"><input type=\"submit\" value=\"Delete\" class=\"button\">\n"; - echo "<input type=\"hidden\" name=\"commentId\" value=\"$oRow->commentId\" />"; + echo "<td><form method=\"post\" name=\"sMessage\" action=\"".BASE."deletecomment.php\"><input type=\"submit\" value=\"Delete\" class=\"button\">\n"; + echo "<input type=\"hidden\" name=\"iCommentId\" value=\"$oRow->commentId\" />"; echo "</form>\n"; echo "</td></tr>"; } @@ -329,7 +329,7 @@ function do_display_comments_threaded($h view_app_comment($oRow); } else { - echo '<li><a href="commentview.php?iAppId='.$oRow->appId.'&iVersionId='.$oRow->versionId.'&threadId='.$oRow->parentId.'"> '. + echo '<li><a href="commentview.php?iAppId='.$oRow->appId.'&iVersionId='.$oRow->versionId.'&iThreadId='.$oRow->parentId.'"> '. $oRow->subject.' </a> by '.forum_lookup_user($oRow->userId).' on '.$oRow->time.' </li>'."\n"; }

1 0

appdb/. addcomment.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26255 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 18:44:52 Modified files: . : addcomment.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Fix adding new comments. We were using 'body' instead of 'sBody' Patch: http://cvs.winehq.org/patch.py?id=26255 Old revision New revision Changes Path 1.29 1.30 +1 -1 appdb/addcomment.php Index: appdb/addcomment.php diff -u -p appdb/addcomment.php:1.29 appdb/addcomment.php:1.30 --- appdb/addcomment.php:1.29 6 Jul 2006 23:44:52 -0000 +++ appdb/addcomment.php 6 Jul 2006 23:44:52 -0000 @@ -77,7 +77,7 @@ if(!empty($aClean['sBody'])) echo " <td> ".$_SESSION['current']->sRealname."</td></tr>\n"; echo "<tr class=\"color0\"><td align=right><b>Subject:</b> </td>\n"; echo " <td> <input type=\"text\" size=\"35\" name=\"sSubject\" value=\"".$aClean['sSubject']."\" /> </td></tr>\n"; - echo "<tr class=\"color1\"><td colspan=2><textarea name=\"body\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$aClean['sBody']."</textarea></td></tr>\n"; + echo "<tr class=\"color1\"><td colspan=2><textarea name=\"sBody\" cols=\"70\" rows=\"15\" wrap=\"virtual\">".$aClean['sBody']."</textarea></td></tr>\n"; echo "<tr class=\"color1\"><td colspan=2 align=center>\n"; echo " <input type=\"submit\" value=\"Post Comment\" class=\"button\" />\n"; echo " <input type=\"reset\" value=\"Reset\" class=\"button\" />\n";

1 0

appdb/include application.php
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26254 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 17:35:01 Modified files: include : application.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Remove require_once("mail.php") that was causing mail.php to be duplicately included. A cleaner fix is necessary Patch: http://cvs.winehq.org/patch.py?id=26254 Old revision New revision Changes Path 1.59 1.60 +0 -1 appdb/include/application.php Index: appdb/include/application.php diff -u -p appdb/include/application.php:1.59 appdb/include/application.php:1.60 --- appdb/include/application.php:1.59 6 Jul 2006 22:35: 1 -0000 +++ appdb/include/application.php 6 Jul 2006 22:35: 1 -0000 @@ -7,7 +7,6 @@ require_once(BASE."include/version.php") require_once(BASE."include/vendor.php"); require_once(BASE."include/url.php"); require_once(BASE."include/util.php"); -require_once(BASE."include/mail.php"); /** * Application class for handling applications.

1 0

appdb/ admin/adminMaintainerQueue.php include/ ...
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26253 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 17:08:37 Modified files: admin : adminMaintainerQueue.php include : application.php maintainer.php sidebar_login.php user.php unit_test : test_user.php Log message: Chris Morgan <cmorgan(a)alum.wpi.edu> Move getAppsFromUserId() to user::getAppsMaintained(). Also implement a unit test for user::getAppsMaintained() Patch: http://cvs.winehq.org/patch.py?id=26253 Old revision New revision Changes Path 1.28 1.29 +2 -1 appdb/admin/adminMaintainerQueue.php 1.58 1.59 +1 -0 appdb/include/application.php 1.10 1.11 +0 -23 appdb/include/maintainer.php 1.15 1.16 +1 -1 appdb/include/sidebar_login.php 1.75 1.76 +23 -0 appdb/include/user.php 1.3 1.4 +82 -0 appdb/unit_test/test_user.php

1 0

appdb/ ./account.php ./addcomment.php ./appbro ...
by WineHQ July 6, 2006

July 6, 2006

ChangeSet ID: 26252 CVSROOT: /opt/cvs-commit Module name: appdb Changes by: wineowner(a)winehq.org 2006/07/06 13:44:57 Modified files: . : account.php addcomment.php appbrowse.php appimage.php appsubmit.php appview.php commentview.php deletecomment.php distributionView.php maintainerdelete.php maintainersubmit.php preferences.php screenshots.php testResults.php vendorview.php viewbugs.php admin : addAppNote.php addCategory.php adminAppDataQueue.php adminAppQueue.php adminBugs.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 resubmitRejectedApps.php include : application.php filter.php incl.php util.php version.php vote.php Log message: Jonathan Ernst <jonathan(a)ernstfamily.ch> Rename util_show_error_page() to util_show_error_page_and_exit() and redirect() to util_redirect_and_exit() so it is explicit that we exit in those functions that so we know it isn't necessary to put an exit after we call them Patch: http://cvs.winehq.org/patch.py?id=26252 Old revision New revision Changes Path 1.29 1.30 +6 -6 appdb/account.php 1.28 1.29 +2 -2 appdb/addcomment.php 1.18 1.19 +1 -1 appdb/appbrowse.php 1.22 1.23 +2 -2 appdb/appimage.php 1.48 1.49 +7 -7 appdb/appsubmit.php 1.88 1.89 +7 -7 appdb/appview.php 1.11 1.12 +1 -1 appdb/commentview.php 1.27 1.28 +2 -2 appdb/deletecomment.php 1.14 1.15 +2 -2 appdb/distributionView.php 1.21 1.22 +1 -1 appdb/maintainerdelete.php 1.29 1.30 +2 -2 appdb/maintainersubmit.php 1.30 1.31 +2 -2 appdb/preferences.php 1.36 1.37 +1 -1 appdb/screenshots.php 1.9 1.10 +4 -4 appdb/testResults.php 1.19 1.20 +2 -2 appdb/vendorview.php 1.7 1.8 +1 -1 appdb/viewbugs.php 1.27 1.28 +2 -2 appdb/admin/addAppNote.php 1.13 1.14 +2 -2 appdb/admin/addCategory.php 1.27 1.28 +3 -3 appdb/admin/adminAppDataQueue.php 1.62 1.63 +10 -10 appdb/admin/adminAppQueue.php 1.8 1.9 +2 -2 appdb/admin/adminBugs.php 1.27 1.28 +2 -2 appdb/admin/adminMaintainerQueue.php 1.24 1.25 +1 -1 appdb/admin/adminMaintainers.php 1.11 1.12 +2 -2 appdb/admin/adminScreenshots.php 1.9 1.10 +3 -3 appdb/admin/adminTestResults.php 1.11 1.12 +1 -1 appdb/admin/adminUsers.php 1.19 1.20 +7 -7 appdb/admin/deleteAny.php 1.40 1.41 +4 -4 appdb/admin/editAppFamily.php 1.26 1.27 +3 -3 appdb/admin/editAppNote.php 1.38 1.39 +3 -3 appdb/admin/editAppVersion.php 1.13 1.14 +1 -1 appdb/admin/editBundle.php 1.7 1.8 +2 -2 appdb/admin/editDistribution.php 1.13 1.14 +2 -2 appdb/admin/editVendor.php 1.7 1.8 +3 -3 appdb/admin/moveAppVersion.php 1.5 1.6 +1 -1 appdb/admin/resubmitRejectedApps.php 1.57 1.58 +1 -1 appdb/include/application.php 1.2 1.3 +4 -4 appdb/include/filter.php 1.31 1.32 +0 -10 appdb/include/incl.php 1.65 1.66 +10 -1 appdb/include/util.php 1.65 1.66 +3 -3 appdb/include/version.php 1.21 1.22 +4 -4 appdb/include/vote.php

1 0