Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgoette] 39572: * fix adding of new entries * hackfix login dialog * allow manual adding of depencies * fix generator
by dgoette＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dgoette Date: Thu Feb 12 12:54:30 2009 New Revision: 39572 URL: http://svn.reactos.org/svn/reactos?rev=39572&view=rev Log: * fix adding of new entries * hackfix login dialog * allow manual adding of depencies * fix generator Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php branches/danny-web/reactos.org/htdocs/roscms/connect.db.php branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… Modified: branches/danny-web/reactos.org/htdocs/roscms/config.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/config.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -43,8 +43,9 @@ $config->setSiteLanguage('en'); // standard language $config->setSiteTimezone(-2); // time difference to utc time from server time -$config->setPathGenerated('/reactos/'); // path to generated files $config->setPathRoscms('/reactos/roscms/'); // path to roscms files +$config->setPathGenerationCache('../roscms_cache/'); // path to generated files (relative to roscms folder) +$config->setPathGenerated('../'); // path to generated files (relative to roscms folder) Modified: branches/danny-web/reactos.org/htdocs/roscms/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/connect.db.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/connect.db.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -21,10 +21,10 @@ // Database: $db_host = 'localhost'; -$db_user = 'lev-db'; -$db_pass = 'DangerGround'; -$db_name = 'realroscms'; -$db_port = 3306; +$db_user = 'username'; +$db_pass = 'password'; +$db_name = 'roscms'; +$db_port = 3301; // vars are unset in DBConnection class // !!! so be sure to use DBConnection or unset(..) yourself Modified: branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/convert3to4.sql [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -113,6 +113,7 @@ child_id bigint(20) unsigned default NULL COMMENT '->entries(id)', child_name varchar(80) collate utf8_unicode_ci default NULL, include tinyint(1) NOT NULL default '0', + user_defined tinyint(1) NOT NULL default '0', PRIMARY KEY (id), KEY rev_id (rev_id), KEY child_id (child_id), @@ -129,6 +130,7 @@ name varchar(100) collate utf8_unicode_ci NOT NULL, name_short varchar(50) collate utf8_unicode_ci NOT NULL, description varchar(255) collate utf8_unicode_ci NOT NULL, + standard tinyint(1) NOT NULL default '0', PRIMARY KEY (id), UNIQUE KEY name (name), UNIQUE KEY name_short (name_short) @@ -139,10 +141,12 @@ NULL, sec_fullname, sec_name, - sec_description + sec_description, + FALSE FROM data_security ORDER BY sec_name; +UPDATE roscms_entries_access SET standard=TRUE WHERE name_short='default'; -- -------------------------------------------------------- @@ -271,7 +275,8 @@ (34, 'show admin filter', 'admin_filter', 'special admin filters'), (35, 'Show all filter', 'dont_hide_filter', 'don''t hide filter from users'), (36, 'Make Entries Stable', 'make_stable', 'Make Entries Stable'), -(37, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''); +(37, 'show system entries', 'show_sys_entry', 'show entries of type ''system'''), +(38, 'Add manuel depencies', 'add_depencies', 'add new manuell depencies to entries'); @@ -290,7 +295,7 @@ WHERE ((a.name_short = 'system_tags' OR a.name_short = 'entry_details' OR a.name_short = 'new_entry' OR a.name_short = 'deltag' OR a.name_short = 'del_entry' OR a.name_short = 'mix_priv_pub' OR a.name_short = 'show_sys_entry' OR a.name_short = 'addlvl1group' OR a.name_short = 'more_filter' OR a.name_short = 'make_stable' OR a.name_short = 'dont_hide_filter') AND g.security_level > 1) -OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter') +OR ((a.name_short = 'delete_file' OR a.name_short = 'delmembership' OR a.name_short = 'disableaccount' OR a.name_short = 'user_details' OR a.name_short = 'other_drafts' OR a.name_short = 'stats' OR a.name_short = 'dynamic_pages' OR a.name_short = 'updatetag' OR a.name_short = 'del_wo_archiv' OR a.name_short = 'addlvl2group' OR a.name_short = 'user' OR a.name_short = 'addmembership' OR a.name_short = 'maintain' OR a.name_short = 'admin_filter' OR a.name_short = 'add_depencies') AND g.security_level = 3) OR ((a.name_short = 'admin' OR a.name_short = 'logs' OR a.name_short = 'addlvl3group') @@ -721,6 +726,7 @@ DROP old_archive, ADD UNIQUE KEY type_name ( type , name ); ALTER TABLE roscms_entries_revisions DROP old_id; +ALTER TABLE roscms_entries_access DROP name_short; Modified: branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/css/cms_website.css [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -120,3 +120,6 @@ #legend .lbox { border: solid 1px black; width: 17px;} + +.deletebutton { cursor:pointer; color:#006090; font-weight: bold; } + Modified: branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/js/cms_website.js [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -1951,6 +1951,11 @@ alertbox('Entry updated'); break; + case 'updatedepencies': + alertbox(http_request.responseText); + makeRequest('?page=backend&type=text&subtype=mef&d_fl=showdepencies&d_r_id='+document.getElementById('mefrrevid').innerHTML, 'mef', 'frmedittagsc2', 'html', 'GET', ''); + break; + case 'updatetag': selectUserTags(); objid = tsplits[1]; @@ -2322,7 +2327,7 @@ // new dynamic entry case 1: - makeRequest('?page=backend&type=text&subtype=ned&action=newdynamic&name='+encodeURIComponent(document.getElementById('txtadddynsource').value), 'ned', 'newentryarea', 'html', 'GET', ''); + makeRequest('?page=backend&type=text&subtype=ned&action=newdynamic&data_id='+encodeURIComponent(document.getElementById('txtadddynsource').value), 'ned', 'newentryarea', 'html', 'GET', ''); break; // new page & content (with template) @@ -2374,6 +2379,35 @@ document.getElementById('previewzone').innerHTML = http_request.responseText; document.getElementById('previewhead').innerHTML = '<span class="button" onclick="loadEntryTableWithOffset(roscms_current_tbl_position)"><strong>« Back</strong></span>   <strong>Preview</strong>'; } // end of function showPreview + + + +/** + * add a new manual depency + * + * @param int rev_id + */ +function addDepency( rev_id ) +{ + var name = document.getElementById('dep_name').value; + + // check if name is given + if (name != '') { + makeRequest('?page=backend&type=text&subtype=mef&d_fl=adddepency&rev_id='+rev_id+'&dep_name='+encodeURIComponent(name)+'&dep_type='+encodeURIComponent(document.getElementById('dep_type').value), 'mef', 'updatedepencies', 'html', 'GET', ''); + } +} // addDepency + + + +/** + * delete a new manual depency + * + * @param int dep_id depency id + */ +function deleteDepency( dep_id ) +{ + makeRequest('?page=backend&type=text&subtype=mef&d_fl=deletedepency&dep_id='+dep_id, 'mef', 'updatedepencies', 'html', 'GET', ''); +} // deleteDepency Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -37,7 +37,7 @@ */ public function __construct() { - global $db_host, $db_host, $db_user, $db_pass; + global $db_host, $db_host, $db_user, $db_pass, $db_port; include_once(ROSCMS_PATH.'connect.db.php'); try { Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/RosCMS.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -44,7 +44,8 @@ private $site_language = 'en'; // standard language private $site_timezone = -2; // time difference to utc time from server time - private $path_generated = '/reactos/'; // path to generated files + private $path_generated = '../reactos/'; // path to generated files + private $path_generation_cache = '../reactos/roscms_cache'; // path to cache files while generation process private $path_roscms = '/reactos/roscms/'; // path to roscms files // system vars @@ -97,6 +98,7 @@ public function siteTimezone(){ return $this->site_timezone; } public function pathGenerated() { return $this->path_generated; } + public function pathGenerationCache() { return $this->path_generation_cache; } public function pathRosCMS() { return $this->path_roscms; } @@ -152,6 +154,11 @@ public function setPathGenerated( $new_value ) { $this->path_generated = $new_value; } + + public function setPathGenerationCache( $new_value ) { + $this->path_generation_cache = $new_value; + } + public function setPathRosCMS( $new_value ) { $this->path_roscms = $new_value; } Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewAddEnt… [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -65,7 +65,7 @@ * * @access private */ - private function evalAction( ) + private function evalAction( ) { switch ($_GET['action']) { @@ -77,7 +77,22 @@ // dynamic entry - save entry case 'newdynamic': - $rev_id = Entry::add($_GET['name'], 'content', null, true); + + // get some data about the dynamic page + $stmt=&DBConnection::getInstance()->prepare("SELECT r.id AS rev_id, d.name FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE d.id=:data_id AND lang_id=:standard_lang LIMIT 1"); + $stmt->bindParam('data_id',$_GET['data_id'],PDO::PARAM_INT); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->execute(); + $page = $stmt->fetchOnce(PDO::FETCH_ASSOC); + $next_index = Tag::getValue($page['rev_id'],'next_index',-1); + + // create new dynamic entry + $rev_id = Entry::add($page['name'].'_'.$next_index, 'content'); + + // update next index for dynamic page + Tag::update(Tag::getId($page['rev_id'],'next_index',-1),$next_index+1); + + // show editor new Backend_ViewEditor($rev_id); break; @@ -106,7 +121,7 @@ break; } // end switch type break; - + } // end switch action } // end of member function evalAction Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/backend/Backend_ViewEditor… [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -112,6 +112,26 @@ // show Depencies case 'showdepencies': $this->showEntryDetails(self::DEPENCIES); + break; + + // add Depencies + case 'adddepency': + if (Depencies::addManual($_GET['rev_id'],$_GET['dep_name'],$_GET['dep_type'])) { + echo 'Adding user defined depency was successful.'; + } + else { + echo 'Error while adding user defined depency.'; + } + break; + + // delete Depencies + case 'deletedepency': + if (Depencies::deleteManual($_GET['dep_id'])) { + echo 'Deleting user defined depency was successful.'; + } + else { + echo 'Error while deleting user defined depency.'; + } break; // show Field details @@ -376,6 +396,7 @@ </span>  '.$revision['name'].'</span>   + <span style="display: none;" id="mefrrevid">'.$revision['id'].'</span> <span style="white-space: nowrap;">type: <span class="revDetail">'.$revision['type'].'</span></span>   <span style="white-space: nowrap;">version: <span id="mefrverid" class="revDetail">'.$revision['version'].'</span></span>   <span style="white-space: nowrap;">language: <span class="revDetail">'.$revision['language'].'</span><span id="mefrlang" style="display:none;">'.$revision['lang_id'].'</span></span>   @@ -635,18 +656,38 @@ */ private function showEntryDepencies() { + + // add manual depency + if (ThisUser::getInstance()->hasAccess('add_depencies')) { + echo_strip(' + <h3>Add Depency</h3> + <fieldset> + <label for="dep_name">Name:</label> + <input type="text" name="dep_name" id="dep_name" /><br /> + + <label for="dep_type">Type:</label> + <select name="dep_type" id ="dep_type"> + <option value="content">Content</option> + <option value="script">Script</option> + <option value="template">Template</option> + '.(ThisUser::getInstance()->hasAccess('dynamic_pages') ? '<option value="dynamic">Dynamic Page</option>' : '').' + </select><br /> + <button type="submit" onclick="'."addDepency(".$this->rev_id.")".'">add manual depency</button> + </fieldset>'); + } + // print depency tree echo '<h3>Dependent Entries</h3>'; $this->buildDepencyTree($this->data_id); // required articles that don't exist - $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT child_name, include FROM ".ROSCMST_DEPENCIES." WHERE rev_id=:rev_id AND child_id IS NULL ORDER BY include DESC, child_name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT child_name, include, id, user_defined FROM ".ROSCMST_DEPENCIES." WHERE rev_id=:rev_id AND child_id IS NULL ORDER BY include DESC, child_name ASC"); $stmt->bindParam('rev_id',$this->rev_id, PDO::PARAM_INT); $stmt->execute(); $required_fail = $stmt->fetchAll(PDO::FETCH_ASSOC); // articles that exist - $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT d.name, d.type, w.include FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON d.id=w.child_id WHERE rev_id=:rev_id AND w.child_name IS NULL ORDER BY w.include DESC, d.name ASC, d.type ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT DISTINCT d.name, d.type, w.include, w.id, w.user_defined FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON d.id=w.child_id WHERE rev_id=:rev_id AND w.child_name IS NULL ORDER BY w.include DESC, d.name ASC, d.type ASC"); $stmt->bindParam('rev_id',$this->rev_id, PDO::PARAM_INT); $stmt->execute(); $required_exist = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -658,17 +699,31 @@ if (count($required_exist) > 0) { echo '<ul>'; foreach($required_exist as $required) { - echo '<li>'.$required['name'].' ['.$required['type'].'] ('.($required['include']==true ? 'include' : 'link').')</li>'; + echo '<li>['.$required['type'].'] '.$required['name'].' ('.($required['include']==true ? 'include' : 'link').')'; + + // delete manual depency + if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { + echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="images/remove.gif" alt="" /> Delete</span>'; + } + + echo '</li>'; } echo '</ul>'; } if (count($required_fail) > 0) { echo_strip(' - <h4>Entries that don\'t exist</h4> + <h4>Required Entries that don\'t exist</h4> <ul>'); foreach($required_fail as $required) { - echo '<li>'.$required['child_name'].' ('.($required['include']==true ? 'include' : 'link').')</li>'; + echo '<li>'.$required['child_name'].' ('.($required['include']==true ? 'include' : 'link').')'; + + // delete manual depency + if (ThisUser::getInstance()->hasAccess('add_depencies') && $required['user_defined']) { + echo ' <span class="deletebutton" onclick="'."deleteDepency(".$required['id'].")".'"><img src="images/remove.gif" alt="" /> Delete</span>'; + } + + echo '</li>'; } echo '</ul>'; } @@ -685,7 +740,7 @@ private function buildDepencyTree( $data_id ) { // get current childs - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, l.name AS language, d.type, r.data_id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON w.rev_id = r.id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE w.child_id=:data_id AND w.include IS TRUE ORDER BY l.name ASC, d.name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, l.name AS language, d.type, r.data_id, w.user_defined, w.id FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_REVISIONS." r ON w.rev_id = r.id JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE w.child_id=:data_id AND w.include IS TRUE ORDER BY l.name ASC, d.name ASC"); $stmt->bindParam('data_id',$data_id, PDO::PARAM_INT); $stmt->execute(); $depencies = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -695,15 +750,19 @@ if (count($depencies) > 0) { echo '<ul>'; - $last_language = null; // show Depencies + $x=0; foreach ($depencies as $depency) { - echo '<li>'.$depency['name'].' ('.$depency['type'].') ['.$depency['language'].']'; + $x++; + echo '<li style="color: #'.($x%2 ? '000' : '777').';">['.$depency['type'].'] '.$depency['name'].' <span style="color: #'.($x%2 ? 'AAA' : 'CCC').';">('.$depency['language'].')</span>'; + + // get childs if ($data_id != $depency['data_id']) { $this->buildDepencyTree( $depency['data_id']); } echo '</li>'; - } + } // end foreach + echo '</ul>'; } elseif ($this->data_id === $data_id) { @@ -1008,7 +1067,14 @@ { // select all related entries if ($lang_id === null) { - $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, r.id, r.lang_id, l.name AS language, r.version, DATE(r.datetime) as date, r.datetime, u.name AS user_name, r.archive FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_USERS." u ON u.id = r.user_id WHERE d.id = :data_id AND r.version > 0 ORDER BY l.name ASC, r.datetime DESC"); + if (ThisUser::getInstance()->hasAccess('more_lang')) { + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, r.id, r.lang_id, l.name AS language, r.version, DATE(r.datetime) as date, r.datetime, u.name AS user_name, r.archive FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_USERS." u ON u.id = r.user_id WHERE d.id = :data_id AND r.version > 0 ORDER BY l.name ASC, r.datetime DESC"); + } + else { + $stmt=&DBConnection::getInstance()->prepare("SELECT r.data_id, d.name, r.id, r.lang_id, l.name AS language, r.version, DATE(r.datetime) as date, r.datetime, u.name AS user_name, r.archive FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_LANGUAGES." l ON r.lang_id = l.id JOIN ".ROSCMST_USERS." u ON u.id = r.user_id WHERE d.id = :data_id AND r.version > 0 AND l.id IN(:standard_lang,:lang_id) ORDER BY l.name ASC, r.datetime DESC"); + $stmt->bindParam('standard_lang',Language::getStandardId(),PDO::PARAM_INT); + $stmt->bindParam('lang_id',ThisUser::getInstance()->language(),PDO::PARAM_INT); + } } // select only one language Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Depencies.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -46,7 +46,7 @@ @set_time_limit(0); // remove old depencies - DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENCIES); + DBConnection::getInstance()->exec("DELETE FROM ".ROSCMST_DEPENCIES." WHERE user_defined IS FALSE"); // walk trough all stable $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_REVISIONS." WHERE archive IS FALSE AND status='stable'"); @@ -146,6 +146,48 @@ /** + * add a new user defined depency + * + * @param int rev_id + * @param string name entry name + * @param string type entry type + * @return bool + * @access public + */ + public static function addManual( $rev_id, $name, $type ) + { + // check access rights + if (ThisUser::getInstance()->hasAccess('add_depencies')) { + return self::insert($rev_id, $name, $type, true); + } + return false; + } // end of member function addManual + + + + /** + * deletes a user defined Depency + * + * @param int dep_id depency id + * @return bool + * @access public + */ + public static function deleteManual( $dep_id ) + { + // check access rights + if (ThisUser::getInstance()->hasAccess('add_depencies')) { + + // delete depencies + $stmt=&DBConnection::getInstance()->prepare("DELETE FROM ".ROSCMST_DEPENCIES." WHERE id = :dep_id AND user_defined IS TRUE"); + $stmt->bindParam('dep_id',$dep_id,PDO::PARAM_INT); + return $stmt->execute(); + } + return false; + } // end of member function deleteManual + + + + /** * inserts/updates new depency into database * * @param string[] matches @@ -158,36 +200,73 @@ switch ($matches[2]) { case 'templ': $type = 'template'; - $include = true; break; case 'cont': $type = 'content'; - $include = true; break; case 'inc': $type = 'script'; - $include = true; break; case 'link': $type = 'page'; + break; + } + + return self::insert($this->rev_id, $matches[3], $type, false); + } // end of member function newDepency + + + + /** + * shared function to insert/update entries + * + * @param int rev_id parent + * @param string name child + * @param string type child + * @param bool user_defined + * @return bool + * @access public + */ + private static function insert( $rev_id, $name, $type, $user_defined ) + { + // is include depency ? + switch ($type) { + case 'template': + $depency_name = 'templ_'.$name; + $include = true; + break; + case 'content': + $depency_name = 'cont_'.$name; + $include = true; + break; + case 'script': + $depency_name = 'inc_'.$name; + $include = true; + break; + case 'dynamic': + $depency_name = 'link_'.$name; + $include = true && $user_defined; + break; + case 'page': + $depency_name = 'link_'.$name; $include = false; break; } - // try to get depency id + // check for existing entry $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ENTRIES." WHERE name = :name AND type = :type LIMIT 1"); - $stmt->bindParam('name',$matches[3],PDO::PARAM_STR); + $stmt->bindParam('name',$name,PDO::PARAM_STR); $stmt->bindParam('type',$type,PDO::PARAM_STR); if ($stmt->execute()) { $data_id = $stmt->fetchColumn(); // check if we already have an depency to this entry $stmt=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_DEPENCIES." WHERE child_name=:depency_name"); - $stmt->bindParam('depency_name',$matches[1],PDO::PARAM_STR); + $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); $stmt->execute(); $depency_id = $stmt->fetchColumn(); - // update depency with name -> depency with id + // update entry with data id instead of name&type if ($depency_id !== false) { $stmt=&DBConnection::getInstance()->prepare("UPDATE ".ROSCMST_DEPENCIES." SET child_name=NULL, child_id=:depency_id WHERE id=:depency_id"); $stmt->bindParam('child_id',$data_id,PDO::PARAM_INT); @@ -195,27 +274,28 @@ return $stmt->execute(); } - // inseert new depency + // insert new depency else { // insert depency with name if ($data_id === false) { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_name, include) VALUES (:rev_id, :depency_name, :is_include)"); - $stmt->bindParam('depency_name',$matches[1],PDO::PARAM_STR); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_name, include, user_defined) VALUES (:rev_id, :depency_name, :is_include, :user_defined)"); + $stmt->bindParam('depency_name',$depency_name,PDO::PARAM_STR); } // insert depency with id else { - $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_id, include) VALUES (:rev_id, :depency_id, :is_include)"); + $stmt=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_DEPENCIES." (rev_id, child_id, include, user_defined) VALUES (:rev_id, :depency_id, :is_include, :user_defined)"); $stmt->bindParam('depency_id',$data_id,PDO::PARAM_INT); } - $stmt->bindParam('rev_id',$this->rev_id,PDO::PARAM_INT); + $stmt->bindParam('rev_id',$rev_id,PDO::PARAM_INT); $stmt->bindParam('is_include',$include,PDO::PARAM_BOOL); + $stmt->bindParam('user_defined',$user_defined,PDO::PARAM_BOOL); return $stmt->execute(); } } return false; - } // end of member function newDepency + } // end of member function deleteManual Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Entry.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -167,7 +167,7 @@ * @return bool * @access public */ - public static function add($data_name, $data_type = null, $template = '', $dynamic = false) + public static function add($data_name, $data_type = null, $template = '') { $data_name = trim($data_name); @@ -180,11 +180,16 @@ // if entry does not exist -> create a new one if ($data_id === false) { + + $stmt_ask=&DBConnection::getInstance()->prepare("SELECT id FROM ".ROSCMST_ACCESS." WHERE standard IS TRUE"); + $stmt_ask->execute(); + $access_id = $stmt_ask->fetchColumn(); // insert new data - $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id , name , type ) VALUES ( NULL , :name, :type )"); + $stmt_ins=&DBConnection::getInstance()->prepare("INSERT INTO ".ROSCMST_ENTRIES." ( id , name , type , access_id ) VALUES ( NULL , :name, :type, :access_id )"); $stmt_ins->bindParam('name',$data_name,PDO::PARAM_STR); $stmt_ins->bindParam('type',$data_type,PDO::PARAM_STR); + $stmt_ins->bindParam('access_id',$access_id,PDO::PARAM_INT); $stmt_ins->execute(); // and get new data_id (use old used statement again) @@ -199,6 +204,7 @@ // only go on, if we got a new revision if ($rev_id === false) { + echo 'Could not create new revision, maybe the entry already exists.'; return false; } @@ -225,16 +231,6 @@ Tag::add($rev_id, 'next_number', 1, -1); } } - elseif ($data_type == 'content' && $dynamic === true) { - - // get highest saved dynamic number for this data - $next_number = intval(Tag::getValue($rev_id,'number_next',-1)); - - // add a title - $stmt->bindValue('description','title',PDO::PARAM_STR); - $stmt->bindValue('content',$data_name.'_'.$next_number,PDO::PARAM_STR); - $stmt->execute(); - } // set page content to template, if selected if ($template != '' && $template != 'none') { @@ -256,7 +252,7 @@ // add Tags Tag::add($rev_id, 'number', $next_number, -1); Tag::add($rev_id, 'pub_date', date('Y-m-d'), -1); - Tag::add($rev_id, 'pub_user', $thisuser->id(), -1); + Tag::add($rev_id, 'pub_user', ThisUser::getInstance()->id(), -1); // update next number Tag::update(Tag::getId($rev_id,'number_next',-1),$next_number+1); Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/om/Generate.class.php [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -27,9 +27,8 @@ class Generate { - private $destination_folder = '../'; // distance between roscms folder to pages folder - private $cache_dir = '../roscms_cache/'; // cached files - private $base_dir = ''; + private $cache_dir; // cached files + private $base_dir; // where current things are generated into (may switch between normal generation and caching generation) // page related vars private $page_name; @@ -51,11 +50,15 @@ */ public function __construct( ) { + // setup paths for generating content and caching + $this->base_dir = ROSCMS_PATH.RosCMS::getInstance()->pathGenerated(); + $this->cache_dir = ROSCMS_PATH.RosCMS::getInstance()->pathGenerationCache(); + // set generation start time $this->begin = date('Y-m-d H:i:s'); // try to force a bigger script runtime (needed by some functions) - @set_time_limit(300); + @set_time_limit(0); } // end of constructor @@ -130,7 +133,7 @@ // build all entries if ($id === null) { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') ORDER BY l.level DESC, l.id ASC, d.name ASC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') ORDER BY l.level DESC, l.name ASC, d.name ASC"); } // build only the selected language @@ -141,14 +144,14 @@ // build only the selected page, in all languages elseif ($id_type === 'data') { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') AND d.name = :data_name ORDER BY l.level DESC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE (d.type = 'page' OR d.type = 'dynamic') AND d.name = :data_name ORDER BY l.level DESC, l.name ASC"); $stmt->bindParam('data_name',$ld,PDO::PARAM_STR); } // build only the revision elseif ($id_type === 'revision') { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE (d.type = 'page' OR d.type = 'dynamic') AND d.name = :data_name ORDER BY l.level DESC"); - $stmt->bindParam('data_name',$ld,PDO::PARAM_STR); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.name, type, l.id AS lang_id, l.name AS language, l.name_short AS lang_short FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id=d.id JOIN ".ROSCMST_LANGUAGES." l ON l.id=r.lang_id WHERE (d.type = 'page' OR d.type = 'dynamic') AND r.id = :rev_id"); + $stmt->bindParam('rev_id',$ld,PDO::PARAM_STR); } $stmt->execute(); @@ -157,7 +160,7 @@ // display language if ($old_lang != $data['lang_id']) { - echo '<span style="text-decoration:underline;">'.$data['language'].'</span>'; + echo '<span style="text-decoration:underline;font-size:1.3em;">'.$data['language'].'</span><br />'; $old_lang = $data['lang_id']; $this->lang_id = $data['lang_id']; @@ -205,44 +208,38 @@ $file_name = $data_name.'.'.$file_extension; // information, what was generated - echo $this->lang_id.'--'.$file_name.'<br />'; - - // can I copy from standard lang? Otherwise we will write a new file - if (!$this->cloneFile(RosCMS::getInstance()->siteLanguage(),$this->lang, $file_name)) { - - // needed by replacing functions - $this->page_name = $data_name; - $this->rev_id = $revision['id']; - - // file content - $content = $revision['content']; - - // used by templates - $content = str_replace('[#%NAME%]', $data_name, $content); - - // replace depencies - $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); - $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); - $stmt_more->execute(); - $depencies = $stmt_more->fetchAll(PDO::FETCH_ASSOC); - foreach ($depencies as $depency) { - - // replace - if ($depency['type'] != 'script') { - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); - } - } - - // execute scripts - $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); - - // replace roscms vars - $content = $this->replaceRoscmsPlaceholder($content); - - // write content to filename, if possible - return $this->writeFile($this->lang,$file_name, $content.''); - } - return false; + echo $file_name.'<br />'; + + // needed by replacing functions + $this->page_name = $data_name; + $this->rev_id = $revision['id']; + + // file content + $content = $revision['content']; + + // used by templates + $content = str_replace('[#%NAME%]', $data_name, $content); + + // replace depencies + $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + $stmt_more->bindParam('rev_id',$revision['id'],PDO::PARAM_INT); + $stmt_more->execute(); + while ($depency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { + + // replace + if ($depency['type'] != 'script') { + $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + } + } // end foreach + + // execute scripts + $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); + + // replace roscms vars + $content = $this->replaceRoscmsPlaceholder($content); + + // write content to filename, if possible + return $this->writeFile($this->lang,$file_name, $content.''); } // end of member function oneEntry @@ -290,29 +287,43 @@ // information, what was generated echo $this->lang_id.'--'.$file_name.'<br />'; - - // can I copy from standard lang ? - if (!$this->cloneFile(RosCMS::getInstance()->siteLanguage(), $this->lang, $file_name)) { - - // needed by replacing functions - $this->page_name = $data_name; - $this->rev_id = $revision['id']; - $this->dynamic_num = $i; - - // used by templates - $content = str_replace('[#%NAME%]', $data_name, $revision['content']); - - // replace depencies - $content = preg_replace_callback('/\[#((cont|templ)_[^][#[:space:]]+)\]/', array($this,'getCached'),$content); - $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); - - // replace roscms vars - $content = $this->replaceRoscmsPlaceholder($content); - - // write content to filename, if possible - $this->writeFile($this->lang,$file_name, $content.''); - } - } + + // get current instance (dynamic entry revision id) + $stmt=&DBConnection::getInstance()->prepare("SELECT r.id, r.lang_id FROM ".ROSCMST_REVISIONS." r JOIN ".ROSCMST_ENTRIES." d ON d.id=r.data_id WHERE d.type='content' AND d.name = CONCAT(:parent_name,'_',:dynamic_num) AND r.status='stable' AND r.archive IS FALSE LIMIT 1"); + $stmt->bindParam('parent_name',$revision['name'],PDO::PARAM_STR); + $stmt->bindParam('dynamic_num',$i,PDO::PARAM_INT); + $stmt->execute(); + $instance = $stmt->fetchOnce(PDO::FETCH_ASSOC); + + // needed by replacing functions + $this->page_name = $data_name; + $this->rev_id = $revision['id']; + $this->dynamic_num = $i; + + // used by templates + $content = str_replace('[#%NAME%]', $data_name, $revision['content']); + + // replace depencies + $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE"); + $stmt_more->bindParam('rev_id',$instance['id'],PDO::PARAM_INT); + $stmt_more->execute(); + while ($depency = $stmt_more->fetch(PDO::FETCH_ASSOC)) { + + // replace + if ($depency['type'] != 'script') { + $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + } + } // end foreach + + // replace scripts + $content = preg_replace_callback('/\[#inc_([^][#[:space:]]+)\]/', array($this,'evalTemplate'),$content); + + // replace roscms vars + $content = $this->replaceRoscmsPlaceholder($content); + + // write content to filename, if possible + $this->writeFile($this->lang,$file_name, $content.''); + } // end for } // end of member function makeDynamic @@ -339,7 +350,7 @@ $stmt->execute(); $revision=$stmt->fetchOnce(PDO::FETCH_ASSOC); - // cache revision (set language, cache, restore base_dir) + // cache revision (set language, cache) $this->lang_id = $revision['lang_id']; $this->cacheFiles($revision['data_id']); @@ -403,6 +414,7 @@ break; } // end switch } // end while depency + return true; } // end of member function update @@ -427,16 +439,17 @@ } if ($data_id === null) { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.type = 'content' OR d.type = 'script' OR d.type='template' ORDER BY l.level DESC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.type = 'content' OR d.type = 'script' OR d.type='template' ORDER BY l.level DESC, l.name ASC"); } else { - $stmt=&DBConnection::getInstance()->prepare("SELECT d.id AS data_id, d.type, d.name, l.id AS lang_id FROM ".ROSCMST_ENTRIES." d CROSS JOIN ".ROSCMST_LANGUAGES." l WHERE d.id=:data_id ORDER BY l.level DESC"); + $stmt=&DBConnection::getInstance()->prepare("SELECT id AS data_id, type, name, :lang_id AS lang_id FROM ".ROSCMST_ENTRIES." WHERE id=:data_id"); $stmt->bindParam('data_id',$data_id,PDO::PARAM_INT); + $stmt->bindParam('lang_id',$this->lang_id,PDO::PARAM_INT); } $stmt->execute(); // prepare for usage in loop - $stmt_more=&DBConnection::getInstance()->prepare("SELECT d.id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE AND d.type != 'script'"); + $stmt_more=&DBConnection::getInstance()->prepare("SELECT w.child_id, d.type, d.name FROM ".ROSCMST_DEPENCIES." w JOIN ".ROSCMST_ENTRIES." d ON w.child_id=d.id WHERE w.rev_id=:rev_id AND w.include IS TRUE AND d.type != 'script'"); while ($data = $stmt->fetch(PDO::FETCH_ASSOC)) { @@ -446,12 +459,11 @@ } $filename = $this->short[$data['type']].'_'.$data['name'].'.rcf'; - $file = $data['lang_id'].'/'.$filename; $revision = $this->getFrom($data['type'],$data['name']); - + // can I copy from standard language ? - if (!$this->cloneFile(Language::getStandardId(),$data['lang_id'], $filename)) { + if (!$this->cloneFile(Language::getStandardId(),$data['lang_id'], $filename, $revision['lang_id'])) { // generate file $this->rev_id = $revision['id']; @@ -478,14 +490,13 @@ // cache dependent entries first $depency_file = $data['lang_id'].'/'.$this->short[$depency['type']].'_'.$depency['name'].'.rcf'; if (!file_exists($this->cache_dir.$depency_file) || $this->begin > date('Y-m-d H:i:s',filemtime($this->cache_dir.$depency_file))) { - $this->cacheFiles($depency['id']); + $this->cacheFiles($depency['child_id']); } // replace - $content = str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); + $content = '~'.$this->lang_id.'~'.str_replace('[#'.$this->short[$depency['type']].'_'.$depency['name'].']', $this->getCached(array(null, $this->short[$depency['type']].'_'.$depency['name'])), $content); } } - $this->writeFile($data['lang_id'],$filename, $content); } } // end while @@ -493,6 +504,7 @@ // reset old build path if ($first == $data_id) { $this->base_dir = $backup; + $backup = null; } } // end of member function cacheFiles @@ -578,7 +590,9 @@ /** - * + * returns an array with revision information & text + * - if an localized version is available that one is returned + * - otherwise the standard language version * * @param string type * @param string name @@ -588,7 +602,7 @@ private function getFrom( $type, $name ) { // get entry - $stmt=&DBConnection::getInstance()->prepare("SELECT t.content, r.id, r.lang_id, r.version, r.status FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id = r.id WHERE d.name = :name AND d.type = :type AND r.version > 0 AND r.lang_id = :lang_id AND r.archive IS FALSE AND t.name = 'content' AND status='stable' LIMIT 1"); + $stmt=&DBConnection::getInstance()->prepare("SELECT t.content, r.id, r.lang_id FROM ".ROSCMST_ENTRIES." d JOIN ".ROSCMST_REVISIONS." r ON r.data_id = d.id JOIN ".ROSCMST_TEXT." t ON t.rev_id = r.id WHERE d.name = :name AND d.type = :type AND r.version > 0 AND r.lang_id = :lang_id AND r.archive IS FALSE AND t.name = 'content' AND status='stable' LIMIT 1"); $stmt->bindParam('name',$name,PDO::PARAM_STR); $stmt->bindParam('type',$type,PDO::PARAM_STR); $stmt->bindParam('lang_id',$this->lang_id,PDO::PARAM_INT); @@ -651,14 +665,17 @@ * This function tries to copy a file from the standard language folder to another language folder * * @param string source_folder + * @param string dest_folder + * @param string filename + * @param int content_lang * @return bool * @access private */ - private function cloneFile( $source_folder, $dest_folder, $filename ) + private function cloneFile( $source_folder, $dest_folder, $filename, $content_lang ) { // check, if language is different than standard and if requested file exists - if ($this->lang_id != Language::getStandardId() && file_exists($this->base_dir.$source_folder.'/'.$filename)) { - return copy($this->base_dir.$source_folder.'/'.$filename, $this->base_dir.$dest_folder.'/'.$filename); + if ($this->lang_id != Language::getStandardId() && $content_lang == Language::getStandardId() && file_exists($this->base_dir.$source_folder.'/'.$filename)) { + return @copy($this->base_dir.$source_folder.'/'.$filename, $this->base_dir.$dest_folder.'/'.$filename); } return false; } // end of member function cloneFile @@ -717,6 +734,9 @@ eval('?>'.$revision['content']); $content = ob_get_contents(); ob_end_clean(); + + // replace roscms links + $content = preg_replace_callback('/\[#link_([^][#[:space:]]+)\]/', array($this, 'replaceWithHyperlink'), $content); } // no other script types supported -> return nothing @@ -724,9 +744,6 @@ $content = $revision['content']; } - // replace roscms links - $content = preg_replace_callback('/\[#link_([^][#[:space:]]+)\]/', array($this, 'replaceWithHyperlink'), $content); - return $content; } // end of member function evalTemplate Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/view/HTML_User_Login.class… [iso-8859-1] Thu Feb 12 12:54:30 2009 @@ -28,6 +28,13 @@ class HTML_User_Login extends HTML_User { + + + private $err_message=null; + private $random_string_security=null; + + + /** * * @@ -36,6 +43,17 @@ public function __construct( ) { session_start(); + $this->checkLogin(); + + $config = &RosCMS::getInstance(); + + if (isset($_GET['sec']) && $_GET['sec'] == 'security') { + $this->random_string_security = $this->makeKey(); + Cookie::write($config->cookieSecure(), $this->random_string_security, 0); + } + else { + Cookie::write($config->cookieSecure(), '', time() - 3600); + } // register js files $this->register_js('md5.js'); @@ -44,21 +62,21 @@ - protected function body( ) + protected function checkLogin( ) { $config = &RosCMS::getInstance(); // show login dialog if (empty($_POST[$config->cookieUserName()]) && empty($_POST[$config->cookiePassword()])) { - self::loginPage(); + $this->loginPage(); } // pw or user are not set elseif(empty($_POST[$config->cookieUserName()])) { - self::loginPage('Please enter your username!'); + $this->loginPage('Please enter your username!'); } elseif(empty($_POST[$config->cookiePassword()])) { - self::loginPage('Please enter your password'); + $this->loginPage('Please enter your password'); } // try to login the user @@ -71,7 +89,7 @@ $session_found = true; } else { - $session_id = self::makeKey(); + $session_id = $this->makeKey(); $session_found = false; } @@ -80,7 +98,7 @@ $user_name = $matches[1]; } else { - self::loginPage('You have specified an incorrect username.'); + $this->loginPage('You have specified an incorrect username.'); exit; } @@ -89,7 +107,7 @@ $password = $matches[1]; } else { - self::loginPage('You have specified an invalid password.'); + $this->loginPage('You have specified an invalid password.'); exit; } @@ -110,13 +128,13 @@ } if ($a_password != $user['password']) { - self::loginPage("You have specified an incorrect or inactive username, or an invalid password."); + $this->loginPage("You have specified an incorrect or inactive username, or an invalid password."); exit; } // if the account is NOT enabled; e.g. a reason could be that a member of the admin group has disabled this account because of spamming, etc. if ($user['disabled'] == true) { - self::loginPage('Account is not activated or disabled!<br /><br />Check your email inbox (and spam folder), maybe you have overseen the activation information.'); + $this->loginPage('Account is not activated or disabled!<br /><br />Check your email inbox (and spam folder), maybe you have overseen the activation information.'); exit; } @@ -191,6 +209,7 @@ } // end of member function body + /** * shows page with login formular * @@ -198,18 +217,19 @@ */ private function loginPage( $err_message = '' ) { + $this->err_message = $err_message; + } + + + + /** + * shows page with login formular + * + * @access private + */ + protected function body( ) + { $config = &RosCMS::getInstance(); - - //@ADD comment -> why do we need this - $random_string_security = ''; - - if (isset($_GET['sec']) && $_GET['sec'] == 'security') { - $random_string_security = self::makeKey(); - Cookie::write($config->cookieSecure(), $random_string_security, 0); - } - else { - Cookie::write($config->cookieSecure(), '', time() - 3600); - } $target_clean = ''; if (isset($_REQUEST['target']) && preg_match('/^(\/[a-zA-Z0-9!$%&,\'()*+\-.\/:;=?@_~]+)$/', $_REQUEST['target'], $matches)) { @@ -262,20 +282,20 @@ } echo_strip(' <input name="logintype" type="hidden" id="logintype" value="'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? 'security' : 'standard').'" /> - <button type="submit" name="submit"'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? ' onclick="'.$config->cookiePassword().'.value = calcMD5(\''.$random_string_security.'\' + calcMD5('.$config->cookiePassword().'.value))"': '').'>Login</button> + <button type="submit" name="submit"'.((isset($_GET['sec']) && $_GET['sec'] == 'security') ? ' onclick="'.$config->cookiePassword().'.value = calcMD5(\''.$this->random_string_security.'\' + calcMD5('.$config->cookiePassword().'.value))"': '').'>Login</button> </div> <div class="corner_BL"> <div class="corner_BR"></div> </div> </div>'); - if ($err_message != "") { + if ($this->err_message != "") { echo_strip(' <div class="bubble message"> <div class="corner_TL"> <div class="corner_TR"></div> </div> - <strong>');echo $err_message;echo_strip('</strong> + <strong>');echo $this->err_message;echo_strip('</strong> <div class="corner_BL"> <div class="corner_BR"></div> </div>

