Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[weiden] 20993: validate the ACLs and SIDs after capturing them in SeCaptureSecurityDescriptor()

by weiden＠svn.reactos.org

validate the ACLs and SIDs after capturing them in SeCaptureSecurityDescriptor() Modified: trunk/reactos/ntoskrnl/se/sd.c _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2006-01-22 23:17:50 UTC (rev 20992) +++ trunk/reactos/ntoskrnl/se/sd.c 2006-01-22 23:28:05 UTC (rev 20993) @@ -372,8 +372,7 @@ PAGED_CODE(); if(CapturedSecurityQualityOfService != NULL && - (AccessMode != KernelMode || - (AccessMode == KernelMode && CaptureIfKernel))) + (AccessMode != KernelMode || CaptureIfKernel)) { ExFreePool(CapturedSecurityQualityOfService); } @@ -551,10 +550,6 @@ ProbeForRead(SidType, \ SidType##Size, \ sizeof(ULONG)); \ - if(!RtlValidSid(SidType)) \ - { \ - Status = STATUS_INVALID_SID; \ - } \ } \ _SEH_HANDLE \ { \ @@ -600,10 +595,6 @@ ProbeForRead(AclType, \ AclType##Size, \ sizeof(ULONG)); \ - if(!RtlValidAcl(AclType)) \ - { \ - Status = STATUS_INVALID_ACL; \ - } \ } \ _SEH_HANDLE \ { \ @@ -648,8 +639,10 @@ { /* setup the offsets and copy the SIDs and ACLs to the new self-relative security descriptor. Probing the pointers is not - neccessary anymore as we did that when collecting the sizes! */ -#define CopySIDOrACL(Type) \ + neccessary anymore as we did that when collecting the sizes! + Make sure to validate the SIDs and ACLs *again* as they could have + been modified in the meanwhile! */ +#define CopySID(Type) \ do { \ if(DescriptorCopy.Type != NULL) \ { \ @@ -658,14 +651,38 @@ (ULONG_PTR)NewDescriptor->Type), \ DescriptorCopy.Type, \ Type##Size); \ + if (!RtlValidSid((PSID)((ULONG_PTR)NewDescriptor + \ + (ULONG_PTR)NewDescriptor->Type))) \ + { \ + RtlRaiseStatus(STATUS_INVALID_SID); \ + } \ Offset += ROUND_UP(Type##Size, sizeof(ULONG)); \ } \ } while(0) - CopySIDOrACL(Owner); - CopySIDOrACL(Group); - CopySIDOrACL(Sacl); - CopySIDOrACL(Dacl); + CopySID(Owner); + CopySID(Group); + +#define CopyACL(Type) \ + do { \ + if(DescriptorCopy.Type != NULL) \ + { \ + NewDescriptor->Type = (PVOID)Offset; \ + RtlCopyMemory((PVOID)((ULONG_PTR)NewDescriptor + \ + (ULONG_PTR)NewDescriptor->Type), \ + DescriptorCopy.Type, \ + Type##Size); \ + if (!RtlValidAcl((PACL)((ULONG_PTR)NewDescriptor + \ + (ULONG_PTR)NewDescriptor->Type))) \ + { \ + RtlRaiseStatus(STATUS_INVALID_ACL); \ + } \ + Offset += ROUND_UP(Type##Size, sizeof(ULONG)); \ + } \ + } while(0) + + CopyACL(Sacl); + CopyACL(Dacl); } _SEH_HANDLE {

18 years, 11 months

[cwittich] 20992: set TBSTYLE_FLAT

by cwittich＠svn.reactos.org

set TBSTYLE_FLAT fixed ToolBar size fixed Rebar (does not work on ROS yet) Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/subsys/system/explorer/shell/mainframe.cpp --- trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-22 23:16:30 UTC (rev 20991) +++ trunk/reactos/subsys/system/explorer/shell/mainframe.cpp 2006-01-22 23:17:50 UTC (rev 20992) @@ -176,9 +176,9 @@ _htoolbar = CreateToolbarEx(hwnd, #ifndef _NO_REBAR - CCS_NOPARENTALIGN|CCS_NORESIZE| + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER| #endif - WS_CHILD|WS_VISIBLE, IDW_TOOLBAR, 2, g_Globals._hInstance, IDB_TOOLBAR, + WS_CHILD|TBSTYLE_FLAT|WS_VISIBLE, IDW_TOOLBAR, 2, g_Globals._hInstance, IDB_TOOLBAR, toolbarBtns, sizeof(toolbarBtns)/sizeof(TBBUTTON), 16, 15, 16, 15, sizeof(TBBUTTON)); @@ -222,8 +222,8 @@ #ifndef _NO_REBAR _hwndrebar = CreateWindowEx(WS_EX_TOOLWINDOW, REBARCLASSNAME, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN| - RBS_VARHEIGHT|RBS_AUTOSIZE|RBS_DBLCLKTOGGLE| - CCS_NODIVIDER|CCS_NOPARENTALIGN, + RBS_VARHEIGHT|RBS_DBLCLKTOGGLE| + WS_BORDER|RBS_AUTOSIZE|RBS_BANDBORDERS, 0, 0, 0, 0, _hwnd, 0, g_Globals._hInstance, 0); int btn_hgt = HIWORD(SendMessage(_htoolbar, TB_GETBUTTONSIZE, 0, 0)); @@ -246,7 +246,7 @@ rbBand.lpText = NULL;//TEXT("Toolbar"); rbBand.hwndChild = _htoolbar; rbBand.cxMinChild = 0; - rbBand.cyMinChild = btn_hgt + 4; + rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif @@ -283,8 +283,12 @@ return true; case WM_SHOWWINDOW: - if (wparam) // trigger child resizing after window creation - now we can succesfully call IsWindowVisible() + if (wparam) // trigger child resizing after window creation - now we can succesfully call IsWindowVisible() + { + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); resize_frame_client(); + } return false; // goto def; case WM_CLOSE: @@ -295,10 +299,13 @@ case WM_DESTROY: break; - case WM_SIZE: - resize_frame(LOWORD(lparam), HIWORD(lparam)); - break; // do not pass message to DefFrameProc + case WM_SIZE:{ + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); + MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); + //resize_frame(LOWORD(lparam), HIWORD(lparam)); + break;} // do not pass message to DefFrameProc + case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam; @@ -467,7 +474,8 @@ { switch(pnmh->code) { // resize children windows when the rebar size changes - case RBN_AUTOSIZE: + + case RBN_AUTOSIZE: resize_frame_client(); break; @@ -525,9 +533,9 @@ RECT rect = {0, 0, cx, cy}; if (_hwndrebar) { - int height = ClientRect(_hwndrebar).bottom; - MoveWindow(_hwndrebar, rect.left, rect.top, rect.right-rect.left, height, TRUE); + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; + rect.top += 4; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -730,13 +738,13 @@ #ifndef _NO_REBAR _hextrabar = CreateToolbarEx(hwnd, - CCS_NOPARENTALIGN|CCS_NORESIZE| - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER| + WS_CHILD|TBSTYLE_FLAT|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, IDW_EXTRABAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, NULL, 0, - 16, 13, 16, 13, sizeof(TBBUTTON)); + 16, 15, 16, 15, sizeof(TBBUTTON)); #else _hextrabar = CreateToolbarEx(hwnd, - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST,CCS_NODIVIDER| IDW_EXTRABAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, &extraBtns, 1, 16, 13, 16, 13, sizeof(TBBUTTON)); #endif @@ -799,13 +807,13 @@ #ifndef _NO_REBAR _hdrivebar = CreateToolbarEx(hwnd, - CCS_NOPARENTALIGN|CCS_NORESIZE| - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + CCS_NOPARENTALIGN|CCS_NORESIZE|CCS_NODIVIDER| + WS_CHILD|WS_VISIBLE|TBSTYLE_FLAT|CCS_NOMOVEY|TBSTYLE_LIST, IDW_DRIVEBAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, NULL, 0, - 16, 13, 16, 13, sizeof(TBBUTTON)); + 16, 15, 16, 15, sizeof(TBBUTTON)); #else _hdrivebar = CreateToolbarEx(hwnd, - WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST, + WS_CHILD|WS_VISIBLE|CCS_NOMOVEY|TBSTYLE_LIST|CCS_NODIVIDER, IDW_DRIVEBAR, 2, g_Globals._hInstance, IDB_DRIVEBAR, &drivebarBtn, 1, 16, 13, 16, 13, sizeof(TBBUTTON)); #endif @@ -856,7 +864,7 @@ rbBand.lpText = TEXT("Extras"); rbBand.hwndChild = _hextrabar; rbBand.cxMinChild = 0; - rbBand.cyMinChild = btn_hgt + 4; + rbBand.cyMinChild = btn_hgt; rbBand.cx = 284; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); @@ -865,7 +873,7 @@ rbBand.lpText = TEXT("Drives"); rbBand.hwndChild = _hdrivebar; rbBand.cxMinChild = 0; - rbBand.cyMinChild = btn_hgt + 4; + rbBand.cyMinChild = btn_hgt; rbBand.cx = 400; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand); #endif @@ -1205,9 +1213,9 @@ RECT rect = {0, 0, cx, cy}; if (_hwndrebar) { - int height = ClientRect(_hwndrebar).bottom; - MoveWindow(_hwndrebar, rect.left, rect.top, rect.right-rect.left, height, TRUE); + int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); rect.top += height; + rect.top += 4; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0); @@ -1566,8 +1574,8 @@ if (_hwndrebar) { int height = ClientRect(_hwndrebar).bottom; - MoveWindow(_hwndrebar, rect.left, rect.top, rect.right-rect.left, height, TRUE); rect.top += height; + rect.top += 4; } else { if (IsWindowVisible(_htoolbar)) { SendMessage(_htoolbar, WM_SIZE, 0, 0);

18 years, 11 months

[gvg] 20991: Serendipity blog software import

by gvg＠svn.reactos.org

Serendipity blog software import Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php Added: trunk/web/reactos.org/htdocs/serendipity/ Added: trunk/web/reactos.org/htdocs/serendipity/.htaccess Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc. php Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_de.inc.php Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_pt.inc.php Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/serendipity_plugin_activeauthors.php Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/serendipity_plugin_roscmsaccount.php Added: trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/commentform.tp l Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/comments.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/config.inc.php Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/entries.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick bg.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick bgcolor.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick bgwide.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick footer.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick header.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick logo.jpg Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/images/kubrick portrait.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/back.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/down.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/forward.pn g Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/img/up.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/index.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/info.txt Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/lang_de.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/lang_en.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/lang_ko.inc.ph p Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/preview.png Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/sidebar.tpl Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/style.css Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/style.css.orig Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/trackbacks.tpl _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_check.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -35,15 +35,19 @@ require_once("subsys_bugzilla.php"); require_once("subsys_phpbb.php"); require_once("subsys_wiki.php"); +require_once("subsys_blogs.php"); ?> <div class="contentSmall"> <span class="contentSmallTitle">Admin Interface - Check Subsystem Consistency</span> <?php $inconsistency_count = 0; +/* $inconsistency_count += subsys_bugzilla_check(); $inconsistency_count += subsys_phpbb_check(); $inconsistency_count += subsys_wiki_check(); +*/ +$inconsistency_count += subsys_blogs_check(); ?> <h2>Total</h2> <?php _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php --- trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/admin_subsys_fix.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -1,23 +1,5 @@ <?php - /* - RosCMS - ReactOS Content Management System - Copyright (C) 2005 Ge van Geldorp <gvg(a)reactos.org> - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - // To prevent hacking activity: if ( !defined('ROSCMS_SYSTEM') OR !defined('ROSCMS_SYSTEM_ADMIN') ) { @@ -35,6 +17,7 @@ require_once("subsys_bugzilla.php"); require_once("subsys_phpbb.php"); require_once("subsys_wiki.php"); +require_once("subsys_blogs.php"); ?> @@ -61,6 +44,10 @@ { $fix_count += subsys_wiki_fix_all(); } +if ($subsys == 'blogs' || $subsys == 'all') + { + $fix_count += subsys_blogs_fix_all(); + } ?> <h2>Total</h2> <?php _____ Added: trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_blogs.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,402 @@ +<?php + +// To prevent hacking activity: +if ( !defined('ROSCMS_SYSTEM')) +{ + if ( !defined('ROSCMS_SYSTEM_LOG') ) { + define ("ROSCMS_SYSTEM_LOG", "Hacking attempt"); + } + $seclog_section="subsys_blogs"; + $seclog_level="50"; + $seclog_reason="Hacking attempt: subsys_blogs.php"; + define ("ROSCMS_SYSTEM", "Hacking attempt"); + include('securitylog.php'); // open security log + die("Hacking attempt"); +} + +require_once("subsys_utils.php"); + +define('SUBSYS_BLOGS_DBNAME', "blogs"); + +function subsys_blogs_info_check() +{ + $inconsistency_count = 0; + $query = "SELECT u.user_id, u.user_name, u.user_fullname, u.user_email, " . + " b.username, b.realname, b.email " . + " FROM users u, " . + " subsys_mappings m, " . + SUBSYS_BLOGS_DBNAME . ".ser_authors b " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs' " . + " AND b.authorid = m.map_subsys_userid " . + " AND (u.user_name != b.username OR " . + " u.user_fullname != b.realname OR " . + " u.user_email != b.email) "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #1)"); + while ($result_row = mysql_fetch_array($query_set)) + { + echo "Info mismatch for RosCMS userid " . $result_row['user_id'] . ": "; + if ($result_row['user_name'] <> $result_row['username']) + { + echo "user_login " . $result_row['user_name'] . "/" . + $result_row['username'] . " "; + } + if ($result_row['user_email'] <> $result_row['email']) + { + echo "user_email " . $result_row['user_email'] . "/" . + $result_row['email']; + } + if ($result_row['user_fullname'] <> $result_row['realname']) + { + echo "user_fullname " . $result_row['user_fullname'] . "/" . + $result_row['realname']; + } + echo "<br>\n"; + $inconsistency_count++; + } + + return $inconsistency_count; +} + +function subsys_blogs_mapping_check() +{ + $inconsistency_count = 0; + $query = "SELECT u.user_id " . + " FROM users u, " . + " usergroup_members ug " . + " WHERE ug.usergroupmember_usergroupid = 'developer' " . + " AND ug.usergroupmember_userid = u.user_id " . + " AND u.user_id NOT IN " . + " (SELECT m.map_roscms_userid " . + " FROM subsys_mappings m " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs') "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #4)"); + while ($result_row = mysql_fetch_array($query_set)) + { + echo "No mapping of RosCMS userid " . $result_row['user_id'] . + "<br>\n"; + $inconsistency_count++; + } + + return $inconsistency_count; +} + + +function subsys_blogs_check() +{ +?> +<h2>Blogs</h2> +<?php + $inconsistency_count = 0; + $inconsistency_count += subsys_blogs_mapping_check(); + $inconsistency_count += subsys_userids_exist('blogs', + SUBSYS_BLOGS_DBNAME . + '.ser_authors', + 'authorid'); + $inconsistency_count += subsys_blogs_info_check(); + + $fix_url = htmlentities('?page=admin&sec=subsys&sec2=fix&subsys=blogs'); + if (0 == $inconsistency_count) + { + echo "No problems found.<br/>\n"; + } + else if (1 == $inconsistency_count) + { + echo '<br />1 problem found. <a href="' . $fix_url . + '">Fix this</a><br/>' . "\n"; + } + else + { + echo "<br />$inconsistency_count problems found." . + ' <a href="' . $fix_url . '">Fix these</a><br/>' . "\n"; + } + + return $inconsistency_count; +} + +function subsys_blogs_update_blogs($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email, + $blogs_user_id) +{ + /* Make sure that the email address and/or user name are not already in + use in blogs */ + $query = "SELECT COUNT(*) AS inuse " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " WHERE (LOWER(username) = LOWER('" . + mysql_real_escape_string($roscms_user_name) . "') OR " . + " LOWER(email) = LOWER('" . + mysql_real_escape_string($roscms_user_email) . "')) " . + " AND authorid <> $blogs_user_id "; + $blogs_check_set = mysql_query($query) + or die("DB error (subsys_blogs #7)"); + $blogs_check_row = mysql_fetch_array($blogs_check_set); + if (0 != $blogs_check_row['inuse']) + { + echo "User name ($roscms_user_name) and/or email address " . + "($roscms_user_email) collision<br>\n"; + return FALSE; + } + + /* Now, make sure that info in blogs matches info in roscms */ + $query = "UPDATE " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " SET realname = '" . + mysql_real_escape_string($roscms_user_fullname) . "', " . + " username = '" . + mysql_real_escape_string($roscms_user_name) . "', " . + " email = '" . + mysql_real_escape_string($roscms_user_email) . "' " . + " WHERE authorid = $blogs_user_id"; + mysql_query($query) or die("DB error (subsys_blogs #8)"); + + return TRUE; +} + +function subsys_blogs_add_blogs_user($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email) +{ + $query = "INSERT INTO " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " (realname, username, email) " . + "VALUES (" . + " '" . mysql_real_escape_string($roscms_user_fullname) . "', " . + " '" . mysql_real_escape_string($roscms_user_name) . "', " . + " '" . mysql_real_escape_string($roscms_user_email) . "') "; + mysql_query($query) or die("DB error (subsys_phpbb #17)"); + + /* Add user to Developers group */ + $query = "INSERT INTO " . SUBSYS_BLOGS_DBNAME . ".ser_authorgroups " . + " (groupid, authorid) " . + "SELECT id, LAST_INSERT_ID() " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_groups " . + " WHERE LOWER(name) = 'developer' "; + mysql_query($query) or die("DB error (subsys_phpbb #18)"); + + /* Finally, insert a row in the mapping table */ + $query = "INSERT INTO subsys_mappings " . + " (map_roscms_userid, map_subsys_name, map_subsys_userid) " . + " VALUES($roscms_user_id, 'blogs', LAST_INSERT_ID())"; + mysql_query($query) or die("DB error (subsys_phpbb #11)"); + + return TRUE; +} + +function subsys_blogs_add_mapping($roscms_user_id) +{ + if (! subsys_get_roscms_info($roscms_user_id, + $roscms_user_name, + $roscms_user_email, + $roscms_user_fullname, + $roscms_user_password, + $roscms_user_register)) + { + return FALSE; + } + + /* First, try to match on email address */ + $query = "SELECT authorid " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " WHERE LOWER(email) = LOWER('" . + mysql_real_escape_string($roscms_user_email) . "')"; + $blogs_email_set = mysql_query($query) + or die("DB error (subsys_blogs #5)"); + if ($blogs_email_row = mysql_fetch_array($blogs_email_set)) + { + $blogs_user_id = $blogs_email_row['authorid']; + } + else + { + /* That failed. Let's try to match on user name then */ + $query = "SELECT authorid " . + " FROM " . SUBSYS_BLOGS_DBNAME . ".ser_authors " . + " WHERE LOWER(username) = LOWER('" . + mysql_real_escape_string($roscms_user_name) . "')"; + $blogs_name_set = mysql_query($query) + or die("DB error (subsys_blogs #6)"); + if ($blogs_name_row = mysql_fetch_array($blogs_name_set)) + { + $blogs_user_id = $blogs_name_row['authorid']; + } + } + + if (! isset($blogs_user_id)) + { + /* We haven't found a match, so we need to add a new blogs user */ + $fixed = subsys_blogs_add_blogs_user($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email); + } + else + { + /* Synchronize the info in blogs */ + if (! subsys_blogs_update_blogs($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email, + $blogs_user_id)) + { + return FALSE; + } + + /* Insert a row in the mapping table */ + $query = "INSERT INTO subsys_mappings " . + " (map_roscms_userid, map_subsys_name, map_subsys_userid) " . + " VALUES($roscms_user_id, 'blogs', $blogs_user_id)"; + mysql_query($query) or die("DB error (subsys_blogs #9)"); + + $fixed = TRUE; + } + + return $fixed; +} + +function subsys_blogs_update_existing($roscms_user_id, $blogs_user_id) +{ + if (! subsys_get_roscms_info($roscms_user_id, + $roscms_user_name, + $roscms_user_email, + $roscms_user_fullname, + $roscms_user_password, + $roscms_user_register)) + { + return FALSE; + } + + if (! subsys_blogs_update_blogs($roscms_user_id, + $roscms_user_name, + $roscms_user_fullname, + $roscms_user_email, + $blogs_user_id)) + { + return FALSE; + } + + return TRUE; +} + +function subsys_blogs_update_user($roscms_user_id) +{ + $query = "SELECT map_subsys_userid " . + " FROM subsys_mappings " . + " WHERE map_roscms_userid = $roscms_user_id " . + " AND map_subsys_name = 'blogs'"; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #2)"); + if ($result_row = mysql_fetch_array($query_set)) + { + $fixed = subsys_blogs_update_existing($roscms_user_id, + $result_row['map_subsys_userid']); + } + else + { + $query = "SELECT COUNT(*) AS count " . + " FROM usergroup_members ug " . + " WHERE ug.usergroupmember_usergroupid = 'developer' " . + " AND ug.usergroupmember_userid = $roscms_user_id "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #14)"); + if (($result_row = mysql_fetch_array($query_set)) && + 0 != $result_row['count']) + { + $fixed = subsys_blogs_add_mapping($roscms_user_id); + } + else + { + $fixed = 0; + } + } + + return $fixed; +} + +function subsys_blogs_fix_mappings() +{ + $fix_count = 0; + $query = "SELECT u.user_id " . + " FROM users u, " . + " usergroup_members ug " . + " WHERE ug.usergroupmember_usergroupid = 'developer' " . + " AND ug.usergroupmember_userid = u.user_id " . + " AND u.user_id NOT IN " . + " (SELECT m.map_roscms_userid " . + " FROM subsys_mappings m " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs') "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #3)"); + while ($result_row = mysql_fetch_array($query_set)) + { + if (subsys_blogs_update_user($result_row['user_id'])) + { + echo "Fixed mapping of RosCMS userid " . $result_row['user_id'] . + "<br>\n"; + $fix_count++; + } + else + { + echo "Unable to fix mapping of RosCMS userid " . + $result_row['user_id'] . "<br>\n"; + } + } + + return $fix_count; +} + +function subsys_blogs_fix_info() +{ + $fix_count = 0; + $query = "SELECT u.user_id " . + " FROM users u, " . + " subsys_mappings m, " . + SUBSYS_BLOGS_DBNAME . ".ser_authors b " . + " WHERE m.map_roscms_userid = u.user_id " . + " AND m.map_subsys_name = 'blogs' " . + " AND b.authorid = m.map_subsys_userid " . + " AND (u.user_name != b.username OR " . + " u.user_fullname != b.realname OR " . + " u.user_email != b.email) "; + $query_set = mysql_query($query) or die("DB error (subsys_blogs #12)".$query); + while ($result_row = mysql_fetch_array($query_set)) + { + if (subsys_blogs_update_user($result_row['user_id'])) + { + echo "Fixed info for RosCMS userid " . $result_row['user_id'] . + "<br>\n"; + $fix_count++; + } + else + { + echo "Unable to fix info for RosCMS userid " . + $result_row['user_id'] . "<br>\n"; + } + } + + return $fix_count; +} + +function subsys_blogs_fix_all() +{ +?> +<h2>Blogs</h2> +<?php + $fix_count = 0; + $fix_count += subsys_blogs_fix_mappings(); + $fix_count += subsys_blogs_fix_info(); + if (0 == $fix_count) + { + echo "No problems fixed.<br/>\n"; + } + else if (1 == $fix_count) + { + echo "<br>1 problem fixed.<br/>\n"; + } + else + { + echo "<br>$fix_count problems fixed.<br/>\n"; + } + + return $fix_count; +} + +?> _____ Modified: trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php --- trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/roscms/inc/subsys_login.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -76,23 +76,23 @@ if ($subsys == "roscms" || $subsys == "") { $query = "SELECT u.user_id, s.usersession_expires " . - " FROM user_sessions s, " . - " users u " . + " FROM roscms.user_sessions s, " . + " roscms.users u " . $bulk_of_where; } else { $query = "SELECT m.map_subsys_userid, s.usersession_expires " . - " FROM user_sessions s, " . - " users u, " . - " subsys_mappings m " . + " FROM roscms.user_sessions s, " . + " roscms.users u, " . + " roscms.subsys_mappings m " . $bulk_of_where . " AND m.map_roscms_userid = s.usersession_user_id " . " AND m.map_subsys_name = '" . mysql_escape_string($subsys) . "'"; } $statement = mysql_query($query, $connect) - or die('DB error (user login)'); + or die('DB error (user login) ' . $query); if ($row = mysql_fetch_array($statement)) { @@ -103,7 +103,7 @@ { /* Session with timeout. Update the expiry time in the table and the expiry time of the cookie */ - $query = "UPDATE user_sessions " . + $query = "UPDATE roscms.user_sessions " . " SET usersession_expires = DATE_ADD(NOW(), INTERVAL 30 MINUTE) " . " WHERE usersession_id = '" . mysql_escape_string($session_id_clean) . "'"; _____ Copied: trunk/web/reactos.org/htdocs/serendipity (from rev 20990, vendor/serendipity/current) _____ Added: trunk/web/reactos.org/htdocs/serendipity/.htaccess --- vendor/serendipity/current/.htaccess 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/.htaccess 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,26 @@ +# BEGIN s9y +DirectoryIndex /serendipity/index.php +php_value session.use_trans_sid 0 +php_value register_globals off + +<Files *.tpl.php> + deny from all +</Files> + +<Files *.tpl> + deny from all +</Files> + +<Files *.sql> + deny from all +</Files> + +<Files *.inc.php> + deny from all +</Files> + +<Files *.db> + deny from all +</Files> + +# END s9y _____ Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc. php --- vendor/serendipity/current/include/functions_comments.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/include/functions_comments.inc. php 2006-01-22 23:16:30 UTC (rev 20991) @@ -309,9 +309,28 @@ return true; } +require_once(ROSCMS_INC_PATH . "/subsys_login.php"); +@define('ROSCMSLOGIN_NOT_LOGGEDIN', 'You need to be logged in to leave a comment'); + + function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL', $source = 'internal') { global $serendipity; + $roscmsid = roscms_subsys_login('roscms', ROSCMS_LOGIN_OPTIONAL, ''); + if (0 == $roscmsid) { + $eventData = array('allow_comments' => false); + $serendipity['messagestack']['comments'][] = ROSCMSLOGIN_NOT_LOGGEDIN; + return false; + } + $query = "SELECT user_fullname, user_email " . + " FROM roscms.users " . + " WHERE user_id = " . (int) $roscmsid; + $userinfo = serendipity_db_query($query, true); + if (is_array($userinfo)) { + $commentInfo['name'] = $userinfo['user_fullname']; + $commentInfo['email'] = $userinfo['user_email']; + } + $query = "SELECT id, allow_comments, moderate_comments, last_modified, timestamp, title FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'"; $ca = serendipity_db_query($query, true); _____ Modified: trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.ph p --- vendor/serendipity/current/include/functions_config.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/include/functions_config.inc.ph p 2006-01-22 23:16:30 UTC (rev 20991) @@ -273,49 +273,44 @@ unset($serendipity['COOKIE'][$name]); } +require_once(ROSCMS_INC_PATH . "/subsys_login.php"); + function serendipity_authenticate_author($username = '', $password = '', $is_md5 = false, $use_external = true) { global $serendipity; - if (isset($_SESSION['serendipityUser']) && isset($_SESSION['serendipityPassword']) && isset($_SESSION['serendipityAuthedUser']) && $_SESSION['serendipityAuthedUser'] == true) { - $username = $_SESSION['serendipityUser']; - $password = $_SESSION['serendipityPassword']; - // For safety reasons when multiple blogs are installed on the same host, we need to check the current author each time to not let him log into a different blog with the same sessiondata - $is_md5 = true; + $authorid = roscms_subsys_login('blogs', + $use_external ? ROSCMS_LOGIN_REQUIRED : + ROSCMS_LOGIN_OPTIONAL, + $serendipity['serendipityHTTPPath'] . + ($serendipity['rewrite'] == 'none' ? + $serendipity['indexFile'] .'?/' : '') . + PATH_ADMIN); + if (0 == $authorid) { + $_SESSION['serendipityAuthedUser'] = false; + return false; } + $query = "SELECT DISTINCT + email, authorid, userlevel, right_publish + FROM + {$serendipity['dbPrefix']}authors + WHERE + authorid = $authorid"; + $row = serendipity_db_query($query, true, 'assoc'); - if ($username != '') { - if ($use_external) { - serendipity_plugin_api::hook_event('backend_auth', $is_md5, array('username' => $username, 'password' => $password)); - } - - if ($is_md5 === false && !empty($password)) { - $password = md5($password); - } - - $query = "SELECT DISTINCT - email, authorid, userlevel, right_publish - FROM - {$serendipity['dbPrefix']}authors - WHERE - username = '" . serendipity_db_escape_string($username) . "' - AND password = '" . serendipity_db_escape_string($password) . "'"; - $row = serendipity_db_query($query, true, 'assoc'); - - if (is_array($row)) { - serendipity_setCookie('old_session', session_id()); - $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $username; - $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = $password; - $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; - $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; - $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; - $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; - $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish']; - serendipity_load_configuration($serendipity['authorid']); - return true; - } else { - $_SESSION['serendipityAuthedUser'] = false; - @session_destroy(); - } + if (is_array($row)) { + serendipity_setCookie('old_session', session_id()); + $_SESSION['serendipityUser'] = $serendipity['serendipityUser'] = $row['username']; + $_SESSION['serendipityPassword'] = $serendipity['serendipityPassword'] = ''; + $_SESSION['serendipityEmail'] = $serendipity['serendipityEmail'] = $row['email']; + $_SESSION['serendipityAuthorid'] = $serendipity['authorid'] = $row['authorid']; + $_SESSION['serendipityUserlevel'] = $serendipity['serendipityUserlevel'] = $row['userlevel']; + $_SESSION['serendipityAuthedUser'] = $serendipity['serendipityAuthedUser'] = true; + $_SESSION['serendipityRightPublish']= $serendipity['serendipityRightPublish'] = $row['right_publish']; + serendipity_load_configuration($serendipity['authorid']); + return true; + } else { + $_SESSION['serendipityAuthedUser'] = false; + @session_destroy(); } return false; _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_de.inc.php --- vendor/serendipity/current/plugins/serendipity_plugin_activeauthors/lang _de.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_de.inc.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,4 @@ +<?php # $Id: lang_de.inc.php,v 1.1 2005/08/01 15:45:48 garvinhicking Exp $ + + @define('PLUGIN_AUTHORS_NAME', 'Liste der Autoren'); + @define('PLUGIN_AUTHORS_DESC', 'Zeigt Eintrõge nach Autor.'); _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_pt.inc.php --- vendor/serendipity/current/plugins/serendipity_plugin_activeauthors/lang _pt.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/lang_pt.inc.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,4 @@ +<?php + + @define('PLUGIN_AUTHORS_NAME', 'Autores'); + @define('PLUGIN_AUTHORS_DESC', 'Mostra entradas por autor.'); _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/serendipity_plugin_activeauthors.php --- vendor/serendipity/current/plugins/serendipity_plugin_activeauthors/sere ndipity_plugin_activeauthors.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_acti veauthors/serendipity_plugin_activeauthors.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,89 @@ +<?php # Based on serendipity_plugin_authors.php + +// Probe for a language include with constants. Still include defines later on, if some constants were missing +$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; +if (file_exists($probelang)) { + include $probelang; +} + +@define('PLUGIN_ACTIVEAUTHORS_NAME', 'Active Authors'); +@define('PLUGIN_ACTIVEAUTHORS_DESC', 'Displays active authors.'); +@define('PLUGIN_ACTIVEAUTHORS_TITLE', 'Authors'); +@define('PLUGIN_ACTIVEAUTHORS_ALL', 'All'); + +class serendipity_plugin_activeauthors extends serendipity_plugin +{ + var $title = PLUGIN_ACTIVEAUTHORS_TITLE; + + function introspect(&$propbag) + { + $propbag->add('name', PLUGIN_ACTIVEAUTHORS_NAME); + $propbag->add('description', PLUGIN_ACTIVEAUTHORS_DESC); + $propbag->add('stackable', true); + $propbag->add('author', 'Ge van Geldorp/Victor Fusco'); + $propbag->add('version', '1.0'); + $propbag->add('requirements', array( + 'serendipity' => '0.8', + 'smarty' => '2.6.7', + 'php' => '4.1.0' + )); + $propbag->add('groups', array('FRONTEND_VIEWS')); + $propbag->add('configuration', array('title')); + } + + function introspect_config_item($name, &$propbag) + { + switch($name) { + case 'title': + $propbag->add('type', 'string'); + $propbag->add('name', TITLE); + $propbag->add('description', TITLE); + $propbag->add('default', PLUGIN_ACTIVEAUTHORS_TITLE); + break; + } + return true; + } + + function generate_content(&$title) { + global $serendipity; + + $title = $this->get_config('title', $this->title); + + $alllink = $serendipity['serendipityHTTPPath']; + echo '<a href="' . $alllink . '">' . PLUGIN_ACTIVEAUTHORS_ALL . "</a><br />\n"; + + + $authors_query = "SELECT DISTINCT a.realname, a.username, a.authorid " . + " FROM {$serendipity['dbPrefix']}authors a, " . + " {$serendipity['dbPrefix']}entries e " . + " WHERE e.authorid = a.authorid " . + " AND e.isdraft = 'false' " . + " ORDER BY a.realname "; + $row_authors = serendipity_db_query($authors_query); + + if (isset($row_authors) && is_array($row_authors)) { + foreach ($row_authors as $entry) { + if (function_exists('serendipity_authorURL')) { + $entryLink = serendipity_authorURL($entry); + } else { + $entryLink = serendipity_rewriteURL( + PATH_AUTHORS . '/' . + serendipity_makePermalink( + PERM_AUTHORS, + array( + 'id' => $entry['authorid'], + 'title' => $entry['realname'] + ) + ) + ); + } + + echo '<a href="' . $entryLink . '">' . $entry['realname'] . + "</a><br />\n"; + } + } + } +} + +/* vim: set sts=4 ts=4 expandtab : */ +?> _____ Added: trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/serendipity_plugin_roscmsaccount.php --- vendor/serendipity/current/plugins/serendipity_plugin_roscmsaccount/sere ndipity_plugin_roscmsaccount.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/plugins/serendipity_plugin_rosc msaccount/serendipity_plugin_roscmsaccount.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,73 @@ +<?php + +// Probe for a language include with constants. Still include defines later on, if some constants were missing +$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; +if (file_exists($probelang)) { + include $probelang; +} + +@define('PLUGIN_ROSCMSACCOUNT_TITLE', 'Account'); +@define('PLUGIN_ROSCMSACCOUNT_NAME', 'Roscms-account'); +@define('PLUGIN_ROSCMSACCOUNT_DESC', 'Roscms global login system account management'); +@define('PLUGIN_ROSCMSACCOUNT_LOGIN', 'Login'); +@define('PLUGIN_ROSCMSACCOUNT_LOGOUT', 'Logout'); +@define('PLUGIN_ROSCMSACCOUNT_REGISTER', 'Register'); +@define('PLUGIN_ROSCMSACCOUNT_MANAGE', 'Manage blog entries'); + +require_once(ROSCMS_INC_PATH . "/subsys_login.php"); + +class serendipity_plugin_roscmsaccount extends serendipity_plugin +{ + function introspect(&$propbag) + { + $propbag->add('name', PLUGIN_ROSCMSACCOUNT_NAME); + $propbag->add('description', PLUGIN_ROSCMSACCOUNT_DESC); + $propbag->add('stackable', true); + $propbag->add('author', 'Ge van Geldorp'); + $propbag->add('version', '1.0'); + $propbag->add('groups', array('FRONTEND_FEATURES')); + } + + function generate_content(&$title) + { + global $serendipity; + + $title = PLUGIN_ROSCMSACCOUNT_TITLE; + $roscmsid = roscms_subsys_login('roscms', ROSCMS_LOGIN_OPTIONAL, ''); + if (0 == $roscmsid) { + echo '<a href="/roscms/?page=login&target=' . + $serendipity['serendipityHTTPPath'] . '">' . + PLUGIN_ROSCMSACCOUNT_LOGIN . "</a><br />\n"; + } else { + echo '<a href="/roscms/?page=logout&target=' . + $serendipity['serendipityHTTPPath'] . '">' . + PLUGIN_ROSCMSACCOUNT_LOGOUT; + $who_query = "SELECT user_name " . + " FROM roscms.users " . + " WHERE user_id = $roscmsid "; + $row_who = serendipity_db_query($who_query, true); + + if (is_array($row_who)) { + echo ' [' . $row_who['user_name'] . ']'; + } + echo "</a><br />\n"; + } + echo '<a href="/roscms/?page=register&target=' . + $serendipity['serendipityHTTPPath'] . '">' . + PLUGIN_ROSCMSACCOUNT_REGISTER . "</a><br />\n"; + $authorid = roscms_subsys_login('blogs', ROSCMS_LOGIN_OPTIONAL, ''); + if (0 != $authorid) { + $base = $serendipity['serendipityHTTPPath']; + + $link = $serendipity['serendipityHTTPPath'] . + ($serendipity['rewrite'] == 'none' ? + $serendipity['indexFile'] .'?/' : '') . PATH_ADMIN; + $text = PLUGIN_ROSCMSACCOUNT_MANAGE; + echo '<a href="' . $link . '" title="'. $text .'">'. $text . + "</a><br />\n"; + } + } +} + +/* vim: set sts=4 ts=4 expandtab : */ +?> _____ Added: trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.ph p --- vendor/serendipity/current/serendipity_config_local.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/serendipity_config_local.inc.ph p 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,17 @@ +<?php + /* + Serendipity configuration file + Written on Tue, 17 Jan 2006 22:13:03 +0100 + */ + + $serendipity['versionInstalled'] = '0.9.1'; + $serendipity['dbPrefix'] = 'ser_'; + $serendipity['dbType'] = 'mysql'; + $serendipity['dbPersistent'] = true; + + // End of Serendipity configuration file + // You can place your own special variables after here: + + require_once("blogs-connect.php"); + @define('ROSCMS_INC_PATH', '/web/reactos.org/htdocs/roscms/inc'); +?> _____ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/commentform.tp l --- vendor/serendipity/current/templates/roscms/commentform.tpl 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/commentform.tp l 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,43 @@ +<div class="serendipityCommentForm"> + <a id="serendipity_CommentForm"></a> + <form id="serendipity_comment" action="{$commentform_action}#feedback" method="post"> + <div><input type="hidden" name="serendipity[entry_id]" value="{$commentform_id}" /></div> + <table border="0" width="100%" cellpadding="3"> + <tr> + <td class="serendipity_commentsLabel"><label for="serendipity_replyTo">{$CONST.IN_REPLY_TO}</label></td> + <td class="serendipity_commentsValue">{$commentform_replyTo}</td> + </tr> + + <tr> + <td class="serendipity_commentsLabel"><label for="serendipity_commentform_comment">{$CONST.COMMENT}</label></td> + <td class="serendipity_commentsValue"> + <textarea rows="10" cols="40" id="serendipity_commentform_comment" name="serendipity[comment]">{$commentform_data}</textarea><br /> + {serendipity_hookPlugin hook="frontend_comment" data=$commentform_entry} + </td> + </tr> + +{if $is_commentform_showToolbar} + <tr> + <td> </td> + <td class="serendipity_commentsLabel"> + {if $is_allowSubscriptions} + <br /> + <input id="checkbox_subscribe" type="checkbox" name="serendipity[subscribe]" {$commentform_subscribe} /><label for="checkbox_subscribe">{$CONST.SUBSCRIBE_TO_THIS_ENTRY}</label> + {/if} + </td> + </tr> +{/if} + +{if $is_moderate_comments} + <tr> + <td class="serendipity_commentsValue serendipity_msg_important" colspan="2">{$CONST.COMMENTS_WILL_BE_MODERATED}</td> + </tr> +{/if} + + <tr> + <td> </td> + <td><input type="submit" name="serendipity[submit]" value="{$CONST.SUBMIT_COMMENT}" /> <input type="submit" name="serendipity[preview]" value="{$CONST.PREVIEW}" /></td> + </tr> + </table> + </form> +</div> _____ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/comments.tpl --- vendor/serendipity/current/templates/roscms/comments.tpl 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/comments.tpl 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,24 @@ +{foreach from=$comments item=comment name="comments"} + <a id="c{$comment.id}"></a> + <li class="{if $smarty.foreach.comments.iteration is odd}graybox{/if}" style="margin-left: {$comment.depth*20}px"> + <cite>{if $comment.url} + <a href="{$comment.url}" target="_blank">{$comment.author|@default:$CONST.ANONYMOUS}</a> + {else} + {$comment.author|@default:$CONST.ANONYMOUS} + {/if}</cite> {$CONST.SAYS}:<br /> + <small class="commentmetadata"> + <a href="#c{$comment.id}" title="{$CONST.LINK_TO_COMMENT|sprintf:$comment.trace}">#{$comment.trace }</a> + {$comment.timestamp|@formatTime:$CONST.DATE_FORMAT_SHORT} + {if $entry.is_entry_owner} + (<a href="{$comment.link_delete}" onclick="return confirm('{$CONST.COMMENT_DELETE_CONFIRM|@sprintf:$comment.id:$comment.au thor}');">{$CONST.DELETE}</a>) + {/if} + {roscms_can_add_comment} + {if $entry.allow_comments && $can_add_comment eq 'true'} + (<a href="#serendipity_CommentForm" onclick="document.getElementById('serendipity_replyTo').value='{$comment .id}';">{$CONST.REPLY}</a>) + {/if} + </small> + <p>{$comment.body}</p> + </li> +{foreachelse} + <p class="nocomments">{$CONST.NO_COMMENTS}</p> +{/foreach} _____ Added: trunk/web/reactos.org/htdocs/serendipity/templates/roscms/config.inc.php --- vendor/serendipity/current/templates/roscms/config.inc.php 2006-01-22 23:07:46 UTC (rev 20990) +++ trunk/web/reactos.org/htdocs/serendipity/templates/roscms/config.inc.php 2006-01-22 23:16:30 UTC (rev 20991) @@ -0,0 +1,42 @@ +<?php # $Id: config.inc.php 108 2005-05-19 08:40:00Z garvinhicking $ + +$probelang = dirname(__FILE__) . '/lang_' . $serendipity['lang'] . '.inc.php'; +if (file_exists($probelang)) { + include $probelang; +} else { + include dirname(__FILE__) . '/lang_en.inc.php'; +} + +@define('LOGIN_TO_LEAVE_COMMENT', 'Please <a href="/roscms/?page=login&target=%s#comments">login</a> to leave a comment'); + +$serendipity['smarty']->register_function('roscms_sidebar_transform', + 'roscms_smarty_sidebar_transform'); +$serendipity['smarty']->register_function('roscms_can_add_comment', + 'roscms_smarty_can_add_comment'); + +function roscms_smarty_sidebar_transform($params, &$smarty) +{ + $old_content = $params['content']; + + if (empty($old_content)) { + $new_content = ''; + } else { + $new_content = '<li>'; + $new_content .= preg_replace('=<br />\n?=i', "</li>\n<li>", $old_content); + $new_content .= "</li>\n"; + $new_content = preg_replace('=<li></li>=i', '', $new_content); + } + + return $new_content; +} + +function roscms_smarty_can_add_comment($params, &$smarty) [truncated at 1000 lines; 1170 more skipped]

18 years, 11 months

[gvg] 20990: Tag Serendipity 0.9.1

by gvg＠svn.reactos.org

Tag Serendipity 0.9.1 Added: vendor/serendipity/0.9.1/ _____ Copied: vendor/serendipity/0.9.1 (from rev 20989, vendor/serendipity/current)

18 years, 11 months

[gvg] 20989: Serendipity (blog software) vendor drop

by gvg＠svn.reactos.org

Serendipity (blog software) vendor drop Added: vendor/serendipity/ Added: vendor/serendipity/current/ Added: vendor/serendipity/current/bundled-libs/ Added: vendor/serendipity/current/bundled-libs/.current_version Added: vendor/serendipity/current/bundled-libs/Cache/ Added: vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/Cache/Lite/ Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php Added: vendor/serendipity/current/bundled-libs/Cache/Lite.php Added: vendor/serendipity/current/bundled-libs/HTTP/ Added: vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/HTTP/Request/ Added: vendor/serendipity/current/bundled-libs/HTTP/Request/Listener.php Added: vendor/serendipity/current/bundled-libs/HTTP/Request.php Added: vendor/serendipity/current/bundled-libs/Net/ Added: vendor/serendipity/current/bundled-libs/Net/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/Net/CheckIP.php Added: vendor/serendipity/current/bundled-libs/Net/DNSBL/ Added: vendor/serendipity/current/bundled-libs/Net/DNSBL/BUNDLE_NOTICE Added: vendor/serendipity/current/bundled-libs/Net/DNSBL/SURBL.php Added: vendor/serendipity/current/bundled-libs/Net/DNSBL.php Added: vendor/serendipity/current/bundled-libs/Net/Socket.php Added: vendor/serendipity/current/bundled-libs/Net/URL.php Added: vendor/serendipity/current/bundled-libs/Onyx/ Added: vendor/serendipity/current/bundled-libs/Onyx/RSS.php Added: vendor/serendipity/current/bundled-libs/PEAR.php Added: vendor/serendipity/current/bundled-libs/Smarty/ Added: vendor/serendipity/current/bundled-libs/Smarty/BUGS Added: vendor/serendipity/current/bundled-libs/Smarty/COPYING.lib Added: vendor/serendipity/current/bundled-libs/Smarty/ChangeLog Added: vendor/serendipity/current/bundled-libs/Smarty/FAQ Added: vendor/serendipity/current/bundled-libs/Smarty/INSTALL Added: vendor/serendipity/current/bundled-libs/Smarty/NEWS Added: vendor/serendipity/current/bundled-libs/Smarty/README Added: vendor/serendipity/current/bundled-libs/Smarty/RELEASE_NOTES Added: vendor/serendipity/current/bundled-libs/Smarty/libs/ Added: vendor/serendipity/current/bundled-libs/Smarty/libs/Config_File.class.ph p Added: vendor/serendipity/current/bundled-libs/Smarty/libs/Smarty.class.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/Smarty_Compiler.clas s.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/debug.tpl Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/ Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.assem ble_plugin_filepath.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.assig n_smarty_interface.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.creat e_dir_structure.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.displ ay_debug_console.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.get_i nclude_path.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.get_m icrotime.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.get_p hp_resource.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.is_se cure.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.is_tr usted.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.load_ plugins.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.load_ resource_plugin.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.proce ss_cached_inserts.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.proce ss_compiled_include.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.read_ cache_file.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.rm_au to.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.rmdir .php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.run_i nsert_handler.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.smart y_include_php.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _cache_file.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _compiled_include.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _compiled_resource.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/internals/core.write _file.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/ Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/block.textfo rmat.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/compiler.ass ign.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.ass ign_debug_info.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.con fig_load.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.cou nter.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.cyc le.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.deb ug.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.eva l.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.fet ch.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_checkboxes.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_image.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_options.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_radios.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_select_date.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_select_time.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.htm l_table.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.mai lto.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.mat h.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.pop up.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/function.pop up_init.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cap italize.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cat .php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_characters.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_paragraphs.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_sentences.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.cou nt_words.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.dat e_format.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.deb ug_print_var.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.def ault.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.esc ape.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.ind ent.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.low er.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.nl2 br.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.reg ex_replace.php Added: vendor/serendipity/current/bundled-libs/Smarty/libs/plugins/modifier.rep lace.php [truncated at 100 lines; 1458 more skipped] _____ Added: vendor/serendipity/current/bundled-libs/.current_version --- vendor/serendipity/current/bundled-libs/.current_version 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/.current_version 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,11 @@ +Cache_Lite 1.5.1 +HTTP_Request 1.2.4 +Net_CheckIP 1.1 +Net_Socket 1.0.6 +Net_URL 1.0.14 +PEAR 1.3.5 +Text_Wiki 0.25.0 +XML_RPC 1.4.0 +Onyx 1.0 (customized) +Smarty 2.6.9 +Net_DNSBL 1.0.0 \ No newline at end of file _____ Added: vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE --- vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/BUNDLE_NOTICE 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,8 @@ +- Replace: +Lite.php: +include_once('PEAR.php'); +include_once dirname(__FILE__) . '/../PEAR.php'; + +Output.php, Function.php: +require_once('Cache/Lite.php'); +require_once(dirname(__FILE__) . '/../Lite.php'; \ No newline at end of file _____ Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php --- vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/Lite/Function.php 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,111 @@ +<?php + +/** +* This class extends Cache_Lite and can be used to cache the result and output of functions/methods +* +* This class is completly inspired from Sebastian Bergmann's +* PEAR/Cache_Function class. This is only an adaptation to +* Cache_Lite +* +* There are some examples in the 'docs/examples' file +* Technical choices are described in the 'docs/technical' file +* +* @package Cache_Lite +* @version $Id: Function.php,v 1.6 2004/02/03 17:07:13 fab Exp $ +* @author Sebastian BERGMANN <sb(a)sebastian-bergmann.de> +* @author Fabien MARTY <fab(a)php.net> +*/ + +require_once(dirname(__FILE__) . '/../Lite.php'); + +class Cache_Lite_Function extends Cache_Lite +{ + + // --- Private properties --- + + /** + * Default cache group for function caching + * + * @var string $_defaultGroup + */ + var $_defaultGroup = 'Cache_Lite_Function'; + + // --- Public methods ---- + + /** + * Constructor + * + * $options is an assoc. To have a look at availables options, + * see the constructor of the Cache_Lite class in 'Cache_Lite.php' + * + * Comparing to Cache_Lite constructor, there is another option : + * $options = array( + * (...) see Cache_Lite constructor + * 'defaultGroup' => default cache group for function caching (string) + * ); + * + * @param array $options options + * @access public + */ + function Cache_Lite_Function($options = array(NULL)) + { + if (isset($options['defaultGroup'])) { + $this->_defaultGroup = $options['defaultGroup']; + } + $this->Cache_Lite($options); + } + + /** + * Calls a cacheable function or method (or not if there is already a cache for it) + * + * Arguments of this method are read with func_get_args. So it doesn't appear + * in the function definition. Synopsis : + * call('functionName', $arg1, $arg2, ...) + * (arg1, arg2... are arguments of 'functionName') + * + * @return mixed result of the function/method + * @access public + */ + function call() + { + $arguments = func_get_args(); + $id = serialize($arguments); // Generate a cache id + if (!$this->_fileNameProtection) { + $id = md5($id); + // if fileNameProtection is set to false, then the id has to be hashed + // because it's a very bad file name in most cases + } + $data = $this->get($id, $this->_defaultGroup); + if ($data !== false) { + $array = unserialize($data); + $output = $array['output']; + $result = $array['result']; + } else { + ob_start(); + ob_implicit_flush(false); + $target = array_shift($arguments); + if (strstr($target, '::')) { // classname::staticMethod + list($class, $method) = explode('::', $target); + $result = call_user_func_array(array($class, $method), $arguments); + } else if (strstr($target, '->')) { // object->method + // use a stupid name ($objet_123456789 because) of problems when the object + // name is the same as this var name + list($object_123456789, $method) = explode('->', $target); + global $$object_123456789; + $result = call_user_func_array(array($$object_123456789, $method), $arguments); + } else { // function + $result = call_user_func_array($target, $arguments); + } + $output = ob_get_contents(); + ob_end_clean(); + $array['output'] = $output; + $array['result'] = $result; + $this->save(serialize($array), $id, $this->_defaultGroup); + } + echo($output); + return $result; + } + +} + +?> _____ Added: vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php --- vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/Lite/Output.php 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,73 @@ +<?php + +/** +* This class extends Cache_Lite and uses output buffering to get the data to cache. +* +* There are some examples in the 'docs/examples' file +* Technical choices are described in the 'docs/technical' file +* +* @package Cache_Lite +* @version $Id: Output.php,v 1.3 2005/04/17 21:40:18 fab Exp $ +* @author Fabien MARTY <fab(a)php.net> +*/ + +require_once(dirname(__FILE__) . '/../Lite.php'); + +class Cache_Lite_Output extends Cache_Lite +{ + + // --- Public methods --- + + /** + * Constructor + * + * $options is an assoc. To have a look at availables options, + * see the constructor of the Cache_Lite class in 'Cache_Lite.php' + * + * @param array $options options + * @access public + */ + function Cache_Lite_Output($options) + { + $this->Cache_Lite($options); + } + + /** + * Start the cache + * + * @param string $id cache id + * @param string $group name of the cache group + * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested + * @return boolean true if the cache is hit (false else) + * @access public + */ + function start($id, $group = 'default', $doNotTestCacheValidity = false) + { + $data = $this->get($id, $group, $doNotTestCacheValidity); + if ($data !== false) { + echo($data); + return true; + } else { + ob_start(); + ob_implicit_flush(false); + return false; + } + } + + /** + * Stop the cache + * + * @access public + */ + function end() + { + $data = ob_get_contents(); + ob_end_clean(); + $this->save($data, $this->_id, $this->_group); + echo($data); + } + +} + + +?> _____ Added: vendor/serendipity/current/bundled-libs/Cache/Lite.php --- vendor/serendipity/current/bundled-libs/Cache/Lite.php 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/Cache/Lite.php 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,755 @@ +<?php + +/** +* Fast, light and safe Cache Class +* +* Cache_Lite is a fast, light and safe cache system. It's optimized +* for file containers. It is fast and safe (because it uses file +* locking and/or anti-corruption tests). +* +* There are some examples in the 'docs/examples' file +* Technical choices are described in the 'docs/technical' file +* +* Memory Caching is from an original idea of +* Mike BENOIT <ipso(a)snappymail.ca> +* +* Nota : A chinese documentation (thanks to RainX <china_1982(a)163.com>) is +* available at : +* http://rainx.phpmore.com/manual/cache_lite.html +* +* @package Cache_Lite +* @category Caching +* @version $Id: Lite.php,v 1.30 2005/06/13 20:50:48 fab Exp $ +* @author Fabien MARTY <fab(a)php.net> +*/ + +define('CACHE_LITE_ERROR_RETURN', 1); +define('CACHE_LITE_ERROR_DIE', 8); + +class Cache_Lite +{ + + // --- Private properties --- + + /** + * Directory where to put the cache files + * (make sure to add a trailing slash) + * + * @var string $_cacheDir + */ + var $_cacheDir = '/tmp/'; + + /** + * Enable / disable caching + * + * (can be very usefull for the debug of cached scripts) + * + * @var boolean $_caching + */ + var $_caching = true; + + /** + * Cache lifetime (in seconds) + * + * @var int $_lifeTime + */ + var $_lifeTime = 3600; + + /** + * Enable / disable fileLocking + * + * (can avoid cache corruption under bad circumstances) + * + * @var boolean $_fileLocking + */ + var $_fileLocking = true; + + /** + * Timestamp of the last valid cache + * + * @var int $_refreshTime + */ + var $_refreshTime; + + /** + * File name (with path) + * + * @var string $_file + */ + var $_file; + + /** + * File name (without path) + * + * @var string $_fileName + */ + var $_fileName; + + /** + * Enable / disable write control (the cache is read just after writing to detect corrupt entries) + * + * Enable write control will lightly slow the cache writing but not the cache reading + * Write control can detect some corrupt cache files but maybe it's not a perfect control + * + * @var boolean $_writeControl + */ + var $_writeControl = true; + + /** + * Enable / disable read control + * + * If enabled, a control key is embeded in cache file and this key is compared with the one + * calculated after the reading. + * + * @var boolean $_writeControl + */ + var $_readControl = true; + + /** + * Type of read control (only if read control is enabled) + * + * Available values are : + * 'md5' for a md5 hash control (best but slowest) + * 'crc32' for a crc32 hash control (lightly less safe but faster, better choice) + * 'strlen' for a length only test (fastest) + * + * @var boolean $_readControlType + */ + var $_readControlType = 'crc32'; + + /** + * Pear error mode (when raiseError is called) + * + * (see PEAR doc) + * + * @see setToDebug() + * @var int $_pearErrorMode + */ + var $_pearErrorMode = CACHE_LITE_ERROR_RETURN; + + /** + * Current cache id + * + * @var string $_id + */ + var $_id; + + /** + * Current cache group + * + * @var string $_group + */ + var $_group; + + /** + * Enable / Disable "Memory Caching" + * + * NB : There is no lifetime for memory caching ! + * + * @var boolean $_memoryCaching + */ + var $_memoryCaching = false; + + /** + * Enable / Disable "Only Memory Caching" + * (be carefull, memory caching is "beta quality") + * + * @var boolean $_onlyMemoryCaching + */ + var $_onlyMemoryCaching = false; + + /** + * Memory caching array + * + * @var array $_memoryCachingArray + */ + var $_memoryCachingArray = array(); + + /** + * Memory caching counter + * + * @var int $memoryCachingCounter + */ + var $_memoryCachingCounter = 0; + + /** + * Memory caching limit + * + * @var int $memoryCachingLimit + */ + var $_memoryCachingLimit = 1000; + + /** + * File Name protection + * + * if set to true, you can use any cache id or group name + * if set to false, it can be faster but cache ids and group names + * will be used directly in cache file names so be carefull with + * special characters... + * + * @var boolean $fileNameProtection + */ + var $_fileNameProtection = true; + + /** + * Enable / disable automatic serialization + * + * it can be used to save directly datas which aren't strings + * (but it's slower) + * + * @var boolean $_serialize + */ + var $_automaticSerialization = false; + + /** + * Disable / Tune the automatic cleaning process + * + * The automatic cleaning process destroy too old (for the given life time) + * cache files when a new cache file is written. + * 0 => no automatic cache cleaning + * 1 => systematic cache cleaning + * x (integer) > 1 => automatic cleaning randomly 1 times on x cache write + * + * @var int $_automaticCleaning + */ + var $_automaticCleaningFactor = 0; + + /** + * Nested directory level + * + * Set the hashed directory structure level. 0 means "no hashed directory + * structure", 1 means "one level of directory", 2 means "two levels"... + * This option can speed up Cache_Lite only when you have many thousands of + * cache file. Only specific benchs can help you to choose the perfect value + * for you. Maybe, 1 or 2 is a good start. + * + * @var int $_hashedDirectoryLevel + */ + var $_hashedDirectoryLevel = 0; + + /** + * Umask for hashed directory structure + * + * @var int $_hashedDirectoryUmask + */ + var $_hashedDirectoryUmask = 0700; + + // --- Public methods --- + + /** + * Constructor + * + * $options is an assoc. Available options are : + * $options = array( + * 'cacheDir' => directory where to put the cache files (string), + * 'caching' => enable / disable caching (boolean), + * 'lifeTime' => cache lifetime in seconds (int), + * 'fileLocking' => enable / disable fileLocking (boolean), + * 'writeControl' => enable / disable write control (boolean), + * 'readControl' => enable / disable read control (boolean), + * 'readControlType' => type of read control 'crc32', 'md5', 'strlen' (string), + * 'pearErrorMode' => pear error mode (when raiseError is called) (cf PEAR doc) (int), + * 'memoryCaching' => enable / disable memory caching (boolean), + * 'onlyMemoryCaching' => enable / disable only memory caching (boolean), + * 'memoryCachingLimit' => max nbr of records to store into memory caching (int), + * 'fileNameProtection' => enable / disable automatic file name protection (boolean), + * 'automaticSerialization' => enable / disable automatic serialization (boolean) + * 'automaticCleaningFactor' => distable / tune automatic cleaning process (int) + * 'hashedDirectoryLevel' => level of the hashed directory system (int) + * 'hashedDirectoryUmask' => umask for hashed directory structure (int) + * ); + * + * @param array $options options + * @access public + */ + function Cache_Lite($options = array(NULL)) + { + $availableOptions = array('hashedDirectoryUmask', 'hashedDirectoryLevel', 'automaticCleaningFactor', 'automaticSerialization', 'fileNameProtection', 'memoryCaching', 'onlyMemoryCaching', 'memoryCachingLimit', 'cacheDir', 'caching', 'lifeTime', 'fileLocking', 'writeControl', 'readControl', 'readControlType', 'pearErrorMode'); + foreach($options as $key => $value) { + if(in_array($key, $availableOptions)) { + $property = '_'.$key; + $this->$property = $value; + } + } + $this->_refreshTime = time() - $this->_lifeTime; + } + + /** + * Test if a cache is available and (if yes) return it + * + * @param string $id cache id + * @param string $group name of the cache group + * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested + * @return string data of the cache (or false if no cache available) + * @access public + */ + function get($id, $group = 'default', $doNotTestCacheValidity = false) + { + $this->_id = $id; + $this->_group = $group; + $data = false; + if ($this->_caching) { + $this->_setFileName($id, $group); + if ($this->_memoryCaching) { + if (isset($this->_memoryCachingArray[$this->_file])) { + if ($this->_automaticSerialization) { + return unserialize($this->_memoryCachingArray[$this->_file]); + } else { + return $this->_memoryCachingArray[$this->_file]; + } + } else { + if ($this->_onlyMemoryCaching) { + return false; + } + } + } + if ($doNotTestCacheValidity) { + if (file_exists($this->_file)) { + $data = $this->_read(); + } + } else { + if ((file_exists($this->_file)) && (@filemtime($this->_file) > $this->_refreshTime)) { + $data = $this->_read(); + } + } + if (($data) and ($this->_memoryCaching)) { + $this->_memoryCacheAdd($this->_file, $data); + } + if (($this->_automaticSerialization) and (is_string($data))) { + $data = unserialize($data); + } + return $data; + } + return false; + } + + /** + * Save some data in a cache file + * + * @param string $data data to put in cache (can be another type than strings if automaticSerialization is on) + * @param string $id cache id + * @param string $group name of the cache group + * @return boolean true if no problem + * @access public + */ + function save($data, $id = NULL, $group = 'default') + { + if ($this->_caching) { + if ($this->_automaticSerialization) { + $data = serialize($data); + } + if (isset($id)) { + $this->_setFileName($id, $group); + } + if ($this->_memoryCaching) { + $this->_memoryCacheAdd($this->_file, $data); + if ($this->_onlyMemoryCaching) { + return true; + } + } + if ($this->_automaticCleaningFactor>0) { + $rand = rand(1, $this->_automaticCleaningFactor); + if ($rand==1) { + $this->clean(false, 'old'); + } + } + if ($this->_writeControl) { + if (!$this->_writeAndControl($data)) { + @touch($this->_file, time() - 2*abs($this->_lifeTime)); + return false; + } else { + return true; + } + } else { + return $this->_write($data); + } + } + return false; + } + + /** + * Remove a cache file + * + * @param string $id cache id + * @param string $group name of the cache group + * @return boolean true if no problem + * @access public + */ + function remove($id, $group = 'default') + { + $this->_setFileName($id, $group); + if ($this->_memoryCaching) { + if (isset($this->_memoryCachingArray[$this->_file])) { + unset($this->_memoryCachingArray[$this->_file]); + $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1; + } + if ($this->_onlyMemoryCaching) { + return true; + } + } + return $this->_unlink($this->_file); + } + + /** + * Clean the cache + * + * if no group is specified all cache files will be destroyed + * else only cache files of the specified group will be destroyed + * + * @param string $group name of the cache group + * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup', + * 'callback_myFunction' + * @return boolean true if no problem + * @access public + */ + function clean($group = false, $mode = 'ingroup') + { + return $this->_cleanDir($this->_cacheDir, $group, $mode); + } + + /** + * Set to debug mode + * + * When an error is found, the script will stop and the message will be displayed + * (in debug mode only). + * + * @access public + */ + function setToDebug() + { + $this->_pearErrorMode = CACHE_LITE_ERROR_DIE; + } + + /** + * Set a new life time + * + * @param int $newLifeTime new life time (in seconds) + * @access public + */ + function setLifeTime($newLifeTime) + { + $this->_lifeTime = $newLifeTime; + $this->_refreshTime = time() - $newLifeTime; + } + + /** + * Save the state of the caching memory array into a cache file cache + * + * @param string $id cache id + * @param string $group name of the cache group + * @access public + */ + function saveMemoryCachingState($id, $group = 'default') + { + if ($this->_caching) { + $array = array( + 'counter' => $this->_memoryCachingCounter, + 'array' => $this->_memoryCachingState + ); + $data = serialize($array); + $this->save($data, $id, $group); + } + } + + /** + * Load the state of the caching memory array from a given cache file cache + * + * @param string $id cache id + * @param string $group name of the cache group + * @param boolean $doNotTestCacheValidity if set to true, the cache validity won't be tested + * @access public + */ + function getMemoryCachingState($id, $group = 'default', $doNotTestCacheValidity = false) + { + if ($this->_caching) { + if ($data = $this->get($id, $group, $doNotTestCacheValidity)) { + $array = unserialize($data); + $this->_memoryCachingCounter = $array['counter']; + $this->_memoryCachingArray = $array['array']; + } + } + } + + /** + * Return the cache last modification time + * + * BE CAREFUL : THIS METHOD IS FOR HACKING ONLY ! + * + * @return int last modification time + */ + function lastModified() { + return @filemtime($this->_file); + } + + /** + * Trigger a PEAR error + * + * To improve performances, the PEAR.php file is included dynamically. + * The file is so included only when an error is triggered. So, in most + * cases, the file isn't included and perfs are much better. + * + * @param string $msg error message + * @param int $code error code + * @access public + */ + function raiseError($msg, $code) + { + include_once(dirname(__FILE__) . '/../PEAR.php'); + PEAR::raiseError($msg, $code, $this->_pearErrorMode); + } + + // --- Private methods --- + + /** + * Remove a file + * + * @param string $file complete file path and name + * @return boolean true if no problem + * @access private + */ + function _unlink($file) + { + if (!@unlink($file)) { + $this->raiseError('Cache_Lite : Unable to remove cache !', -3); + return false; + } else { + return true; + } + } + + /** + * Recursive function for cleaning cache file in the given directory + * + * @param string $dir directory complete path (with a trailing slash) + * @param string $group name of the cache group + * @param string $mode flush cache mode : 'old', 'ingroup', 'notingroup', + 'callback_myFunction' + * @return boolean true if no problem + * @access private + */ + function _cleanDir($dir, $group = false, $mode = 'ingroup') + { + if ($this->_fileNameProtection) { + $motif = ($group) ? 'cache_'.md5($group).'_' : 'cache_'; + } else { + $motif = ($group) ? 'cache_'.$group.'_' : 'cache_'; + } + if ($this->_memoryCaching) { + while (list($key, $value) = each($this->_memoryCachingArray)) { + if (strpos($key, $motif, 0)) { + unset($this->_memoryCachingArray[$key]); + $this->_memoryCachingCounter = $this->_memoryCachingCounter - 1; + } + } + if ($this->_onlyMemoryCaching) { + return true; + } + } + if (!($dh = opendir($dir))) { + $this->raiseError('Cache_Lite : Unable to open cache directory !', -4); + return false; + } + $result = true; + while ($file = readdir($dh)) { + if (($file != '.') && ($file != '..')) { + if (substr($file, 0, 6)=='cache_') { + $file2 = $dir . $file; + if (is_file($file2)) { + switch (substr($mode, 0, 9)) { + case 'old': + // files older than lifeTime get deleted from cache + if ((mktime() - filemtime($file2)) > $this->_lifeTime) { + $result = ($result and ($this->_unlink($file2))); + } + break; + case 'notingrou': + if (!strpos($file2, $motif, 0)) { + $result = ($result and ($this->_unlink($file2))); + } + break; + case 'callback_': + $func = substr($mode, 9, strlen($mode) - 9); + if ($func($file2, $group)) { + $result = ($result and ($this->_unlink($file2))); + } + break; + case 'ingroup': + default: + if (strpos($file2, $motif, 0)) { + $result = ($result and ($this->_unlink($file2))); + } + break; + } + } + if ((is_dir($file2)) and ($this->_hashedDirectoryLevel>0)) { + $result = ($result and ($this->_cleanDir($file2 . '/', $group, $mode))); + } + } + } + } + return $result; + } + + /** + * Add some date in the memory caching array + * + * @param string $id cache id + * @param string $data data to cache + * @access private + */ + function _memoryCacheAdd($id, $data) + { + $this->_memoryCachingArray[$this->_file] = $data; + if ($this->_memoryCachingCounter >= $this->_memoryCachingLimit) { + list($key, $value) = each($this->_memoryCachingArray); + unset($this->_memoryCachingArray[$key]); + } else { + $this->_memoryCachingCounter = $this->_memoryCachingCounter + 1; + } + } + + /** + * Make a file name (with path) + * + * @param string $id cache id + * @param string $group name of the group + * @access private + */ + function _setFileName($id, $group) + { + + if ($this->_fileNameProtection) { + $suffix = 'cache_'.md5($group).'_'.md5($id); + } else { + $suffix = 'cache_'.$group.'_'.$id; + } + $root = $this->_cacheDir; + if ($this->_hashedDirectoryLevel>0) { + $hash = md5($suffix); + for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) { + $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/'; + } + } + $this->_fileName = $suffix; + $this->_file = $root.$suffix; + } + + /** + * Read the cache file and return the content + * + * @return string content of the cache file + * @access private + */ + function _read() + { + $fp = @fopen($this->_file, "rb"); + if ($this->_fileLocking) @flock($fp, LOCK_SH); + if ($fp) { + clearstatcache(); // because the filesize can be cached by PHP itself... + $length = @filesize($this->_file); + $mqr = get_magic_quotes_runtime(); + set_magic_quotes_runtime(0); + if ($this->_readControl) { + $hashControl = @fread($fp, 32); + $length = $length - 32; + } + if ($length) { + $data = @fread($fp, $length); + } else { + $data = ''; + } + set_magic_quotes_runtime($mqr); + if ($this->_fileLocking) @flock($fp, LOCK_UN); + @fclose($fp); + if ($this->_readControl) { + $hashData = $this->_hash($data, $this->_readControlType); + if ($hashData != $hashControl) { + @touch($this->_file, time() - 2*abs($this->_lifeTime)); + return false; + } + } + return $data; + } + $this->raiseError('Cache_Lite : Unable to read cache !', -2); + return false; + } + + /** + * Write the given data in the cache file + * + * @param string $data data to put in cache + * @return boolean true if ok + * @access private + */ + function _write($data) + { + $try = 1; + while ($try<=2) { + $fp = @fopen($this->_file, "wb"); + if ($fp) { + if ($this->_fileLocking) @flock($fp, LOCK_EX); + if ($this->_readControl) { + @fwrite($fp, $this->_hash($data, $this->_readControlType), 32); + } + $len = strlen($data); + @fwrite($fp, $data, $len); + if ($this->_fileLocking) @flock($fp, LOCK_UN); + @fclose($fp); + return true; + } else { + if (($try==1) and ($this->_hashedDirectoryLevel>0)) { + $hash = md5($this->_fileName); + $root = $this->_cacheDir; + for ($i=0 ; $i<$this->_hashedDirectoryLevel ; $i++) { + $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/'; + @mkdir($root, $this->_hashedDirectoryUmask); + } + $try = 2; + } else { + $try = 999; + } + } + } + $this->raiseError('Cache_Lite : Unable to write cache file : '.$this->_file, -1); + return false; + } + + /** + * Write the given data in the cache file and control it just after to avoir corrupted cache entries + * + * @param string $data data to put in cache + * @return boolean true if the test is ok + * @access private + */ + function _writeAndControl($data) + { + $this->_write($data); + $dataRead = $this->_read($data); + return ($dataRead==$data); + } + + /** + * Make a control key with the string containing datas + * + * @param string $data data + * @param string $controlType type of control 'md5', 'crc32' or 'strlen' + * @return string control key + * @access private + */ + function _hash($data, $controlType) + { + switch ($controlType) { + case 'md5': + return md5($data); + case 'crc32': + return sprintf('% 32d', crc32($data)); + case 'strlen': + return sprintf('% 32d', strlen($data)); + default: + $this->raiseError('Unknown controlType ! (available values are only \'md5\', \'crc32\', \'strlen\')', -5); + } + } + +} + +?> _____ Added: vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE --- vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE 2006-01-22 22:49:49 UTC (rev 20988) +++ vendor/serendipity/current/bundled-libs/HTTP/BUNDLE_NOTICE 2006-01-22 23:06:24 UTC (rev 20989) @@ -0,0 +1,10 @@ +- Replace: +Request.php: +require_once('PEAR.php'); +require_once(dirname(__FILE__) . '/../PEAR.php'); + +require_once('Net/Socket.php'); +require_once(dirname(__FILE__) . '/../Net/Socket.php'); + +require_once('Net/URL.php'); +require_once(dirname(__FILE__) . '/../Net/URL.php'); [truncated at 1000 lines; 165701 more skipped]

18 years, 11 months

[weiden] 20988: return the result in NtPrivilegeCheck

by weiden＠svn.reactos.org

return the result in NtPrivilegeCheck Modified: trunk/reactos/ntoskrnl/se/priv.c _____ Modified: trunk/reactos/ntoskrnl/se/priv.c --- trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:49:04 UTC (rev 20987) +++ trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:49:49 UTC (rev 20988) @@ -393,7 +393,8 @@ { RtlCopyMemory(RequiredPrivileges->Privilege, Privileges, - PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES));; + PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)); + *Result = CheckResult; Status = STATUS_SUCCESS; } _SEH_HANDLE

18 years, 11 months

[mflyer] 20987: Correct icons. If your treeview code isn't picky about what size icon it will display, at least edit the icon so that the icon only includes the display size (16x16). Previous commit (mbosma, 20982) caused computer.ico to be sampled at a too large size and then resized to 16x16 (which is bad, bad, and ugly).

by mflyer＠svn.reactos.org

Correct icons. If your treeview code isn't picky about what size icon it will display, at least edit the icon so that the icon only includes the display size (16x16). Previous commit (mbosma, 20982) caused computer.ico to be sampled at a too large size and then resized to 16x16 (which is bad, bad, and ugly). Modified: trunk/reactos/subsys/system/regedit/res/computer.ico Modified: trunk/reactos/subsys/system/regedit/res/folder.ico Modified: trunk/reactos/subsys/system/regedit/res/folderopen.ico _____ Modified: trunk/reactos/subsys/system/regedit/res/computer.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/folder.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/regedit/res/folderopen.ico (Binary files differ)

18 years, 11 months

[weiden] 20986: - secure access to buffers in NtPrivilegeCheck()

by weiden＠svn.reactos.org

- secure access to buffers in NtPrivilegeCheck() - fixed SeCaptureLuidAndAttributesArray() and SeReleaseLuidAndAttributesArray() to securely capture the buffers Modified: trunk/reactos/ntoskrnl/include/internal/se.h Modified: trunk/reactos/ntoskrnl/se/priv.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/se.h --- trunk/reactos/ntoskrnl/include/internal/se.h 2006-01-22 22:33:22 UTC (rev 20985) +++ trunk/reactos/ntoskrnl/include/internal/se.h 2006-01-22 22:46:23 UTC (rev 20986) @@ -153,7 +153,7 @@ PLUID_AND_ATTRIBUTES AllocatedMem, ULONG AllocatedLength, POOL_TYPE PoolType, - ULONG d, + BOOLEAN CaptureIfKernel, PLUID_AND_ATTRIBUTES* Dest, PULONG Length ); @@ -163,7 +163,7 @@ SeReleaseLuidAndAttributesArray( PLUID_AND_ATTRIBUTES Privilege, KPROCESSOR_MODE PreviousMode, - ULONG a + BOOLEAN CaptureIfKernel ); BOOLEAN _____ Modified: trunk/reactos/ntoskrnl/se/priv.c --- trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:33:22 UTC (rev 20985) +++ trunk/reactos/ntoskrnl/se/priv.c 2006-01-22 22:46:23 UTC (rev 20986) @@ -180,51 +180,96 @@ PLUID_AND_ATTRIBUTES AllocatedMem, ULONG AllocatedLength, POOL_TYPE PoolType, - ULONG d, + BOOLEAN CaptureIfKernel, PLUID_AND_ATTRIBUTES* Dest, PULONG Length) { - PLUID_AND_ATTRIBUTES* NewMem; - ULONG SrcLength; + ULONG BufferSize; + NTSTATUS Status = STATUS_SUCCESS; - PAGED_CODE(); + PAGED_CODE(); - if (PrivilegeCount == 0) + if (PrivilegeCount == 0) { - *Dest = 0; - *Length = 0; - return STATUS_SUCCESS; + *Dest = 0; + *Length = 0; + return STATUS_SUCCESS; } - if (PreviousMode == KernelMode && d == 0) + if (PreviousMode == KernelMode && !CaptureIfKernel) { - *Dest = Src; - return STATUS_SUCCESS; + *Dest = Src; + return STATUS_SUCCESS; } - SrcLength = ((PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES)) + 3) & 0xfc; - *Length = SrcLength; - if (AllocatedMem == NULL) + /* FIXME - check PrivilegeCount for a valid number so we don't + cause an integer overflow or exhaust system resources! */ + + BufferSize = PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); + *Length = ROUND_UP(BufferSize, 4); /* round up to a 4 byte alignment */ + + /* probe the buffer */ + if (PreviousMode != KernelMode) { - NewMem = ExAllocatePool (PoolType, - SrcLength); - *Dest = (PLUID_AND_ATTRIBUTES)NewMem; - if (NewMem == NULL) - { - return STATUS_UNSUCCESSFUL; - } + _SEH_TRY + { + ProbeForRead(Src, + BufferSize, + sizeof(ULONG)); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } } - else + + /* allocate enough memory or check if the provided buffer is + large enough to hold the array */ + if (AllocatedMem != NULL) { - if (SrcLength > AllocatedLength) - { - return STATUS_UNSUCCESSFUL; - } - *Dest = AllocatedMem; + if (AllocatedLength < BufferSize) + { + return STATUS_BUFFER_TOO_SMALL; + } + + *Dest = AllocatedMem; } - memmove (*Dest, Src, SrcLength); + else + { + *Dest = ExAllocatePool(PoolType, + BufferSize); - return STATUS_SUCCESS; + if (&Dest == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + } + + /* copy the array to the buffer */ + _SEH_TRY + { + RtlCopyMemory(*Dest, + Src, + BufferSize); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status) && AllocatedMem == NULL) + { + ExFreePool(*Dest); + } + + return Status; } @@ -232,11 +277,15 @@ NTAPI SeReleaseLuidAndAttributesArray (PLUID_AND_ATTRIBUTES Privilege, KPROCESSOR_MODE PreviousMode, - ULONG a) + BOOLEAN CaptureIfKernel) { - PAGED_CODE(); + PAGED_CODE(); - ExFreePool (Privilege); + if (Privilege != NULL && + (PreviousMode != KernelMode || CaptureIfKernel)) + { + ExFreePool(Privilege); + } } @@ -245,18 +294,58 @@ IN PPRIVILEGE_SET RequiredPrivileges, IN PBOOLEAN Result) { - PLUID_AND_ATTRIBUTES Privilege; + PLUID_AND_ATTRIBUTES Privileges; PTOKEN Token; - ULONG PrivilegeCount; - ULONG PrivilegeControl; + ULONG PrivilegeCount = 0; + ULONG PrivilegeControl = 0; ULONG Length; + BOOLEAN CheckResult; KPROCESSOR_MODE PreviousMode; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PAGED_CODE(); PreviousMode = KeGetPreviousMode(); + /* probe the buffers */ + if (PreviousMode != KernelMode) + { + _SEH_TRY + { + ProbeForWrite(RequiredPrivileges, + sizeof(PRIVILEGE_SET), + sizeof(ULONG)); + + PrivilegeCount = RequiredPrivileges->PrivilegeCount; + PrivilegeControl = RequiredPrivileges->Control; + + /* probe all of the array */ + ProbeForWrite(RequiredPrivileges, + sizeof(FIELD_OFFSET(PRIVILEGE_SET, + Privilege[PrivilegeCount])), + sizeof(ULONG)); + + ProbeForWriteBoolean(Result); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + if (!NT_SUCCESS(Status)) + { + return Status; + } + } + else + { + PrivilegeCount = RequiredPrivileges->PrivilegeCount; + PrivilegeControl = RequiredPrivileges->Control; + } + + /* reference the token and make sure we're + not doing an anonymous impersonation */ Status = ObReferenceObjectByHandle (ClientToken, TOKEN_QUERY, SepTokenObjectType, @@ -269,45 +358,55 @@ } if (Token->TokenType == TokenImpersonation && - Token->ImpersonationLevel < SecurityAnonymous) + Token->ImpersonationLevel < SecurityIdentification) { ObDereferenceObject (Token); - return STATUS_UNSUCCESSFUL; + return STATUS_BAD_IMPERSONATION_LEVEL; } - PrivilegeCount = RequiredPrivileges->PrivilegeCount; - PrivilegeControl = RequiredPrivileges->Control; - Privilege = 0; + /* capture the privileges */ Status = SeCaptureLuidAndAttributesArray (RequiredPrivileges->Privilege, PrivilegeCount, - UserMode, + PreviousMode, NULL, 0, PagedPool, - 1, - &Privilege, + TRUE, + &Privileges, &Length); if (!NT_SUCCESS(Status)) { ObDereferenceObject (Token); - return STATUS_UNSUCCESSFUL; + return Status; } - *Result = SepPrivilegeCheck (Token, - Privilege, - PrivilegeCount, - PrivilegeControl, - UserMode); + CheckResult = SepPrivilegeCheck (Token, + Privileges, + PrivilegeCount, + PrivilegeControl, + PreviousMode); - memmove (RequiredPrivileges->Privilege, - Privilege, - Length); + ObDereferenceObject (Token); - SeReleaseLuidAndAttributesArray (Privilege, - UserMode, - 1); + /* return the array */ + _SEH_TRY + { + RtlCopyMemory(RequiredPrivileges->Privilege, + Privileges, + PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES));; + Status = STATUS_SUCCESS; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; - return STATUS_SUCCESS; + SeReleaseLuidAndAttributesArray (Privileges, + PreviousMode, + TRUE); + + return Status; }

