Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[martinf] 33226: update to XMLStorage version 1.3

by martinf＠svn.reactos.org

Author: martinf Date: Thu May 1 16:17:35 2008 New Revision: 33226 URL: http://svn.reactos.org/svn/reactos?rev=33226&view=rev Log: update to XMLStorage version 1.3 Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp trunk/reactos/base/shell/explorer/utility/xmlstorage.h trunk/reactos/base/shell/explorer/utility/xs-native.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp [iso-8859-1] Thu May 1 16:17:35 2008 @@ -1,8 +1,8 @@ // - // XML storage C++ classes version 1.2 + // XML storage C++ classes version 1.3 // - // Copyright (c) 2004, 2005, 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005, 2006, 2007, 2008 Martin Fuchs <martin-fuchs(a)gmx.net> // /// \file xmlstorage.cpp @@ -57,6 +57,10 @@ const LPCXSSTR XS_FLOATFMT = XS_FLOATFMT_STR; #endif +const XS_String XS_KEY = XS_KEY_STR; +const XS_String XS_VALUE = XS_VALUE_STR; +const XS_String XS_PROPERTY = XS_PROPERTY_STR; + /// remove escape characters from zero terminated string static std::string unescape(const char* s, char b, char e) @@ -105,18 +109,12 @@ } - /// move XPath like to position in XML tree -bool XMLPos::go(const char* path) -{ - XMLNode* node = _cur; - - // Is this an absolute path? - if (*path == '/') { - node = _root; - ++path; - } - - node = node->find_relative(path); + /// move to the position defined by xpath in XML tree +bool XMLPos::go(const XPath& xpath) +{ + XMLNode* node = xpath._absolute? _root: _cur; + + node = node->find_relative(xpath); if (node) { go_to(node); @@ -125,18 +123,12 @@ return false; } - /// move XPath like to position in XML tree -bool const_XMLPos::go(const char* path) -{ - const XMLNode* node = _cur; - - // Is this an absolute path? - if (*path == '/') { - node = _root; - ++path; - } - - node = node->find_relative(path); + /// move to the position defined by xpath in XML tree +bool const_XMLPos::go(const XPath& xpath) +{ + const XMLNode* node = xpath._absolute? _root: _cur; + + node = node->find_relative(xpath); if (node) { go_to(node); @@ -146,40 +138,7 @@ } -const XMLNode* XMLNode::find_relative(const char* path) const -{ - const XMLNode* node = this; - - // parse relative path - while(*path) { - node = const_cast<XMLNode*>(node)->get_child_relative(path, false); // get_child_relative() ist const for create==false - - if (!node) - return NULL; - - if (*path == '/') - ++path; - } - - return node; -} - -XMLNode* XMLNode::create_relative(const char* path) -{ - XMLNode* node = this; - - // parse relative path - while(*path) { - node = node->get_child_relative(path, true); - - if (*path == '/') - ++path; - } - - return node; -} - -XMLNode* XMLNode::get_child_relative(const char*& path, bool create) +const char* XPathElement::parse(const char* path) { const char* slash = strchr(path, '/'); if (slash == path) @@ -192,8 +151,7 @@ // look for [n] and [@attr_name="attr_value"] expressions in path components const char* bracket = strchr(comp.c_str(), '['); l = bracket? bracket-comp.c_str(): comp.length(); - std::string child_name(comp.c_str(), l); - std::string attr_name, attr_value; + _child_name.assign(comp.c_str(), l); int n = 0; if (bracket) { @@ -203,7 +161,7 @@ n = atoi(p); // read index number if (n) - n = n - 1; // convert into zero based index + _child_idx = n - 1; // convert into zero based index const char* at = strchr(p, '@'); @@ -213,30 +171,198 @@ // read attribute name and value if (equal) { - attr_name = unescape(p, equal-p); - attr_value = unescape(equal+1); + _attr_name = unescape(p, equal-p); + _attr_value = unescape(equal+1); } } } - XMLNode* child; - - if (attr_name.empty()) - // search n.th child node with specified name - child = find(child_name, n); + return path; +} + +XMLNode* XPathElement::find(XMLNode* node) const +{ + int n = 0; + + for(XMLNode::Children::const_iterator it=node->_children.begin(); it!=node->_children.end(); ++it) + if (matches(**it, n)) + return *it; + + return NULL; +} + +const XMLNode* XPathElement::const_find(const XMLNode* node) const +{ + int n = 0; + + for(XMLNode::Children::const_iterator it=node->_children.begin(); it!=node->_children.end(); ++it) + if (matches(**it, n)) + return *it; + + return NULL; +} + +bool XPathElement::matches(const XMLNode& node, int& n) const +{ + if (node != _child_name) + if (_child_name != XS_TEXT("*")) // use asterisk as wildcard + return false; + + if (!_attr_name.empty()) + if (node.get(_attr_name) != _attr_value) + return false; + + if (_child_idx == -1) + return true; + else if (n++ == _child_idx) + return true; else - // search n.th child node with specified name and matching attribute value - child = find(child_name, attr_name, attr_value, n); - - if (!child && create) { - child = new XMLNode(child_name); - add_child(child); - - if (!attr_name.empty()) - (*this)[attr_name] = attr_value; - } - - return child; + return false; +} + + +void XPath::init(const char* path) +{ + // Is this an absolute path? + if (*path == '/') { + _absolute = true; + ++path; + } else + _absolute = false; + + // parse path + while(*path) { + XPathElement elem; + + path = elem.parse(path); + + if (!path) + break; + + if (*path == '/') + ++path; + + push_back(elem); + } +} + + +const XMLNode* XMLNode::find_relative(const XPath& xpath) const +{ + const XMLNode* node = this; + + for(XPath::const_iterator it=xpath.begin(); it!=xpath.end(); ++it) { + node = it->const_find(node); + + if (!node) + return NULL; + } + + return node; +} + +XMLNode* XMLNode::find_relative(const XPath& xpath) +{ + XMLNode* node = this; + + for(XPath::const_iterator it=xpath.begin(); it!=xpath.end(); ++it) { + node = it->find(node); + + if (!node) + return NULL; + } + + return node; +} + +XMLNode* XMLNode::create_relative(const XPath& xpath) +{ + XMLNode* node = this; + + for(XPath::const_iterator it=xpath.begin(); it!=xpath.end(); ++it) { + XMLNode* child = it->find(this); + + if (!child) { + child = new XMLNode(it->_child_name); + add_child(child); + + if (!it->_attr_name.empty()) + (*this)[it->_attr_name] = it->_attr_value; + } + } + + return node; +} + + /// count the nodes matching the given relative XPath expression +int XMLNode::count(XPath::const_iterator from, const XPath::const_iterator& to) const +{ + const XPathElement& elem = *from++; + int cnt = 0; + int n = 0; + + for(XMLNode::Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) + if (elem.matches(**it, n)) + if (from != to) + // iterate deeper + cnt += (*it)->count(from, to); + else + // increment match counter + ++cnt; + + return cnt; +} + + /// copy matching tree nodes using the given XPath filter expression +bool XMLNode::filter(const XPath& xpath, XMLNode& target) const +{ + XMLNode* ret = filter(xpath.begin(), xpath.end()); + + if (ret) { + // move returned nodes to target node + target._children.move(ret->_children); + target._attributes = ret->_attributes; + + delete ret; + + return true; + } else + return false; +} + + /// create a new node tree using the given XPath filter expression +XMLNode* XMLNode::filter(XPath::const_iterator from, const XPath::const_iterator& to) const +{ + XMLNode* copy = NULL; + + const XPathElement& elem = *from++; + int cnt = 0; + int n = 0; + + for(XMLNode::Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) + if (elem.matches(**it, n)) { + if (!copy) + copy = new XMLNode(*this, XMLNode::COPY_NOCHILDREN); + + if (from != to) { + XMLNode* ret = (*it)->filter(from, to); + + if (ret) { + copy->add_child(ret); + ++cnt; + } + } else { + copy->add_child(new XMLNode(**it, XMLNode::COPY_NOCHILDREN)); + ++cnt; + } + } + + if (cnt > 0) { + return copy; + } else { + delete copy; + return NULL; + } } @@ -286,9 +412,9 @@ break; default: - if ((unsigned)*p<20 && *p!='\t' && *p!='\r' && *p!='\n') { + if ((unsigned)*p<0x20 && *p!='\t' && *p!='\r' && *p!='\n') { char b[16]; - sprintf(b, "&%d;", (unsigned)*p); + sprintf(b, "&#%d;", (unsigned)*p); for(const char*q=b; *q; ) *o++ = *q++; } else @@ -330,8 +456,8 @@ break; default: - if ((unsigned)*p<20 && *p!='\t' && *p!='\r' && *p!='\n') - out << "&" << (unsigned)*p << ";"; + if ((unsigned)*p<0x20 && *p!='\t' && *p!='\r' && *p!='\n') + out << "&#" << (unsigned)*p << ";"; else out << *p; } @@ -368,7 +494,7 @@ } else if (!XS_nicmp(p+1, XS_TEXT("apos;"), 5)) { *o++ = '\''; p += 5; - } else + } else //@@ maybe decode "&#xx;" special characters *o++ = *p; } else if (*p=='<' && !XS_nicmp(p+1,XS_TEXT("![CDATA["),8)) { LPCXSSTR e = XS_strstr(p+9, XS_TEXT("]]>")); @@ -535,18 +661,33 @@ } +const char* get_xmlsym_end_utf8(const char* p) +{ + for(; *p; ++p) { + char c = *p; + + if (c == '\xC3') // UTF-8 escape character + ++p; //TODO only continue on umlaut characters + else if (!isalnum(c) && c!='_' && c!='-') + break; + } + + return p; +} + + void DocType::parse(const char* p) { while(isspace((unsigned char)*p)) ++p; const char* start = p; - while(isxmlsym(*p)) ++p; + p = get_xmlsym_end_utf8(p); _name.assign(start, p-start); while(isspace((unsigned char)*p)) ++p; start = p; - while(isxmlsym(*p)) ++p; + p = get_xmlsym_end_utf8(p); std::string keyword(p, p-start); // "PUBLIC" or "SYSTEM" while(isspace((unsigned char)*p)) ++p; @@ -705,7 +846,6 @@ break; if (p != s) - { if (_pos->_children.empty()) { // no children in last node? if (_last_tag == TAG_START) _pos->_content.append(s, p-s); @@ -715,7 +855,7 @@ p = s; } else _pos->_children.back()->_trailing.append(s, p-s); - } + std::string leading; if (p != e) @@ -753,14 +893,12 @@ } if (p != s) - { if (_pos->_children.empty()) // no children in current node? _pos->_content.append(s, p-s); else if (_last_tag == TAG_START) _pos->_content.append(s, p-s); else _pos->_children.back()->_trailing.append(s, p-s); - } if (p != e) _pos->_end_leading.assign(p, e-p); @@ -786,5 +924,91 @@ XS_String XMLWriter::s_empty_attr; +void XMLWriter::create(const XS_String& name) +{ + if (!_stack.empty()) { + StackEntry& last = _stack.top(); + + if (last._state < PRE_CLOSED) { + write_attributes(last); + close_pre(last); + } + + ++last._children; + } + + StackEntry entry; + entry._node_name = name; + _stack.push(entry); + + write_pre(entry); +} + +bool XMLWriter::back() +{ + if (!_stack.empty()) { + write_post(_stack.top()); + + _stack.pop(); + return true; + } else + return false; +} + +void XMLWriter::close_pre(StackEntry& entry) +{ + _out << '>'; + + entry._state = PRE_CLOSED; +} + +void XMLWriter::write_pre(StackEntry& entry) +{ + if (_format._pretty >= PRETTY_LINEFEED) + _out << _format._endl; + + if (_format._pretty == PRETTY_INDENT) + for(size_t i=_stack.size(); --i>0; ) + _out << XML_INDENT_SPACE; + + _out << '<' << EncodeXMLString(entry._node_name); + //entry._state = PRE; +} + +void XMLWriter::write_attributes(StackEntry& entry) +{ + for(AttrMap::const_iterator it=entry._attributes.begin(); it!=entry._attributes.end(); ++it) + _out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; + + entry._state = ATTRIBUTES; +} + +void XMLWriter::write_post(StackEntry& entry) +{ + if (entry._state < ATTRIBUTES) + write_attributes(entry); + + if (entry._children || !entry._content.empty()) { + if (entry._state < PRE_CLOSED) + close_pre(entry); + + _out << entry._content; + //entry._state = CONTENT; + + if (_format._pretty>=PRETTY_LINEFEED && entry._content.empty()) + _out << _format._endl; + + if (_format._pretty==PRETTY_INDENT && entry._content.empty()) + for(size_t i=_stack.size(); --i>0; ) + _out << XML_INDENT_SPACE; + + _out << "</" << EncodeXMLString(entry._node_name) << ">"; + } else { + _out << "/>"; + } + + entry._state = POST; +} + } // namespace XMLStorage Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h [iso-8859-1] Thu May 1 16:17:35 2008 @@ -1,8 +1,8 @@ // - // XML storage C++ classes version 1.2 + // XML storage C++ classes version 1.3 // - // Copyright (c) 2004, 2005, 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005, 2006, 2007, 2008 Martin Fuchs <martin-fuchs(a)gmx.net> // /// \file xmlstorage.h @@ -39,9 +39,6 @@ #ifndef _XMLSTORAGE_H -#ifndef __REACTOS__ -#include <strstream> -#endif #ifdef UNICODE #ifndef _UNICODE @@ -202,6 +199,10 @@ #define _tcsnicmp strncasecmp #endif +#endif + +#ifdef __BORLANDC__ +#define _stricmp stricmp #endif @@ -264,10 +265,7 @@ #endif -int inline isxmlsym(unsigned char c) -{ - return isalnum(c) || c=='_' || c=='-'; -} +extern const char* get_xmlsym_end_utf8(const char* p); #if defined(_STRING_DEFINED) && !defined(XS_STRING_UTF8) @@ -397,6 +395,10 @@ #define XS_INTFMT_STR XS_TEXT("%d") #define XS_FLOATFMT_STR XS_TEXT("%f") +#define XS_KEY_STR XS_TEXT("key") +#define XS_VALUE_STR XS_TEXT("value") +#define XS_PROPERTY_STR XS_TEXT("property") + // work around GCC's wide string constant bug #ifdef __GNUC__ extern const LPCXSSTR XS_EMPTY; @@ -412,6 +414,10 @@ #define XS_FLOATFMT XS_FLOATFMT_STR #endif +extern const XS_String XS_KEY; +extern const XS_String XS_VALUE; +extern const XS_String XS_PROPERTY; + #ifndef XS_STRING_UTF8 @@ -783,6 +789,46 @@ }; +struct XMLNode; + +struct XPathElement +{ + XPathElement() : _child_idx(-1) {} + + XPathElement(const XS_String& child_name, int child_idx=-1) + : _child_name(child_name), _child_idx(child_idx) {} + + XPathElement(const XS_String& child_name, int child_idx, const XS_String& attr_name, const XS_String& attr_value) + : _child_name(child_name), _child_idx(child_idx), + _attr_name(attr_name), _attr_value(attr_value) + { + } + + XS_String _child_name; + int _child_idx; + + XS_String _attr_name; + XS_String _attr_value; + + const char* parse(const char* path); + + XMLNode* find(XMLNode* node) const; + const XMLNode* const_find(const XMLNode* node) const; + + bool matches(const XMLNode& node, int& n) const; +}; + +struct XPath : std::list<XPathElement> +{ + XPath(const char* path) {init(path);} + XPath(const std::string path) {init(path.c_str());} + + void init(const char* path); + + bool _absolute; +}; + + /// in memory representation of an XML node struct XMLNode : public XS_String { @@ -841,10 +887,40 @@ /// internal children node list struct Children : public std::list<XMLNode*> { - void assign(const Children& other) + typedef std::list<XMLNode*> super; + + Children() + { + } + + Children(Children& other) + { + for(Children::const_iterator it=other.begin(); it!=other.end(); ++it) + push_back(*it); + } + + void assign(Children& other) { clear(); - + move(other); + } + + void move(Children& other) + { + for(Children::const_iterator it=other.begin(); it!=other.end(); ++it) + push_back(*it); + + other.reset(); + } + + Children& operator=(Children& other) + { + assign(other); + return *this; + } + + void copy(const Children& other) + { for(Children::const_iterator it=other.begin(); it!=other.end(); ++it) push_back(new XMLNode(**it)); } @@ -858,6 +934,23 @@ node->clear(); delete node; } + } + + bool remove(XMLNode* node) + { + for(iterator it=begin(); it!=end(); ++it) + if (*it == node) { + erase(it); + return true; + } + + return false; + } + + private: + void reset() + { + super::clear(); } }; @@ -865,6 +958,7 @@ friend struct XMLPos; friend struct const_XMLPos; friend struct XMLReaderBase; + friend struct XPathElement; XMLNode(const XS_String& name) : XS_String(name) @@ -892,6 +986,22 @@ _children.push_back(new XMLNode(**it)); } + enum COPY_FLAGS {COPY_NOCHILDREN}; + + XMLNode(const XMLNode& other, COPY_FLAGS copy_no_children) + : XS_String(other), + _attributes(other._attributes), + _leading(other._leading), + _content(other._content), + _end_leading(other._end_leading), + _trailing(other._trailing) +#ifdef XMLNODE_LOCATION + , _location(other._location) +#endif + { +// assert(copy_no_children==COPY_NOCHILDREN); + } + virtual ~XMLNode() { while(!_children.empty()) { @@ -915,7 +1025,8 @@ XMLNode& operator=(const XMLNode& other) { - _children.assign(other._children); + _children.clear(); + _children.copy(other._children); _attributes = other._attributes; @@ -933,6 +1044,16 @@ _children.push_back(child); } + /// remove all children named 'name' + void remove_children(const XS_String& name) + { + Children::iterator it, next=_children.begin(); + + while((it=next++)!=_children.end()) + if (**it == name) + _children.erase(it); + } + /// write access to an attribute void put(const XS_String& attr_name, const XS_String& value) { @@ -956,10 +1077,16 @@ return def; } + /// remove the attribute 'attr_name' + void erase(const XS_String& attr_name) + { + _attributes.erase(attr_name); + } + /// convenient value access in children node - XS_String subvalue(const XS_String& name, const XS_String& attr_name, int n=0) const - { - const XMLNode* node = find(name, n); + XS_String subvalue(const XS_String& child_name, const XS_String& attr_name, int n=0) const + { + const XMLNode* node = XPathElement(child_name, n).const_find(this); if (node) return node->get(attr_name); @@ -968,12 +1095,12 @@ } /// convenient storage of distinct values in children node - XS_String& subvalue(const XS_String& name, const XS_String& attr_name, int n=0) - { - XMLNode* node = find(name, n); + XS_String& subvalue(const XS_String& child_name, const XS_String& attr_name, int n=0) + { + XMLNode* node = XPathElement(child_name, n).find(this); if (!node) { - node = new XMLNode(name); + node = new XMLNode(child_name); add_child(node); } @@ -982,9 +1109,9 @@ #if defined(UNICODE) && !defined(XS_STRING_UTF8) /// convenient value access in children node - XS_String subvalue(const char* name, const char* attr_name, int n=0) const - { - const XMLNode* node = find(name, n); + XS_String subvalue(const char* child_name, const char* attr_name, int n=0) const + { + const XMLNode* node = XPathElement(child_name, n).const_find(this); if (node) return node->get(attr_name); @@ -993,12 +1120,12 @@ } /// convenient storage of distinct values in children node - XS_String& subvalue(const char* name, const XS_String& attr_name, int n=0) - { - XMLNode* node = find(name, n); + XS_String& subvalue(const char* child_name, const XS_String& attr_name, int n=0) + { + XMLNode* node = XPathElement(child_name, n).find(this); if (!node) { - node = new XMLNode(name); + node = new XMLNode(child_name); add_child(node); } @@ -1070,6 +1197,18 @@ return out.good(); } + /// count the nodes matching the given relative XPath expression + int count(const XPath& xpath) const + { + return count(xpath.begin(), xpath.end()); + } + + /// count the nodes matching the given relative XPath expression + int count(XPath::const_iterator from, const XPath::const_iterator& to) const; + + /// copy matching tree nodes using the given XPath filter expression + bool filter(const XPath& xpath, XMLNode& target) const; + protected: Children _children; AttributeMap _attributes; @@ -1091,72 +1230,22 @@ return NULL; } - XMLNode* find(const XS_String& name, int n=0) const - { - for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) - if (**it == name) - if (!n--) - return *it; - - return NULL; - } - - XMLNode* find(const XS_String& name, const XS_String& attr_name, const XS_String& attr_value, int n=0) const - { - for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) { - const XMLNode& node = **it; - - if (node==name && node.get(attr_name)==attr_value) - if (!n--) - return *it; - } - - return NULL; - } - -#if defined(UNICODE) && !defined(XS_STRING_UTF8) - XMLNode* find(const char* name, int n=0) const - { - for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) - if (**it == name) - if (!n--) - return *it; - - return NULL; - } - - template<typename T, typename U> - XMLNode* find(const char* name, const T& attr_name, const U& attr_value, int n=0) const - { - for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) { - const XMLNode& node = **it; - - if (node==name && node.get(attr_name)==attr_value) - if (!n--) - return *it; - } - - return NULL; - } -#endif - /// XPath find function (const) - const XMLNode* find_relative(const char* path) const; + const XMLNode* find_relative(const XPath& xpath) const; /// XPath find function - XMLNode* find_relative(const char* path) - {return const_cast<XMLNode*>(const_cast<const XMLNode*>(this)->find_relative(path));} + XMLNode* find_relative(const XPath& xpath); /// relative XPath create function - XMLNode* create_relative(const char* path); + XMLNode* create_relative(const XPath& xpath); + + /// create a new node tree using the given XPath filter expression + XMLNode* filter(XPath::const_iterator from, const XPath::const_iterator& to) const; void write_worker(std::ostream& out) const; void plain_write_worker(std::ostream& out) const; void pretty_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; void smart_write_worker(std::ostream& out, const XMLFormat& format, int indent) const; - -protected: - XMLNode* get_child_relative(const char*& path, bool create); // mutable for create==true }; @@ -1179,6 +1268,7 @@ struct iterator { typedef XMLNode::Children::iterator BaseIterator; + typedef iterator myType; iterator(BaseIterator begin, BaseIterator end, const XS_String& filter_name) : _cur(begin), @@ -1203,7 +1293,7 @@ return *_cur; } - iterator& operator++() + myType& operator++() { ++_cur; search_next(); @@ -1211,9 +1301,9 @@ return *this; } - iterator operator++(int) - { - iterator ret = *this; + myType operator++(int) + { + myType ret = *this; ++_cur; search_next(); @@ -1221,14 +1311,14 @@ return ret; } - bool operator==(const BaseIterator& other) const - { - return _cur == other; - } - - bool operator!=(const BaseIterator& other) const - { - return _cur != other; + bool operator==(const myType& other) const + { + return _cur == other._cur; + } + + bool operator!=(const myType& other) const + { + return _cur != other._cur; } protected: @@ -1278,6 +1368,7 @@ struct const_iterator { typedef XMLNode::Children::const_iterator BaseIterator; + typedef const_iterator myType; const_iterator(BaseIterator begin, BaseIterator end, const XS_String& filter_name) : _cur(begin), @@ -1297,7 +1388,7 @@ return *_cur; } - const_iterator& operator++() + myType& operator++() { ++_cur; search_next(); @@ -1305,9 +1396,9 @@ return *this; } - const_iterator operator++(int) - { - const_iterator ret = *this; + myType operator++(int) + { + myType ret = *this; ++_cur; search_next(); @@ -1315,14 +1406,14 @@ return ret; } - bool operator==(const BaseIterator& other) const - { - return _cur == other; - } - - bool operator!=(const BaseIterator& other) const - { - return _cur != other; + bool operator==(const myType& other) const + { + return _cur == other._cur; + } + + bool operator!=(const myType& other) const + { + return _cur != other._cur; } protected: @@ -1464,9 +1555,9 @@ } /// search for child and go down - bool go_down(const XS_String& name, int n=0) - { - XMLNode* node = _cur->find(name, n); + bool go_down(const XS_String& child_name, int n=0) + { + XMLNode* node = XPathElement(child_name, n).find(_cur); if (node) { go_to(node); @@ -1475,13 +1566,13 @@ return false; } - /// move XPath like to position in XML tree - bool go(const char* path); + /// move to the position defined by xpath in XML tree + bool go(const XPath& xpath); /// create child nodes using XPath notation and move to the deepest child - bool create_relative(const char* path) - { - XMLNode* node = _cur->create_relative(path); + bool create_relative(const XPath& xpath) + { + XMLNode* node = _cur->create_relative(xpath); if (!node) return false; // invalid path specified @@ -1496,35 +1587,47 @@ } /// create node if not already existing and move to it - void smart_create(const XS_String& name) - { - XMLNode* node = _cur->find(name); + void smart_create(const XS_String& child_name) + { + XMLNode* node = XPathElement(child_name).find(_cur); if (node) go_to(node); else - add_down(new XMLNode(name)); + add_down(new XMLNode(child_name)); } /// search matching child node identified by key name and an attribute value - void smart_create(const XS_String& name, const XS_String& attr_name, const XS_String& attr_value) - { - XMLNode* node = _cur->find(name, attr_name, attr_value); + void smart_create(const XS_String& child_name, const XS_String& attr_name, const XS_String& attr_value) + { + XMLNode* node = XPathElement(child_name, 0, attr_name, attr_value).find(_cur); if (node) go_to(node); else { - node = new XMLNode(name); + node = new XMLNode(child_name); add_down(node); (*node)[attr_name] = attr_value; } } + /// count the nodes matching the given relative XPath expression + int count(const XPath& xpath) const + { + return _cur->count(xpath); + } + + /// create a new node tree using the given XPath filter expression + int filter(const XPath& xpath, XMLNode& target) const + { + return _cur->filter(xpath, target); + } + #if defined(UNICODE) && !defined(XS_STRING_UTF8) /// search for child and go down - bool go_down(const char* name, int n=0) - { - XMLNode* node = _cur->find(name, n); + bool go_down(const char* child_name, int n=0) + { + XMLNode* node = XPathElement(child_name, n).find(_cur); if (node) { go_to(node); @@ -1534,40 +1637,76 @@ } /// create node and move to it - void create(const char* name) - { - add_down(new XMLNode(name)); + void create(const char* child_name) + { + add_down(new XMLNode(child_name)); } /// create node if not already existing and move to it - void smart_create(const char* name) - { - XMLNode* node = _cur->find(name); + void smart_create(const char* child_name) + { + XMLNode* node = XPathElement(child_name).find(_cur); if (node) go_to(node); else - add_down(new XMLNode(name)); + add_down(new XMLNode(child_name)); } /// search matching child node identified by key name and an attribute value template<typename T, typename U> - void smart_create(const char* name, const T& attr_name, const U& attr_value) - { - XMLNode* node = _cur->find(name, attr_name, attr_value); + void smart_create(const char* child_name, const T& attr_name, const U& attr_value) + { + XMLNode* node = XPathElement(child_name, 0, attr_name, attr_value).find(_cur); if (node) go_to(node); else { - XMLNode* node = new XMLNode(name); + node = new XMLNode(child_name); add_down(node); (*node)[attr_name] = attr_value; } } #endif + /// delete current node and go back to previous position + bool delete_this() + { + if (!_stack.empty()) { + XMLNode* pLast = _stack.top(); + + if (pLast->_children.remove(_cur)) { + _cur = _stack.top(); + return true; + } + } + + return false; + } + + /// remove all children named 'name' + void remove_children(const XS_String& name) + { + _cur->remove_children(name); + } + + /// remove the attribute 'attr_name' from the current node + void erase(const XS_String& attr_name) + { + _cur->erase(attr_name); + } + XS_String& str() {return *_cur;} const XS_String& str() const {return *_cur;} + + // property (key/value pair) setter functions + void set_property(const XS_String& key, int value, const XS_String& name=XS_PROPERTY); + void set_property(const XS_String& key, double value, const XS_String& name=XS_PROPERTY); + void set_property(const XS_String& key, const XS_String& value, const XS_String& name=XS_PROPERTY); + void set_property(const XS_String& key, const struct XMLBool& value, const XS_String& name=XS_PROPERTY); + + void set_property(const XS_String& key, const char* value, const XS_String& name=XS_PROPERTY) + {set_property(key, XS_String(value), name);} protected: XMLNode* _root; @@ -1644,9 +1783,9 @@ } /// search for child and go down - bool go_down(const XS_String& name, int n=0) - { - XMLNode* node = _cur->find(name, n); + bool go_down(const XS_String& child_name, int n=0) + { + const XMLNode* node = XPathElement(child_name, n).const_find(_cur); if (node) { go_to(node); @@ -1655,14 +1794,14 @@ return false; } - /// move XPath like to position in XML tree - bool go(const char* path); + /// move to the position defined by xpath in XML tree + bool go(const XPath& xpath); #if defined(UNICODE) && !defined(XS_STRING_UTF8) /// search for child and go down - bool go_down(const char* name, int n=0) - { - XMLNode* node = _cur->find(name, n); + bool go_down(const char* child_name, int n=0) + { + const XMLNode* node = XPathElement(child_name, n).const_find(_cur); if (node) { go_to(node); @@ -1698,7 +1837,7 @@ XMLBool(LPCXSSTR value, bool def=false) { - if (value && *value) + if (value && *value)//@@ also handle white space and return def instead of false _value = !XS_icmp(value, XS_TRUE); else _value = def; @@ -1788,7 +1927,7 @@ XMLInt(LPCXSSTR value, int def=0) { - if (value && *value) + if (value && *value)//@@ also handle white space and return def instead of 0 _value = XS_toi(value); else _value = def; @@ -1813,7 +1952,7 @@ { XS_CHAR buffer[32]; XS_snprintf(buffer, COUNTOF(buffer), XS_INTFMT, _value); - return buffer; + return XS_String(buffer); } protected: @@ -1869,7 +2008,7 @@ { LPTSTR end; - if (value && *value) + if (value && *value)//@@ also handle white space and return def instead of 0 _value = XS_tod(value, &end); else _value = def; @@ -1895,7 +2034,7 @@ { XS_CHAR buffer[32]; XS_snprintf(buffer, COUNTOF(buffer), XS_FLOATFMT, _value); - return buffer; + return XS_String(buffer); } protected: @@ -2022,6 +2161,7 @@ }; + // read option (for example configuration) values from XML node attributes template<typename T> inline void read_option(T& var, const_XMLPos& cfg, LPCXSSTR key) { @@ -2031,6 +2171,7 @@ var = val; } + // read integer option values from XML node attributes template<> inline void read_option(int& var, const_XMLPos& cfg, LPCXSSTR key) { @@ -2039,6 +2180,141 @@ if (!val.empty()) var = XS_toi(val.c_str()); } + + +inline void XMLPos::set_property(const XS_String& key, int value, const XS_String& name) +{ + smart_create(name, XS_KEY, key); + XMLIntRef(_cur, XS_VALUE) = value; + back(); +} + +inline void XMLPos::set_property(const XS_String& key, double value, const XS_String& name) +{ + smart_create(name, XS_KEY, key); + XMLDoubleRef(_cur, XS_VALUE) = value; + back(); +} + +inline void XMLPos::set_property(const XS_String& key, const XS_String& value, const XS_String& name) +{ + smart_create(name, XS_KEY, key); + put(XS_VALUE, value); + back(); +} + +inline void XMLPos::set_property(const XS_String& key, const XMLBool& value, const XS_String& name) +{ + smart_create(name, XS_KEY, key); + XMLBoolRef(_cur, XS_VALUE) = value; + back(); +} + + + /// a key/value pair for property data access +struct XMLProperty { + XMLProperty(const XMLNode* node) + : _key(node->get(XS_KEY)), + _value(node->get(XS_VALUE)) + { + } + + XS_String _key; + XS_String _value; +}; + + + /// utility class to read property settings from a XML tree +struct XMLPropertyReader +{ + XMLPropertyReader(const XMLNode::Children& children) + : _filter(children, XS_PROPERTY), + _begin(_filter.begin(), _filter.end()), + _end(_filter.end(), _filter.end()) + { + } + + XMLPropertyReader(const XMLNode* node) + : _filter(node, XS_PROPERTY), + _begin(_filter.begin(), _filter.end()), + _end(_filter.end(), _filter.end()) + { + } + + /// internal iterator class + struct const_iterator + { + typedef const_XMLChildrenFilter::const_iterator BaseIterator; + typedef const_iterator myType; + + const_iterator(BaseIterator begin, BaseIterator end) + : _cur(begin), + _end(end) + { + } + + operator BaseIterator() + { + return _cur; + } + + XMLProperty operator*() const + { + return XMLProperty(*_cur); + } + + const XMLNode* get_node() const + { + return *_cur; + } + + myType& operator++() + { + ++_cur; + + return *this; + } + + myType operator++(int) + { + myType ret = *this; + + ++_cur; + + return ret; + } + + bool operator==(const myType& other) const + { + return _cur == other._cur; + } + + bool operator!=(const myType& other) const + { + return _cur != other._cur; + } + + protected: + BaseIterator _cur; + BaseIterator _end; + }; + + const_iterator begin() + { + return _begin; + } + + const_iterator end() + { + return _end; + } + +protected: + const_XMLChildrenFilter _filter; + + const_iterator _begin; + const_iterator _end; +}; #ifdef _MSC_VER @@ -2245,7 +2521,7 @@ typedef std::char_traits<_E> _Tr; explicit fast_ostringbuffer() - {_Init(0, 0, /*std::_Noread*/4);} // optimized for ios::out mode + {_Init(0, 0, std::_Noread);} // optimized for ios::out mode virtual ~fast_ostringbuffer() {_Tidy();} @@ -2274,10 +2550,10 @@ else if (_ALSIZE < _Alsize) _Alsize = _ALSIZE; - if (_Strmode & std::strstreambuf::_Allocated) + if (_Strmode & std::_Allocated) _Al.deallocate(eback(), _Os); - _Strmode |= std::strstreambuf::_Allocated; + _Strmode |= std::_Allocated; if (_Os == 0) {_Seekhigh = _P; @@ -2291,24 +2567,24 @@ return _C;}} - void _Init(const _E *_S, size_t _N, std::strstreambuf::_Strstate _M) + void _Init(const _E *_S, size_t _N, std::_Strstate _M) {_Pendsave = 0, _Seekhigh = 0; _Alsize = _MINSIZE, _Strmode = _M; setg(0, 0, 0); setp(0, 0);} void _Tidy() - {if (_Strmode & std::strstreambuf::_Allocated) + {if (_Strmode & std::_Allocated) _Al.deallocate(eback(), (pptr() != 0 ? epptr() : egptr()) - eback()); _Seekhigh = 0; - _Strmode &= ~std::strstreambuf::_Allocated;} + _Strmode &= ~std::_Allocated;} private: enum {_ALSIZE = 65536/*512*/, _MINSIZE = 32768/*32*/}; // bigger buffer sizes _E *_Pendsave, *_Seekhigh; int _Alsize; - std::strstreambuf::_Strstate _Strmode; + std::_Strstate _Strmode; std::allocator<_E> _Al; }; @@ -2545,37 +2821,10 @@ } /// create node and move to it - void create(const XS_String& name) - { - if (!_stack.empty()) { - StackEntry& last = _stack.top(); - - if (last._state < PRE_CLOSED) { - write_attributes(last); - close_pre(last); - } - - ++last._children; - } - - StackEntry entry; - entry._node_name = name; - _stack.push(entry); - - write_pre(entry); - } + void create(const XS_String& name); /// go back to previous position - bool back() - { - if (!_stack.empty()) { - write_post(_stack.top()); - - _stack.pop(); - return true; - } else - return false; - } + bool back(); /// attribute setting void put(const XS_String& attr_name, const XS_String& value) @@ -2626,62 +2875,10 @@ static XS_String s_empty_attr; - void close_pre(StackEntry& entry) - { - _out << '>'; - - entry._state = PRE_CLOSED; - } - - void write_pre(StackEntry& entry) - { - if (_format._pretty >= PRETTY_LINEFEED) - _out << _format._endl; - - if (_format._pretty == PRETTY_INDENT) - { - for(size_t i=_stack.size(); --i>0; ) - _out << XML_INDENT_SPACE; - } - _out << '<' << EncodeXMLString(entry._node_name); - //entry._state = PRE; - } - - void write_attributes(StackEntry& entry) - { - for(AttrMap::const_iterator it=entry._attributes.begin(); it!=entry._attributes.end(); ++it) - _out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - - entry._state = ATTRIBUTES; - } - - void write_post(StackEntry& entry) - { - if (entry._state < ATTRIBUTES) - write_attributes(entry); - - if (entry._children || !entry._content.empty()) { - if (entry._state < PRE_CLOSED) - close_pre(entry); - - _out << entry._content; - //entry._state = CONTENT; - - if (_format._pretty>=PRETTY_LINEFEED && entry._content.empty()) - _out << _format._endl; - - if (_format._pretty==PRETTY_INDENT && entry._content.empty()) - { - for(size_t i=_stack.size(); --i>0; ) - _out << XML_INDENT_SPACE; - } - _out << "</" << EncodeXMLString(entry._node_name) << ">"; - } else { - _out << "/>"; - } - - entry._state = POST; - } + void close_pre(StackEntry& entry); + void write_pre(StackEntry& entry); + void write_attributes(StackEntry& entry); + void write_post(StackEntry& entry); }; Modified: trunk/reactos/base/shell/explorer/utility/xs-native.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/utilit… ============================================================================== --- trunk/reactos/base/shell/explorer/utility/xs-native.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/utility/xs-native.cpp [iso-8859-1] Thu May 1 16:17:35 2008 @@ -1,8 +1,8 @@ // - // XML storage C++ classes version 1.2 + // XML storage C++ classes version 1.3 // - // Copyright (c) 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2006, 2007, 2008 Martin Fuchs <martin-fuchs(a)gmx.net> // /// \file xs-native.cpp @@ -94,7 +94,7 @@ _buffer_str.erase(); } - void append(char c) + void append(int c) { size_t wpos = _wptr-_buffer; @@ -104,7 +104,7 @@ _wptr = _buffer + wpos; } - *_wptr++ = c; + *_wptr++ = static_cast<char>(c); } const std::string& str(bool utf8) // returns UTF-8 encoded buffer content @@ -149,8 +149,7 @@ if (*q == '?') ++q; - while(isxmlsym(*q)) - ++q; + q = get_xmlsym_end_utf8(q); #ifdef XS_STRING_UTF8 return XS_String(p, q-p); @@ -175,8 +174,7 @@ else if (*p == '?') ++p; - while(isxmlsym(*p)) - ++p; + p = get_xmlsym_end_utf8(p); // read attributes from buffer while(*p && *p!='>' && *p!='/') { @@ -185,8 +183,7 @@ const char* attr_name = p; - while(isxmlsym(*p)) - ++p; + p = get_xmlsym_end_utf8(p); if (*p != '=') break; //@TODO error handling @@ -360,8 +357,7 @@ // read white space for(;;) { // check for the encoding of the first line end - if (!_endl_defined) - { + if (!_endl_defined) { if (c == '\n') { _format._endl = "\n"; _endl_defined = true; @@ -370,6 +366,7 @@ _endl_defined = true; } } + c = get(); if (c == EOF)

