Ros-diffs December 2007

ros-diffs@reactos.org

22 participants
605 discussions

[tkreuzer] 31270: w32kdll for windows 2003 SP2
by tkreuzer＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: tkreuzer Date: Sun Dec 16 05:32:20 2007 New Revision: 31270 URL: http://svn.reactos.org/svn/reactos?rev=31270&view=rev Log: w32kdll for windows 2003 SP2 Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/ trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def (with props) trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild (with props) Modified: trunk/rostests/apitests/w32kdll/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/apitests/w32kdll/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/director… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.S URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.def URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_… Added: trunk/rostests/apitests/w32kdll/w32kdll_2k3sp2/w32kdll_2k3sp2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/w32kdll/w32kdll_…

1 0

[greatlrd] 31269: do not try add DDSD_LPSURFACE when it is already been set
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:56:43 2007 New Revision: 31269 URL: http://svn.reactos.org/svn/reactos?rev=31269&view=rev Log: do not try add DDSD_LPSURFACE when it is already been set Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:56:43 2007 @@ -81,7 +81,8 @@ * if they forget set it, the ddraw will autoamtic * set it for system memory. */ - if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) + if ( ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) && + ((pDDSD->dwFlags & DDSD_LPSURFACE) != DDSD_LPSURFACE) ) { pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; }

1 0

[greatlrd] 31268: fix a typo
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:46:43 2007 New Revision: 31268 URL: http://svn.reactos.org/svn/reactos?rev=31268&view=rev Log: fix a typo Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:46:43 2007 @@ -81,7 +81,7 @@ * if they forget set it, the ddraw will autoamtic * set it for system memory. */ - if ((pDDSD->dwFlags & DDSCAPS_SYSTEMMEMORY) != DDSCAPS_SYSTEMMEMORY) + if ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) { pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; }

1 0

[greatlrd] 31267: fix a bug in createsurface DDSD_LPSURFACE should only be automatic set if we have a system memory surface.
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:43:22 2007 New Revision: 31267 URL: http://svn.reactos.org/svn/reactos?rev=31267&view=rev Log: fix a bug in createsurface DDSD_LPSURFACE should only be automatic set if we have a system memory surface. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:43:22 2007 @@ -78,10 +78,10 @@ /* * program does not need set the DDSD_LPSURFACE, - * if they forget set it, the ddraw will autoamtic set it. - * + * if they forget set it, the ddraw will autoamtic + * set it for system memory. */ - if ((pDDSD->dwFlags & DDSD_LPSURFACE) != DDSD_LPSURFACE) + if ((pDDSD->dwFlags & DDSCAPS_SYSTEMMEMORY) != DDSCAPS_SYSTEMMEMORY) { pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; }

1 0

[greatlrd] 31266: fix another bug in createsurface a program does not need set the flag DDSD_LPSURFACE, if they forget ddraw will automatic set it.
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:38:22 2007 New Revision: 31266 URL: http://svn.reactos.org/svn/reactos?rev=31266&view=rev Log: fix another bug in createsurface a program does not need set the flag DDSD_LPSURFACE, if they forget ddraw will automatic set it. Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:38:22 2007 @@ -76,6 +76,16 @@ return DDERR_INVALIDPARAMS; } + /* + * program does not need set the DDSD_LPSURFACE, + * if they forget set it, the ddraw will autoamtic set it. + * + */ + if ((pDDSD->dwFlags & DDSD_LPSURFACE) != DDSD_LPSURFACE) + { + pDDSD->dwFlags = pDDSD->dwFlags | DDSD_LPSURFACE; + } + /* FIXME count our how many surface we need */ DxHeapMemAlloc(slist_int, num_of_surf * sizeof( LPDDRAWI_DDRAWSURFACE_INT ) );

1 0

[greatlrd] 31265: fix a check in createsurface do not accpect if both flag DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY are set in pDDSD->ddsCaps
by greatlrd＠svn.reactos.org 16 Dec '07

16 Dec '07

Author: greatlrd Date: Sun Dec 16 03:28:35 2007 New Revision: 31265 URL: http://svn.reactos.org/svn/reactos?rev=31265&view=rev Log: fix a check in createsurface do not accpect if both flag DDSCAPS_SYSTEMMEMORY and DDSCAPS_VIDEOMEMORY are set in pDDSD->ddsCaps Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Modified: trunk/reactos/dll/directx/ddraw/Surface/createsurface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Surface/… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Surface/createsurface.c (original) +++ trunk/reactos/dll/directx/ddraw/Surface/createsurface.c Sun Dec 16 03:28:35 2007 @@ -58,6 +58,12 @@ return DDERR_INVALIDOBJECT; } + if ( ((pDDSD->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) == DDSCAPS_SYSTEMMEMORY) && + ((pDDSD->ddsCaps.dwCaps & DDSCAPS_VIDEOMEMORY) == DDSCAPS_VIDEOMEMORY) ) + { + return DDERR_INVALIDCAPS; + } + if(!(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->dwFlags & DDSD_HEIGHT) && !(pDDSD->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE)) {

1 0