18 years, 11 months

[gedmurphy] 20985: - Added a progress bar showing the status of the action on the service

by gedmurphy＠svn.reactos.org

- Added a progress bar showing the status of the action on the service - Better control over stopping, pausing and resuming - Get pointer to services via separate function Modified: trunk/reactos/subsys/system/servman/En.rc Modified: trunk/reactos/subsys/system/servman/about.c Modified: trunk/reactos/subsys/system/servman/control.c Added: trunk/reactos/subsys/system/servman/progress.c Modified: trunk/reactos/subsys/system/servman/propsheet.c Modified: trunk/reactos/subsys/system/servman/query.c Modified: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.h Modified: trunk/reactos/subsys/system/servman/servman.xml Modified: trunk/reactos/subsys/system/servman/start.c _____ Modified: trunk/reactos/subsys/system/servman/En.rc --- trunk/reactos/subsys/system/servman/En.rc 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/En.rc 2006-01-22 22:33:22 UTC (rev 20985) @@ -60,7 +60,7 @@ BEGIN LTEXT "Service Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 - CONTROL "",IDI_SM_ICON,"Static",0x50000203,0,12,7,30 + ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE END @@ -125,7 +125,8 @@ IDD_DLG_PROGRESS DIALOGEX 6,6,255,89 CAPTION "Service Control" FONT 8,"MS Sans Serif",0,0 -STYLE WS_BORDER | WS_VISIBLE | WS_DLGFRAME | WS_SYSMENU | WS_THICKFRAME | WS_GROUP | WS_TABSTOP +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +EXSTYLE WS_EX_TOOLWINDOW BEGIN CONTROL "",IDC_SERVCON_PROGRESS,"msctls_progress32",0x50000000,8,46,238,13 CONTROL "",IDC_SERVCON_INFO,"Static",0x50000000,8,5,236,11 @@ -177,5 +178,5 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_PROGRESS_INFO "ReactOS is attempting to %s the following service on %s" + IDS_PROGRESS_INFO "ReactOS is attempting to %s the following service" END _____ Modified: trunk/reactos/subsys/system/servman/about.c --- trunk/reactos/subsys/system/servman/about.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/about.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -50,5 +50,5 @@ break; } - return 0; + return FALSE; } _____ Modified: trunk/reactos/subsys/system/servman/control.c --- trunk/reactos/subsys/system/servman/control.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/control.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -12,13 +12,17 @@ extern HWND hListView; -BOOL Control(DWORD Control) +BOOL Control(HWND hProgDlg, DWORD Control) { + HWND hProgBar; SC_HANDLE hSCManager; SC_HANDLE hSc; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + SERVICE_STATUS_PROCESS ServiceStatus; SERVICE_STATUS Status; LVITEM item; + DWORD BytesNeeded = 0; + DWORD Loop = 5; //FIXME: testing value. needs better control item.mask = LVIF_PARAM; item.iItem = GetSelectedItem(); @@ -27,6 +31,11 @@ /* copy pointer to selected service */ Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + /* set the progress bar range and step */ + hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); + SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, Loop)); + SendMessage(hProgBar, PBM_SETSTEP, (WPARAM)1, 0); + /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) @@ -37,7 +46,7 @@ /* open handle to the service */ hSc = OpenService(hSCManager, Service->lpServiceName, - SERVICE_PAUSE_CONTINUE | SERVICE_STOP); + SC_MANAGER_ALL_ACCESS); if (hSc == NULL) { GetError(0); @@ -52,8 +61,50 @@ return FALSE; } + /* query the state of the service */ + if (! QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + GetError(0); + return FALSE; + } + + /* loop whilst service is not running */ + /* FIXME: needs more control adding. 'Loop' is temparary */ + while (ServiceStatus.dwCurrentState != Control || !Loop) + { + /* increment the progress bar */ + SendMessage(hProgBar, PBM_STEPIT, 0, 0); + + /* wait before checking status */ + Sleep(ServiceStatus.dwWaitHint / 8); + + /* check status again */ + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + GetError(0); + return FALSE; + } + Loop--; + } + CloseServiceHandle(hSc); - return TRUE; + if (ServiceStatus.dwCurrentState == Control) + { + SendMessage(hProgBar, PBM_DELTAPOS, Loop, 0); + Sleep(1000); + return TRUE; + } + else + return FALSE; } _____ Added: trunk/reactos/subsys/system/servman/progress.c --- trunk/reactos/subsys/system/servman/progress.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/progress.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -0,0 +1,45 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: subsys/system/servman/progress.c + * PURPOSE: Progress dialog box message handler + * COPYRIGHT: Copyright 2006 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include "servman.h" + +extern HINSTANCE hInstance; +//extern HWND hMainWnd; + + +BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam) +{ + switch(Message) + { + case WM_INITDIALOG: + + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDOK: + DestroyWindow(hDlg); + break; + + } + break; + + case WM_DESTROY: + DestroyWindow(hDlg); + break; + + default: + return FALSE; + } + + return TRUE; + +} + _____ Modified: trunk/reactos/subsys/system/servman/propsheet.c --- trunk/reactos/subsys/system/servman/propsheet.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/propsheet.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -77,18 +77,13 @@ { HKEY hKey; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; - LVITEM item; PROP_DLG_INFO DlgInfo; LPCTSTR Path = _T("System\\CurrentControlSet\\Services\\%s"); TCHAR buf[300]; - item.mask = LVIF_PARAM; - item.iItem = GetSelectedItem(); - SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + /* get pointer to selected service */ + Service = GetSelectedService(); - /* copy pointer to selected service */ - Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; - /* open the registry key for the service */ _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, Service->lpServiceName); RegOpenKeyEx(HKEY_LOCAL_MACHINE, _____ Modified: trunk/reactos/subsys/system/servman/query.c --- trunk/reactos/subsys/system/servman/query.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/query.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -24,6 +24,24 @@ } + +ENUM_SERVICE_STATUS_PROCESS* +GetSelectedService(VOID) +{ + ENUM_SERVICE_STATUS_PROCESS *pSelectedService = NULL; + LVITEM item; + + item.mask = LVIF_PARAM; + item.iItem = GetSelectedItem(); + SendMessage(hListView, LVM_GETITEM, 0, (LPARAM)&item); + + /* copy pointer to selected service */ + pSelectedService = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + + return pSelectedService; +} + + /* Retrives the service description from the registry */ BOOL GetDescription(HKEY hKey, LPTSTR *retDescription) { _____ Modified: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -16,6 +16,7 @@ HWND hListView; HWND hStatus; HWND hTool; +HWND hProgDlg; HMENU hShortcutMenu; INT SelectedItem; @@ -343,8 +344,35 @@ break; case ID_START: - if ( DoStartService() ) + { + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + TCHAR buf1[100]; + TCHAR buf2[100]; + /* open the progress dialog */ + hProgDlg = CreateDialog(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_DLG_PROGRESS), + hMainWnd, + (DLGPROC)ProgressDialogProc); + if (hProgDlg != NULL) { + ShowWindow(hProgDlg, SW_SHOW); + + /* write the info to the progress dialog */ + LoadString(hInstance, IDS_PROGRESS_INFO, buf1, + sizeof(buf1) / sizeof(TCHAR)); + _sntprintf(buf2, 100, buf1, _T("start")); + SendDlgItemMessage(hProgDlg, IDC_SERVCON_INFO, WM_SETTEXT, 0, (LPARAM)buf2); + + /* get pointer to selected service */ + Service = GetSelectedService(); + + /* write the service name to the progress dialog */ + SendDlgItemMessage(hProgDlg, IDC_SERVCON_NAME, WM_SETTEXT, 0, + (LPARAM)Service->lpServiceName); + } + + if ( DoStartService(hProgDlg) ) + { LVITEM item; TCHAR szStatus[64]; @@ -355,11 +383,41 @@ item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } break; case ID_STOP: - if( Control(SERVICE_CONTROL_STOP) ) + { + ENUM_SERVICE_STATUS_PROCESS *Service = NULL; + TCHAR buf1[100]; + TCHAR buf2[100]; + /* open the progress dialog */ + hProgDlg = CreateDialog(GetModuleHandle(NULL), + MAKEINTRESOURCE(IDD_DLG_PROGRESS), + hMainWnd, + (DLGPROC)ProgressDialogProc); + if (hProgDlg != NULL) { + ShowWindow(hProgDlg, SW_SHOW); + + /* write the info to the progress dialog */ + LoadString(hInstance, IDS_PROGRESS_INFO, buf1, + sizeof(buf1) / sizeof(TCHAR)); + _sntprintf(buf2, 100, buf1, _T("stop")); + SendDlgItemMessage(hProgDlg, IDC_SERVCON_INFO, WM_SETTEXT, 0, (LPARAM)buf2); + + /* get pointer to selected service */ + Service = GetSelectedService(); + + /* write the service name to the progress dialog */ + SendDlgItemMessage(hProgDlg, IDC_SERVCON_NAME, WM_SETTEXT, 0, + (LPARAM)Service->lpServiceName); + } + + if( Control(hProgDlg, SERVICE_CONTROL_STOP) ) + { LVITEM item; item.pszText = '\0'; @@ -367,39 +425,22 @@ item.iSubItem = 2; SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); } + + SendMessage(hProgDlg, WM_DESTROY, 0, 0); + } break; case ID_PAUSE: - Control(SERVICE_CONTROL_PAUSE); + Control(hProgDlg, SERVICE_CONTROL_PAUSE); break; case ID_RESUME: - Control(SERVICE_CONTROL_CONTINUE ); + Control(hProgDlg, SERVICE_CONTROL_CONTINUE ); break; case ID_RESTART: - if( Control(SERVICE_CONTROL_STOP) ) - { - LVITEM item; - - item.pszText = '\0'; - item.iItem = GetSelectedItem(); - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - - if ( DoStartService() ) - { - LVITEM item; - TCHAR szStatus[64]; - - LoadString(hInstance, IDS_SERVICES_STARTED, szStatus, - sizeof(szStatus) / sizeof(TCHAR)); - item.pszText = szStatus; - item.iItem = GetSelectedItem(); - item.iSubItem = 2; - SendMessage(hListView, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } - } + SendMessage(hMainWnd, WM_COMMAND, 0, ID_STOP); + SendMessage(hMainWnd, WM_COMMAND, 0, ID_START); break; case ID_NEW: @@ -420,8 +461,8 @@ case ID_ABOUT: DialogBox(hInstance, MAKEINTRESOURCE(IDD_ABOUTBOX), - hwnd, - AboutDialogProc); + hMainWnd, + (DLGPROC)AboutDialogProc); break; } @@ -497,8 +538,11 @@ while( GetMessage( &Msg, NULL, 0, 0 ) ) { - TranslateMessage(&Msg); - DispatchMessage(&Msg); + if(! IsDialogMessage(hProgDlg, &Msg) ) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } } return (int)Msg.wParam; _____ Modified: trunk/reactos/subsys/system/servman/servman.h --- trunk/reactos/subsys/system/servman/servman.h 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/servman.h 2006-01-22 22:33:22 UTC (rev 20985) @@ -15,12 +15,15 @@ BOOL RefreshServiceList(VOID); BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +BOOL CALLBACK ProgressDialogProc(HWND hDlg, UINT Message, WPARAM wParam, LPARAM lParam); -BOOL DoStartService(VOID); -BOOL Control(DWORD Control); +BOOL DoStartService(HWND hProgDlg); +BOOL Control(HWND hProgBar, DWORD Control); INT GetSelectedItem(VOID); +ENUM_SERVICE_STATUS_PROCESS* GetSelectedService(VOID); + VOID GetError(DWORD); VOID FreeMemory(VOID); VOID DisplayString(PTCHAR); _____ Modified: trunk/reactos/subsys/system/servman/servman.xml --- trunk/reactos/subsys/system/servman/servman.xml 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/servman.xml 2006-01-22 22:33:22 UTC (rev 20985) @@ -16,6 +16,7 @@ <file>about.c</file> <file>control.c</file> <file>geterror.c</file> + <file>progress.c</file> <file>propsheet.c</file> <file>query.c</file> <file>servman.c</file> _____ Modified: trunk/reactos/subsys/system/servman/start.c --- trunk/reactos/subsys/system/servman/start.c 2006-01-22 20:34:47 UTC (rev 20984) +++ trunk/reactos/subsys/system/servman/start.c 2006-01-22 22:33:22 UTC (rev 20985) @@ -10,17 +10,19 @@ #include "servman.h" extern HWND hListView; +extern HWND hMainWnd; -BOOL DoStartService(VOID) +BOOL DoStartService(HWND hProgDlg) { + HWND hProgBar; SC_HANDLE hSCManager; SC_HANDLE hSc; SERVICE_STATUS_PROCESS ServiceStatus; ENUM_SERVICE_STATUS_PROCESS *Service = NULL; LVITEM item; - DWORD BytesNeeded; + DWORD BytesNeeded = 0; INT ArgCount = 0; - BOOL Loop = 10; //FIXME: testing value. needs better control + DWORD Loop = 5; //FIXME: testing value. needs better control item.mask = LVIF_PARAM; item.iItem = GetSelectedItem(); @@ -29,6 +31,11 @@ /* copy pointer to selected service */ Service = (ENUM_SERVICE_STATUS_PROCESS *)item.lParam; + /* set the progress bar range and step */ + hProgBar = GetDlgItem(hProgDlg, IDC_SERVCON_PROGRESS); + SendMessage(hProgBar, PBM_SETRANGE, 0, MAKELPARAM(0, Loop)); + SendMessage(hProgBar, PBM_SETSTEP, (WPARAM)1, 0); + /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) @@ -53,12 +60,11 @@ } /* query the state of the service */ - if (! QueryServiceStatusEx( - hSc, - SC_STATUS_PROCESS_INFO, - (LPBYTE)&ServiceStatus, - sizeof(SERVICE_STATUS_PROCESS), - &BytesNeeded)) + if (! QueryServiceStatusEx(hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) { GetError(0); return FALSE; @@ -66,10 +72,13 @@ /* loop whilst service is not running */ /* FIXME: needs more control adding. 'Loop' is temparary */ - while (ServiceStatus.dwCurrentState == SERVICE_START_PENDING || !Loop) + while (ServiceStatus.dwCurrentState != SERVICE_RUNNING || !Loop) { + /* increment the progress bar */ + SendMessage(hProgBar, PBM_STEPIT, 0, 0); + /* wait before checking status */ - Sleep(ServiceStatus.dwWaitHint); + Sleep(ServiceStatus.dwWaitHint / 8); /* check status again */ if (! QueryServiceStatusEx( @@ -88,7 +97,11 @@ CloseServiceHandle(hSc); if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + SendMessage(hProgBar, PBM_DELTAPOS, Loop, 0); + Sleep(1000); return TRUE; + } else return FALSE;