16 years, 4 months

[greatlrd] 33225: Thx fireball to found the real issue with dxg.sys why the hell it did send down NULL we need the graphic drv DeviceObject be sent in, it is known as PDev->hSpooler in windows reactos win32k does not set it up yet so we using reactos version of it it call PDev->VideoFileObject->DeviceObject.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu May 1 16:00:54 2008 New Revision: 33225 URL: http://svn.reactos.org/svn/reactos?rev=33225&view=rev Log: Thx fireball to found the real issue with dxg.sys why the hell it did send down NULL we need the graphic drv DeviceObject be sent in, it is known as PDev->hSpooler in windows reactos win32k does not set it up yet so we using reactos version of it it call PDev->VideoFileObject->DeviceObject. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Thu May 1 16:00:54 2008 @@ -309,7 +309,8 @@ break; case DxEGShDevData_hSpooler: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_hSpooler\n"); - retVal = (DWORD_PTR) PDev->hSpooler; // If the device is a spooler driver. + // retVal = (DWORD_PTR) PDev->hSpooler; // If the device is a spooler driver. + retVal = (DWORD_PTR) PDev->VideoFileObject->DeviceObject; break; case DxEGShDevData_DitherFmt: DPRINT1("requested DXEGSHDEVDATA DxEGShDevData_DitherFmt\n");