1 0

[cwittich] 39571: -move FCB_TAG to header -use ExAllocatePoolWithTag / ExFreePoolWithTag -free the NameListResource when destroying an FCB -get rid of CdfsWriteNumberInShortName
by cwittich＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: cwittich Date: Thu Feb 12 12:52:12 2009 New Revision: 39571 URL: http://svn.reactos.org/svn/reactos?rev=39571&view=rev Log: -move FCB_TAG to header -use ExAllocatePoolWithTag / ExFreePoolWithTag -free the NameListResource when destroying an FCB -get rid of CdfsWriteNumberInShortName Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/fcb.c trunk/reactos/drivers/filesystems/cdfs/misc.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Thu Feb 12 12:52:12 2009 @@ -232,6 +232,7 @@ #endif #define TAG_CCB TAG('I', 'C', 'C', 'B') +#define TAG_FCB TAG('I', 'F', 'C', 'B') typedef struct { Modified: trunk/reactos/drivers/filesystems/cdfs/fcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fcb.c [iso-8859-1] Thu Feb 12 12:52:12 2009 @@ -35,8 +35,6 @@ /* FUNCTIONS ****************************************************************/ -#define TAG_FCB TAG('I', 'F', 'C', 'B') - #define ROUND_UP(N, S) ((((N) + (S) - 1) / (S)) * (S)) @@ -114,10 +112,11 @@ { Entry = Fcb->ShortNameList.Flink; RemoveEntryList(Entry); - ExFreePool(Entry); - } - - ExFreePool(Fcb); + ExFreePoolWithTag(Entry, TAG_FCB); + } + + ExDeleteResourceLite(&Fcb->NameListResource); + ExFreePoolWithTag(Fcb, TAG_FCB); } Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Thu Feb 12 12:52:12 2009 @@ -95,21 +95,6 @@ ((Fcb->Entry.FileFlags & FILE_FLAG_READONLY) ? FILE_ATTRIBUTE_READONLY : 0); } -/* Writes a number into a string, ending at the target position. */ -static PWCHAR -CdfsWriteNumberInShortName -(PWCHAR EndOfNumberTarget, - ULONG Number) -{ - while (Number) - { - *EndOfNumberTarget = '0' + (Number % 10); - EndOfNumberTarget--; - Number /= 10; - } - return EndOfNumberTarget; -} - VOID CdfsShortNameCacheGet (PFCB DirectoryFcb, @@ -118,11 +103,9 @@ PUNICODE_STRING ShortName) { BOOLEAN HasSpaces; - PWCHAR LastDot, Scan; - ULONG Number = 1; PLIST_ENTRY Entry; PCDFS_SHORT_NAME ShortNameEntry; - GENERATE_NAME_CONTEXT Context = { }; + GENERATE_NAME_CONTEXT Context = { 0 }; DPRINT("CdfsShortNameCacheGet(%I64u,%wZ)\n", StreamOffset->QuadPart, LongName); @@ -165,13 +148,6 @@ DPRINT("Initial Guess %wZ\n", ShortName); - /* Find the part that'll be numberified */ - LastDot = &ShortName->Buffer[(ShortName->Length / sizeof(WCHAR)) - 1]; - for (Scan = ShortName->Buffer; - Scan - ShortName->Buffer < ShortName->Length; - Scan++) - if (*Scan == '.') LastDot = Scan - 1; - /* Make it unique by scanning the cache and bumping */ /* Note that incrementing the ambiguous name is enough, since we add new * entries at the tail. We'll scan over all collisions. */ @@ -186,14 +162,13 @@ &ShortNameEntry->Name, TRUE) == 0) /* Match */ { - Scan = CdfsWriteNumberInShortName(LastDot, ++Number); - *Scan = '~'; + RtlGenerate8dot3Name(LongName, FALSE, &Context, ShortName); DPRINT("Collide; try %wZ\n", ShortName); } } /* We've scanned over all entries and now have a unique one. Cache it. */ - ShortNameEntry = ExAllocatePool(PagedPool, sizeof(CDFS_SHORT_NAME)); + ShortNameEntry = ExAllocatePoolWithTag(PagedPool, sizeof(CDFS_SHORT_NAME), TAG_FCB); if (!ShortNameEntry) { /* We couldn't cache it, but we can return it. We run the risk of