18 years, 11 months

[weiden] 20984: add SEH to NtW32Call and directly use KeUserModeCallback in win32k instead

by weiden＠svn.reactos.org

add SEH to NtW32Call and directly use KeUserModeCallback in win32k instead Modified: trunk/reactos/include/ndk/kefuncs.h Modified: trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/subsys/win32k/ntuser/callback.c _____ Modified: trunk/reactos/include/ndk/kefuncs.h --- trunk/reactos/include/ndk/kefuncs.h 2006-01-22 15:55:14 UTC (rev 20983) +++ trunk/reactos/include/ndk/kefuncs.h 2006-01-22 20:34:47 UTC (rev 20984) @@ -426,8 +426,8 @@ IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength, - OUT PVOID* Result OPTIONAL, - OUT PULONG ResultLength OPTIONAL + OUT PVOID* Result, + OUT PULONG ResultLength ); NTSTATUS _____ Modified: trunk/reactos/ntoskrnl/ps/win32.c --- trunk/reactos/ntoskrnl/ps/win32.c 2006-01-22 15:55:14 UTC (rev 20983) +++ trunk/reactos/ntoskrnl/ps/win32.c 2006-01-22 20:34:47 UTC (rev 20984) @@ -192,25 +192,56 @@ NtW32Call(IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength, - OUT PVOID* Result OPTIONAL, - OUT PULONG ResultLength OPTIONAL) + OUT PVOID* Result, + OUT PULONG ResultLength) { - NTSTATUS CallbackStatus; + PVOID RetResult; + ULONG RetResultLength; + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtW32Call(RoutineIndex %d, Argument %X, ArgumentLength %d)\n", + DPRINT("NtW32Call(RoutineIndex %d, Argument %p, ArgumentLength %d)\n", RoutineIndex, Argument, ArgumentLength); - /* FIXME: SEH!!! */ + /* must not be called as KernelMode! */ + ASSERT(KeGetPreviousMode() != KernelMode); - /* Call kernel function */ - CallbackStatus = KeUserModeCallback(RoutineIndex, - Argument, - ArgumentLength, - Result, - ResultLength); + _SEH_TRY + { + ProbeForWritePointer(Result); + ProbeForWriteUlong(ResultLength); + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (NT_SUCCESS(Status)) + { + /* Call kernel function */ + Status = KeUserModeCallback(RoutineIndex, + Argument, + ArgumentLength, + &RetResult, + &RetResultLength); + + if (NT_SUCCESS(Status)) + { + _SEH_TRY + { + *Result = RetResult; + *ResultLength = RetResultLength; + } + _SEH_HANDLE + { + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + } + } + /* Return the result */ - return(CallbackStatus); + return Status; } /* EOF */ _____ Modified: trunk/reactos/subsys/win32k/ntuser/callback.c --- trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-22 15:55:14 UTC (rev 20983) +++ trunk/reactos/subsys/win32k/ntuser/callback.c 2006-01-22 20:34:47 UTC (rev 20984) @@ -116,6 +116,8 @@ LRESULT Result) { SENDASYNCPROC_CALLBACK_ARGUMENTS Arguments; + PVOID ResultPointer; + ULONG ResultLength; NTSTATUS Status; Arguments.Callback = CompletionCallback; @@ -126,11 +128,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_SENDASYNCPROC, - &Arguments, - sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), - NULL, - NULL); + Status = KeUserModeCallback(USER32_CALLBACK_SENDASYNCPROC, + &Arguments, + sizeof(SENDASYNCPROC_CALLBACK_ARGUMENTS), + &ResultPointer, + &ResultLength); UserEnterCo(); @@ -187,11 +189,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_WINDOWPROC, - Arguments, - ArgumentLength, - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_WINDOWPROC, + Arguments, + ArgumentLength, + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ RtlMoveMemory(Arguments, ResultPointer, ArgumentLength); @@ -232,11 +234,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_LOADSYSMENUTEMPLATE, - NULL, - 0, - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_LOADSYSMENUTEMPLATE, + NULL, + 0, + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer; @@ -264,11 +266,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_LOADDEFAULTCURSORS, - &DefaultCursor, - sizeof(BOOL), - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_LOADDEFAULTCURSORS, + &DefaultCursor, + sizeof(BOOL), + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer; @@ -398,11 +400,11 @@ UserLeaveCo(); - Status = NtW32Call(USER32_CALLBACK_HOOKPROC, - Argument, - ArgumentLength, - &ResultPointer, - &ResultLength); + Status = KeUserModeCallback(USER32_CALLBACK_HOOKPROC, + Argument, + ArgumentLength, + &ResultPointer, + &ResultLength); /* Simulate old behaviour: copy into our local buffer */ Result = *(LRESULT*)ResultPointer;

18 years, 11 months

← Newer
1
...
7
8
9
10
11
12
13
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006