16 years, 4 months

[cfinck] 33224: Matthias Kupfer (matthias DOT kupfer AT informatik DOT tu-chemnitz DOT de): - Fix some minor translation errors in the german translation and adjust the size of the elements of some control panel applets. See issue #3211 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu May 1 15:12:53 2008 New Revision: 33224 URL: http://svn.reactos.org/svn/reactos?rev=33224&view=rev Log: Matthias Kupfer (matthias DOT kupfer AT informatik DOT tu-chemnitz DOT de): - Fix some minor translation errors in the german translation and adjust the size of the elements of some control panel applets. See issue #3211 for more details. Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc trunk/reactos/dll/cpl/main/lang/de-DE.rc trunk/reactos/dll/cpl/timedate/lang/de-DE.rc Modified: trunk/reactos/dll/cpl/intl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/de-DE.rc [iso-8859-1] Thu May 1 15:12:53 2008 @@ -15,7 +15,7 @@ LTEXT "Währung:", -1, 16, 101, 48, 10 LTEXT "Zeit:", -1, 16, 116, 48, 10 LTEXT "Kurzes Datum:", -1, 16, 131, 48, 10 - LTEXT "Langes Datum:", -1, 16, 146, 48, 10 + LTEXT "Langes Datum:", -1, 16, 146, 55, 10 EDITTEXT IDC_NUMSAMPLE_EDIT, 89, 86, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_MONEYSAMPLE_EDIT, 89, 101, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP EDITTEXT IDC_TIMESAMPLE_EDIT, 89, 116, 140, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP Modified: trunk/reactos/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/de-DE.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/de-DE.rc [iso-8859-1] Thu May 1 15:12:53 2008 @@ -104,11 +104,11 @@ BEGIN GROUPBOX "Bewegung", -1, 5, 5, 230, 60 ICON IDI_MOUSE_SPEED, IDC_ICON_MOUSE_SPEED, 15, 15, 15, 15 - LTEXT "&Zeigergeschwindigkeit auswählen:", -1, 60, 15, 110, 10 + LTEXT "&Zeigergeschwindigkeit auswählen:", -1, 60, 15, 150, 10 LTEXT "Langsam", -1, 60, 30, 29, 10 CONTROL "",IDC_SLIDER_MOUSE_SPEED, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 90, 30, 70, 17 - LTEXT "Schnell", -1, 170, 30, 23, 10 - CHECKBOX "Z&eigerbeschleunigung verbessern", IDC_CHECK_POINTER_PRECISION, 60, 50, 121, 10 + LTEXT "Schnell", -1, 170, 30, 25, 10 + CHECKBOX "Z&eigerbeschleunigung verbessern", IDC_CHECK_POINTER_PRECISION, 60, 50, 125, 10 GROUPBOX "Zur Standardschaltfläche springen", -1, 5, 65, 230, 40 ICON IDI_MOUSE_BUTTON, IDC_ICON_SNAP_TO, 15, 75, 15, 15 CHECKBOX "&In Dialogfeldern automatisch zur Standardschaltfläche springen", @@ -120,7 +120,7 @@ LTEXT "Lang", IDC_TEXT_TRAIL_LONG, 160, 130, 30, 10 CONTROL "", IDC_SLIDER_POINTER_TRAIL ,"msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 80, 130, 70, 17 ICON IDI_MOUSE_SPEED, IDC_ICON_HIDE_POINTER, 15, 145, 15, 15 - CHECKBOX "Zeiger bei &Tastatureingaben ausblenden", IDC_CHECK_HIDE_POINTER, 60, 150, 141, 10 + CHECKBOX "Zeiger bei &Tastatureingaben ausblenden", IDC_CHECK_HIDE_POINTER, 60, 150, 145, 10 ICON IDI_MOUSE_POINTER, IDC_ICON_SHOW_POINTER, 15, 170, 15, 15 CHECKBOX "Zeigerposition beim Drücken der &STRG-Taste anzeigen", IDC_CHECK_SHOW_POINTER, 60, 175, 170, 20, BS_MULTILINE | BS_TOP @@ -173,3 +173,4 @@ IDS_ANIMATE_CURSOR "Animierter Cursor" END + Modified: trunk/reactos/dll/cpl/timedate/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/de-D… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/de-DE.rc [iso-8859-1] Thu May 1 15:12:53 2008 @@ -3,7 +3,7 @@ IDD_DATETIMEPAGE DIALOGEX 0, 0, 252, 146 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Datum & Uhrzeit" +CAPTION "Datum && Uhrzeit" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "&Datum", -1, 4, 2, 122, 125