1 0

[janderwald] 39570: - Implement MediaClassInstaller for GUID_DEVCLASS_SOUND (install wdmaud / sysaudio service from audio.inf)
by janderwald＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: janderwald Date: Thu Feb 12 11:45:14 2009 New Revision: 39570 URL: http://svn.reactos.org/svn/reactos?rev=39570&view=rev Log: - Implement MediaClassInstaller for GUID_DEVCLASS_SOUND (install wdmaud / sysaudio service from audio.inf) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/dll/cpl/mmsys/mmsys.rbuild trunk/reactos/media/inf/audio.inf Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Thu Feb 12 11:45:14 2009 @@ -18,6 +18,7 @@ #include <cpl.h> #include <tchar.h> #include <debug.h> +#include <shlwapi.h> #include "mmsys.h" #include "resource.h" @@ -158,7 +159,71 @@ DWORD MMSYS_InstallDevice(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pspDevInfoData) { - return ERROR_DI_DO_DEFAULT; + UINT Length; + LPWSTR pBuffer; + WCHAR szBuffer[MAX_PATH]; + HINF hInf; + PVOID Context; + BOOL Result; + + if (!IsEqualIID(&pspDevInfoData->ClassGuid, &GUID_DEVCLASS_SOUND)) + return ERROR_DI_DO_DEFAULT; + + Length = GetWindowsDirectoryW(szBuffer, MAX_PATH); + if (!Length || Length >= MAX_PATH - 14) + { + return ERROR_GEN_FAILURE; + } + + pBuffer = PathAddBackslashW(szBuffer); + if (!pBuffer) + { + return ERROR_GEN_FAILURE; + } + + wcscpy(pBuffer, L"inf\\audio.inf"); + + hInf = SetupOpenInfFileW(szBuffer, + NULL, + INF_STYLE_WIN4, + NULL); + + if (hInf == INVALID_HANDLE_VALUE) + { + return ERROR_GEN_FAILURE; + } + + Context = SetupInitDefaultQueueCallback(NULL); + if (Context == NULL) + { + SetupCloseInfFile(hInf); + return ERROR_GEN_FAILURE; + } + + Result = SetupInstallFromInfSectionW(NULL, + hInf, + L"AUDIO_Inst.NT", + SPINST_ALL, + NULL, + NULL, + SP_COPY_NEWER, + SetupDefaultQueueCallbackW, + Context, + NULL, + NULL); + + if (Result) + { + Result = SetupInstallServicesFromInfSectionW(hInf, + L"Audio_Inst.NT.Services", + 0); + } + + SetupTermDefaultQueueCallback(Context); + SetupCloseInfFile(hInf); + + return ERROR_DI_DO_DEFAULT; + } DWORD Modified: trunk/reactos/dll/cpl/mmsys/mmsys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.rbuild… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.rbuild [iso-8859-1] Thu Feb 12 11:45:14 2009 @@ -12,6 +12,7 @@ <library>advapi32</library> <library>shell32</library> <library>setupapi</library> + <library>shlwapi</library> <file>mmsys.c</file> <file>sounds.c</file> <file>volume.c</file> Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=39… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Thu Feb 12 11:45:14 2009 @@ -22,6 +22,7 @@ HKR, , , 0, %AUDIOClassName% HKR, , EnumPropPages32,0, "MmSys.Cpl,MediaPropPageProvider" HKR, , Icon, 0, "-51" +HKR, , Installer32, 0, "MmSys.Cpl,MediaClassInstaller" ;-------------------------------- Audio installation ----------------------------------------