[frik85] 31264: ReactOS paste service * improved data-i/o code * new features like word-wrap * bug fixes URI: http://www.reactos.org/paste/
by frik85＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: frik85 Date: Sun Dec 16 02:04:19 2007 New Revision: 31264 URL: http://svn.reactos.org/svn/reactos?rev=31264&view=rev Log: ReactOS paste service * improved data-i/o code * new features like word-wrap * bug fixes URI: http://www.reactos.org/paste/ Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php trunk/web/reactos.org/htdocs/paste/inc/header.php trunk/web/reactos.org/htdocs/paste/inc/help.php trunk/web/reactos.org/htdocs/paste/inc/highlight.php trunk/web/reactos.org/htdocs/paste/inc/paste.php trunk/web/reactos.org/htdocs/paste/inc/recent.php trunk/web/reactos.org/htdocs/paste/index.php Modified: trunk/web/reactos.org/htdocs/paste/inc/account.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/a… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/account.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/account.php Sun Dec 16 02:04:19 2007 @@ -24,7 +24,7 @@ require_once("/web/reactos.org/htdocs/roscms/inc/subsys_login.php"); $RSDB_intern_user_id = roscms_subsys_login('', ROSCMS_LOGIN_OPTIONAL, "/" . $RSDB_intern_path); */ - $RSDB_intern_user_id=0; + $RSDB_intern_user_id=2; $RSDB_USER_name="Anonymous"; if($RSDB_intern_user_id != 0) { @@ -40,5 +40,6 @@ else { $RSDB_USER_name = "Anonymous"; } + //echo "<h1>!!!".$RSDB_USER_name."</h1>"; ?> Modified: trunk/web/reactos.org/htdocs/paste/inc/header.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/h… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/header.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/header.php Sun Dec 16 02:04:19 2007 @@ -18,6 +18,11 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +function create_header() { + +global $ros_paste_SET_path; +global $ros_paste_SET_path_ex; ?> @@ -101,9 +106,30 @@ </ol> </div> <p></p> - + + +<script type="text/javascript"></script> +<script type="text/javascript" + src="http://pagead2.googlesyndication.com/pagead/show_ads.js"> +</script> + </td>  <td id="content"> +<?php + } +?> Modified: trunk/web/reactos.org/htdocs/paste/inc/help.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/h… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/help.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/help.php Sun Dec 16 02:04:19 2007 @@ -28,5 +28,5 @@ <h2>What's different about this one? </h2> <p> A lot of paste sites have appeared lately, and many of them are quite similar. The ReactOS "Copy&Paste" paste service provide a unique list of features and a broad range of code highlight support. It uses <a href="http://rafb.net/paste/highlight.phps" target="_blank">rafb.net's code highlight php library</a> which is free available under BSD license. </p> <h2>How long is the paste accessable? </h2> -<p> The paste is accessable for 7 days. </p> +<p> The paste is accessable for 7 days (default setting). The timeframe can be set between 1 to 7 days as per paste setting. </p> <p></p> Modified: trunk/web/reactos.org/htdocs/paste/inc/highlight.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/h… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/highlight.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/highlight.php Sun Dec 16 02:04:19 2007 @@ -496,7 +496,60 @@ "varchar", "variable", "varying", "verbose", "version", "view", "volatile", "when", "whenever", "where", "with", "without", - "work", "write", "year", "zone") + "work", "write", "year", "zone"), + + + "Bash" => array( + "alias", "break", "case", "continue", + "do", "done", "elif", "else", + "esac", "exit", "export", "fi", + "for", "if", "in", "return", + "set", "then", "unalias", "unset", + "while", "halt", "ifconfig", "lsmod", + "modprobe", "reboot", "rmmod", "route", + "shutdown", "traceroute", "awk", "basename", + "cat", "cp", "echo", "egrep", + "fgrep", "gawk", "grep", "gzip", + "kill", "killall", "less", "md", + "mkdir", "mv", "nice", "pidof", + "ps", "rd", "read", "rm", + "rmdir", "sed", "sleep", "test", + "touch", "ulimit", "uname", "usleep", + "zcat", "zless" + ), + + "Batch" => array( + "do", "else", "end", "errorlevel", + "exist", "exit", "for", "goto", + "if", "not", "pause", "return", + "say", "select", "then", "when", + "ansi", "append", "assign", "attrib", + "autofail", "backup", "basedev", "boot", + "break", "buffers", "cache", "call", + "cd", "chcp", "chdir", "chkdsk", + "choice", "cls", "cmd", "codepage", + "command", "comp", "copy", "country", + "date", "ddinstal", "debug", "del", + "detach", "device", "devicehigh", "devinfo", + "dir", "diskcoache", "diskcomp", "diskcopy", + "doskey", "dpath", "dumpprocess", "eautil", + "endlocal", "erase", "exit_vdm", "extproc", + "fcbs", "fdisk", "fdiskpm", "files", + "find", "format", "fsaccess", "fsfilter", + "graftabl", "iopl", "join", "keyb", "keys", + "label", "lastdrive", "libpath", "lh", "loadhigh", + "makeini", "maxwait", "md", "mem", "memman", "mkdir", "mode", "move", + "net", "patch", "path", "pauseonerror", "picview", "pmrexx", "print", + "printmonbufsize", "priority", "priority_disk_io", "prompt", "protectonly", + "protshell", "pstat", "rd", "recover", "reipl", "ren", "rename", "replace", + "restore", "rmdir", "rmsize", "run", "set", "setboot", "setlocal", "shell", + "shift", "sort", "spool", "start", "subst", "suppresspopups", "swappath", + "syslevel", "syslog", "threads", "time", "timeslice", "trace", "tracebuf", + "tracefmt", "trapdump", "tree", "type", "undelete", "unpack", "use", + "ver", "verify", "view", "vmdisk", "vol", + "xcopy", "xcopy32", "xdfcopy", + "echo", "off", "on" + ) ); @@ -751,7 +804,7 @@ $mirc[line_comment]["\n"] = normal_text; $mirc[line_comment][0] = line_comment; - + $ruby = $perl; $python = $perl; @@ -850,6 +903,9 @@ $xml[dq_escape][";"] = dq_literal; $xml[dq_escape][0] = dq_escape; + $bash = $perl; + $batch = $c89;; + // // Main state transition table // @@ -869,7 +925,9 @@ "PL/I" => $pli, "SQL" => $sql, "XML" => $xml, - "Scheme" => $sch + "Scheme" => $sch, + "Bash" => $bash, + "Batch" => $batch ); @@ -949,6 +1007,10 @@ $process["XML"][xml_tag][dq_literal] = "rtrim1"; $process["XML"][dq_literal][xml_tag] = "rtrim1"; $process["XML"][dq_literal][dq_escape] = "rtrim1"; + + $process["Bash"] = $process["Perl"]; + $process["Batch"] = $process["C++"]; + $process_end["C89"] = "syntax_highlight_helper"; $process_end["C++"] = $process_end["C89"]; @@ -965,7 +1027,8 @@ $process_end["PL/I"] = $process_end["C89"]; $process_end["SQL"] = $process_end["C89"]; $process_end["Scheme"] = "sch_syntax_helper"; - + $process_end["Bash"] = $process_end["C89"]; + $process_end["Batch"] = $process_end["C89"]; $edges["C89"][normal_text .",". dq_literal] = '<span class="literal">"'; $edges["C89"][normal_text .",". sq_literal] = '<span class="literal">\''; @@ -1049,6 +1112,10 @@ $edges["XML"][sq_literal . "," . xml_tag] = '\'</span>'; $edges["XML"][sq_literal . "," . sq_escape] = '<span class="html_entity">&'; $edges["XML"][sq_escape . "," . sq_literal] = '</span>'; + + $edges["Bash"] = $edges["Perl"]; + $edges["Batch"] = $edges["C89"]; + // // The State Machine Modified: trunk/web/reactos.org/htdocs/paste/inc/paste.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/p… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/paste.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/paste.php Sun Dec 16 02:04:19 2007 @@ -29,94 +29,109 @@ } if ($ros_paste_SET_pasteid) { + create_header(); + $query_pasteid=mysql_query("SELECT * FROM `paste_service` - WHERE `paste_id` = '".mysql_real_escape_string($ros_paste_SET_pasteid)."' + WHERE `paste_id` = '".mysql_real_escape_string($ros_paste_SET_pasteid)."' LIMIT 1 ;"); $result_pasteid = mysql_fetch_array($query_pasteid); - echo '<link href="highlight.css" type="text/css" rel="stylesheet" />'; - echo "<h1><a style=\"color:#FFFFFF ! important ;\" href=\"http://www.reactos.org/\">Home</a> > <a style=\"color:#FFFFFF ! important ;\" href=\"".$ros_paste_SET_path."\">Paste Service</a> > ".$ros_paste_SET_pasteid."</h1>"; - echo "<h2>"; - if ($result_pasteid['paste_desc']) { - echo $result_pasteid['paste_desc']; + if ($result_pasteid['paste_lines'] == "" || $result_pasteid['paste_lines'] <= 0 || compareDate((date('Y')."-".date('m')."-".date('d')),stripDate($result_pasteid['paste_datetime'])) > 7) { + echo "<p><b>No related paste exists.</b></p>"; + } else if (compareDate((date('Y')."-".date('m')."-".date('d')),stripDate($result_pasteid['paste_datetime'])) <= $result_pasteid['paste_days']) { + + echo '<link href="highlight.css" type="text/css" rel="stylesheet" />'; + echo "<h1><a style=\"color:#FFFFFF ! important ;\" href=\"http://www.reactos.org/\">Home</a> > <a style=\"color:#FFFFFF ! important ;\" href=\"".$ros_paste_SET_path."\">Paste Service</a> > ".$ros_paste_SET_pasteid."</h1>"; + echo "<h2>"; + if ($result_pasteid['paste_desc']) { + echo $result_pasteid['paste_desc']; + } + else { + echo "Paste #".$result_pasteid['paste_id']; + } + echo "</h2>"; + + ?> + + <p>Pasted by: <b><?php echo $result_pasteid['paste_nick']; ?></b><br /> + Language: <b><?php echo $result_pasteid['paste_lang']; ?></b><br /> + Description: <b><?php echo $result_pasteid['paste_desc']; ?></b><br /> + Pasted on: <b><?php echo $result_pasteid['paste_date']; ?></b><br /> + Expire after: <b><?php echo $result_pasteid['paste_days']; ?> days </b><br /> + Paste history: <b><?php + + if ($result_pasteid['paste_public'] == "1") { + echo "yes (public)"; } else { - echo $result_pasteid['paste_id']; - } - echo "</h2>"; - -?> - -<p>Pasted by: <b><?php echo $result_pasteid['paste_nick']; ?></b><br /> -Language: <b><?php echo $result_pasteid['paste_lang']; ?></b><br /> -Description: <b><?php echo $result_pasteid['paste_desc']; ?></b><br /> -Pasted on: <b><?php echo $result_pasteid['paste_date']; ?></b><br /> -Expire after: <b><?php echo $result_pasteid['paste_days']; ?> days </b><br /> -Paste history: <b><?php - - if ($result_pasteid['paste_public'] == "1") { - echo "yes (public)"; - } - else { - echo "no (private)"; - } - -?></b></p> -<p><?php - - if (@$ros_paste_SET_pasteflag == "nln") { - echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/">Add line numbers</a>'; - } - else { - echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/nln/">Remove line numbers</a>'; - } -?> | - <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/text/'; ?>" target="_blank">Download as Text</a> | - <a href="<?php echo $ros_paste_SET_path_ex . 'recent/'; ?>">Other recent pastes</a> | - <a href="<?php echo $ros_paste_SET_path; ?>">Create new paste</a> </p> -<?php - - - $ros_paste_SET_textcontent = htmlspecialchars($result_pasteid['paste_content']); - if ($result_pasteid['paste_tabs'] != "0") { - $PASTE_var_tabs = ""; - for($xxx=0; $xxx<$result_pasteid['paste_tabs']; $xxx++){ - $PASTE_var_tabs .= " "; - } - $ros_paste_SET_textcontent = str_replace("\t",$PASTE_var_tabs,$ros_paste_SET_textcontent); - } - - - - // Content: - $ros_paste_SET_textcontent = syntax_highlight($ros_paste_SET_textcontent, $result_pasteid['paste_lang']); - - - + echo "no (private)"; + } + + ?></b></p> + <p><?php + if (@$ros_paste_SET_pasteflag == "nln") { - echo '<pre class="code" style="margin: 6px;">'; - echo $ros_paste_SET_textcontent; - echo '</pre>'; + echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/">Add line numbers</a>'; } else { -?> - <table cellspacing="5" cellpadding="1" border="0"> - <tbody> - <tr> - - <td align="right" valign="top"><pre class="code"><?php + echo '<a href="'. $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/nln/">Remove line numbers</a>'; + } + ?> | + <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/text/'; ?>" target="_blank">Download as Text</a> + <a href="<?php echo $ros_paste_SET_path_ex . $result_pasteid['paste_id'] .'/textw/'; ?>" target="_blank">(word-warp)</a> | + <a href="<?php echo $ros_paste_SET_path_ex . 'recent/'; ?>">Other recent pastes</a> | + <a href="<?php echo $ros_paste_SET_path; ?>">Create new paste</a> </p> + <?php + + + $filename = $ros_paste_SET_content."/".$result_pasteid['paste_id'].".txt"; + $handle = @fopen($filename, "r"); + $contents = @fread($handle, @filesize($filename)); + @fclose($handle); - for ($PASTE_linecount=1; $PASTE_linecount <= $result_pasteid['paste_lines']; $PASTE_linecount++) { - echo $PASTE_linecount."\n"; + if ($contents == "") { + die("<b>paste expired</b>"); + } + + $ros_paste_SET_textcontent = htmlspecialchars($contents); + if ($result_pasteid['paste_tabs'] != "0") { + $PASTE_var_tabs = ""; + for($xxx=0; $xxx<$result_pasteid['paste_tabs']; $xxx++){ + $PASTE_var_tabs .= " "; } + $ros_paste_SET_textcontent = str_replace("\t",$PASTE_var_tabs,$ros_paste_SET_textcontent); + } - ?></pre> - </td> - <td width="100%" valign="top"><pre class="code"><?php echo $ros_paste_SET_textcontent; ?></pre></td></tr></tbody></table> + + // Content: + $ros_paste_SET_textcontent = syntax_highlight($ros_paste_SET_textcontent, $result_pasteid['paste_lang']); + + + + if (@$ros_paste_SET_pasteflag == "nln") { + echo '<pre class="code" style="margin: 6px;">'; + echo $ros_paste_SET_textcontent; + echo '</pre>'; + } + else { + ?> + <table cellspacing="5" cellpadding="1" border="0"> + <tbody> + <tr> + + <td align="right" valign="top"><pre class="code"><?php + + for ($PASTE_linecount=1; $PASTE_linecount <= $result_pasteid['paste_lines']; $PASTE_linecount++) { + echo $PASTE_linecount."\n"; + } + + ?></pre> + </td> + <td width="100%" valign="top"><pre class="code"><?php echo $ros_paste_SET_textcontent; ?></pre></td></tr></tbody></table> <?php - } - + } + } } else { if ($ros_paste_SET_cnp == "1") { @@ -124,7 +139,8 @@ $ros_paste_SET_lang = ""; $ros_paste_SET_usrname = ""; $ros_paste_SET_nick = ""; - $ros_paste_SET_husrname = ""; + //$ros_paste_SET_husrname = ""; + //$ros_paste_SET_husrid = ""; $ros_paste_SET_desc = ""; $ros_paste_SET_cvt_tabs = ""; $ros_paste_SET_optday = ""; @@ -132,10 +148,12 @@ $ros_paste_SET_textcontent = ""; $ros_paste_SET_public = ""; + if (array_key_exists("lang", $_POST)) $ros_paste_SET_lang=htmlspecialchars($_POST["lang"]); if (array_key_exists("usrname", $_POST)) $ros_paste_SET_usrname=htmlspecialchars($_POST["usrname"]); if (array_key_exists("nick", $_POST)) $ros_paste_SET_nick=htmlspecialchars($_POST["nick"]); - if (array_key_exists("husrname", $_POST)) $ros_paste_SET_husrname=htmlspecialchars($_POST["husrname"]); + //if (array_key_exists("husrname", $_POST)) $ros_paste_SET_husrname=htmlspecialchars($_POST["husrname"]); + //if (array_key_exists("husrid", $_POST)) $ros_paste_SET_husrid=htmlspecialchars($_POST["husrid"]); if (array_key_exists("desc", $_POST)) $ros_paste_SET_desc=htmlspecialchars($_POST["desc"]); if (array_key_exists("cvt_tabs", $_POST)) $ros_paste_SET_cvt_tabs=htmlspecialchars($_POST["cvt_tabs"]); if (array_key_exists("optday", $_POST)) $ros_paste_SET_optday=htmlspecialchars($_POST["optday"]); @@ -144,11 +162,14 @@ if (array_key_exists("optpub", $_POST)) $ros_paste_SET_public=htmlspecialchars($_POST["optpub"]); // Nick: + $ros_paste_SET_husrname = $RSDB_USER_name; + $ros_paste_SET_husrid = $RSDB_intern_user_id; + if ($ros_paste_SET_usrname == "1") { $PASTE_var_nick = $ros_paste_SET_nick; } elseif ($ros_paste_SET_usrname == "2") { - if ($PASTE_var_nick == "") { + if ($ros_paste_SET_husrname == "") { $PASTE_var_nick = "Anonymous"; } else { @@ -174,7 +195,7 @@ $PASTE_var_public = $ros_paste_SET_public; - // Paste ID: + /*// Paste ID: $tmp_id_check = true; while($tmp_id_check) { mt_srand((double)microtime()*1000000); @@ -189,7 +210,7 @@ if ($result_pasteid[0] <= 0) { $tmp_id_check = false; } - } + }*/ /*if ($ros_paste_SET_cvt_tabs != "0") { $PASTE_var_tabs = ""; @@ -210,15 +231,74 @@ $PASTE_var_lines = sizeof(explode("\n", $PASTE_var_content)); $PASTE_var_lang = $ros_paste_SET_lang; + + $ip = @$_SERVER["HTTP_X_FORWARDED_FOR"]; + $proxy = $_SERVER["REMOTE_ADDR"]; + $host = @gethostbyaddr($_SERVER["HTTP_X_FORWARDED_FOR"]); + + if ($ip == "") { + $ip = $proxy; + } + + //echo "<p>$ip<br />$proxy<br />$host</p>"; + // SQL Statement: - $paste_sql="INSERT INTO `paste_service` ( `paste_id` , `paste_date` , `paste_days` , `paste_nick` , `paste_desc` , `paste_content` , `paste_lines` , `paste_tabs`, `paste_public` , `paste_lang` , `paste_datetime` ) - VALUES ( '".mysql_real_escape_string($PASTE_var_pasteid)."' , CURDATE( ) , '".mysql_real_escape_string($PASTE_var_days)."', '".mysql_real_escape_string($PASTE_var_nick)."', '".mysql_real_escape_string($PASTE_var_desc)."', '".mysql_real_escape_string($PASTE_var_content)."', '".mysql_real_escape_string($PASTE_var_lines)."', '".mysql_real_escape_string($PASTE_var_tabs)."', '".mysql_real_escape_string($PASTE_var_public)."', '".mysql_real_escape_string($PASTE_var_lang)."', NOW( ) );"; + $tmp_insert_date = date("Y-m-d H:i:s"); + $paste_sql="INSERT INTO `paste_service` ( `paste_date` , `paste_days` , `paste_usrid` , `paste_nick` , `paste_desc` , `paste_lines` , `paste_tabs`, `paste_public` , `paste_lang` , `paste_datetime` , `paste_ip` , `paste_proxy` , `paste_host` ) + VALUES ( CURDATE( ) , '".mysql_real_escape_string($PASTE_var_days)."', '".mysql_real_escape_string($ros_paste_SET_husrid)."', '".mysql_real_escape_string($PASTE_var_nick)."', '".mysql_real_escape_string($PASTE_var_desc)."', '".mysql_real_escape_string($PASTE_var_lines)."', '".mysql_real_escape_string($PASTE_var_tabs)."', '".mysql_real_escape_string($PASTE_var_public)."', '".mysql_real_escape_string($PASTE_var_lang)."', '".$tmp_insert_date."', '".mysql_real_escape_string($ip)."', '".mysql_real_escape_string($proxy)."', '".mysql_real_escape_string($host)."' );"; $paste_query=mysql_query($paste_sql); + + $sql_inserted_entry = "SELECT paste_id + FROM paste_service + WHERE paste_datetime = '".$tmp_insert_date."' + LIMIT 1;"; + $query_inserted_entry = mysql_query($sql_inserted_entry); + $result_inserted_entry = mysql_fetch_array($query_inserted_entry); + + //echo $sql_inserted_entry; + //echo $result_inserted_entry['paste_id']; + + if (!@is_dir($ros_paste_SET_content)) { + @mkdir($ros_paste_SET_content,"0493"); + } + + if ($result_inserted_entry['paste_id'] == "") { + die(""); + } + + $filename = $ros_paste_SET_content."/".$result_inserted_entry['paste_id'].".txt"; + + // Let's make sure the file exists and is writable first. + if (!@is_writable($filename)) { + + // In our example we're opening $filename in append mode. + // The file pointer is at the bottom of the file hence + // that's where $somecontent will go when we fwrite() it. + if (!$handle = @fopen($filename, 'a')) { + die("error: open file problem"); + } + + // Write $somecontent to our opened file. + if (@fwrite($handle, $PASTE_var_content) === FALSE) { + die("error: file write problem"); + } + + //echo "Success, wrote to file ($filename)"; + + @fclose($handle); + + } + + $update_entry = mysql_query("UPDATE `paste_service` SET `paste_size` = '".mysql_real_escape_string(@filesize($filename))."' WHERE `paste_service`.`paste_id` = ".$result_inserted_entry['paste_id']." LIMIT 1 ;"); + + // Redirect to paste result page: - header("Location: ". $ros_paste_SET_path_ex . $PASTE_var_pasteid. "/"); + header("Location: ". $ros_paste_SET_path_ex . $result_inserted_entry['paste_id']. "/"); } else { + create_header(); + ?> <h1><a href="http://www.reactos.org/">Home</a> > Paste Service</h1> <h2>Copy & Paste - paste service</h2> @@ -229,6 +309,8 @@ <td valign="top" bgcolor="#E2E2E2" style="padding-left: 0px; padding-right: 5px;"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Language:</font></b></td> <td bgcolor="#E2E2E2"><select name="lang" id="lang"> <option value="Plain Text">Plain Text</option> + <option value="Bash">Bash *</option> + <option value="Batch">Batch *</option> <option value="C89">C (C89)</option> <option value="C" selected="selected">C (C99)</option> <option value="C++">C++</option> @@ -240,19 +322,18 @@ <option value="PL/I">PL/I</option> <option value="Python">Python</option> <option value="Ruby">Ruby</option> - <option value="Scheme">Scheme (beta)</option> + <option value="Scheme">Scheme *</option> <option value="SQL">SQL</option> <option value="VB">Visual Basic</option> - <option value="XML">XML (beta)</option> - </select></td> + <option value="XML">XML *</option> + </select> +    <font size="1">(* experimental syntax highlighting)</font></td> </tr> <tr> <td valign="top" bgcolor="#EEEEEE" style="padding-left: 0px; padding-right: 5px;"><b><font size="2" face="Verdana, Arial, Helvetica, sans-serif">Nickname:</font></b></td> <td bgcolor="#EEEEEE"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <input name="usrname" type="radio" id="usrname" value="2" checked="checked" /> - <?php echo $RSDB_USER_name; ?> - <input name="husrname" type="hidden" id="husrname" value="<?php echo $RSDB_USER_name; ?>" /> - <br /> + <?php echo $RSDB_USER_name; ?><br /> <input name="usrname" type="radio" id="usrname" value="1" /> <input type="text" size="14" maxlength="9" name="nick" id="nick" value=""/> </font></td> Modified: trunk/web/reactos.org/htdocs/paste/inc/recent.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/inc/r… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/inc/recent.php (original) +++ trunk/web/reactos.org/htdocs/paste/inc/recent.php Sun Dec 16 02:04:19 2007 @@ -23,13 +23,15 @@ ?> <h1>Recent Pastes</h1> <h2>Recent Pastes</h2> -<p>Pastes expire by default after 7 days, if desired even earlier. </p> +<p>Pastes expire by default after 7 days, if desired even earlier. This page lists the 50 most recent pastes. </p> <table width="100%" border="0" cellpadding="1" cellspacing="1"> <tr bgcolor="#5984C3"> - <td width="25%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Date</strong></font></div></td> - <td width="10%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> - <td width="25%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> - <td width="40%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> + <td width="20%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Date</strong></font></div></td> + <td width="35%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Description</strong></font></div></td> + <td width="20%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Nick</strong></font></div></td> + <td width="10%"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Language</strong></font></div></td> + <td width="5%"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Lines</strong></font></div></td> + <td width="10%" bgcolor="#5984C3"><div align="center"><font color="#FFFFFF" face="Arial, Helvetica, sans-serif"><strong>Size</strong></font></div></td> </tr> <?php @@ -41,8 +43,9 @@ FROM `paste_service` WHERE `paste_days` <=7 AND `paste_public` = 1 + AND paste_size < 100000 ORDER BY `paste_datetime` DESC - LIMIT 0 , 30 ;") ; + LIMIT 0 , 50 ;"); while($result_content = mysql_fetch_array($query_content)) { //echo "<p>".stripDate($result_content['paste_datetime'])."</p>"; @@ -65,12 +68,8 @@ echo $farbe2; $farbe = $farbe2; } - ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_datetime']; ?></font></div></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_lang']; ?></font></div></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> - <div align="left"><?php echo $result_content['paste_nick']; ?> - </div></td> - <td valign="middle" bgcolor="<?php echo $farbe; ?>" ><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><a href="<?php echo $ros_paste_SET_path_ex . $result_content['paste_id']."/"; ?>"> + ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><a href="<?php echo $ros_paste_SET_path_ex . $result_content['paste_id']."/"; ?>"><?php echo substr($result_content['paste_datetime'],0,strlen($result_content['paste_datetime'])-3); ?></a></font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>" ><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"> <?php if ($result_content['paste_desc']) { @@ -81,7 +80,11 @@ } ?> - </a></font></div></td> + </font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><div align="left"><?php echo $result_content['paste_nick']; ?> </div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="left"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_lang']; ?></font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="right"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_lines']; ?></font></div></td> + <td valign="middle" bgcolor="<?php echo $farbe; ?>"><div align="right"><font size="2" face="Verdana, Arial, Helvetica, sans-serif"><?php echo $result_content['paste_size']; ?> byte</font></div></td> </tr> <?php } Modified: trunk/web/reactos.org/htdocs/paste/index.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/paste/index… ============================================================================== --- trunk/web/reactos.org/htdocs/paste/index.php (original) +++ trunk/web/reactos.org/htdocs/paste/index.php Sun Dec 16 02:04:19 2007 @@ -30,6 +30,7 @@ $ros_paste_SET_path = "http://localhost/reactos.org/paste/"; $ros_paste_SET_path_ex = "http://localhost/reactos.org/paste/index.php/"; $ros_paste_SET_dirs = "reactos.org/paste/"; + $ros_paste_SET_content = "content"; @@ -82,10 +83,12 @@ } } + include("inc/tools.php"); + switch ($ros_paste_SET_page) { default: case "paste": // Paste Your Content - if (@$ros_paste_SET_pasteflag == "text") { + if (@$ros_paste_SET_pasteflag == "text" || @$ros_paste_SET_pasteflag == "textw") { include("inc/account.php"); $query_pasteid=mysql_query("SELECT * FROM `paste_service` @@ -94,8 +97,12 @@ $result_pasteid = mysql_fetch_array($query_pasteid); header('Content-type: text/plain'); - //echo "ReactOS Paste Service - http://www.reactos.org/paste/".$result_pasteid['paste_id']."/ \n\n"; - $ros_paste_SET_textcontent = $result_pasteid['paste_content']; + //echo " \n\n"; + $filename = $ros_paste_SET_content."/".$result_pasteid['paste_id'].".txt"; + $handle = @fopen($filename, "r"); + $contents = @fread($handle, @filesize($filename)); + @fclose($handle); + $ros_paste_SET_textcontent = $contents; //$ros_paste_SET_textcontent = str_replace(" "," ",$ros_paste_SET_textcontent); if ($result_pasteid['paste_tabs'] != "0") { $PASTE_var_tabs = ""; @@ -104,7 +111,11 @@ } $ros_paste_SET_textcontent = str_replace("\t",$PASTE_var_tabs,$ros_paste_SET_textcontent); } - echo $ros_paste_SET_textcontent; + if (@$ros_paste_SET_pasteflag == "textw") { + echo wordwrap($ros_paste_SET_textcontent, 80, "\n", true); + } else { + echo $ros_paste_SET_textcontent; + } } else { include("inc/header.php"); @@ -116,18 +127,20 @@ break; case "conditions": // Conditions include("inc/header.php"); + create_header(); include("inc/conditions.php"); include("inc/footer.php"); break; case "help": // Help & FAQ include("inc/header.php"); + create_header(); include("inc/help.php"); include("inc/footer.php"); break; case "recent": // Recent Pastes include("inc/header.php"); + create_header(); include("inc/account.php"); - include("inc/tools.php"); include("inc/recent.php"); include("inc/footer.php"); break;