16 years, 4 months

[fireball] 33223: - Remove incorrect check introduced in r33221 since Windows does not do it (try to call it on your Windows 2003 installation, and see results).

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 1 14:44:30 2008 New Revision: 33223 URL: http://svn.reactos.org/svn/reactos?rev=33223&view=rev Log: - Remove incorrect check introduced in r33221 since Windows does not do it (try to call it on your Windows 2003 installation, and see results). Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Thu May 1 14:44:30 2008 @@ -1,3 +1,4 @@ + /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory @@ -620,9 +621,6 @@ { PIRP Irp; PIO_STACK_LOCATION StackPtr; - - /* Check if DeviceObject is NULL dxg.sys will send in NULL if we got a PCI graphic card */ - if (DeviceObject == NULL) return NULL; /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE);

16 years, 4 months

[greatlrd] 33222: remove some debug data that was double. it is not longer need it

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu May 1 14:33:18 2008 New Revision: 33222 URL: http://svn.reactos.org/svn/reactos?rev=33222&view=rev Log: remove some debug data that was double. it is not longer need it Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 14:33:18 2008 @@ -69,10 +69,6 @@ DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } - /* FIXME : remove this when we are done with debuging of dxg */ - dump_edd_directdraw_global(pEddgbl); - dump_halinfo(&pEddgbl->ddHalInfo); - DPRINT1("Return value : 0x%08x\n",success); return success; }