1 0

[cwittich] 39569: fix some gdi32 font winetests
by cwittich＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: cwittich Date: Thu Feb 12 11:08:45 2009 New Revision: 39569 URL: http://svn.reactos.org/svn/reactos?rev=39569&view=rev Log: fix some gdi32 font winetests Modified: trunk/reactos/dll/win32/gdi32/objects/font.c trunk/reactos/subsystems/win32/win32k/objects/freetype.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Thu Feb 12 11:08:45 2009 @@ -376,6 +376,7 @@ LogFont.lfCharSet = DEFAULT_CHARSET; if (NULL != lpszFamily) { + if (!*lpszFamily) return 1; lstrcpynW(LogFont.lfFaceName, lpszFamily, LF_FACESIZE); } @@ -417,6 +418,7 @@ LogFont.lfCharSet = DEFAULT_CHARSET; if (NULL != lpszFamily) { + if (!*lpszFamily) return 1; MultiByteToWideChar(CP_THREAD_ACP, 0, lpszFamily, -1, LogFont.lfFaceName, LF_FACESIZE); } Modified: trunk/reactos/subsystems/win32/win32k/objects/freetype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/freetype.c [iso-8859-1] Thu Feb 12 11:08:45 2009 @@ -603,7 +603,7 @@ return; } - if (0 == pOS2->usWinAscent + pOS2->usWinDescent) + if (pOS2->usWinAscent + pOS2->usWinDescent == 0) { Ascent = pHori->Ascender; Descent = -pHori->Descender; @@ -621,9 +621,9 @@ TM->tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */ TM->tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */ #endif - TM->tmInternalLeading = (FT_MulFix(Ascent + Descent - Face->units_per_EM, YScale) + 32) >> 6; - TM->tmHeight = TM->tmAscent + TM->tmDescent; // we need add 1 height more after scale it right + + TM->tmHeight = TM->tmAscent + TM->tmDescent; /* MSDN says: * el = MAX(0, LineGap - ((WinAscent + WinDescent) - (Ascender - Descender))) @@ -634,7 +634,7 @@ YScale) + 32) >> 6); TM->tmAveCharWidth = (FT_MulFix(pOS2->xAvgCharWidth, XScale) + 32) >> 6; - if (0 == TM->tmAveCharWidth) + if (TM->tmAveCharWidth == 0) { TM->tmAveCharWidth = 1; } @@ -647,8 +647,8 @@ TM->tmDigitizedAspectX = 96; TM->tmDigitizedAspectY = 96; TM->tmFirstChar = pOS2->usFirstCharIndex; + TM->tmDefaultChar = pOS2->usDefaultChar ? pOS2->usDefaultChar : 0xffff; TM->tmLastChar = pOS2->usLastCharIndex; - TM->tmDefaultChar = pOS2->usDefaultChar; TM->tmBreakChar = L'\0' != pOS2->usBreakChar ? pOS2->usBreakChar : ' '; TM->tmItalic = (Face->style_flags & FT_STYLE_FLAG_ITALIC) ? 255 : 0; TM->tmUnderlined = FontGDI->Underline; @@ -670,11 +670,15 @@ TM->tmPitchAndFamily |= FF_SCRIPT; break; case PAN_FAMILY_DECORATIVE: - case PAN_FAMILY_PICTORIAL: TM->tmPitchAndFamily |= FF_DECORATIVE; break; + + case PAN_ANY: + case PAN_NO_FIT: case PAN_FAMILY_TEXT_DISPLAY: - if (0 == TM->tmPitchAndFamily) /* fixed */ + case PAN_FAMILY_PICTORIAL: /* symbol fonts get treated as if they were text */ + /* which is clearly not what the panose spec says. */ + if (TM->tmPitchAndFamily == 0) /* fixed */ { TM->tmPitchAndFamily = FF_MODERN; } @@ -682,13 +686,30 @@ { switch (pOS2->panose[PAN_SERIFSTYLE_INDEX]) { + case PAN_ANY: + case PAN_NO_FIT: + default: + TM->tmPitchAndFamily |= FF_DONTCARE; + break; + + case PAN_SERIF_COVE: + case PAN_SERIF_OBTUSE_COVE: + case PAN_SERIF_SQUARE_COVE: + case PAN_SERIF_OBTUSE_SQUARE_COVE: + case PAN_SERIF_SQUARE: + case PAN_SERIF_THIN: + case PAN_SERIF_BONE: + case PAN_SERIF_EXAGGERATED: + case PAN_SERIF_TRIANGLE: + TM->tmPitchAndFamily |= FF_ROMAN; + break; + case PAN_SERIF_NORMAL_SANS: case PAN_SERIF_OBTUSE_SANS: case PAN_SERIF_PERP_SANS: + case PAN_SERIF_FLARED: + case PAN_SERIF_ROUNDED: TM->tmPitchAndFamily |= FF_SWISS; - break; - default: - TM->tmPitchAndFamily |= FF_ROMAN; break; } } @@ -822,9 +843,9 @@ Otm->otmrcFontBox.right = (FT_MulFix(FontGDI->face->bbox.xMax, XScale) + 32) >> 6; Otm->otmrcFontBox.top = (FT_MulFix(FontGDI->face->bbox.yMax, YScale) + 32) >> 6; Otm->otmrcFontBox.bottom = (FT_MulFix(FontGDI->face->bbox.yMin, YScale) + 32) >> 6; - Otm->otmMacAscent = 0; /* where do these come from ? */ - Otm->otmMacDescent = 0; - Otm->otmMacLineGap = 0; + Otm->otmMacAscent = FontGDI->TextMetric.tmAscent; + Otm->otmMacDescent = -FontGDI->TextMetric.tmDescent; + Otm->otmMacLineGap = Otm->otmLineGap; Otm->otmusMinimumPPEM = 0; /* TT Header */ Otm->otmptSubscriptSize.x = (FT_MulFix(pOS2->ySubscriptXSize, XScale) + 32) >> 6; Otm->otmptSubscriptSize.y = (FT_MulFix(pOS2->ySubscriptYSize, YScale) + 32) >> 6; @@ -836,7 +857,7 @@ Otm->otmptSuperscriptOffset.y = (FT_MulFix(pOS2->ySuperscriptYOffset, YScale) + 32) >> 6; Otm->otmsStrikeoutSize = (FT_MulFix(pOS2->yStrikeoutSize, YScale) + 32) >> 6; Otm->otmsStrikeoutPosition = (FT_MulFix(pOS2->yStrikeoutPosition, YScale) + 32) >> 6; - if (NULL == pPost) + if (!pPost) { Otm->otmsUnderscoreSize = 0; Otm->otmsUnderscorePosition = 0;