1 0

[janderwald] 31263: - fix typo spotted by towerr thanks
by janderwald＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: janderwald Date: Sun Dec 16 01:19:24 2007 New Revision: 31263 URL: http://svn.reactos.org/svn/reactos?rev=31263&view=rev Log: - fix typo spotted by towerr thanks Modified: trunk/reactos/boot/bootdata/hivecls.inf Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf (original) +++ trunk/reactos/boot/bootdata/hivecls.inf Sun Dec 16 01:19:24 2007 @@ -246,7 +246,7 @@ HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-210" HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\Open\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0" HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\shell\RunAs\command","",0x00000000,"rundll32.exe shell32.dll,Options_RunDLL 0" -HKCR,"CLSID\{{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000 +HKCR,"CLSID\{6DFD7C5C-2451-11d3-A299-00C04F8EF6AF}\ShellFolder","Attributes",0x00010001,0x00000000 ; Open With shell extension HKCR,"CLSID\{09799AFB-AD67-11d1-ABCD-00C04FC30936}","",0x00000000,"Open With Context Menu Handler"

1 0

[fireball] 31262: - Use CmpLockRegistry instead of manual registry locking -- this also makes the registry lock shared instead of exclusive. - Start using KCB locking/unlocking, usually shared first. - Support KCB lock promotion from shared to exclusive when value cache functions require it (SearchNeedExclusiveLock -- not yet used). - Add multiple checks for deleted KCBs so that operations on them fail. - Protect symlinks from being erroneously modified. - Remove a ReactOS symlink hack. - Add co
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sun Dec 16 01:06:10 2007 New Revision: 31262 URL: http://svn.reactos.org/svn/reactos?rev=31262&view=rev Log: - Use CmpLockRegistry instead of manual registry locking -- this also makes the registry lock shared instead of exclusive. - Start using KCB locking/unlocking, usually shared first. - Support KCB lock promotion from shared to exclusive when value cache functions require it (SearchNeedExclusiveLock -- not yet used). - Add multiple checks for deleted KCBs so that operations on them fail. - Protect symlinks from being erroneously modified. - Remove a ReactOS symlink hack. - Add code to setup the KCB Value Cache (right now we use the node list since nobody was setting the value cache up). - Detect and assert on CM_KCB_SYM_LINK_FOUND, this is used by caching which we don't support. - Protect KEY_NO_DELETE nodes from deletion. - Lock the registry during hive flushing. - Respect CmpNoWrite if it's set. - Don't ignore Allocate flag sent to CmpLinkhivetoMaster during hive loading. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c Sun Dec 16 01:06:10 2007 @@ -266,10 +266,56 @@ NTSTATUS Status; BOOLEAN Found, Result; ULONG Count, ChildIndex, SmallData, Storage; - - /* Acquire hive lock exclusively */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + VALUE_SEARCH_RETURN_TYPE SearchResult; + + /* Acquire hive lock */ + CmpLockRegistry(); + CmpAcquireKcbLockShared(Kcb); + + /* Sanity check */ + ASSERT(sizeof(ULONG) == CM_KEY_VALUE_SMALL); + + /* Don't touch deleted KCBs */ +DoAgain: + if (Kcb->Delete) + { + /* Fail */ + Status = STATUS_KEY_DELETED; + goto Quickie; + } + + /* Don't let anyone mess with symlinks */ + if ((Kcb->Flags & KEY_SYM_LINK) && + ((Type != REG_LINK) || + !(ValueName) || + !(RtlEqualUnicodeString(&CmSymbolicLinkValueName, ValueName, TRUE)))) + { + /* Invalid modification of a symlink key */ + Status = STATUS_ACCESS_DENIED; + goto Quickie; + } + + /* Search for the value */ + SearchResult = SearchFail; + if (SearchResult == SearchNeedExclusiveLock) + { + /* Try again with the exclusive lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + else if (SearchResult == SearchSuccess) + { + /* We don't actually need to do anything! */ + Status = STATUS_SUCCESS; + goto Quickie; + } + + /* We need the exclusive KCB lock now */ + if (!(CmpIsKcbLockedExclusive(Kcb)) && !(CmpTryToConvertKcbSharedToExclusive(Kcb))) + { + /* Acquire exclusive lock */ + CmpConvertKcbSharedToExclusive(Kcb); + } /* Get pointer to key cell */ Hive = Kcb->KeyHive; @@ -315,7 +361,11 @@ /* No child list, we'll need to add it */ ChildIndex = 0; } - + + /* The KCB must be locked exclusive at this point */ + ASSERT((CmpIsKcbLockedExclusive(Kcb) == TRUE) || + (CmpTestRegistryLockExclusive() == TRUE)); + /* Mark the cell dirty */ HvMarkCellDirty(Hive, Cell, FALSE); @@ -357,27 +407,23 @@ SmallData); } - /* Mark link key */ - if ((Type == REG_LINK) && - (_wcsicmp(ValueName->Buffer, L"SymbolicLinkValue") == 0)) - { - Parent->Flags |= KEY_SYM_LINK; - } - /* Check for success */ -Quickie: if (NT_SUCCESS(Status)) { + /* Check if the maximum value name length changed */ ASSERT(Parent->MaxValueNameLen == Kcb->KcbMaxValueNameLen); if (Parent->MaxValueNameLen < ValueName->Length) { + /* Set the new values */ Parent->MaxValueNameLen = ValueName->Length; Kcb->KcbMaxValueNameLen = ValueName->Length; } - + + /* Check if the maximum data length changed */ ASSERT(Parent->MaxValueDataLen == Kcb->KcbMaxValueDataLen); if (Parent->MaxValueDataLen < DataLength) { + /* Update it */ Parent->MaxValueDataLen = DataLength; Kcb->KcbMaxValueDataLen = Parent->MaxValueDataLen; } @@ -385,11 +431,32 @@ /* Save the write time */ KeQuerySystemTime(&Parent->LastWriteTime); KeQuerySystemTime(&Kcb->KcbLastWriteTime); - } - - /* Release the lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + + /* Check if the cell is cached */ + if ((Found) && (CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } + else + { + /* Cleanup the value cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Sanity checks */ + ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); + + /* Set the value cache */ + Kcb->ValueCache.Count = Parent->ValueList.Count; + Kcb->ValueCache.ValueList = Parent->ValueList.List; + } + } + +Quickie: + /* Release the locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -408,8 +475,19 @@ BOOLEAN Result; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock KCB exclusively */ + CmpAcquireKcbLockExclusive(Kcb); + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } /* Get the hive and the cell index */ Hive = Kcb->KeyHive; @@ -490,6 +568,17 @@ Kcb->KcbMaxValueNameLen = 0; Kcb->KcbMaxValueDataLen = 0; } + + /* Cleanup the value cache */ + CmpCleanUpKcbValueCache(Kcb); + + /* Sanity checks */ + ASSERT(!(CMP_IS_CELL_CACHED(Kcb->ValueCache.ValueList))); + ASSERT(!(Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND)); + + /* Set the value cache */ + Kcb->ValueCache.Count = ChildList->Count; + Kcb->ValueCache.ValueList = ChildList->List; /* Change default Status to success */ Status = STATUS_SUCCESS; @@ -507,9 +596,9 @@ HvReleaseCell(Hive, ChildCell); } - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -533,8 +622,27 @@ PAGED_CODE(); /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Don't touch deleted keys */ +DoAgain: + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } + + /* We don't deal with this yet */ + if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* Shouldn't happen */ + ASSERT(FALSE); + } /* Get the hive */ Hive = Kcb->KeyHive; @@ -547,6 +655,17 @@ &ValueData, &ValueCached, &CellToRelease); + if (Result == SearchNeedExclusiveLock) + { + /* Check if we need an exclusive lock */ + ASSERT(CellToRelease == HCELL_NIL); + ASSERT(ValueData == NULL); + + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + if (Result == SearchSuccess) { /* Sanity check */ @@ -562,6 +681,12 @@ Length, ResultLength, &Status); + if (Result == SearchNeedExclusiveLock) + { + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } } else { @@ -572,9 +697,9 @@ /* If we have a cell to release, do so */ if (CellToRelease != HCELL_NIL) HvReleaseCell(Hive, CellToRelease); - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -599,8 +724,20 @@ PAGED_CODE(); /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Don't touch deleted keys */ +DoAgain: + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } /* Get the hive and parent */ Hive = Kcb->KeyHive; @@ -620,6 +757,13 @@ HvReleaseCell(Hive, Kcb->KeyCell); Status = STATUS_NO_MORE_ENTRIES; goto Quickie; + } + + /* We don't deal with this yet */ + if (Kcb->ExtFlags & CM_KCB_SYM_LINK_FOUND) + { + /* Shouldn't happen */ + ASSERT(FALSE); } /* Find the value list */ @@ -627,7 +771,17 @@ &CellData, &IndexIsCached, &CellToRelease); - if (Result != SearchSuccess) + if (Result == SearchNeedExclusiveLock) + { + /* Check if we need an exclusive lock */ + ASSERT(CellToRelease == HCELL_NIL); + ASSERT(ValueData == NULL); + + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + else if (Result != SearchSuccess) { /* Sanity check */ ASSERT(CellData == NULL); @@ -646,10 +800,16 @@ IndexIsCached, &ValueIsCached, &CellToRelease2); - if (Result != SearchSuccess) + if (Result == SearchNeedExclusiveLock) + { + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } + else if (Result != SearchSuccess) { /* Sanity check */ - ASSERT(CellToRelease2 == HCELL_NIL); + ASSERT(ValueData == NULL); /* Release the cells and fail */ Status = STATUS_INSUFFICIENT_RESOURCES; @@ -666,6 +826,12 @@ Length, ResultLength, &Status); + if (Result == SearchNeedExclusiveLock) + { + /* Try with exclusive KCB lock */ + CmpConvertKcbSharedToExclusive(Kcb); + goto DoAgain; + } Quickie: /* If we have a cell to release, do so */ @@ -677,9 +843,9 @@ /* If we have a cell to release, do so */ if (CellToRelease2 != HCELL_NIL) HvReleaseCell(Hive, CellToRelease2); - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -911,8 +1077,10 @@ PCM_KEY_NODE Parent; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock KCB shared */ + CmpAcquireKcbLockShared(Kcb); /* Get the hive and parent */ Hive = Kcb->KeyHive; @@ -921,6 +1089,14 @@ { /* Fail */ Status = STATUS_INSUFFICIENT_RESOURCES; + goto Quickie; + } + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Fail */ + Status = STATUS_KEY_DELETED; goto Quickie; } @@ -961,9 +1137,9 @@ } Quickie: - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -982,8 +1158,19 @@ HCELL_INDEX ChildCell; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Lock the KCB shared */ + CmpAcquireKcbLockShared(Kcb); + + /* Don't touch deleted keys */ + if (Kcb->Delete) + { + /* Undo everything */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); + return STATUS_KEY_DELETED; + } /* Get the hive and parent */ Hive = Kcb->KeyHive; @@ -1027,9 +1214,9 @@ ResultLength); Quickie: - /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + /* Release locks */ + CmpReleaseKcbLock(Kcb); + CmpUnlockRegistry(); return Status; } @@ -1041,11 +1228,32 @@ PHHIVE Hive; PCM_KEY_NODE Node, Parent; HCELL_INDEX Cell, ParentCell; - PCM_KEY_CONTROL_BLOCK Kcb = KeyBody->KeyControlBlock; + PCM_KEY_CONTROL_BLOCK Kcb; /* Acquire hive lock */ - KeEnterCriticalRegion(); - ExAcquireResourceExclusiveLite(&CmpRegistryLock, TRUE); + CmpLockRegistry(); + + /* Get the kcb */ + Kcb = KeyBody->KeyControlBlock; + + /* Don't allow deleting the root */ + if (!Kcb->ParentKcb) + { + /* Fail */ + CmpUnlockRegistry(); + return STATUS_CANNOT_DELETE; + } + + /* Lock parent and child */ + CmpAcquireTwoKcbLocksExclusiveByKey(Kcb->ConvKey, Kcb->ParentKcb->ConvKey); + + /* Check if we're already being deleted */ + if (Kcb->Delete) + { + /* Don't do it twice */ + Status = STATUS_SUCCESS; + goto Quickie2; + } /* Get the hive and node */ Hive = Kcb->KeyHive; @@ -1059,34 +1267,22 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto Quickie; } - - /* Check if we have no parent */ - if (!Node->Parent) - { - /* This is an attempt to delete \Registry itself! */ - Status = STATUS_CANNOT_DELETE; - goto Quickie; - } - - /* Check if we're already being deleted */ - if (Kcb->Delete) - { - /* Don't do it twice */ - Status = STATUS_SUCCESS; - goto Quickie; - } - + /* Sanity check */ ASSERT(Node->Flags == Kcb->Flags); /* Check if we don't have any children */ - if (!(Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile])) + if (!(Node->SubKeyCounts[Stable] + Node->SubKeyCounts[Volatile]) && + !(Node->Flags & KEY_NO_DELETE)) { /* Get the parent and free the cell */ ParentCell = Node->Parent; Status = CmpFreeKeyByCell(Hive, Cell, TRUE); if (NT_SUCCESS(Status)) { + /* Clean up information we have on the subkey */ + CmpCleanUpSubKeyInfo(Kcb->ParentKcb); + /* Get the parent node */ Parent = (PCM_KEY_NODE)HvGetCell(Hive, ParentCell); if (Parent) @@ -1119,16 +1315,16 @@ Status = STATUS_CANNOT_DELETE; } - /* Flush the registry */ - CmpLazyFlush(); - Quickie: /* Release the cell */ HvReleaseCell(Hive, Cell); + + /* Release the KCB locks */ +Quickie2: + CmpReleaseTwoKcbLockByKey(Kcb->ConvKey, Kcb->ParentKcb->ConvKey); /* Release hive lock */ - ExReleaseResourceLite(&CmpRegistryLock); - KeLeaveCriticalRegion(); + CmpUnlockRegistry(); return Status; } @@ -1140,6 +1336,9 @@ PCMHIVE CmHive; NTSTATUS Status = STATUS_SUCCESS; PHHIVE Hive; + + /* Ignore flushes until we're ready */ + if (CmpNoWrite) return STATUS_SUCCESS; /* Get the hives */ Hive = Kcb->KeyHive; @@ -1239,7 +1438,7 @@ } /* Lock the registry shared */ - //CmpLockRegistry(); + CmpLockRegistry(); /* Lock the hive to this thread */ CmHive->Hive.HiveFlags |= HIVE_IS_UNLOADING; @@ -1252,7 +1451,7 @@ Status = CmpLinkHiveToMaster(TargetKey->ObjectName, TargetKey->RootDirectory, CmHive, - FALSE, + Allocate, TargetKey->SecurityDescriptor); if (NT_SUCCESS(Status)) { @@ -1276,7 +1475,7 @@ } /* Unlock the registry */ - //CmpUnlockRegistry(); + CmpUnlockRegistry(); /* Close handle and return */ if (KeyHandle) ZwClose(KeyHandle);

1 0

[fireball] 31261: - Delete cm rewrite branch since everything is merged into trunk now.
by fireball＠svn.reactos.org 15 Dec '07

15 Dec '07

Author: fireball Date: Sun Dec 16 00:46:54 2007 New Revision: 31261 URL: http://svn.reactos.org/svn/reactos?rev=31261&view=rev Log: - Delete cm rewrite branch since everything is merged into trunk now. Removed: branches/alex-cm-branch/

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2007