16 years, 4 months

[greatlrd] 33221: Bugfix ntoskrnl : IoBuildAsynchronousFsdRequest the param DeviceObject, can be NULL when it comes from dxg.sys for dxg will set it only for AGP graphic card or newer. Cleanup : intEnableReactXDriver it contain less code now. for most of the work are done by dxg.sys. now ms dxg.sys fill the edd_directdraw_gloabl struct by it self.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu May 1 14:20:10 2008 New Revision: 33221 URL: http://svn.reactos.org/svn/reactos?rev=33221&view=rev Log: Bugfix ntoskrnl : IoBuildAsynchronousFsdRequest the param DeviceObject, can be NULL when it comes from dxg.sys for dxg will set it only for AGP graphic card or newer. Cleanup : intEnableReactXDriver it contain less code now. for most of the work are done by dxg.sys. now ms dxg.sys fill the edd_directdraw_gloabl struct by it self. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Thu May 1 14:20:10 2008 @@ -620,6 +620,9 @@ { PIRP Irp; PIO_STACK_LOCATION StackPtr; + + /* Check if DeviceObject is NULL dxg.sys will send in NULL if we got a PCI graphic card */ + if (DeviceObject == NULL) return NULL; /* Allocate IRP */ Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE); Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Thu May 1 14:20:10 2008 @@ -33,15 +33,26 @@ intEnableReactXDriver(PEDD_DIRECTDRAW_GLOBAL pEddgbl, PDC pDC) { PGDIDEVICE pDev = (PGDIDEVICE)pDC->pPDev; - BOOLEAN success = FALSE; - DD_GETDRIVERINFODATA GetInfo; PGD_DXDDENABLEDIRECTDRAW pfnDdEnableDirectDraw = (PGD_DXDDENABLEDIRECTDRAW)gpDxFuncs[DXG_INDEX_DxDdEnableDirectDraw].pfn; + BOOL success = FALSE; /*clean up some of the cache entry */ RtlZeroMemory(pEddgbl,sizeof(EDD_DIRECTDRAW_GLOBAL)); + /* test see if drv got a dx interface or not */ + if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || + ( pDev->DriverFunctions.EnableDirectDraw == NULL)) + { + DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); + return FALSE; + } + /* setup EDD_DIRECTDRAW_GLOBAL for pDev xp */ pDev->pEDDgpl = pEddgbl; + + pEddgbl->ddCallbacks.dwSize = sizeof(DD_CALLBACKS); + pEddgbl->ddSurfaceCallbacks.dwSize = sizeof(DD_SURFACECALLBACKS); + pEddgbl->ddPaletteCallbacks.dwSize = sizeof(DD_PALETTECALLBACKS); if (pfnDdEnableDirectDraw == NULL) { @@ -57,218 +68,13 @@ dump_halinfo(&pEddgbl->ddHalInfo); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } - - /* test see if drv got a dx interface or not */ - if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) || - ( pDev->DriverFunctions.EnableDirectDraw == NULL)) - { - DPRINT1("Waring : DisableDirectDraw and EnableDirectDraw are NULL, no dx driver \n"); - return FALSE; - } - - /* Get DirectDraw infomations form the driver - * DDK say pvmList, pdwFourCC is always NULL in frist call here - * but we get back how many pvmList it whant we should alloc, same - * with pdwFourCC. - */ - - if (pDev->DriverFunctions.GetDirectDrawInfo) - { - // DPRINT1("if u are using vmware driver and see this msg, please repot this\n"); - DPRINT1("at DrvGetDirectDrawInfo \n"); - success = pDev->DriverFunctions.GetDirectDrawInfo( pDC->PDev, - &pEddgbl->ddHalInfo, - &pEddgbl->dwNumHeaps, - NULL, - &pEddgbl->dwNumFourCC, - NULL); - if (!success) - { - DPRINT1("DrvGetDirectDrawInfo frist call fail\n"); - return FALSE; - } - DPRINT1(" DrvGetDirectDrawInfo OK\n"); - - /* The driver are not respnose to alloc the memory for pvmList - * but it is win32k responsible todo, Windows 9x it is gdi32.dll - */ - - if (pEddgbl->dwNumHeaps != 0) - { - DPRINT1("Setup pvmList\n"); - pEddgbl->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pEddgbl->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); - if (pEddgbl->pvmList == NULL) - { - DPRINT1("pvmList memmery alloc fail\n"); - return FALSE; - } - } - - /* The driver are not respnose to alloc the memory for pdwFourCC - * but it is win32k responsible todo, Windows 9x it is gdi32.dll - */ - if (pEddgbl->dwNumFourCC != 0) - { - DPRINT1("Setup pdwFourCC\n"); - pEddgbl->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pEddgbl->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); - - if (pEddgbl->pdwFourCC == NULL) - { - DPRINT1("pdwFourCC memmery alloc fail\n"); - return FALSE; - } - } - success = pDev->DriverFunctions.GetDirectDrawInfo( pDC->PDev, - &pEddgbl->ddHalInfo, - &pEddgbl->dwNumHeaps, - pEddgbl->pvmList, - &pEddgbl->dwNumFourCC, - pEddgbl->pdwFourCC); - if (!success) - { - DPRINT1("DrvGetDirectDrawInfo second call fail\n"); - return FALSE; - } - - /* We need now convert the DD_HALINFO we got, it can be NT4 driver we - * loading ReactOS supporting NT4 and higher to be loading.so we make - * the HALInfo compatible here so we can easy pass it to gdi32.dll - * without converting it later - */ - - if ((pEddgbl->ddHalInfo.dwSize != sizeof(DD_HALINFO)) && - (pEddgbl->ddHalInfo.dwSize != sizeof(DD_HALINFO_V4))) - { - DPRINT1(" Fail not vaild driver DD_HALINFO struct found\n"); - return FALSE; - } - - if (pEddgbl->ddHalInfo.dwSize != sizeof(DD_HALINFO)) - { - if (pEddgbl->ddHalInfo.dwSize == sizeof(DD_HALINFO_V4)) - { - /* NT4 Compatible */ - DPRINT1("Got DD_HALINFO_V4 sturct we convert it to DD_HALINFO \n"); - pEddgbl->ddHalInfo.dwSize = sizeof(DD_HALINFO); - pEddgbl->ddHalInfo.lpD3DGlobalDriverData = NULL; - pEddgbl->ddHalInfo.lpD3DHALCallbacks = NULL; - pEddgbl->ddHalInfo.lpD3DBufCallbacks = NULL; - } - else - { - /* Unknown version found */ - DPRINT1(" Fail : did not get DD_HALINFO size \n"); - return FALSE; - } - } - } - - DPRINT1("Trying EnableDirectDraw the driver\n"); - - success = pDev->DriverFunctions.EnableDirectDraw( pDC->PDev, - &pEddgbl->ddCallbacks, - &pEddgbl->ddSurfaceCallbacks, - &pEddgbl->ddPaletteCallbacks); - - if (!success) - { - DPRINT1("EnableDirectDraw call fail\n"); - return FALSE; - } - - GetInfo.dhpdev = pDC->PDev; - - - /* Note this check will fail on some nvida drv, it is a bug in their drv not in our code, - * we doing proper check if GetDriverInfo exists */ - if ( ((pEddgbl->ddHalInfo.dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0) && - (pEddgbl->ddHalInfo.GetDriverInfo != NULL) ) - { - GetInfo.dhpdev = pDC->PDev; - GetInfo.dwSize = sizeof (DD_GETDRIVERINFODATA); - GetInfo.dwFlags = 0x00; - GetInfo.guidInfo = GUID_VideoPortCallbacks; - GetInfo.lpvData = (PVOID)&pEddgbl->ddVideoPortCallback; - GetInfo.dwExpectedSize = sizeof (DD_VIDEOPORTCALLBACKS); - GetInfo.ddRVal = DDERR_GENERIC; - if ( ( pEddgbl->ddHalInfo.GetDriverInfo (&GetInfo) == DDHAL_DRIVER_NOTHANDLED) || - (GetInfo.ddRVal != DD_OK) ) - { - DPRINT1(" Fail : did not get DD_VIDEOPORTCALLBACKS \n"); - } - else - { - pEddgbl->dwCallbackFlags |= EDDDGBL_VIDEOPORTCALLBACKS; - } - - /* FIXME fill in videoport caps */ - } - else - { - DPRINT1(" Fail : did not foundpEddgbl->ddHalInfo.GetDriverInfo \n"); - } - - /* Note this check will fail on some nvida drv, it is a bug in their drv not in our code, - * we doing proper check if GetDriverInfo exists */ - if ( ((pEddgbl->ddHalInfo.dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0) && - (pEddgbl->ddHalInfo.GetDriverInfo != NULL) ) - { - GetInfo.dhpdev = pDC->PDev; - GetInfo.dwSize = sizeof (DD_GETDRIVERINFODATA); - GetInfo.dwFlags = 0x00; - GetInfo.guidInfo = GUID_MiscellaneousCallbacks; - GetInfo.lpvData = (PVOID)&pEddgbl->ddMiscellanousCallbacks; - GetInfo.dwExpectedSize = sizeof (DD_MISCELLANEOUSCALLBACKS); - GetInfo.ddRVal = DDERR_GENERIC; - if ( ( pEddgbl->ddHalInfo.GetDriverInfo (&GetInfo) == DDHAL_DRIVER_NOTHANDLED) || - (GetInfo.ddRVal != DD_OK) ) - { - DPRINT1(" Fail : did not get DD_MISCELLANEOUSCALLBACKS \n"); - } - else - { - pEddgbl->dwCallbackFlags |= EDDDGBL_MISCCALLBACKS; - } - } - else - { - DPRINT1(" Fail : did not foundpEddgbl->ddHalInfo.GetDriverInfo \n"); - } - - /* Note this check will fail on some nvida drv, it is a bug in their drv not in our code, - * we doing proper check if GetDriverInfo exists */ - if ( ((pEddgbl->ddHalInfo.dwFlags & (DDHALINFO_GETDRIVERINFOSET | DDHALINFO_GETDRIVERINFO2)) != 0) && - (pEddgbl->ddHalInfo.GetDriverInfo != NULL) ) - { - GetInfo.dhpdev = pDC->PDev; - GetInfo.dwSize = sizeof (DD_GETDRIVERINFODATA); - GetInfo.dwFlags = 0x00; - GetInfo.guidInfo = GUID_Miscellaneous2Callbacks; - GetInfo.lpvData = (PVOID)&pEddgbl->ddMiscellanous2Callbacks; - GetInfo.dwExpectedSize = sizeof (DD_MISCELLANEOUS2CALLBACKS); - GetInfo.ddRVal = DDERR_GENERIC; - if ( ( pEddgbl->ddHalInfo.GetDriverInfo (&GetInfo) == DDHAL_DRIVER_NOTHANDLED) || - (GetInfo.ddRVal != DD_OK) ) - { - DPRINT1(" Fail : did not get DD_MISCELLANEOUS2CALLBACKS \n"); - } - else - { - pEddgbl->dwCallbackFlags |= EDDDGBL_MISC2CALLBACKS; - } - } - else - { - DPRINT1(" Fail : did not foundpEddgbl->ddHalInfo.GetDriverInfo \n"); - } - - /* setup missing data in ddHalInfo */ - //pEddgbl->ddHalInfo.GetDriverInfo = (PVOID)pDev->DriverFunctions.GetDirectDrawInfo; - + /* FIXME : remove this when we are done with debuging of dxg */ dump_edd_directdraw_global(pEddgbl); dump_halinfo(&pEddgbl->ddHalInfo); - return TRUE; + + DPRINT1("Return value : 0x%08x\n",success); + return success; } /************************************************************************/

16 years, 4 months

[pschweitzer] 33220: Added French translation for kbswitch.exe

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Thu May 1 12:19:38 2008 New Revision: 33220 URL: http://svn.reactos.org/svn/reactos?rev=33220&view=rev Log: Added French translation for kbswitch.exe Added: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc Added: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc (added) +++ trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc [iso-8859-1] Thu May 1 12:19:38 2008 @@ -1,0 +1,11 @@ +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + MENUITEM SEPARATOR + MENUITEM "&Préférences...", ID_PREFERENCES + MENUITEM "Quitt&er", ID_EXIT + END +END Propchange: trunk/reactos/base/applications/kbswitch/lang/fr-FR.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/rsrc.rc [iso-8859-1] Thu May 1 12:19:38 2008 @@ -2,5 +2,6 @@ #include "lang/de-DE.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" +#include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc"

16 years, 4 months

[dreimer] 33219: Some small fixes

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu May 1 12:05:43 2008 New Revision: 33219 URL: http://svn.reactos.org/svn/reactos?rev=33219&view=rev Log: Some small fixes Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Thu May 1 12:05:43 2008 @@ -73,6 +73,7 @@ # # Get the current date and time for use in in our build log's file name. # +$TIMERAW = get-date -f t $DATENAME = get-date -f dyMMyyyy $TIMENAME = get-date -f HHmm @@ -146,22 +147,14 @@ # if ($args.count -gt 1) { if ($args[0] -eq "multi") { - if ($args[1] -ne "") { - $host.ui.RawUI.WindowTitle = "makex $args parallel build started: $TIMERAW" - } else { - $host.ui.RawUI.WindowTitle = "makex parallel build started: $TIMERAW" - } + $host.ui.RawUI.WindowTitle = "makex $($args) parallel build started: $TIMERAW" +} BUILDMULTI -} } else { if ($args.count -gt 0) { - if ($args[0] -ne "") { - $host.ui.RawUI.WindowTitle = "make $args build started: $TIMERAW" - } else { - $host.ui.RawUI.WindowTitle = "make build started: $TIMERAW" - } + $host.ui.RawUI.WindowTitle = "make $($args) build started: $TIMERAW" +} BUILD -} } #

16 years, 4 months

[dreimer] 33218: Build Process works BaseDir is set properly

by dreimer＠svn.reactos.org

Author: dreimer Date: Thu May 1 11:54:22 2008 New Revision: 33218 URL: http://svn.reactos.org/svn/reactos?rev=33218&view=rev Log: Build Process works BaseDir is set properly Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Thu May 1 11:54:22 2008 @@ -83,21 +83,25 @@ # if ($_ROSBE_WRITELOG -eq 1) { if (!(Test-Path "$_ROSBE_LOGDIR")) { - New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory + $null = (New-Item -path "$_ROSBE_ROSSOURCEDIR" -name "RosBE-Logs" -type directory) } } function BUILD { if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { - New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { - New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } & "$_ROSBE_MINGWMAKE" $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { & "$_ROSBE_MINGWMAKE" $($args) @@ -114,21 +118,25 @@ # -x2 - Number of CPUs, doubled. # -a - Determine the cpu count based on the inherited process affinity mask. # -# for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i +$CPUCOUNT= &"$_ROSBE_BASEDIR\Tools\cpucount.exe" -x1 if ($_ROSBE_SHOWTIME -eq 1) { if ($_ROSBE_WRITELOG -eq 1) { -# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file -# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + & "$_ROSBE_BASEDIR\Tools\buildtime.exe" "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } else { if ($_ROSBE_WRITELOG -eq 1) { -# New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file -# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" + if (!(Test-Path "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt")) { + $null = (New-Item -path "$_ROSBE_LOGDIR" -name "BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" -type file) + } + & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) 2>&1 | tee-object -filepath "$_ROSBE_LOGDIR\BuildLog-$_ROSBE_GCCVERSION-$DATENAME-$TIMENAME.txt" } else { -# & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) + & "$_ROSBE_MINGWMAKE" -j $CPUCOUNT $($args) } } } @@ -139,7 +147,7 @@ if ($args.count -gt 1) { if ($args[0] -eq "multi") { if ($args[1] -ne "") { - $host.ui.RawUI.WindowTitle = "makex $args[1] parallel build started: $TIMERAW" + $host.ui.RawUI.WindowTitle = "makex $args parallel build started: $TIMERAW" } else { $host.ui.RawUI.WindowTitle = "makex parallel build started: $TIMERAW" } @@ -148,7 +156,7 @@ } else { if ($args.count -gt 0) { if ($args[0] -ne "") { - $host.ui.RawUI.WindowTitle = "make $args[1] build started: $TIMERAW" + $host.ui.RawUI.WindowTitle = "make $args build started: $TIMERAW" } else { $host.ui.RawUI.WindowTitle = "make build started: $TIMERAW" } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu May 1 11:54:22 2008 @@ -18,7 +18,8 @@ if ($APPDATA.Length -lt 1) {$APPDATA = $ENV:USERPROFILE} $global:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" $global:_ROSBE_VERSION = 1.2 -$global:_ROSBE_BASEDIR = "C:\Programme\RosBE" #NOCH FALSCH +$global:0 = $myInvocation.MyCommand.Definition +$global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" $global:_ROSBE_ROSSOURCEDIR = "$pwd" $global:_ROSBE_ORIGINALPATH = "$PATH" @@ -101,7 +102,7 @@ # # Check if RosBE data directory exists, if not, create it. # -if (!(Test-Path "$APPDATA\RosBE")) {mkdir $APPDATA\RosBE} +if (!(Test-Path "$APPDATA\RosBE")) {New-Item -path "$APPDATA" -name "RosBE" -type directory} # # Check if the user has used the options utility and @@ -119,17 +120,16 @@ # if ($args.count -gt 0) { if ($args[0] = "oldmode") { -# cls + cls $_ROSBE_MODE = "MinGW" } else { -# cls + cls "Unknown parameter specified. Exiting." exit } } RosBE4 -#cls # # Load the base directory from srclist.txt and set it as the @@ -157,8 +157,7 @@ # inform the user and mention 'ssvn create' (only if ssvn is installed). # if (!(Test-Path "$_ROSBE_BASEDIR\sSVN.ps1")) { -# dir /b $_ROSBE_ROSSOURCEDIR 2>nul | findstr "." >nul - if ($errorlevel = 1) { + if ((get-childitem $_ROSBE_ROSSOURCEDIR).Count -le 0) { "No ReactOS source detected. Please use ""ssvn create"" to download it." } } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Thu May 1 11:54:22 2008 @@ -11,7 +11,7 @@ # Check if we are running within the RosBE, and if not # initialize GCC for the current directory. # -if ($ENV:_ROSBE_MINGWPATH = $null) { +if ($ENV:_ROSBE_MINGWPATH -eq $null) { $ENV:_ROSBE_MODE = "MinGW" $ENV:_ROSBE_MINGWPATH = "$pwd" $ENV:_ROSBE_ORIGINALPATH = "$PATH" @@ -23,11 +23,11 @@ $ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" $global:_ROSBE_GCCVERSION = $null $global:_ROSBE_GCCTARGET = $null -#for /f "usebackq tokens=3" %%i in (`"gcc -v 2>&1 | find "gcc version""`) do set _ROSBE_GCCVERSION=%%i -#for /f "usebackq tokens=2" %%i in (`"gcc -v 2>&1 | find "Target""`) do set _ROSBE_GCCTARGET=%%i +$global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' $ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH" $global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" -if ($_ROSBE_MODE = "MinGW") { +if ($_ROSBE_MODE -eq "MinGW") { $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" } else { @@ -39,28 +39,29 @@ # # Display the current version of GCC, NASM, ld and make. # -gcc -v 2>&1 | find "gcc version" +& gcc -v 2>&1 | select-string "gcc version" "gcc target - $_ROSBE_GCCTARGET" -ld -v +& ld -v if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") { - nasm -v + & nasm -v } else { - if ($_ROSBE_MODE = "RosBE") { + if ($_ROSBE_MODE -eq "RosBE") { "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." } } if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") { - bison --version | find "GNU Bison" + & bison --version | find "GNU Bison" } else { - if ($_ROSBE_MODE = "RosBE") { + if ($_ROSBE_MODE -eq "RosBE") { "WARNING: Bison will soon be required to build ReactOS, none found in the current MinGW/GCC." } } if (Test-Path "$_ROSBE_MINGWPATH\bin\flex.exe") { - flex --version +$fver = (& flex --version) -replace ".*version ((\d|\.)+).*",'$1' + "flex $fver" } else { - if ($_ROSBE_MODE = "RosBE") { + if ($_ROSBE_MODE -eq "RosBE") { "WARNING: Flex will soon be required to build ReactOS, none found in the current MinGW/GCC." } } -mingw32-make -v | find "GNU Make" +& mingw32-make -v | & find "GNU Make" Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu May 1 11:54:22 2008 @@ -40,7 +40,7 @@ :: Check if RosBE data directory exists, if not, create it. :: if not exist "%APPDATA%\RosBE\." ( - mkdir "%APPDATA%\RosBE" + mkdir "%APPDATA%\RosBE" 1> NUL 2> NUL ) ::

16 years, 4 months

[greatlrd] 33217: Fixed DRIVER_FUNCTIONS this struct are being passdown to ms dxg.sys and it access it direcly so we need it match eacly windows xp/2003 layout Fixed DRIVER_BuildDDIFunctions it now setup all api from the drv to DRIVER_FUNCTIONS struct. it is update to windows 2003, we can now use all hw acc api that exists in the drv. we do not doing that yet.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Thu May 1 11:36:42 2008 New Revision: 33217 URL: http://svn.reactos.org/svn/reactos?rev=33217&view=rev Log: Fixed DRIVER_FUNCTIONS this struct are being passdown to ms dxg.sys and it access it direcly so we need it match eacly windows xp/2003 layout Fixed DRIVER_BuildDDIFunctions it now setup all api from the drv to DRIVER_FUNCTIONS struct. it is update to windows 2003, we can now use all hw acc api that exists in the drv. we do not doing that yet. Modified: trunk/reactos/include/ddk/winddi.h trunk/reactos/include/reactos/drivers/directx/directxint.h trunk/reactos/include/reactos/win32k/ntgdityp.h trunk/reactos/subsystems/win32/win32k/misc/driver.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Modified: trunk/reactos/include/ddk/winddi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddi.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddi.h [iso-8859-1] Thu May 1 11:36:42 2008 @@ -337,6 +337,7 @@ #define INDEX_DrvOffset 6L #define INDEX_DrvResetPDEV 7L #define INDEX_DrvDisableDriver 8L +#define INDEX_DrvUnknown1 9L #define INDEX_DrvCreateDeviceBitmap 10L #define INDEX_DrvDeleteDeviceBitmap 11L #define INDEX_DrvRealizeBrush 12L @@ -348,6 +349,7 @@ #define INDEX_DrvBitBlt 18L #define INDEX_DrvCopyBits 19L #define INDEX_DrvStretchBlt 20L +#define INDEX_DrvUnknown2 21L #define INDEX_DrvSetPalette 22L #define INDEX_DrvTextOut 23L #define INDEX_DrvEscape 24L @@ -362,8 +364,10 @@ #define INDEX_DrvStartPage 33L #define INDEX_DrvEndDoc 34L #define INDEX_DrvStartDoc 35L +#define INDEX_DrvUnknown3 36L #define INDEX_DrvGetGlyphMode 37L #define INDEX_DrvSynchronize 38L +#define INDEX_DrvUnknown4 39L #define INDEX_DrvSaveScreenBits 40L #define INDEX_DrvGetModes 41L #define INDEX_DrvFree 42L @@ -387,6 +391,7 @@ #define INDEX_DrvEnableDirectDraw 60L #define INDEX_DrvDisableDirectDraw 61L #define INDEX_DrvQuerySpoolType 62L +#define INDEX_DrvUnknown5 63L #define INDEX_DrvIcmCreateColorTransform 64L #define INDEX_DrvIcmDeleteColorTransform 65L #define INDEX_DrvIcmCheckBitmapBits 66L @@ -3622,6 +3627,7 @@ IN LPWSTR pwszDeviceName, IN HANDLE hDriver); #endif + typedef HSURF (APIENTRY *PFN_DrvEnableSurface)( IN DHPDEV dhpdev); Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di… ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Thu May 1 11:36:42 2008 @@ -140,7 +140,7 @@ /* 0x034 */ VIDEOMEMORY *pvmList; // 0x034 <-- verified to match Windows XP, pvmList /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; -/* 0x040 */ DD_HALINFO ddHalInfo; +/* 0x040 */ DD_HALINFO ddHalInfo; // 0x040 <-- verified to match Windows XP, ddHalInfo /* 0x1E0 */ ULONG unk_1e0[46]; /* 0x298 */ DD_CALLBACKS ddCallbacks; // 0x298 <-- verified to match Windows XP, ddCallbacks /* 0x2C0 */ DD_SURFACECALLBACKS ddSurfaceCallbacks; // 0x2C4 <-- verified to match Windows XP, ddSurfaceCallbacks Modified: trunk/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdityp.h [iso-8859-1] Thu May 1 11:36:42 2008 @@ -130,28 +130,28 @@ GDIObjType_DRVOBJ_TYPE = 0x1c, GDIObjType_DCIOBJ_TYPE = 0x1d, GDIObjType_SPOOL_TYPE = 0x1e, - GDIObjType_MAX_TYPE = 0x1e, - GDIObjTypeTotal = 0x1f, + GDIObjType_MAX_TYPE = 0x1e, + GDIObjTypeTotal = 0x1f, } GDIOBJTYPE, *PGDIOBJTYPE; - -typedef enum GDILoObjType -{ - GDILoObjType_LO_BRUSH_TYPE = 0x100000, - GDILoObjType_LO_DC_TYPE = 0x10000, - GDILoObjType_LO_BITMAP_TYPE = 0x50000, - GDILoObjType_LO_PALETTE_TYPE = 0x80000, - GDILoObjType_LO_FONT_TYPE = 0xa0000, - GDILoObjType_LO_REGION_TYPE = 0x40000, - GDILoObjType_LO_ICMLCS_TYPE = 0x90000, - GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, - GDILoObjType_LO_ALTDC_TYPE = 0x210000, - GDILoObjType_LO_PEN_TYPE = 0x300000, - GDILoObjType_LO_EXTPEN_TYPE = 0x500000, - GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, - GDILoObjType_LO_METAFILE16_TYPE = 0x260000, - GDILoObjType_LO_METAFILE_TYPE = 0x460000, - GDILoObjType_LO_METADC16_TYPE = 0x660000 -} GDILOOBJTYPE, *PGDILOOBJTYPE; + +typedef enum GDILoObjType +{ + GDILoObjType_LO_BRUSH_TYPE = 0x100000, + GDILoObjType_LO_DC_TYPE = 0x10000, + GDILoObjType_LO_BITMAP_TYPE = 0x50000, + GDILoObjType_LO_PALETTE_TYPE = 0x80000, + GDILoObjType_LO_FONT_TYPE = 0xa0000, + GDILoObjType_LO_REGION_TYPE = 0x40000, + GDILoObjType_LO_ICMLCS_TYPE = 0x90000, + GDILoObjType_LO_CLIENTOBJ_TYPE = 0x60000, + GDILoObjType_LO_ALTDC_TYPE = 0x210000, + GDILoObjType_LO_PEN_TYPE = 0x300000, + GDILoObjType_LO_EXTPEN_TYPE = 0x500000, + GDILoObjType_LO_DIBSECTION_TYPE = 0x250000, + GDILoObjType_LO_METAFILE16_TYPE = 0x260000, + GDILoObjType_LO_METAFILE_TYPE = 0x460000, + GDILoObjType_LO_METADC16_TYPE = 0x660000 +} GDILOOBJTYPE, *PGDILOOBJTYPE; #define GdiWorldSpaceToPageSpace 0x203 @@ -531,102 +531,102 @@ // typedef struct _DRIVER_FUNCTIONS { - PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra - PGD_ENABLEPDEV EnablePDEV; - PGD_COMPLETEPDEV CompletePDEV; - PGD_DISABLEPDEV DisablePDEV; - PGD_ENABLESURFACE EnableSurface; - PGD_DISABLESURFACE DisableSurface; - PGD_ASSERTMODE AssertMode; - PGD_OFFSET Offset; - PGD_RESETPDEV ResetPDEV; - PGD_DISABLEDRIVER DisableDriver; - PVOID Unknown0; - PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; - PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; - PGD_REALIZEBRUSH RealizeBrush; - PGD_DITHERCOLOR DitherColor; - PGD_STROKEPATH StrokePath; - PGD_FILLPATH FillPath; - PGD_STROKEANDFILLPATH StrokeAndFillPath; - PGD_PAINT Paint; - PGD_BITBLT BitBlt; - PGD_COPYBITS CopyBits; - PGD_STRETCHBLT StretchBlt; - PVOID Unknown1; - PGD_SETPALETTE SetPalette; - PGD_TEXTOUT TextOut; - PGD_ESCAPE Escape; - PGD_DRAWESCAPE DrawEscape; - PGD_QUERYFONT QueryFont; - PGD_QUERYFONTTREE QueryFontTree; - PGD_QUERYFONTDATA QueryFontData; - PGD_SETPOINTERSHAPE SetPointerShape; - PGD_MOVEPOINTER MovePointer; - PGD_LINETO LineTo; - PGD_SENDPAGE SendPage; - PGD_STARTPAGE StartPage; - PGD_ENDDOC EndDoc; - PGD_STARTDOC StartDoc; - PVOID Unknown2; - PGD_GETGLYPHMODE GetGlyphMode; - PGD_SYNCHRONIZE Synchronize; - PVOID Unknown3; - PGD_SAVESCREENBITS SaveScreenBits; - PGD_GETMODES GetModes; - PGD_FREE Free; - PGD_DESTROYFONT DestroyFont; - PGD_QUERYFONTCAPS QueryFontCaps; - PGD_LOADFONTFILE LoadFontFile; - PGD_UNLOADFONTFILE UnloadFontFile; - PGD_FONTMANAGEMENT FontManagement; - PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; - PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; - PGD_GETTRUETYPEFILE GetTrueTypeFile; - PGD_QUERYFONTFILE QueryFontFile; - PFN_DrvMovePanning MovePanning; - PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; - PGD_SETPIXELFORMAT SetPixelFormat; - PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; - PGD_SWAPBUFFERS SwapBuffers; - PGD_STARTBANDING StartBanding; - PGD_NEXTBAND NextBand; - PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; - PGD_ENABLEDIRECTDRAW EnableDirectDraw; - PGD_DISABLEDIRECTDRAW DisableDirectDraw; - PGD_QUERYSPOOLTYPE QuerySpoolType; - PVOID Unknown4; - PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; - PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; - PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; - PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; - PGD_GRADIENTFILL GradientFill; - PGD_STRETCHBLTROP StretchBltROP; - PFN_DrvPlgBlt PlgBlt; - PGD_ALPHABLEND AlphaBlend; - PVOID SynthesizeFont; - PVOID Unknown5; - PVOID GetSynthesizedFontFiles; - PVOID Unknown6; - PGD_TRANSPARENTBLT TransparentBlt; - PFN_DrvQueryPerBandInfo QueryPerBandInfo; - PFN_DrvQueryDeviceSupport QueryDeviceSupport; - PVOID Reserved1; - PVOID Reserved2; - PVOID Reserved3; - PVOID Reserved4; - PVOID Reserved5; - PVOID Reserved6; - PVOID Reserved7; - PVOID Reserved8; - PFN_DrvDeriveSurface DeriveSurface; - PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; - PFN_DrvNotify Notify; - PGD_SYNCHRONIZESURFACE SynchronizeSurface; - PFN_DrvResetDevice ResetDevice; - PVOID Reserved9; - PVOID Reserved10; - PVOID Reserved11; + PGD_ENABLEPDEV EnablePDEV; + PGD_COMPLETEPDEV CompletePDEV; + PGD_DISABLEPDEV DisablePDEV; + PGD_ENABLESURFACE EnableSurface; + PGD_DISABLESURFACE DisableSurface; + PGD_ASSERTMODE AssertMode; + PGD_OFFSET Offset; + PGD_RESETPDEV ResetPDEV; + PGD_DISABLEDRIVER DisableDriver; + PVOID Unknown1; + PGD_CREATEDEVICEBITMAP CreateDeviceBitmap; + PGD_DELETEDEVICEBITMAP DeleteDeviceBitmap; + PGD_REALIZEBRUSH RealizeBrush; + PGD_DITHERCOLOR DitherColor; + PGD_STROKEPATH StrokePath; + PGD_FILLPATH FillPath; + PGD_STROKEANDFILLPATH StrokeAndFillPath; + PGD_PAINT Paint; + PGD_BITBLT BitBlt; + PGD_COPYBITS CopyBits; + PGD_STRETCHBLT StretchBlt; + PVOID Unknown2; + PGD_SETPALETTE SetPalette; + PGD_TEXTOUT TextOut; + PGD_ESCAPE Escape; + PGD_DRAWESCAPE DrawEscape; + PGD_QUERYFONT QueryFont; + PGD_QUERYFONTTREE QueryFontTree; + PGD_QUERYFONTDATA QueryFontData; + PGD_SETPOINTERSHAPE SetPointerShape; + PGD_MOVEPOINTER MovePointer; + PGD_LINETO LineTo; + PGD_SENDPAGE SendPage; + PGD_STARTPAGE StartPage; + PGD_ENDDOC EndDoc; + PGD_STARTDOC StartDoc; + PVOID Unknown3; + PGD_GETGLYPHMODE GetGlyphMode; + PGD_SYNCHRONIZE Synchronize; + PVOID Unknown4; + PGD_SAVESCREENBITS SaveScreenBits; + PGD_GETMODES GetModes; + PGD_FREE Free; + PGD_DESTROYFONT DestroyFont; + PGD_QUERYFONTCAPS QueryFontCaps; + PGD_LOADFONTFILE LoadFontFile; + PGD_UNLOADFONTFILE UnloadFontFile; + PGD_FONTMANAGEMENT FontManagement; + PGD_QUERYTRUETYPETABLE QueryTrueTypeTable; + PGD_QUERYTRUETYPEOUTLINE QueryTrueTypeOutline; + PGD_GETTRUETYPEFILE GetTrueTypeFile; + PGD_QUERYFONTFILE QueryFontFile; + PFN_DrvMovePanning MovePanning; + PGD_QUERYADVANCEWIDTHS QueryAdvanceWidths; + PGD_SETPIXELFORMAT SetPixelFormat; + PGD_DESCRIBEPIXELFORMAT DescribePixelFormat; + PGD_SWAPBUFFERS SwapBuffers; + PGD_STARTBANDING StartBanding; + PGD_NEXTBAND NextBand; + PGD_GETDIRECTDRAWINFO GetDirectDrawInfo; + PGD_ENABLEDIRECTDRAW EnableDirectDraw; + PGD_DISABLEDIRECTDRAW DisableDirectDraw; + PGD_QUERYSPOOLTYPE QuerySpoolType; + PVOID Unknown5; + PFN_DrvIcmCreateColorTransform IcmCreateColorTransform; + PFN_DrvIcmDeleteColorTransform IcmDeleteColorTransform; + PFN_DrvIcmCheckBitmapBits IcmCheckBitmapBits; + PFN_DrvIcmSetDeviceGammaRamp IcmSetDeviceGammaRamp; + PGD_GRADIENTFILL GradientFill; + PGD_STRETCHBLTROP StretchBltROP; + PFN_DrvPlgBlt PlgBlt; + PGD_ALPHABLEND AlphaBlend; + PVOID SynthesizeFont; + PVOID GetSynthesizedFontFiles; + PGD_TRANSPARENTBLT TransparentBlt; + PFN_DrvQueryPerBandInfo QueryPerBandInfo; + PFN_DrvQueryDeviceSupport QueryDeviceSupport; + PVOID Reserved1; + PVOID Reserved2; + PVOID Reserved3; + PVOID Reserved4; + PVOID Reserved5; + PVOID Reserved6; + PVOID Reserved7; + PVOID Reserved8; + PFN_DrvDeriveSurface DeriveSurface; + PFN_DrvQueryGlyphAttrs QueryGlyphAttrs; + PFN_DrvNotify Notify; + PGD_SYNCHRONIZESURFACE SynchronizeSurface; + PFN_DrvResetDevice ResetDevice; + PVOID Reserved9; + PVOID Reserved10; + PVOID Reserved11; /* 92 */ + + /* ReactOS specify */ + PGD_ENABLEDRIVER EnableDriver; //ReactOS Extra } DRIVER_FUNCTIONS, *PDRIVER_FUNCTIONS; #endif Modified: trunk/reactos/subsystems/win32/win32k/misc/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/misc/driver.c [iso-8859-1] Thu May 1 11:36:42 2008 @@ -30,6 +30,7 @@ /* #define TRACE_DRV_CALLS to get a log of all calls into the display driver. */ #undef TRACE_DRV_CALLS + typedef struct _GRAPHICS_DRIVER { @@ -391,8 +392,7 @@ PDRIVER_FUNCTIONS DF) { BEGIN_FUNCTION_MAP(); - - DRIVER_FUNCTION(EnablePDEV); + DRIVER_FUNCTION(EnablePDEV); DRIVER_FUNCTION(CompletePDEV); DRIVER_FUNCTION(DisablePDEV); DRIVER_FUNCTION(EnableSurface); @@ -401,6 +401,7 @@ DRIVER_FUNCTION(Offset); DRIVER_FUNCTION(ResetPDEV); DRIVER_FUNCTION(DisableDriver); + DRIVER_FUNCTION(Unknown1); DRIVER_FUNCTION(CreateDeviceBitmap); DRIVER_FUNCTION(DeleteDeviceBitmap); DRIVER_FUNCTION(RealizeBrush); @@ -410,10 +411,9 @@ DRIVER_FUNCTION(StrokeAndFillPath); DRIVER_FUNCTION(Paint); DRIVER_FUNCTION(BitBlt); - DRIVER_FUNCTION(TransparentBlt); DRIVER_FUNCTION(CopyBits); DRIVER_FUNCTION(StretchBlt); - DRIVER_FUNCTION(StretchBltROP); + DRIVER_FUNCTION(Unknown2); DRIVER_FUNCTION(SetPalette); DRIVER_FUNCTION(TextOut); DRIVER_FUNCTION(Escape); @@ -428,8 +428,10 @@ DRIVER_FUNCTION(StartPage); DRIVER_FUNCTION(EndDoc); DRIVER_FUNCTION(StartDoc); + DRIVER_FUNCTION(Unknown3); DRIVER_FUNCTION(GetGlyphMode); DRIVER_FUNCTION(Synchronize); + DRIVER_FUNCTION(Unknown4); DRIVER_FUNCTION(SaveScreenBits); DRIVER_FUNCTION(GetModes); DRIVER_FUNCTION(Free); @@ -452,11 +454,36 @@ DRIVER_FUNCTION(EnableDirectDraw); DRIVER_FUNCTION(DisableDirectDraw); DRIVER_FUNCTION(QuerySpoolType); - DRIVER_FUNCTION(IcmSetDeviceGammaRamp); - DRIVER_FUNCTION(GradientFill); - DRIVER_FUNCTION(SynchronizeSurface); - DRIVER_FUNCTION(AlphaBlend); - + DRIVER_FUNCTION(Unknown5); + DRIVER_FUNCTION(IcmCreateColorTransform); + DRIVER_FUNCTION(IcmDeleteColorTransform); + DRIVER_FUNCTION(IcmCheckBitmapBits); + DRIVER_FUNCTION(IcmSetDeviceGammaRamp); + DRIVER_FUNCTION(GradientFill); + DRIVER_FUNCTION(StretchBltROP); + DRIVER_FUNCTION(PlgBlt); + DRIVER_FUNCTION(AlphaBlend); + DRIVER_FUNCTION(SynthesizeFont); + DRIVER_FUNCTION(GetSynthesizedFontFiles); + DRIVER_FUNCTION(TransparentBlt); + DRIVER_FUNCTION(QueryPerBandInfo); + DRIVER_FUNCTION(QueryDeviceSupport); + DRIVER_FUNCTION(Reserved1); + DRIVER_FUNCTION(Reserved2); + DRIVER_FUNCTION(Reserved3); + DRIVER_FUNCTION(Reserved4); + DRIVER_FUNCTION(Reserved5); + DRIVER_FUNCTION(Reserved6); + DRIVER_FUNCTION(Reserved7); + DRIVER_FUNCTION(Reserved8); + DRIVER_FUNCTION(DeriveSurface); + DRIVER_FUNCTION(QueryGlyphAttrs); + DRIVER_FUNCTION(Notify); + DRIVER_FUNCTION(SynchronizeSurface); + DRIVER_FUNCTION(ResetDevice); + DRIVER_FUNCTION(Reserved9); + DRIVER_FUNCTION(Reserved10); + DRIVER_FUNCTION(Reserved11); END_FUNCTION_MAP(); return TRUE; Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Thu May 1 11:36:42 2008 @@ -737,6 +737,8 @@ /************************************************************************/ BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) { + DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); }

16 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2008