1 0

[janderwald] 39568: - Install wdmaud, sysaudio driver when a new audio device is installed
by janderwald＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: janderwald Date: Thu Feb 12 09:44:32 2009 New Revision: 39568 URL: http://svn.reactos.org/svn/reactos?rev=39568&view=rev Log: - Install wdmaud, sysaudio driver when a new audio device is installed Modified: trunk/reactos/media/inf/audio.inf Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=39… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Thu Feb 12 09:44:32 2009 @@ -12,7 +12,8 @@ DriverVer = 10/19/1999,5.00.2157.1 [DestinationDirs] -DefaultDestDir = 12 +Audio.CopyFiles.UserMode = 12 +Audio.CopyFiles.KernelMode = 11 [ClassInstall32.NT] AddReg = AUDIOClass.NT.AddReg @@ -22,6 +23,36 @@ HKR, , EnumPropPages32,0, "MmSys.Cpl,MediaPropPageProvider" HKR, , Icon, 0, "-51" +;-------------------------------- Audio installation ---------------------------------------- + +[AUDIO_Inst.NT] +CopyFiles = Audio.CopyFiles.KernelMode, Audio.CopyFiles.UserMode + +[Audio.CopyFiles.KernelMode] +sysaudio.sys +wdmaud.sys +portcls.sys +drmk.sys + +[Audio.CopyFiles.UserMode] +wdmaud.drv +ksuser.dll + +[Audio_Inst.NT.Services] +AddService = wdmaud, , wdmaud_Service_Inst +AddService = sysaudio, , sysaudio_Service_Inst + +[wdmaud_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 0 +ServiceBinary = %12%\wdmaud.sys + +[sysaudio_Service_Inst] +ServiceType = 1 +StartType = 3 +ErrorControl = 0 +ServiceBinary = %12%\sysaudio.sys ;-------------------------------- STRINGS -------------------------------

1 0

[cwittich] 39567: fix formatting
by cwittich＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: cwittich Date: Thu Feb 12 09:33:06 2009 New Revision: 39567 URL: http://svn.reactos.org/svn/reactos?rev=39567&view=rev Log: fix formatting Modified: trunk/reactos/subsystems/win32/win32k/misc/copy.c Modified: trunk/reactos/subsystems/win32/win32k/misc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/copy.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/copy.c [iso-8859-1] Thu Feb 12 09:33:06 2009 @@ -3,12 +3,16 @@ NTSTATUS _MmCopyFromCaller( PVOID Target, PVOID Source, UINT Bytes ) { NTSTATUS Status = STATUS_SUCCESS; - _SEH2_TRY { - //ProbeForRead(Source,Bytes,1); + _SEH2_TRY + { + /* ProbeForRead(Source,Bytes,1); */ RtlCopyMemory(Target,Source,Bytes); - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; return Status; } @@ -16,12 +20,16 @@ NTSTATUS _MmCopyToCaller( PVOID Target, PVOID Source, UINT Bytes ) { NTSTATUS Status = STATUS_SUCCESS; - _SEH2_TRY { - //ProbeForWrite(Target,Bytes,1); + _SEH2_TRY + { + /* ProbeForWrite(Target,Bytes,1); */ RtlCopyMemory(Target,Source,Bytes); - } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); - } _SEH2_END; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; return Status; }

1 0

[dchapyshev] 39566: - Add more stubs
by dchapyshev＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dchapyshev Date: Thu Feb 12 09:23:33 2009 New Revision: 39566 URL: http://svn.reactos.org/svn/reactos?rev=39566&view=rev Log: - Add more stubs Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.spec [iso-8859-1] Thu Feb 12 09:23:33 2009 @@ -5,13 +5,13 @@ @ stdcall AddAtomW(wstr) @ stdcall AddConsoleAliasA(str str str) #check @ stdcall AddConsoleAliasW(wstr wstr wstr) #check -@ stub AddLocalAlternateComputerNameA -@ stub AddLocalAlternateComputerNameW +@ stdcall AddLocalAlternateComputerNameA(str ptr) +@ stdcall AddLocalAlternateComputerNameW(wstr ptr) @ stdcall AddRefActCtx(ptr) @ stdcall AddVectoredExceptionHandler(long ptr) ntdll.RtlAddVectoredExceptionHandler @ stdcall AllocConsole() -@ stub AllocLSCallback -@ stub AllocateUserPhysicalPages +@ stub AllocLSCallback # missed in XP SP3 +@ stdcall AllocateUserPhysicalPages(long ptr ptr) @ stdcall AreFileApisANSI() @ stdcall AssignProcessToJobObject(ptr ptr) @ stdcall AttachConsole(long) @@ -19,17 +19,17 @@ @ stdcall BackupSeek(ptr long long ptr ptr ptr) @ stdcall BackupWrite(ptr ptr long ptr long long ptr) @ stdcall BaseCheckAppcompatCache(long long long ptr) #check -@ stub BaseCleanupAppcompatCache -@ stub BaseCleanupAppcompatCacheSupport +@ stdcall BaseCleanupAppcompatCache() +@ stdcall BaseCleanupAppcompatCacheSupport(ptr) @ stdcall BaseDumpAppcompatCache() @ stdcall BaseFlushAppcompatCache() -@ stub BaseInitAppcompatCache -@ stub BaseInitAppcompatCacheSupport +@ stdcall BaseInitAppcompatCache() +@ stdcall BaseInitAppcompatCacheSupport() @ stdcall BaseProcessInitPostImport() @ stdcall BaseQueryModuleData(str str ptr ptr ptr) #check @ stdcall BaseUpdateAppcompatCache(long long long) @ stub BasepCheckWinSaferRestrictions -@ stub BasepDebugDump +@ stub BasepDebugDump # missed in XP SP3 @ stdcall Beep(long long) @ stdcall BeginUpdateResourceA(str long) @ stdcall BeginUpdateResourceW(wstr long) @@ -55,7 +55,7 @@ @ stdcall CloseConsoleHandle(long) @ stdcall CloseHandle(long) @ stdcall CloseProfileUserMapping() -@ stub CloseSystemHandle +@ stub CloseSystemHandle # missed in XP SP3 @ stdcall CmdBatNotification(long) @ stdcall CommConfigDialogA(str long ptr) @ stdcall CommConfigDialogW(wstr long ptr) @@ -64,7 +64,7 @@ @ stdcall CompareStringW(long long wstr long wstr long) @ stdcall ConnectNamedPipe(long ptr) @ stdcall ConsoleMenuControl(long long long) -@ stub ConsoleSubst +@ stub ConsoleSubst # missed in XP SP3 @ stdcall ContinueDebugEvent(long long long) @ stdcall ConvertDefaultLocale (long) @ stdcall ConvertFiberToThread() @@ -96,7 +96,7 @@ @ stdcall CreateJobObjectA(ptr str) @ stdcall CreateJobObjectW(ptr wstr) @ stdcall CreateJobSet(long ptr long) -@ stub CreateKernelThread +@ stub CreateKernelThread # missed in XP SP3 @ stdcall CreateMailslotA(ptr long long ptr) @ stdcall CreateMailslotW(ptr long long ptr) @ stdcall CreateMemoryResourceNotification(ptr) @@ -109,7 +109,7 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) @ stdcall CreateProcessInternalA(ptr str str ptr ptr long long ptr str ptr ptr long) @ stdcall CreateProcessInternalW(ptr wstr wstr ptr ptr long long ptr wstr ptr ptr long) -@ stub CreateProcessInternalWSecure +@ stdcall CreateProcessInternalWSecure() @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) @ stdcall CreateSemaphoreA(ptr long long str) @@ -136,7 +136,7 @@ @ stdcall DebugBreakProcess(long) @ stdcall DebugSetProcessKillOnExit(long) @ stdcall DecodePointer(ptr) ntdll.RtlDecodePointer -@ stub DecodeSystemPointer +@ stdcall DecodeSystemPointer(ptr) ntdll.RtlDecodeSystemPointer @ stdcall DefineDosDeviceA(long str str) @ stdcall DefineDosDeviceW(long wstr wstr) @ stdcall DelayLoadFailureHook(str str) @@ -161,7 +161,7 @@ @ stdcall DuplicateConsoleHandle(long long long long) @ stdcall DuplicateHandle(long long long ptr long long long) @ stdcall EncodePointer(ptr) ntdll.RtlEncodePointer -@ stub EncodeSystemPointer +@ stdcall EncodeSystemPointer(ptr) ntdll.RtlEncodeSystemPointer @ stdcall EndUpdateResourceA(long long) @ stdcall EndUpdateResourceW(long long) @ stdcall EnterCriticalSection(ptr) ntdll.RtlEnterCriticalSection @@ -192,13 +192,13 @@ @ stdcall EnumTimeFormatsW(ptr long long) @ stdcall EnumUILanguagesA(ptr long long) @ stdcall EnumUILanguagesW(ptr long long) -@ stub EnumerateLocalComputerNamesA -@ stub EnumerateLocalComputerNamesW +@ stdcall EnumerateLocalComputerNamesA(ptr long str ptr) +@ stdcall EnumerateLocalComputerNamesW(ptr long wstr ptr) @ stdcall EraseTape(ptr long long) @ stdcall EscapeCommFunction(long long) @ stdcall ExitProcess(long) @ stdcall ExitThread(long) -@ stub ExitVDM +@ stdcall ExitVDM(long long) @ stdcall ExpandEnvironmentStringsA(str ptr long) @ stdcall ExpandEnvironmentStringsW(wstr ptr long) @ stdcall ExpungeConsoleCommandHistoryA(long) @@ -244,10 +244,10 @@ @ stdcall FindResourceW(long wstr wstr) @ stdcall FindVolumeClose(ptr) @ stdcall FindVolumeMountPointClose(ptr) -#@ stdcall FlsAlloc(ptr) -#@ stdcall FlsFree(long) -#@ stdcall FlsGetValue(long) -#@ stdcall FlsSetValue(long ptr) +#@ stdcall FlsAlloc(ptr) # missed in XP SP3 +#@ stdcall FlsFree(long) # missed in XP SP3 +#@ stdcall FlsGetValue(long) # missed in XP SP3 +#@ stdcall FlsSetValue(long ptr) # missed in XP SP3 @ stdcall FlushConsoleInputBuffer(long) @ stdcall FlushFileBuffers(long) @ stdcall FlushInstructionCache(long long long) @@ -277,7 +277,7 @@ @ stdcall GetCPInfoExW(long long ptr) @ stdcall GetCalendarInfoA(long long long ptr long ptr) @ stdcall GetCalendarInfoW(long long long ptr long ptr) -@ stub GetComPlusPackageInstallStatus +@ stdcall GetComPlusPackageInstallStatus() @ stdcall GetCommConfig(long ptr long) @ stdcall GetCommMask(long ptr) @ stdcall GetCommModemStatus(long ptr) @@ -303,35 +303,35 @@ @ stdcall GetConsoleAliasesLengthW(wstr) @ stdcall GetConsoleAliasesW(wstr long wstr) @ stdcall GetConsoleCP() -@ stub GetConsoleCharType +@ stdcall GetConsoleCharType(long long ptr) @ stdcall GetConsoleCommandHistoryA(long long long) @ stdcall GetConsoleCommandHistoryLengthA(long) @ stdcall GetConsoleCommandHistoryLengthW(long) @ stdcall GetConsoleCommandHistoryW(long long long) @ stdcall GetConsoleCursorInfo(long ptr) -@ stub GetConsoleCursorMode +@ stdcall GetConsoleCursorMode(long ptr ptr) @ stdcall GetConsoleDisplayMode(ptr) -@ stub GetConsoleFontInfo -@ stub GetConsoleFontSize -@ stub GetConsoleHardwareState +@ stdcall GetConsoleFontInfo(long long long ptr) +@ stdcall GetConsoleFontSize(long long) +@ stdcall GetConsoleHardwareState(long long ptr) @ stdcall GetConsoleInputExeNameA(long ptr) @ stdcall GetConsoleInputExeNameW(long ptr) @ stdcall GetConsoleInputWaitHandle() @ stdcall GetConsoleKeyboardLayoutNameA(ptr) @ stdcall GetConsoleKeyboardLayoutNameW(ptr) @ stdcall GetConsoleMode(long ptr) -@ stub GetConsoleNlsMode +@ stdcall GetConsoleNlsMode(long ptr) @ stdcall GetConsoleOutputCP() -@ stub GetConsoleProcessist +@ stub GetConsoleProcessist # missed in XP SP3 @ stdcall GetConsoleScreenBufferInfo(long ptr) -@ stub GetConsoleSelectionInfo +@ stdcall GetConsoleSelectionInfo(ptr) @ stdcall GetConsoleTitleA(ptr long) @ stdcall GetConsoleTitleW(ptr long) @ stdcall GetConsoleWindow() @ stdcall GetCurrencyFormatA(long long str ptr str long) @ stdcall GetCurrencyFormatW(long long str ptr str long) @ stdcall GetCurrentActCtx(ptr) -@ stub GetCurrentConsoleFont +@ stdcall GetCurrentConsoleFont(long long ptr) @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentProcess() @@ -340,10 +340,10 @@ @ stdcall GetCurrentThreadId() @ stdcall GetDateFormatA(long long ptr str ptr long) @ stdcall GetDateFormatW(long long ptr wstr ptr long) -@ stub GetDaylightFlag +@ stub GetDaylightFlag # missed in XP SP3 @ stdcall GetDefaultCommConfigA(str ptr long) @ stdcall GetDefaultCommConfigW(wstr ptr long) -@ stub GetDefaultSortkeySize +@ stdcall GetDefaultSortkeySize(ptr) @ stdcall GetDevicePowerState(long ptr) @ stdcall GetDiskFreeSpaceA(str ptr ptr ptr ptr) @ stdcall GetDiskFreeSpaceExA (str ptr ptr ptr) @@ -358,7 +358,7 @@ @ stdcall GetEnvironmentStringsW() @ stdcall GetEnvironmentVariableA(str ptr long) @ stdcall GetEnvironmentVariableW(wstr ptr long) -@ stub GetErrorMode +@ stdcall GetErrorMode() @ stdcall GetExitCodeProcess(long ptr) @ stdcall GetExitCodeThread(long ptr) @ stdcall GetExpandedNameA(str ptr) @@ -376,20 +376,20 @@ @ stdcall GetFileType(long) @ stdcall GetFinalPathNameByHandleA(long str long long) @ stdcall GetFinalPathNameByHandleW(long wstr long long) -@ stub GetFirmwareEnvironmentVariableA -@ stub GetFirmwareEnvironmentVariableW +@ stdcall GetFirmwareEnvironmentVariableA(str str ptr long) +@ stdcall GetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall GetFullPathNameA(str long ptr ptr) @ stdcall GetFullPathNameW(wstr long ptr ptr) @ stdcall GetGeoInfoA(long long ptr long long) @ stdcall GetGeoInfoW(long long ptr long long) @ stdcall GetHandleContext(long) @ stdcall GetHandleInformation(long ptr) -@ stub GetSCallbackTarget -@ stub GetSCallbackTemplate +@ stub GetSCallbackTarget # missed in XP SP3 +@ stub GetSCallbackTemplate # missed in XP SP3 @ stdcall GetLargePageMinimum() @ stdcall GetLargestConsoleWindowSize(long) @ stdcall GetLastError() -@ stub GetLinguistLangSize +@ stdcall GetLinguistLangSize(ptr) @ stdcall GetLocalTime(ptr) @ stdcall GetLocaleInfoA(long long ptr long) @ stdcall GetLocaleInfoW(long long ptr long) @@ -410,14 +410,14 @@ @ stdcall GetNamedPipeHandleStateW(long ptr ptr ptr ptr wstr long) @ stdcall GetNamedPipeInfo(long ptr ptr ptr ptr) @ stdcall GetNativeSystemInfo(ptr) -@ stub GetNextVDMCommand -@ stub GetNlsSectionName -@ stub GetNumaAvailableMemory -@ stub GetNumaAvailableMemoryNode -@ stub GetNumaHighestNodeNumber -@ stub GetNumaNodeProcessorMask -@ stub GetNumaProcessorMap -@ stub GetNumaProcessorNode +@ stdcall GetNextVDMCommand(long) +@ stdcall GetNlsSectionName(long long double str str double) +@ stdcall GetNumaAvailableMemory(ptr double ptr) +@ stdcall GetNumaAvailableMemoryNode(double ptr) +@ stdcall GetNumaHighestNodeNumber(ptr) +@ stdcall GetNumaNodeProcessorMask(double ptr) +@ stdcall GetNumaProcessorMap(ptr double ptr) +@ stdcall GetNumaProcessorNode(double ptr) @ stdcall GetNumberFormatA(long long str ptr ptr long) @ stdcall GetNumberFormatW(long long wstr ptr ptr long) @ stdcall GetNumberOfConsoleFonts() @@ -448,7 +448,7 @@ @ stdcall GetProcessTimes(long ptr ptr ptr ptr) @ stdcall GetProcessVersion(long) @ stdcall GetProcessWorkingSetSize(long ptr ptr) -@ stub GetProductName +@ stub GetProductName # missed in XP SP3 @ stdcall GetProfileIntA(str str long) @ stdcall GetProfileIntW(wstr wstr long) @ stdcall GetProfileSectionA(str ptr long) @@ -456,8 +456,8 @@ @ stdcall GetProfileStringA(str str str ptr long) @ stdcall GetProfileStringW(wstr wstr wstr ptr long) @ stdcall GetQueuedCompletionStatus(long ptr ptr ptr long) -@ stub GetLSCallbackTarget -@ stub GetLSCallbackTemplate +@ stub GetLSCallbackTarget # missed in XP SP3 +@ stub GetLSCallbackTemplate # missed in XP SP3 @ stdcall GetShortPathNameA(str ptr long) @ stdcall GetShortPathNameW(wstr ptr long) @ stdcall GetStartupInfoA(ptr) @@ -474,11 +474,11 @@ @ stdcall GetSystemDirectoryW(ptr long) @ stdcall GetSystemInfo(ptr) @ stdcall GetSystemPowerStatus(ptr) -@ stub GetSystemRegistryQuota +@ stdcall GetSystemRegistryQuota(ptr ptr) @ stdcall GetSystemTime(ptr) @ stdcall GetSystemTimeAdjustment(ptr ptr ptr) @ stdcall GetSystemTimeAsFileTime(ptr) -@ stub GetSystemTimes +@ stdcall GetSystemTimes(ptr ptr ptr) @ stdcall GetSystemWindowsDirectoryA(ptr long) @ stdcall GetSystemWindowsDirectoryW(ptr long) @ stdcall GetSystemWow64DirectoryA(ptr long) @@ -492,7 +492,7 @@ @ stdcall GetTempPathW(long ptr) @ stdcall GetThreadContext(long ptr) @ stdcall GetThreadId(ptr) -@ stub GetThreadIOPendingFlag +@ stdcall GetThreadIOPendingFlag(long ptr) @ stdcall GetThreadLocale() @ stdcall GetThreadPriority(long) @ stdcall GetThreadPriorityBoost(long ptr) @@ -507,7 +507,7 @@ @ stdcall GetUserDefaultLangID() @ stdcall GetUserDefaultUILanguage() @ stdcall GetUserGeoID(long) -@ stub GetVDMCurrentDirectories +@ stdcall GetVDMCurrentDirectories(long long) @ stdcall GetVersion() @ stdcall GetVersionExA(ptr) @ stdcall GetVersionExW(ptr) @@ -517,11 +517,11 @@ @ stdcall GetVolumeNameForVolumeMountPointW(wstr ptr long) @ stdcall GetVolumePathNameA(str ptr long) @ stdcall GetVolumePathNameW(wstr ptr long) -@ stub GetVolumePathNamesForVolumeNameA -@ stub GetVolumePathNamesForVolumeNameW +@ stdcall GetVolumePathNamesForVolumeNameA(str str long ptr) +@ stdcall GetVolumePathNamesForVolumeNameW(wstr wstr long ptr) @ stdcall GetWindowsDirectoryA(ptr long) @ stdcall GetWindowsDirectoryW(ptr long) -@ stub GetWriteWatch +@ stdcall GetWriteWatch(long ptr long ptr ptr ptr) @ stdcall GlobalAddAtomA(str) @ stdcall GlobalAddAtomW(wstr) @ stdcall GlobalAlloc(long long) @@ -544,33 +544,33 @@ @ stdcall GlobalUnfix(long) @ stdcall GlobalUnlock(long) @ stdcall GlobalWire(long) -@ stub Heap32First +@ stdcall Heap32First(ptr long long) @ stdcall Heap32ListFirst(long ptr) -@ stub Heap32ListNext -@ stub Heap32Next +@ stdcall Heap32ListNext(long ptr) +@ stdcall Heap32Next(ptr) @ stdcall HeapAlloc(long long long) ntdll.RtlAllocateHeap @ stdcall HeapCompact(long long) @ stdcall HeapCreate(long long long) -@ stub HeapCreateTagsW +@ stdcall HeapCreateTagsW(long long wstr wstr) @ stdcall HeapDestroy(long) -@ stub HeapExtend +@ stdcall HeapExtend(long long ptr long) @ stdcall HeapFree(long long long) ntdll.RtlFreeHeap @ stdcall HeapLock(long) -@ stub HeapQueryInformation -@ stub HeapQueryTagW +@ stdcall HeapQueryInformation(long long ptr long ptr) +@ stdcall HeapQueryTagW(long long long long ptr) @ stdcall HeapReAlloc(long long ptr long) ntdll.RtlReAllocateHeap -@ stub HeapSetFlags +@ stub HeapSetFlags # missed in XP SP3 @ stdcall HeapSetInformation(ptr long ptr long) @ stdcall HeapSize(long long ptr) ntdll.RtlSizeHeap -@ stub HeapSummary +@ stdcall HeapSummary(long long ptr) @ stdcall HeapUnlock(long) -@ stub HeapUsage +@ stdcall HeapUsage(long long long long ptr) @ stdcall HeapValidate(long long ptr) @ stdcall HeapWalk(long ptr) @ stdcall InitAtomTable(long) @ stdcall InitializeCriticalSection(ptr) @ stdcall InitializeCriticalSectionAndSpinCount(ptr long) -#@ stdcall InitializeCriticalSectionEx(ptr long long) +#@ stdcall InitializeCriticalSectionEx(ptr long long) # missed in XP SP3 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead @ stdcall InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock @ stdcall InterlockedCompareExchange (ptr long long) @@ -581,8 +581,8 @@ @ stdcall InterlockedIncrement(ptr) @ stdcall InterlockedPopEntrySList(ptr) ntdll.RtlInterlockedPopEntrySList @ stdcall InterlockedPushEntrySList(ptr ptr) ntdll.RtlInterlockedPushEntrySList -@ stub InvalidateConsoleDIBits -@ stub InvalidateNSCache +@ stdcall InvalidateConsoleDIBits(long long) +@ stub InvalidateNSCache # missed in XP SP3 @ stdcall IsBadCodePtr(ptr) @ stdcall IsBadHugeReadPtr(ptr long) @ stdcall IsBadHugeWritePtr(ptr long) @@ -593,15 +593,15 @@ @ stdcall IsDBCSLeadByte(long) @ stdcall IsDBCSLeadByteEx(long long) @ stdcall IsDebuggerPresent() -@ stub IsProcessInJob +@ stdcall IsProcessInJob(long long ptr) @ stdcall IsProcessorFeaturePresent(long) @ stdcall IsSystemResumeAutomatic() @ stdcall IsValidCodePage(long) @ stdcall IsValidLanguageGroup(long long) @ stdcall IsValidLocale(long long) -@ stub IsValidUILanguage +@ stdcall IsValidUILanguage(long) @ stdcall IsWow64Process(ptr ptr) -@ stub LCIDToLocaleName +@ stub LCIDToLocaleName # missed in XP SP3 @ stdcall LCMapStringA(long long str long ptr long) @ stdcall LCMapStringW(long long wstr long ptr long) @ stdcall LeaveCriticalSection(ptr) ntdll.RtlLeaveCriticalSection @@ -622,7 +622,7 @@ @ stdcall LocalShrink(long long) @ stdcall LocalSize(long) @ stdcall LocalUnlock(long) -@ stub LocaleNameToLCID +@ stub LocaleNameToLCID # missed in XP SP3 @ stdcall LockFile(long long long long long) @ stdcall LockFileEx(long long long long long ptr) @ stdcall LockResource(long) @@ -653,24 +653,24 @@ @ stdcall MultiByteToWideChar(long long str long ptr long) @ stdcall NeedCurrentDirectoryForExePathA(str) @ stdcall NeedCurrentDirectoryForExePathW(wstr) -@ stub NlsConvertIntegerToString -@ stub NlsGetCacheUpdateCount -@ stub NlsResetProcessocale -@ stub NotifyNLSUserCache -@ stub NumaVirtualQueryNode +@ stdcall NlsConvertIntegerToString(double double double wstr double) +@ stdcall NlsGetCacheUpdateCount() +@ stub NlsResetProcessocale # missed in XP SP3 +@ stub NotifyNLSUserCache # missed in XP SP3 +@ stdcall NumaVirtualQueryNode(long long long long) @ stdcall OpenConsoleW(wstr long long long) -@ stub OpenDataFile +@ stdcall OpenDataFile(long long) @ stdcall OpenEventA(long long str) @ stdcall OpenEventW(long long wstr) @ stdcall OpenFile(str ptr long) @ stdcall OpenFileMappingA(long long str) @ stdcall OpenFileMappingW(long long wstr) -@ stub OpenJobObjectA -@ stub OpenJobObjectW +@ stdcall OpenJobObjectA(long long str) +@ stdcall OpenJobObjectW(long long wstr) @ stdcall OpenMutexA(long long str) @ stdcall OpenMutexW(long long wstr) @ stdcall OpenProcess(long long long) -@ stub OpenProfileUserMapping +@ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall OpenSemaphoreW(long long wstr) @ stdcall OpenThread(long long long) @@ -683,8 +683,8 @@ @ stdcall PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall PostQueuedCompletionStatus(long long ptr ptr) @ stdcall PrepareTape(ptr long long) -@ stub PrivCopyFileExW -@ stub PrivMoveFileIdentityW +@ stdcall PrivCopyFileExW(wstr wstr ptr ptr long long) +@ stdcall PrivMoveFileIdentityW(long long long) @ stdcall Process32First (ptr ptr) @ stdcall Process32FirstW (ptr ptr) @ stdcall Process32Next (ptr ptr) @@ -696,20 +696,20 @@ @ stdcall QueryDepthSList(ptr) ntdll.RtlQueryDepthSList @ stdcall QueryDosDeviceA(str ptr long) @ stdcall QueryDosDeviceW(wstr ptr long) -@ stub QueryInformationJobObject -@ stub QueryMemoryResourceNotification -@ stub QueryNumberOfEventogRecords -@ stub QueryOldestEventogRecord +@ stdcall QueryInformationJobObject(long long ptr long ptr) +@ stdcall QueryMemoryResourceNotification(long ptr) +@ stub QueryNumberOfEventogRecords # missed in XP SP3 +@ stub QueryOldestEventogRecord # missed in XP SP3 @ stdcall QueryPerformanceCounter(ptr) @ stdcall QueryPerformanceFrequency(ptr) -@ stub QueryWin31IniFilesMappedToRegistry +@ stdcall QueryWin31IniFilesMappedToRegistry(long long long long) @ stdcall QueueUserAPC(ptr long long) @ stdcall QueueUserWorkItem(ptr ptr long) @ stdcall RaiseException(long long long ptr) @ stdcall ReadConsoleA(long ptr long ptr ptr) @ stdcall ReadConsoleInputA(long ptr long ptr) -@ stub ReadConsoleInputExA -@ stub ReadConsoleInputExW +@ stdcall ReadConsoleInputExA(long ptr long ptr long) +@ stdcall ReadConsoleInputExW(long ptr long ptr long) @ stdcall ReadConsoleInputW(long ptr long ptr) @ stdcall ReadConsoleOutputA(long ptr long long ptr) @ stdcall ReadConsoleOutputAttribute(long ptr long long ptr) @@ -723,16 +723,16 @@ @ stdcall ReadFileScatter(long ptr long ptr ptr) @ stdcall ReadProcessMemory(long ptr ptr long ptr) @ stdcall RegisterApplicationRestart(wstr long) -@ stub RegisterConsoleIME -@ stub RegisterConsoleOS2 -@ stub RegisterConsoleVDM -@ stub RegisterServiceProcess -@ stub RegisterSysMsgHandler -@ stub RegisterWaitForInputIdle +@ stdcall RegisterConsoleIME(ptr ptr) +@ stdcall RegisterConsoleOS2(long) +@ stdcall RegisterConsoleVDM(long long long long long long long long long long long) +@ stub RegisterServiceProcess # missed in XP SP3 +@ stub RegisterSysMsgHandler # missed in XP SP3 +@ stdcall RegisterWaitForInputIdle(ptr) @ stdcall RegisterWaitForSingleObject(ptr long ptr ptr long long) @ stdcall RegisterWaitForSingleObjectEx(long ptr ptr long long) -@ stub RegisterWowBaseHandlers -@ stub RegisterWowExec +@ stdcall RegisterWowBaseHandlers(long) +@ stdcall RegisterWowExec(long) @ stdcall ReleaseActCtx(ptr) @ stdcall ReleaseMutex(long) @ stdcall ReleaseSemaphore(long long ptr) @@ -740,16 +740,16 @@ @ stdcall ReleaseSRWLockShared(ptr) ntdll.RtlReleaseSRWLockShared @ stdcall RemoveDirectoryA(str) @ stdcall RemoveDirectoryW(wstr) -@ stub RemoveLocalAlternateComputerNameA -@ stub RemoveLocalAlternateComputerNameW +@ stdcall RemoveLocalAlternateComputerNameA(str long) +@ stdcall RemoveLocalAlternateComputerNameW(wstr long) @ stdcall RemoveVectoredExceptionHandler(ptr) ntdll.RtlRemoveVectoredExceptionHandler @ stdcall ReplaceFile(wstr wstr wstr long ptr ptr) ReplaceFileW @ stdcall ReplaceFileA(str str str long ptr ptr) @ stdcall ReplaceFileW(wstr wstr wstr long ptr ptr) -@ stub RequestDeviceWakeup +@ stdcall RequestDeviceWakeup(long) @ stdcall RequestWakeupLatency(long) @ stdcall ResetEvent(long) -@ stub ResetWriteWatch +@ stdcall ResetWriteWatch(ptr long) @ stdcall RestoreLastError(long) ntdll.RtlRestoreLastWin32Error @ stdcall ResumeThread(long) @ stdcall RtlCaptureContext(ptr) ntdll.RtlCaptureContext @@ -767,8 +767,8 @@ @ stdcall SetCPGlobal(long) @ stdcall SetCalendarInfoA(long long long str) @ stdcall SetCalendarInfoW(long long long wstr) -@ stub SetClientTimeZoneInformation -@ stub SetComPlusPackageInstallStatus +@ stdcall SetClientTimeZoneInformation(ptr) +@ stdcall SetComPlusPackageInstallStatus(ptr) @ stdcall SetCommBreak(long) @ stdcall SetCommConfig(long ptr long) @ stdcall SetCommMask(long ptr) @@ -780,29 +780,29 @@ @ stdcall SetComputerNameW(wstr) @ stdcall SetConsoleActiveScreenBuffer(long) @ stdcall SetConsoleCP(long) -@ stub SetConsoleCommandHistoryMode +@ stdcall SetConsoleCommandHistoryMode(long) @ stdcall SetConsoleCtrlHandler(ptr long) -@ stub SetConsoleCursor +@ stdcall SetConsoleCursor(long long) @ stdcall SetConsoleCursorInfo(long ptr) -@ stub SetConsoleCursorMode +@ stdcall SetConsoleCursorMode(long long long) @ stdcall SetConsoleCursorPosition(long long) @ stdcall SetConsoleDisplayMode(long long ptr) -@ stub SetConsoleFont -@ stub SetConsoleHardwareState -@ stub SetConsoleIcon +@ stdcall SetConsoleFont(long long) +@ stdcall SetConsoleHardwareState(long long long) +@ stdcall SetConsoleIcon(ptr) @ stdcall SetConsoleInputExeNameA(ptr) @ stdcall SetConsoleInputExeNameW(ptr) -@ stub SetConsoleKeyShortcuts -@ stub SetConsoleLocalEUDC -@ stub SetConsoleMaximumWindowSize -@ stub SetConsoleMenuClose +@ stdcall SetConsoleKeyShortcuts(long long long long) +@ stdcall SetConsoleLocalEUDC(long long long long) +@ stdcall SetConsoleMaximumWindowSize(long long) +@ stdcall SetConsoleMenuClose(long) @ stdcall SetConsoleMode(long long) -@ stub SetConsoleNlsMode -@ stub SetConsoleNumberOfCommandsA -@ stub SetConsoleNumberOfCommandsW -@ stub SetConsoleOS2OemFormat +@ stdcall SetConsoleNlsMode(long long) +@ stdcall SetConsoleNumberOfCommandsA(long long) +@ stdcall SetConsoleNumberOfCommandsW(long long) +@ stdcall SetConsoleOS2OemFormat(long) @ stdcall SetConsoleOutputCP(long) -@ stub SetConsolePalette +@ stdcall SetConsolePalette(long long long) @ stdcall SetConsoleScreenBufferSize(long long) @ stdcall SetConsoleTextAttribute(long long) @ stdcall SetConsoleTitleA(str) @@ -811,7 +811,7 @@ @ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount @ stdcall SetCurrentDirectoryA(str) @ stdcall SetCurrentDirectoryW(wstr) -@ stub SetDaylightFlag +@ stub SetDaylightFlag # missed in XP SP3 @ stdcall SetDefaultCommConfigA(str ptr long) @ stdcall SetDefaultCommConfigW(wstr ptr long) @ stdcall SetDllDirectoryA(str) @@ -827,25 +827,25 @@ @ stdcall SetFileAttributesW(wstr long) @ stdcall SetFilePointer(long long ptr long) @ stdcall SetFilePointerEx(long double ptr long) -@ stub SetFileShortNameA -@ stub SetFileShortNameW +@ stdcall SetFileShortNameA(long str) +@ stdcall SetFileShortNameW(long wstr) @ stdcall SetFileTime(long ptr ptr ptr) -@ stub SetFileValidData -@ stub SetFirmwareEnvironmentVariableA -@ stub SetFirmwareEnvironmentVariableW +@ stdcall SetFileValidData(long double) +@ stdcall SetFirmwareEnvironmentVariableA(str str ptr long) +@ stdcall SetFirmwareEnvironmentVariableW(wstr wstr ptr long) @ stdcall SetHandleContext(long long) @ stdcall SetHandleCount(long) @ stdcall SetHandleInformation(long long long) -@ stub SetInformationJobObject -@ stub SetastConsoleEventActive +@ stdcall SetInformationJobObject(long long ptr long) +@ stub SetastConsoleEventActive # missed in XP SP3 @ stdcall SetLastError(long) -@ stub SetocalPrimaryComputerNameA -@ stub SetocalPrimaryComputerNameW +@ stub SetocalPrimaryComputerNameA # missed in XP SP3 +@ stub SetocalPrimaryComputerNameW # missed in XP SP3 @ stdcall SetLocalTime(ptr) @ stdcall SetLocaleInfoA(long long str) @ stdcall SetLocaleInfoW(long long wstr) @ stdcall SetMailslotInfo(long long) -@ stub SetMessageWaitingIndicator +@ stdcall SetMessageWaitingIndicator(long double) @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetProcessAffinityMask(long long) @@ -868,17 +868,17 @@ @ stdcall SetThreadPriorityBoost(long long) @ stdcall SetThreadUILanguage(long) @ stdcall SetTimeZoneInformation(ptr) -@ stub SetTimerQueueTimer +@ stdcall SetTimerQueueTimer(long ptr ptr long long long) @ stdcall SetUnhandledExceptionFilter(ptr) @ stdcall SetUserGeoID(long) -@ stub SetVDMCurrentDirectories +@ stdcall SetVDMCurrentDirectories(long long) @ stdcall SetVolumeLabelA(str str) @ stdcall SetVolumeLabelW(wstr wstr) -@ stub SetVolumeMountPointA -@ stub SetVolumeMountPointW +@ stdcall SetVolumeMountPointA(str str) +@ stdcall SetVolumeMountPointW(wstr wstr) @ stdcall SetWaitableTimer(long ptr long ptr ptr long) @ stdcall SetupComm(long long long) -@ stub ShowConsoleCursor +@ stdcall ShowConsoleCursor(long long) @ stdcall SignalObjectAndWait(long long long long) @ stdcall SizeofResource(long long) @ stdcall Sleep(long) @@ -888,16 +888,16 @@ @ stdcall SwitchToThread() @ stdcall SystemTimeToFileTime(ptr ptr) @ stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr) -@ stub TerminateJobObject +@ stdcall TerminateJobObject(long long) @ stdcall TerminateProcess(long long) @ stdcall TerminateThread(long long) @ stdcall TermsrvAppInstallMode() @ stdcall Thread32First(long ptr) @ stdcall Thread32Next(long ptr) @ stdcall TlsAlloc() -@ stub TlsAllocInternal +@ stub TlsAllocInternal # missed in XP SP3 @ stdcall TlsFree(long) -@ stub TlsFreeInternal +@ stub TlsFreeInternal # missed in XP SP3 @ stdcall TlsGetValue(long) @ stdcall TlsSetValue(long ptr) @ stdcall Toolhelp32ReadProcessMemory(long ptr ptr long ptr) @@ -912,15 +912,15 @@ @ stdcall UnlockFile(long long long long long) @ stdcall UnlockFileEx(long long long long ptr) @ stdcall UnmapViewOfFile(ptr) -@ stub UnregisterConsoleIME +@ stdcall UnregisterConsoleIME() @ stdcall UnregisterWait(long) @ stdcall UnregisterWaitEx(long long) @ stdcall UpdateResourceA(long str str long ptr long) @ stdcall UpdateResourceW(long wstr wstr long ptr long) -@ stub VDMConsoleOperation -@ stub VDMOperationStarted -@ stub ValidateCType -@ stub ValidatLeocale +@ stdcall VDMConsoleOperation(long long) +@ stdcall VDMOperationStarted(long) +@ stub ValidateCType # missed in XP SP3 +@ stub ValidatLeocale # missed in XP SP3 @ stdcall VerLanguageNameA(long str long) @ stdcall VerLanguageNameW(long wstr long) @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @@ -929,7 +929,7 @@ @ stdcall VerifyVersionInfoW(long long double) @ stdcall VirtualAlloc(ptr long long long) @ stdcall VirtualAllocEx(long ptr long long long) -@ stub VirtualBufferExceptionHandler +@ stdcall VirtualBufferExceptionHandler(long long long) @ stdcall VirtualFree(ptr long long) @ stdcall VirtualFreeEx(long ptr long long) @ stdcall VirtualLock(ptr long) @@ -955,8 +955,8 @@ @ stdcall Wow64RevertWow64FsRedirection(long) @ stdcall WriteConsoleA(long ptr long ptr ptr) @ stdcall WriteConsoleInputA(long ptr long ptr) -@ stub WriteConsoleInputVDMA -@ stub WriteConsoleInputVDMW +@ stdcall WriteConsoleInputVDMA(long long long long) +@ stdcall WriteConsoleInputVDMW(long long long long) @ stdcall WriteConsoleInputW(long ptr long ptr) @ stdcall WriteConsoleOutputA(long ptr long long ptr) @ stdcall WriteConsoleOutputAttribute(long ptr long long ptr) @@ -981,8 +981,8 @@ @ stdcall WriteTapemark(ptr long long long) @ stdcall WTSGetActiveConsoleSessionId() @ stdcall ZombifyActCtx(ptr) -@ stub _DebugOut -@ stub _DebugPrintf +@ stub _DebugOut # missed in XP SP3 +@ stub _DebugPrintf # missed in XP SP3 @ stdcall _hread(long ptr long) @ stdcall _hwrite(long ptr long) @ stdcall _lclose(long) @@ -991,7 +991,7 @@ @ stdcall _lopen(str long) @ stdcall _lread(long ptr long) _hread @ stdcall _lwrite(long ptr long) _hwrite -@ stub dprintf +@ stub dprintf # missed in XP SP3 @ stdcall lstrcat(str str) lstrcatA @ stdcall lstrcatA(str str) @ stdcall lstrcatW(wstr wstr) @@ -1010,5 +1010,3 @@ @ stdcall lstrlen(str) lstrlenA @ stdcall lstrlenA(str) @ stdcall lstrlenW(wstr) - -#EOF Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Thu Feb 12 09:23:33 2009 @@ -1019,8 +1019,267 @@ BOOL WINAPI +GetNumaAvailableMemory(PVOID lpInfo, + ULONG Length, + PULONG ReturnLength) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetNumaProcessorMap(PVOID lpInfo, + ULONG Length, + PULONG ReturnLength) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI NlsResetProcessLocale(VOID) { STUB; return TRUE; } + +DWORD +WINAPI +AddLocalAlternateComputerNameA(LPSTR lpName, PNTSTATUS Status) +{ + STUB; + return 0; +} + +DWORD +WINAPI +AddLocalAlternateComputerNameW(LPWSTR lpName, PNTSTATUS Status) +{ + STUB; + return 0; +} + +NTSTATUS +WINAPI +BaseCleanupAppcompatCache() +{ + STUB; + return STATUS_NOT_IMPLEMENTED; +} + +NTSTATUS +WINAPI +BaseCleanupAppcompatCacheSupport(PVOID pUnknown) +{ + STUB; + return STATUS_NOT_IMPLEMENTED; +} + +BOOL +WINAPI +BaseInitAppcompatCache(VOID) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +BaseInitAppcompatCacheSupport(VOID) +{ + STUB; + return FALSE; +} + +VOID +WINAPI +CreateProcessInternalWSecure(VOID) +{ + STUB; +} + +DWORD +WINAPI +EnumerateLocalComputerNamesA(PVOID pUnknown, DWORD Size, LPSTR lpBuffer, LPDWORD lpnSize) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD +WINAPI +EnumerateLocalComputerNamesW(PVOID pUnknown, DWORD Size, LPWSTR lpBuffer, LPDWORD lpnSize) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +PVOID +WINAPI +GetComPlusPackageInstallStatus(VOID) +{ + STUB; + return NULL; +} + +BOOL +WINAPI +GetConsoleCharType(HANDLE hConsole, COORD Coord, PDWORD Type) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetConsoleCursorMode(HANDLE hConsole, PBOOL pUnknown1, PBOOL pUnknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +GetConsoleNlsMode(HANDLE hConsole, LPDWORD lpMode) +{ + STUB; + return FALSE; +} + +VOID +WINAPI +GetDefaultSortkeySize(LPVOID lpUnknown) +{ + STUB; + lpUnknown = NULL; +} + +VOID +WINAPI +GetLinguistLangSize(LPVOID lpUnknown) +{ + STUB; + lpUnknown = NULL; +} + +BOOL +WINAPI +OpenDataFile(HANDLE hFile, DWORD dwUnused) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +OpenProfileUserMapping(VOID) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +PrivMoveFileIdentityW(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +ReadConsoleInputExA(HANDLE hConsole, LPVOID lpBuffer, DWORD dwLen, LPDWORD Unknown1, DWORD Unknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +ReadConsoleInputExW(HANDLE hConsole, LPVOID lpBuffer, DWORD dwLen, LPDWORD Unknown1, DWORD Unknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +RegisterConsoleIME(HWND hWnd, LPDWORD ThreadId) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +RegisterConsoleOS2(BOOL bUnknown) +{ + STUB; + return FALSE; +} + +DWORD +WINAPI +RemoveLocalAlternateComputerNameA(LPSTR lpName, DWORD Unknown) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +DWORD +WINAPI +RemoveLocalAlternateComputerNameW(LPWSTR lpName, DWORD Unknown) +{ + STUB; + return ERROR_CALL_NOT_IMPLEMENTED; +} + +BOOL +WINAPI +SetComPlusPackageInstallStatus(LPVOID lpInfo) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleCursorMode(HANDLE hConsole, BOOL Unknown1, BOOL Unknown2) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleLocalEUDC(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleNlsMode(HANDLE hConsole, DWORD dwMode) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +SetConsoleOS2OemFormat(BOOL bUnknown) +{ + STUB; + return FALSE; +} + +BOOL +WINAPI +UnregisterConsoleIME(VOID) +{ + STUB; + return FALSE; +}

1 0

[janderwald] 39565: - Add audio class installer inf
by janderwald＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: janderwald Date: Thu Feb 12 07:14:42 2009 New Revision: 39565 URL: http://svn.reactos.org/svn/reactos?rev=39565&view=rev Log: - Add audio class installer inf Added: trunk/reactos/media/inf/audio.inf (with props) Modified: trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu Feb 12 07:14:42 2009 @@ -553,6 +553,7 @@ media\nls\c_28605.nls 1 media\nls\c_28606.nls 1 media\drivers\etc\services 5 +media\inf\audio.inf 6 media\inf\acpi.inf 6 media\inf\cdrom.inf 6 media\inf\display.inf 6 Added: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=39… ============================================================================== --- trunk/reactos/media/inf/audio.inf (added) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Thu Feb 12 07:14:42 2009 @@ -1,0 +1,34 @@ +; AUDIO.INF + +; Installation of Audio / Video Adapters + +[Version] +Signature = "$Windows NT$" +;Signature = "$ReactOS$" +LayoutFile = layout.inf +Class = AUDIO +ClassGUID = {4d36e96c-e325-11ce-bfc1-08002be10318} +Provider = %ReactOS% +DriverVer = 10/19/1999,5.00.2157.1 + +[DestinationDirs] +DefaultDestDir = 12 + +[ClassInstall32.NT] +AddReg = AUDIOClass.NT.AddReg + +[AUDIOClass.NT.AddReg] +HKR, , , 0, %AUDIOClassName% +HKR, , EnumPropPages32,0, "MmSys.Cpl,MediaPropPageProvider" +HKR, , Icon, 0, "-51" + + +;-------------------------------- STRINGS ------------------------------- + +[Strings] +ReactOS = "ReactOS Team" +AUDIOClassName = "Audio & Videocontroller" + + +[Strings.0407] +AUDIOClassName = "Audio-, Video- und Gamecontroller" Propchange: trunk/reactos/media/inf/audio.inf ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=3… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Thu Feb 12 07:14:42 2009 @@ -1,6 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> + <installfile installbase="inf">audio.inf</installfile> <installfile installbase="inf">acpi.inf</installfile> <installfile installbase="inf">cdrom.inf</installfile> <installfile installbase="inf">display.inf</installfile> Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[dgoette] 39564: add support for different port numbers while connecting to MySQL. patch by Mariusz Przybylski
by dgoette＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dgoette Date: Thu Feb 12 06:28:16 2009 New Revision: 39564 URL: http://svn.reactos.org/svn/reactos?rev=39564&view=rev Log: add support for different port numbers while connecting to MySQL. patch by Mariusz Przybylski Modified: branches/danny-web/reactos.org/htdocs/roscms/connect.db.php branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php Modified: branches/danny-web/reactos.org/htdocs/roscms/connect.db.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/connect.db.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/connect.db.php [iso-8859-1] Thu Feb 12 06:28:16 2009 @@ -21,9 +21,10 @@ // Database: $db_host = 'localhost'; -$db_user = 'user'; -$db_pass = 'pass'; -$db_name = 'roscms'; +$db_user = 'lev-db'; +$db_pass = 'DangerGround'; +$db_name = 'realroscms'; +$db_port = 3306; // vars are unset in DBConnection class // !!! so be sure to use DBConnection or unset(..) yourself Modified: branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/ro… ============================================================================== --- branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] (original) +++ branches/danny-web/reactos.org/htdocs/roscms/lib/DBConnection.class.php [iso-8859-1] Thu Feb 12 06:28:16 2009 @@ -41,13 +41,14 @@ include_once(ROSCMS_PATH.'connect.db.php'); try { - parent::__construct('mysql:dbname='.$db_name.';host='.$db_host, $db_user, $db_pass); + parent::__construct('mysql:dbname='.$db_name.';host='.$db_host.';port='.$db_port, $db_user, $db_pass); // unset loaded db config unset($GLOBALS['db_name']); unset($GLOBALS['db_host']); unset($GLOBALS['db_user']); unset($GLOBALS['db_pass']); + unset($GLOBALS['db_port']); // show errors as warning, and use our own statement class $this->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);

1 0

[dchapyshev] 39563: - Add missed CopyCursor
by dchapyshev＠svn.reactos.org 12 Feb '09

12 Feb '09

Author: dchapyshev Date: Thu Feb 12 06:27:04 2009 New Revision: 39563 URL: http://svn.reactos.org/svn/reactos?rev=39563&view=rev Log: - Add missed CopyCursor Modified: trunk/reactos/dll/win32/user32/user32.pspec Modified: trunk/reactos/dll/win32/user32/user32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.ps… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/user32.pspec [iso-8859-1] Thu Feb 12 06:27:04 2009 @@ -74,6 +74,7 @@ @ stdcall CloseWindowStation(long) NtUserCloseWindowStation @ stdcall CopyAcceleratorTableA(long ptr long) @ stdcall CopyAcceleratorTableW(long ptr long) NtUserCopyAcceleratorTable +@ stdcall CopyCursor(long) @ stdcall CopyIcon(long) @ stdcall CopyImage(long long long long long) @ stdcall CopyRect(ptr ptr)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs