Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[martinf] 29338: update explorer/xmlstorage

by martinf＠svn.reactos.org

Author: martinf Date: Mon Oct 1 23:53:58 2007 New Revision: 29338 URL: http://svn.reactos.org/svn/reactos?rev=29338&view=rev Log: update explorer/xmlstorage Modified: trunk/reactos/base/shell/explorer/ (props changed) trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/notifyhook/ (props changed) trunk/reactos/base/shell/explorer/res/ (props changed) trunk/reactos/base/shell/explorer/taskbar/favorites.cpp 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 Propchange: trunk/reactos/base/shell/explorer/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 1 23:53:58 2007 @@ -5,3 +5,18 @@ *.ncb *.suo *.sln +Debug +doxy-doc +Release +*.chm +UDebug +URelease +Win32 +*.coff +*.exe +*.dll +*.aps +.gdbinit +*.gch +pack.cfg +pack.ign Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp Mon Oct 1 23:53:58 2007 @@ -93,12 +93,12 @@ _cfg_dir.printf(TEXT("%s\\ReactOS"), (LPCTSTR)SpecialFolderFSPath(CSIDL_APPDATA,0)); _cfg_path.printf(TEXT("%s\\ros-explorer-cfg.xml"), _cfg_dir.c_str()); - if (!_cfg.read(_cfg_path)) { + if (!_cfg.read_file(_cfg_path)) { //if (_cfg._last_error != XML_ERROR_NO_ELEMENTS) MessageBox(_hwndDesktop, _cfg._errors.str(), TEXT("ROS Explorer - reading user settings"), MB_OK); - _cfg.read(TEXT("explorer-cfg-template.xml")); + _cfg.read_file(TEXT("explorer-cfg-template.xml")); } // read bookmarks @@ -115,7 +115,7 @@ // write configuration file RecursiveCreateDirectory(_cfg_dir); - _cfg.write(_cfg_path); + _cfg.write_file(_cfg_path); _favorites.write(_favorites_path); } Propchange: trunk/reactos/base/shell/explorer/notifyhook/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 1 23:53:58 2007 @@ -5,3 +5,6 @@ *.ncb *.suo *.sln +Debug +Release +Win32 Propchange: trunk/reactos/base/shell/explorer/res/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Mon Oct 1 23:53:58 2007 @@ -5,3 +5,4 @@ *.ncb *.suo *.sln +Thumbs.db Modified: trunk/reactos/base/shell/explorer/taskbar/favorites.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/favorites.cpp (original) +++ trunk/reactos/base/shell/explorer/taskbar/favorites.cpp Mon Oct 1 23:53:58 2007 @@ -426,7 +426,7 @@ { XMLDoc xbel; - if (!xbel.read(path)) { + if (!xbel.read_file(path)) { MessageBox(g_Globals._hwndDesktop, xbel._errors.str(), TEXT("ROS Explorer - reading bookmark file"), MB_OK); } @@ -457,7 +457,7 @@ xbel._format._doctype._public = "+//IDN python.org//DTD XML Bookmark Exchange Language 1.0//EN//XML"; xbel._format._doctype._system = "http://www.python.org/topics/xml/dtds/xbel-1.0.dtd"; - xbel.write(path); + xbel.write_file(path); } /// import Internet Explorer bookmarks from Favorites folder 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 (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Mon Oct 1 23:53:58 2007 @@ -1,6 +1,6 @@ // - // XML storage classes version 1.2 + // XML storage C++ classes version 1.2 // // Copyright (c) 2004, 2005, 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -44,6 +44,10 @@ //#include "xmlstorage.h" #include <precomp.h> +#ifdef __GNUC__ +#include <alloca.h> +#endif + namespace XMLStorage { @@ -152,129 +156,91 @@ // parse relative path while(*path) { - const char* slash = strchr(path, '/'); - if (slash == path) + node = const_cast<XMLNode*>(node)->get_child_relative(path, false); // get_child_relative() ist const for create==false + + if (!node) return NULL; - size_t l = slash? slash-path: strlen(path); - std::string comp(path, l); - path += l; - - // 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; - - int n = 0; - if (bracket) { - std::string expr = unescape(bracket, '[', ']'); - const char* p = expr.c_str(); - - n = atoi(p); // read index number - - if (n) - n = n - 1; // convert into zero based index - - const char* at = strchr(p, '@'); - - if (at) { - p = at + 1; - const char* equal = strchr(p, '='); - - // read attribute name and value - if (equal) { - attr_name = unescape(p, equal-p); - attr_value = unescape(equal+1); - } + 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* slash = strchr(path, '/'); + if (slash == path) + return NULL; + + size_t l = slash? slash-path: strlen(path); + std::string comp(path, l); + path += l; + + // 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; + + int n = 0; + if (bracket) { + std::string expr = unescape(bracket, '[', ']'); + const char* p = expr.c_str(); + + n = atoi(p); // read index number + + if (n) + n = n - 1; // convert into zero based index + + const char* at = strchr(p, '@'); + + if (at) { + p = at + 1; + const char* equal = strchr(p, '='); + + // read attribute name and value + if (equal) { + attr_name = unescape(p, equal-p); + attr_value = unescape(equal+1); } } - - if (attr_name.empty()) - // search n.th child node with specified name - node = node->find(child_name, n); - else - // search n.th child node with specified name and matching attribute value - node = node->find(child_name, attr_name, attr_value, n); - - if (!node) - return NULL; - - if (*path == '/') - ++path; - } - - return node; -} - -XMLNode* XMLNode::create_relative(const char* path) -{ - XMLNode* node = this; - - // parse relative path - while(*path) { - const char* slash = strchr(path, '/'); - if (slash == path) - return NULL; - - size_t l = slash? slash-path: strlen(path); - std::string comp(path, l); - path += l; - - // 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; - - int n = 0; - if (bracket) { - std::string expr = unescape(bracket, '[', ']'); - const char* p = expr.c_str(); - - n = atoi(p); // read index number - - if (n) - n = n - 1; // convert into zero based index - - const char* at = strchr(p, '@'); - - if (at) { - p = at + 1; - const char* equal = strchr(p, '='); - - // read attribute name and value - if (equal) { - 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 = node->find(child_name, n); - else - // search n.th child node with specified name and matching attribute value - child = node->find(child_name, attr_name, attr_value, n); - - if (!child) { - child = new XMLNode(child_name); - node->add_child(child); - - if (!attr_name.empty()) - (*node)[attr_name] = attr_value; - } - - node = child; - - if (*path == '/') - ++path; - } - - return node; + } + + XMLNode* child; + + if (attr_name.empty()) + // search n.th child node with specified name + child = find(child_name, n); + 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; } @@ -426,7 +392,7 @@ /// write node with children tree to output stream using original white space -void XMLNode::write_worker(std::ostream& out, int indent) const +void XMLNode::write_worker(std::ostream& out) const { out << _leading << '<' << EncodeXMLString(*this); @@ -437,7 +403,7 @@ out << '>' << _content; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) - (*it)->write_worker(out, indent+1); + (*it)->write_worker(out); out << _end_leading << "</" << EncodeXMLString(*this) << '>'; } else @@ -455,8 +421,12 @@ for(AttributeMap::const_iterator it=_attributes.begin(); it!=_attributes.end(); ++it) out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - if (!_children.empty()/*@@ || !_content.empty()*/) { - out << ">"; + // strip leading white space from content + const char* content = _content.c_str(); + while(isspace((unsigned char)*content)) ++content; + + if (!_children.empty() || *content) { + out << ">" << content; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) (*it)->plain_write_worker(out); @@ -478,8 +448,15 @@ for(AttributeMap::const_iterator it=_attributes.begin(); it!=_attributes.end(); ++it) out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - if (!_children.empty()/*@@ || !_content.empty()*/) { - out << '>' << format._endl; + // strip leading white space from content + const char* content = _content.c_str(); + while(isspace((unsigned char)*content)) ++content; + + if (!_children.empty() || *content) { + out << '>' << content; + + if (!_children.empty()) + out << format._endl; for(Children::const_iterator it=_children.begin(); it!=_children.end(); ++it) (*it)->pretty_write_worker(out, format, indent+1); @@ -496,26 +473,34 @@ /// write node with children tree to output stream using smart formating void XMLNode::smart_write_worker(std::ostream& out, const XMLFormat& format, int indent) const { - if (_leading.empty()) + // strip the first line feed from _leading + const char* leading = _leading.c_str(); + if (*leading == '\n') ++leading; + + if (!*leading) for(int i=indent; i--; ) out << XML_INDENT_SPACE; else - out << _leading; + out << leading; out << '<' << EncodeXMLString(*this); for(AttributeMap::const_iterator it=_attributes.begin(); it!=_attributes.end(); ++it) out << ' ' << EncodeXMLString(it->first) << "=\"" << EncodeXMLString(it->second) << "\""; - if (_children.empty() && _content.empty()) + // strip leading white space from content + const char* content = _content.c_str(); + while(isspace((unsigned char)*content)) ++content; + + if (_children.empty() && !*content) out << "/>"; else { out << '>'; - if (_content.empty()) + if (!*content) out << format._endl; else - out << _content; + out << content; Children::const_iterator it = _children.begin(); @@ -523,11 +508,15 @@ for(; it!=_children.end(); ++it) (*it)->smart_write_worker(out, format, indent+1); - if (_end_leading.empty()) + // strip the first line feed from _end_leading + const char* end_leading = _end_leading.c_str(); + if (*end_leading == '\n') ++end_leading; + + if (!*end_leading) for(int i=indent; i--; ) out << XML_INDENT_SPACE; else - out << _end_leading; + out << end_leading; } else out << _end_leading; @@ -710,16 +699,14 @@ /// notifications about XML start tag void XMLReaderBase::StartElementHandler(const XS_String& name, const XMLNode::AttributeMap& attributes) { - // search for end of first line const char* s = _content.c_str(); + const char* e = s + _content.length(); const char* p = s; - const char* e = p + _content.length(); - - for(; p<e; ++p) - if (*p == '\n') { - ++p; + + // search for content end leaving only white space for leading + for(p=e; p>s; --p) + if (!isspace((unsigned char)p[-1])) break; - } if (p != s) if (_pos->_children.empty()) { // no children in last node? @@ -754,29 +741,27 @@ /// notifications about XML end tag void XMLReaderBase::EndElementHandler() { - // search for end of first line const char* s = _content.c_str(); - const char* p = s; - const char* e = p + _content.length(); + const char* e = s + _content.length(); + const char* p; if (!strncmp(s,"<![CDATA[",9) && !strncmp(e-3,"]]>",3)) { s += 9; p = (e-=3); - } else - for(; p<e; ++p) - if (*p == '\n') { - ++p; - break; - } + } else { + // search for content end leaving only white space for _end_leading + for(p=e; p>s; --p) + if (!isspace((unsigned char)p[-1])) + break; + } 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 - if (_last_tag == TAG_START) - _pos->_content.append(s, p-s); - else - _pos->_children.back()->_trailing.append(s, p-s); + _pos->_children.back()->_trailing.append(s, p-s); if (p != e) _pos->_end_leading.assign(p, e-p); 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 (original) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h Mon Oct 1 23:53:58 2007 @@ -1,6 +1,6 @@ // - // XML storage classes version 1.2 + // XML storage C++ classes version 1.2 // // Copyright (c) 2004, 2005, 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -154,6 +154,10 @@ #include <windows.h> // for LPCTSTR #include <tchar.h> #include <malloc.h> + +#ifndef _MSC_VER +#include <stdio.h> // vsnprintf(), snprintf() +#endif #else @@ -476,10 +480,12 @@ #ifdef __GNUC__ #include <ext/stdio_filebuf.h> -typedef __gnu_cxx::stdio_filebuf<char> STDIO_FILEBUF; -#else -typedef std::filebuf STDIO_FILEBUF; -#endif +#define FILE_FILEBUF __gnu_cxx::stdio_filebuf<char> +#elif defined(_MSC_VER) +#define FILE_FILEBUF std::filebuf +#endif + +#ifdef FILE_FILEBUF /// base class for XMLStorage::tifstream and XMLStorage::tofstream struct FileHolder @@ -521,7 +527,7 @@ } protected: - STDIO_FILEBUF _buf; + FILE_FILEBUF _buf; }; /// output file stream with ANSI/UNICODE file names @@ -546,8 +552,36 @@ } protected: - STDIO_FILEBUF _buf; -}; + FILE_FILEBUF _buf; +}; + +#else // FILE_FILEBUF + +#ifdef UNICODE +#error UNICODE not supported for this platform +#endif + +struct tifstream : public std::ifstream +{ + typedef std::ifstream super; + + tifstream(const char* path) + : super(path, std::ios::in|std::ios::binary) + { + } +}; + +struct tofstream : public std::ofstream +{ + typedef std::ofstream super; + + tofstream(const char* path) + : super(path, std::ios::out|std::ios::binary) + { + } +}; + +#endif // write XML files with 2 spaces indenting @@ -902,7 +936,7 @@ _attributes[attr_name] = value; } - /// C++ write access to an attribute + /// index operator write access to an attribute XS_String& operator[](const XS_String& attr_name) { return _attributes[attr_name]; @@ -1023,7 +1057,7 @@ break; case FORMAT_ORIGINAL: - write_worker(out, indent); + write_worker(out); break; default: // FORMAT_SMART @@ -1113,10 +1147,13 @@ /// relative XPath create function XMLNode* create_relative(const char* path); - void write_worker(std::ostream& out, int indent) 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 }; @@ -1367,7 +1404,7 @@ return *_cur; } - /// C++ access to current node + /// automatic access to current node operator const XMLNode*() const {return _cur;} operator XMLNode*() {return _cur;} @@ -1378,9 +1415,9 @@ XMLNode& operator*() {return *_cur;} /// attribute access - XS_String get(const XS_String& attr_name) const - { - return _cur->get(attr_name); + XS_String get(const XS_String& attr_name, LPCXSSTR def=XS_EMPTY_STR) const + { + return _cur->get(attr_name, def); } /// attribute setting @@ -1389,7 +1426,7 @@ _cur->put(attr_name, value); } - /// C++ attribute access + /// index operator attribute access template<typename T> XS_String get(const T& attr_name) const {return (*_cur)[attr_name];} XS_String& operator[](const XS_String& attr_name) {return (*_cur)[attr_name];} @@ -1564,7 +1601,7 @@ return *_cur; } - /// C++ access to current node + /// automatic access to current node operator const XMLNode*() const {return _cur;} const XMLNode* operator->() const {return _cur;} @@ -1577,7 +1614,7 @@ return _cur->get(attr_name); } - /// C++ attribute access + /// index operator attribute access template<typename T> XS_String get(const T& attr_name) const {return _cur->get(attr_name);} /// go back to previous position @@ -1944,23 +1981,23 @@ }; /// type converter for string data with write access -struct XMStringRef -{ - XMStringRef(XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) +struct XMLStringRef +{ + XMLStringRef(XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) : _ref((*node)[attr_name]) { if (_ref.empty()) assign(def); } - XMStringRef(XMLNode* node, const XS_String& node_name, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) + XMLStringRef(const XS_String& node_name, XMLNode* node, const XS_String& attr_name, LPCXSSTR def=XS_EMPTY) : _ref(node->subvalue(node_name, attr_name)) { if (_ref.empty()) assign(def); } - XMStringRef& operator=(const XS_String& value) + XMLStringRef& operator=(const XS_String& value) { assign(value); @@ -2304,11 +2341,11 @@ XMLDoc(LPCTSTR path) : XMLNode("") { - read(path); + read_file(path); } #ifdef XS_USE_XERCES - bool read(LPCTSTR path) + bool read_file(LPCTSTR path) { XMLReader reader(this, path); @@ -2319,7 +2356,7 @@ #endif } - bool read(const char* buffer, size_t len, const std::string& system_id=std::string()) + bool read_buffer(const char* buffer, size_t len, const std::string& system_id=std::string()) { XMLReader reader(this, (const XMLByte*)buffer, len, system_id); @@ -2328,7 +2365,7 @@ #else // XS_USE_XERCES - bool read(LPCTSTR path) + bool read_file(LPCTSTR path) { tifstream in(path); XMLReader reader(this, in); @@ -2340,7 +2377,7 @@ #endif } - bool read(const char* buffer, size_t len, const std::string& system_id=std::string()) + bool read_buffer(const char* buffer, size_t len, const std::string& system_id=std::string()) { std::istringstream in(std::string(buffer, len)); @@ -2377,7 +2414,8 @@ return true; } - /// write XML stream preserving previous white space and comments + /// write XML stream + // FORMAT_SMART: preserving previous white space and comments bool write(std::ostream& out, WRITE_MODE mode=FORMAT_SMART) const { _format.print_header(out, mode!=FORMAT_PLAIN); @@ -2398,7 +2436,7 @@ return write(out, FORMAT_PRETTY); } - bool write(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART) const + bool write_file(LPCTSTR path, WRITE_MODE mode=FORMAT_SMART) const { tofstream out(path); @@ -2454,7 +2492,7 @@ { XMLMessageFromString(const std::string& xml_str, const std::string& system_id=std::string()) { - read(xml_str.c_str(), xml_str.length(), system_id); + read_buffer(xml_str.c_str(), xml_str.length(), system_id); } }; @@ -2465,7 +2503,7 @@ XMLMessageReader(const std::string& xml_str, const std::string& system_id=std::string()) : XMLPos(&_msg) { - _msg.read(xml_str.c_str(), xml_str.length(), system_id); + _msg.read_buffer(xml_str.c_str(), xml_str.length(), system_id); } const XMLDoc& get_document() @@ -2543,7 +2581,7 @@ _stack.top()._attributes[attr_name] = value; } - /// C++ write access to an attribute + /// index operator write access to an attribute XS_String& operator[](const XS_String& attr_name) { if (_stack.empty()) 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 (original) +++ trunk/reactos/base/shell/explorer/utility/xs-native.cpp Mon Oct 1 23:53:58 2007 @@ -1,6 +1,6 @@ // - // XML storage classes version 1.2 + // XML storage C++ classes version 1.2 // // Copyright (c) 2006, 2007 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -224,7 +224,7 @@ char* _buffer; char* _wptr; size_t _len; - std::string _buffer_str; // UF-8 encoded + std::string _buffer_str; // UTF-8 encoded }; bool XMLReaderBase::parse() @@ -386,7 +386,7 @@ buffer.reset(); } - return true; + return true; //TODO return false on invalid XML } int XMLReaderBase::eat_endl()

17 years, 2 months

[fireball] 29337: - Forgot to hit "CTRL+S" in the editor :) (add a FIXME comment about small hack).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 1 23:12:09 2007 New Revision: 29337 URL: http://svn.reactos.org/svn/reactos?rev=29337&view=rev Log: - Forgot to hit "CTRL+S" in the editor :) (add a FIXME comment about small hack). Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Mon Oct 1 23:12:09 2007 @@ -388,6 +388,8 @@ UseDummyFile = ((OpenPacket->QueryOnly) || (OpenPacket->DeleteOnly)); /* Check if this is a direct open */ + /* FIXME: Small hack still exists, because there is probably + a small bug somewhere in vfat */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && (((DesiredAccess & ~(SYNCHRONIZE |

17 years, 2 months

[hpoussin] 29336: Autosyncing with Wine HEAD

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 1 23:09:53 2007 New Revision: 29336 URL: http://svn.reactos.org/svn/reactos?rev=29336&view=rev Log: Autosyncing with Wine HEAD Added: trunk/reactos/dll/win32/browseui/aclmulti.c (with props) trunk/reactos/dll/win32/browseui/browseui.h (with props) trunk/reactos/dll/win32/browseui/browseui.rbuild (with props) trunk/reactos/dll/win32/browseui/browseui.spec (with props) trunk/reactos/dll/win32/browseui/browseui_main.c (with props) trunk/reactos/dll/win32/browseui/browseui_ros.diff (with props) trunk/reactos/dll/win32/browseui/regsvr.c (with props) trunk/reactos/dll/win32/browseui/version.rc (with props) Added: trunk/reactos/dll/win32/browseui/aclmulti.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/aclmult… ============================================================================== --- trunk/reactos/dll/win32/browseui/aclmulti.c (added) +++ trunk/reactos/dll/win32/browseui/aclmulti.c Mon Oct 1 23:09:53 2007 @@ -1,0 +1,331 @@ +/* + * Multisource AutoComplete list + * + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "winuser.h" +#include "shlwapi.h" +#include "winerror.h" +#include "objbase.h" + +#include "shlguid.h" +#include "shlobj.h" + +#include "wine/unicode.h" + +#include "browseui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +struct ACLMultiSublist { + IUnknown *punk; + IEnumString *pEnum; + IACList *pACL; +}; + +typedef struct tagACLMulti { + const IEnumStringVtbl *vtbl; + const IACListVtbl *aclVtbl; + const IObjMgrVtbl *objmgrVtbl; + LONG refCount; + INT nObjs; + INT currObj; + struct ACLMultiSublist *objs; +} ACLMulti; + +static const IEnumStringVtbl ACLMultiVtbl; +static const IACListVtbl ACLMulti_ACListVtbl; +static const IObjMgrVtbl ACLMulti_ObjMgrVtbl; + +static inline ACLMulti *impl_from_IACList(IACList *iface) +{ + return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, aclVtbl)); +} + +static inline ACLMulti *impl_from_IObjMgr(IObjMgr *iface) +{ + return (ACLMulti *)((char *)iface - FIELD_OFFSET(ACLMulti, objmgrVtbl)); +} + +static void release_obj(struct ACLMultiSublist *obj) +{ + IUnknown_Release(obj->punk); + if (obj->pEnum) + IEnumString_Release(obj->pEnum); + if (obj->pACL) + IACList_Release(obj->pACL); +} + +HRESULT WINAPI ACLMulti_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + ACLMulti *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = CoTaskMemAlloc(sizeof(ACLMulti)); + if (This == NULL) + return E_OUTOFMEMORY; + ZeroMemory(This, sizeof(*This)); + This->vtbl = &ACLMultiVtbl; + This->aclVtbl = &ACLMulti_ACListVtbl; + This->objmgrVtbl = &ACLMulti_ObjMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + BROWSEUI_refCount++; + return S_OK; +} + +static void WINAPI ACLMulti_Destructor(ACLMulti *This) +{ + int i; + TRACE("destroying %p\n", This); + for (i = 0; i < This->nObjs; i++) + release_obj(&This->objs[i]); + CoTaskMemFree(This->objs); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI ACLMulti_QueryInterface(IEnumString *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLMulti *This = (ACLMulti *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumString)) + { + *ppvOut = This; + } + else if (IsEqualIID(iid, &IID_IACList)) + { + *ppvOut = &This->aclVtbl; + } + else if (IsEqualIID(iid, &IID_IObjMgr)) + { + *ppvOut = &This->objmgrVtbl; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ACLMulti_AddRef(IEnumString *iface) +{ + ACLMulti *This = (ACLMulti *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI ACLMulti_Release(IEnumString *iface) +{ + ACLMulti *This = (ACLMulti *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + ACLMulti_Destructor(This); + return ret; +} + +static HRESULT WINAPI ACLMulti_Append(IObjMgr *iface, IUnknown *obj) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + + TRACE("(%p, %p)\n", This, obj); + if (obj == NULL) + return E_FAIL; + + This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * (This->nObjs+1)); + This->objs[This->nObjs].punk = obj; + IUnknown_AddRef(obj); + if (FAILED(IUnknown_QueryInterface(obj, &IID_IEnumString, (LPVOID *)&This->objs[This->nObjs].pEnum))) + This->objs[This->nObjs].pEnum = NULL; + if (FAILED(IUnknown_QueryInterface(obj, &IID_IACList, (LPVOID *)&This->objs[This->nObjs].pACL))) + This->objs[This->nObjs].pACL = NULL; + This->nObjs++; + return S_OK; +} + +static HRESULT WINAPI ACLMulti_Remove(IObjMgr *iface, IUnknown *obj) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + int i; + + TRACE("(%p, %p)\n", This, obj); + for (i = 0; i < This->nObjs; i++) + if (This->objs[i].punk == obj) + { + release_obj(&This->objs[i]); + memmove(&This->objs[i], &This->objs[i+1], (This->nObjs-i-1)*sizeof(struct ACLMultiSublist)); + This->nObjs--; + This->objs = CoTaskMemRealloc(This->objs, sizeof(This->objs[0]) * This->nObjs); + return S_OK; + } + + return E_FAIL; +} + +static HRESULT WINAPI ACLMulti_Next(IEnumString *iface, ULONG celt, LPOLESTR *rgelt, ULONG *pceltFetched) +{ + ACLMulti *This = (ACLMulti *)iface; + + TRACE("(%p, %d, %p, %p)\n", iface, celt, rgelt, pceltFetched); + while (This->currObj < This->nObjs) + { + if (This->objs[This->currObj].pEnum) + { + /* native browseui 6.0 also returns only one element */ + HRESULT ret = IEnumString_Next(This->objs[This->currObj].pEnum, 1, rgelt, pceltFetched); + if (ret != S_FALSE) + return ret; + } + This->currObj++; + } + + if (pceltFetched) + *pceltFetched = 0; + *rgelt = NULL; + return S_FALSE; +} + +static HRESULT WINAPI ACLMulti_Reset(IEnumString *iface) +{ + ACLMulti *This = (ACLMulti *)iface; + int i; + + This->currObj = 0; + for (i = 0; i < This->nObjs; i++) + { + if (This->objs[i].pEnum) + IEnumString_Reset(This->objs[i].pEnum); + } + return S_OK; +} + +static HRESULT WINAPI ACLMulti_Skip(IEnumString *iface, ULONG celt) +{ + /* native browseui 6.0 returns this: */ + return E_NOTIMPL; +} + +static HRESULT WINAPI ACLMulti_Clone(IEnumString *iface, IEnumString **ppOut) +{ + *ppOut = NULL; + /* native browseui 6.0 returns this: */ + return E_OUTOFMEMORY; +} + +static HRESULT WINAPI ACLMulti_Expand(IACList *iface, LPCWSTR wstr) +{ + ACLMulti *This = impl_from_IACList(iface); + HRESULT res = S_OK; + int i; + + for (i = 0; i < This->nObjs; i++) + { + if (!This->objs[i].pACL) + continue; + res = IACList_Expand(This->objs[i].pACL, wstr); + if (res == S_OK) + break; + } + return res; +} + +static const IEnumStringVtbl ACLMultiVtbl = +{ + ACLMulti_QueryInterface, + ACLMulti_AddRef, + ACLMulti_Release, + + ACLMulti_Next, + ACLMulti_Skip, + ACLMulti_Reset, + ACLMulti_Clone +}; + +static HRESULT WINAPI ACLMulti_IObjMgr_QueryInterface(IObjMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); +} + +static ULONG WINAPI ACLMulti_IObjMgr_AddRef(IObjMgr *iface) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + return ACLMulti_AddRef((IEnumString *)This); +} + +static ULONG WINAPI ACLMulti_IObjMgr_Release(IObjMgr *iface) +{ + ACLMulti *This = impl_from_IObjMgr(iface); + return ACLMulti_Release((IEnumString *)This); +} + +static const IObjMgrVtbl ACLMulti_ObjMgrVtbl = +{ + ACLMulti_IObjMgr_QueryInterface, + ACLMulti_IObjMgr_AddRef, + ACLMulti_IObjMgr_Release, + + ACLMulti_Append, + ACLMulti_Remove +}; + +static HRESULT WINAPI ACLMulti_IACList_QueryInterface(IACList *iface, REFIID iid, LPVOID *ppvOut) +{ + ACLMulti *This = impl_from_IACList(iface); + return ACLMulti_QueryInterface((IEnumString *)This, iid, ppvOut); +} + +static ULONG WINAPI ACLMulti_IACList_AddRef(IACList *iface) +{ + ACLMulti *This = impl_from_IACList(iface); + return ACLMulti_AddRef((IEnumString *)This); +} + +static ULONG WINAPI ACLMulti_IACList_Release(IACList *iface) +{ + ACLMulti *This = impl_from_IACList(iface); + return ACLMulti_Release((IEnumString *)This); +} + +static const IACListVtbl ACLMulti_ACListVtbl = +{ + ACLMulti_IACList_QueryInterface, + ACLMulti_IACList_AddRef, + ACLMulti_IACList_Release, + + ACLMulti_Expand +}; Propchange: trunk/reactos/dll/win32/browseui/aclmulti.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.h (added) +++ trunk/reactos/dll/win32/browseui/browseui.h Mon Oct 1 23:09:53 2007 @@ -1,0 +1,28 @@ +/* + * Internal header for browseui.dll + * + * Copyright 2007 Mikolaj Zalewski + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_BROWSEUI_H +#define __WINE_BROWSEUI_H + +extern LONG BROWSEUI_refCount; + +HRESULT WINAPI ACLMulti_Constructor(IUnknown *punkOuter, IUnknown **ppOut); + +#endif /* __WINE_SHDOCVW_H */ Propchange: trunk/reactos/dll/win32/browseui/browseui.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.rbuild (added) +++ trunk/reactos/dll/win32/browseui/browseui.rbuild Mon Oct 1 23:09:53 2007 @@ -1,0 +1,26 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="browseui" type="win32dll" baseaddress="${BASEADDRESS_BROWSEUI}" installbase="system32" installname="browseui.dll" allowwarnings="true"> + <autoregister infsection="OleControlDlls" type="Both" /> + <importlibrary definition="browseui.spec.def" /> + <include base="browseui">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="__REACTOS__" /> + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x600</define> + <define name="WINVER">0x600</define> + <library>wine</library> + <library>ole32</library> + <library>user32</library> + <library>advapi32</library> + <library>kernel32</library> + <library>uuid</library> + <library>ntdll</library> + <file>aclmulti.c</file> + <file>browseui_main.c</file> + <file>regsvr.c</file> + <file>version.rc</file> + <file>browseui.spec</file> +</module> Propchange: trunk/reactos/dll/win32/browseui/browseui.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui.spec (added) +++ trunk/reactos/dll/win32/browseui/browseui.spec Mon Oct 1 23:09:53 2007 @@ -1,0 +1,6 @@ +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllGetVersion(ptr) +@ stub DllInstall +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer() Propchange: trunk/reactos/dll/win32/browseui/browseui.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_main.c (added) +++ trunk/reactos/dll/win32/browseui/browseui_main.c Mon Oct 1 23:09:53 2007 @@ -1,0 +1,211 @@ +/* + * browseui - Internet Explorer / Windows Explorer standard UI + * + * Copyright 2001 John R. Sheets (for CodeWeavers) + * Copyright 2004 Mike McCormack (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "wine/debug.h" +#include "windef.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" +#include "shlguid.h" + +#include "initguid.h" + +#include "browseui.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +LONG BROWSEUI_refCount = 0; + +HINSTANCE browseui_hinstance = 0; + +typedef HRESULT (WINAPI *LPFNCONSTRUCTOR)(IUnknown *pUnkOuter, IUnknown **ppvOut); + +static const struct { + REFCLSID clsid; + LPFNCONSTRUCTOR ctor; +} ClassesTable[] = { + {&CLSID_ACLMulti, ACLMulti_Constructor}, + {NULL, NULL} +}; + +typedef struct tagClassFactory +{ + const IClassFactoryVtbl *vtbl; + LONG ref; + LPFNCONSTRUCTOR ctor; +} ClassFactory; +static const IClassFactoryVtbl ClassFactoryVtbl; + +static HRESULT ClassFactory_Constructor(LPFNCONSTRUCTOR ctor, LPVOID *ppvOut) +{ + ClassFactory *This = CoTaskMemAlloc(sizeof(ClassFactory)); + This->vtbl = &ClassFactoryVtbl; + This->ref = 1; + This->ctor = ctor; + *ppvOut = (LPVOID)This; + TRACE("Created class factory %p\n", This); + BROWSEUI_refCount++; + return S_OK; +} + +static void ClassFactory_Destructor(ClassFactory *This) +{ + TRACE("Destroying class factory %p\n", This); + CoTaskMemFree(This); + BROWSEUI_refCount--; +} + +static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppvOut) +{ + *ppvOut = NULL; + if (IsEqualIID(riid, &IID_IClassFactory) || IsEqualIID(riid, &IID_IUnknown)) { + IClassFactory_AddRef(iface); + *ppvOut = iface; + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) +{ + ClassFactory *This = (ClassFactory *)iface; + ULONG ret = InterlockedDecrement(&This->ref); + + if (ret == 0) + ClassFactory_Destructor(This); + return ret; +} + +static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *punkOuter, REFIID iid, LPVOID *ppvOut) +{ + ClassFactory *This = (ClassFactory *)iface; + HRESULT ret; + IUnknown *obj; + + TRACE("(%p, %p, %s, %p)\n", iface, punkOuter, debugstr_guid(iid), ppvOut); + ret = This->ctor(punkOuter, &obj); + if (FAILED(ret)) + return ret; + ret = IUnknown_QueryInterface(obj, iid, ppvOut); + IUnknown_Release(obj); + return ret; +} + +static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL fLock) +{ + ClassFactory *This = (ClassFactory *)iface; + + TRACE("(%p)->(%x)\n", This, fLock); + + if(fLock) + InterlockedIncrement(&BROWSEUI_refCount); + else + InterlockedDecrement(&BROWSEUI_refCount); + + return S_OK; +} + +static const IClassFactoryVtbl ClassFactoryVtbl = { + /* IUnknown */ + ClassFactory_QueryInterface, + ClassFactory_AddRef, + ClassFactory_Release, + + /* IClassFactory*/ + ClassFactory_CreateInstance, + ClassFactory_LockServer +}; + +/************************************************************************* + * BROWSEUI DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad) +{ + TRACE("%p 0x%x %p\n", hinst, fdwReason, fImpLoad); + switch (fdwReason) + { + case DLL_WINE_PREATTACH: + return FALSE; /* prefer native version */ + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinst); + browseui_hinstance = hinst; + break; + } + return TRUE; +} + +/************************************************************************* + * DllCanUnloadNow (BROWSEUI.@) + */ +HRESULT WINAPI DllCanUnloadNow(void) +{ + return BROWSEUI_refCount ? S_FALSE : S_OK; +} + +/*********************************************************************** + * DllGetVersion (BROWSEUI.@) + */ +HRESULT WINAPI DllGetVersion(DLLVERSIONINFO *info) +{ + if (info->cbSize != sizeof(DLLVERSIONINFO)) FIXME("support DLLVERSIONINFO2\n"); + + /* this is what IE6 on Windows 98 reports */ + info->dwMajorVersion = 6; + info->dwMinorVersion = 0; + info->dwBuildNumber = 2600; + info->dwPlatformID = DLLVER_PLATFORM_WINDOWS; + + return NOERROR; +} + +/*********************************************************************** + * DllGetClassObject (BROWSEUI.@) + */ +HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID iid, LPVOID *ppvOut) +{ + int i; + + *ppvOut = NULL; + if (!IsEqualIID(iid, &IID_IUnknown) && !IsEqualIID(iid, &IID_IClassFactory)) + return E_NOINTERFACE; + + for (i = 0; ClassesTable[i].clsid != NULL; i++) + if (IsEqualCLSID(ClassesTable[i].clsid, clsid)) { + return ClassFactory_Constructor(ClassesTable[i].ctor, ppvOut); + } + FIXME("CLSID %s not supported\n", debugstr_guid(clsid)); + return CLASS_E_CLASSNOTAVAILABLE; +} Propchange: trunk/reactos/dll/win32/browseui/browseui_main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/browseui_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/browseu… ============================================================================== --- trunk/reactos/dll/win32/browseui/browseui_ros.diff (added) +++ trunk/reactos/dll/win32/browseui/browseui_ros.diff Mon Oct 1 23:09:53 2007 @@ -1,0 +1,15 @@ +Index: browseui.rbuild +=================================================================== +--- browseui.rbuild (revision 23123) ++++ browseui.rbuild (working copy) +@@ -9,8 +9,8 @@ + <define name="__WINESRC__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> +- <define name="_WIN32_WINNT">0x501</define> +- <define name="WINVER">0x501</define> ++ <define name="_WIN32_WINNT">0x600</define> ++ <define name="WINVER">0x600</define> + <library>wine</library> + <library>ole32</library> + <library>user32</library> Propchange: trunk/reactos/dll/win32/browseui/browseui_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/regsvr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/regsvr.… ============================================================================== --- trunk/reactos/dll/win32/browseui/regsvr.c (added) +++ trunk/reactos/dll/win32/browseui/regsvr.c Mon Oct 1 23:09:53 2007 @@ -1,0 +1,489 @@ +/* + * self-registerable dll functions for browseui.dll + * + * Copyright (C) 2004 Stefan Leichter + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> +#include <string.h> + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "wingdi.h" +#include "winreg.h" +#include "winerror.h" + +#include "ole2.h" +#include "shlguid.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(browseui); + +/* + * Near the bottom of this file are the exported DllRegisterServer and + * DllUnregisterServer, which make all this worthwhile. + */ + +/*********************************************************************** + * interface for self-registering + */ +struct regsvr_interface +{ + IID const *iid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + IID const *base_iid; /* can be NULL to omit */ + int num_methods; /* can be <0 to omit */ + CLSID const *ps_clsid; /* can be NULL to omit */ + CLSID const *ps_clsid32; /* can be NULL to omit */ +}; + +static HRESULT register_interfaces(struct regsvr_interface const *list); +static HRESULT unregister_interfaces(struct regsvr_interface const *list); + +struct regsvr_coclass +{ + CLSID const *clsid; /* NULL for end of list */ + LPCSTR name; /* can be NULL to omit */ + LPCSTR ips; /* can be NULL to omit */ + LPCSTR ips32; /* can be NULL to omit */ + LPCSTR ips32_tmodel; /* can be NULL to omit */ + LPCSTR progid; /* can be NULL to omit */ + LPCSTR viprogid; /* can be NULL to omit */ + LPCSTR progid_extra; /* can be NULL to omit */ +}; + +static HRESULT register_coclasses(struct regsvr_coclass const *list); +static HRESULT unregister_coclasses(struct regsvr_coclass const *list); + +/*********************************************************************** + * static string constants + */ +static WCHAR const interface_keyname[10] = { + 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', 'e', 0 }; +static WCHAR const base_ifa_keyname[14] = { + 'B', 'a', 's', 'e', 'I', 'n', 't', 'e', 'r', 'f', 'a', 'c', + 'e', 0 }; +static WCHAR const num_methods_keyname[11] = { + 'N', 'u', 'm', 'M', 'e', 't', 'h', 'o', 'd', 's', 0 }; +static WCHAR const ps_clsid_keyname[15] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', 0 }; +static WCHAR const ps_clsid32_keyname[17] = { + 'P', 'r', 'o', 'x', 'y', 'S', 't', 'u', 'b', 'C', 'l', 's', + 'i', 'd', '3', '2', 0 }; +static WCHAR const clsid_keyname[6] = { + 'C', 'L', 'S', 'I', 'D', 0 }; +static WCHAR const curver_keyname[7] = { + 'C', 'u', 'r', 'V', 'e', 'r', 0 }; +static WCHAR const ips_keyname[13] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + 0 }; +static WCHAR const ips32_keyname[15] = { + 'I', 'n', 'P', 'r', 'o', 'c', 'S', 'e', 'r', 'v', 'e', 'r', + '3', '2', 0 }; +static WCHAR const progid_keyname[7] = { + 'P', 'r', 'o', 'g', 'I', 'D', 0 }; +static WCHAR const viprogid_keyname[25] = { + 'V', 'e', 'r', 's', 'i', 'o', 'n', 'I', 'n', 'd', 'e', 'p', + 'e', 'n', 'd', 'e', 'n', 't', 'P', 'r', 'o', 'g', 'I', 'D', + 0 }; +static char const tmodel_valuename[] = "ThreadingModel"; + +/*********************************************************************** + * static helper functions + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid); +static LONG register_key_defvalueW(HKEY base, WCHAR const *name, + WCHAR const *value); +static LONG register_key_defvalueA(HKEY base, WCHAR const *name, + char const *value); +static LONG register_progid(WCHAR const *clsid, + char const *progid, char const *curver_progid, + char const *name, char const *extra); + +/*********************************************************************** + * register_interfaces + */ +static HRESULT register_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &interface_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + HKEY iid_key; + + StringFromGUID2(list->iid, buf, 39); + res = RegCreateKeyExW(interface_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &iid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_interface_key; + + if (list->name) { + res = RegSetValueExA(iid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->base_iid) { + res = register_key_guid(iid_key, base_ifa_keyname, list->base_iid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (0 <= list->num_methods) { + static WCHAR const fmt[3] = { '%', 'd', 0 }; + HKEY key; + + res = RegCreateKeyExW(iid_key, num_methods_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + + wsprintfW(buf, fmt, list->num_methods); + res = RegSetValueExW(key, NULL, 0, REG_SZ, + (CONST BYTE*)buf, + (lstrlenW(buf) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid) { + res = register_key_guid(iid_key, ps_clsid_keyname, list->ps_clsid); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + if (list->ps_clsid32) { + res = register_key_guid(iid_key, ps_clsid32_keyname, list->ps_clsid32); + if (res != ERROR_SUCCESS) goto error_close_iid_key; + } + + error_close_iid_key: + RegCloseKey(iid_key); + } + +error_close_interface_key: + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_interfaces + */ +static HRESULT unregister_interfaces(struct regsvr_interface const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY interface_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, interface_keyname, 0, + KEY_READ | KEY_WRITE, &interface_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->iid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->iid, buf, 39); + res = RegDeleteTreeW(interface_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + } + + RegCloseKey(interface_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * register_coclasses + */ +static HRESULT register_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegCreateKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &coclass_key, NULL); + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + HKEY clsid_key; + + StringFromGUID2(list->clsid, buf, 39); + res = RegCreateKeyExW(coclass_key, buf, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &clsid_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->name) { + res = RegSetValueExA(clsid_key, NULL, 0, REG_SZ, + (CONST BYTE*)(list->name), + strlen(list->name) + 1); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips) { + res = register_key_defvalueA(clsid_key, ips_keyname, list->ips); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->ips32) { + HKEY ips32_key; + + res = RegCreateKeyExW(clsid_key, ips32_keyname, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, + &ips32_key, NULL); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = RegSetValueExA(ips32_key, NULL, 0, REG_SZ, + (CONST BYTE*)list->ips32, + lstrlenA(list->ips32) + 1); + if (res == ERROR_SUCCESS && list->ips32_tmodel) + res = RegSetValueExA(ips32_key, tmodel_valuename, 0, REG_SZ, + (CONST BYTE*)list->ips32_tmodel, + strlen(list->ips32_tmodel) + 1); + RegCloseKey(ips32_key); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->progid) { + res = register_key_defvalueA(clsid_key, progid_keyname, + list->progid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->progid, NULL, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + if (list->viprogid) { + res = register_key_defvalueA(clsid_key, viprogid_keyname, + list->viprogid); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + + res = register_progid(buf, list->viprogid, list->progid, + list->name, list->progid_extra); + if (res != ERROR_SUCCESS) goto error_close_clsid_key; + } + + error_close_clsid_key: + RegCloseKey(clsid_key); + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * unregister_coclasses + */ +static HRESULT unregister_coclasses(struct regsvr_coclass const *list) +{ + LONG res = ERROR_SUCCESS; + HKEY coclass_key; + + res = RegOpenKeyExW(HKEY_CLASSES_ROOT, clsid_keyname, 0, + KEY_READ | KEY_WRITE, &coclass_key); + if (res == ERROR_FILE_NOT_FOUND) return S_OK; + if (res != ERROR_SUCCESS) goto error_return; + + for (; res == ERROR_SUCCESS && list->clsid; ++list) { + WCHAR buf[39]; + + StringFromGUID2(list->clsid, buf, 39); + res = RegDeleteTreeW(coclass_key, buf); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + + if (list->progid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->progid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + + if (list->viprogid) { + res = RegDeleteTreeA(HKEY_CLASSES_ROOT, list->viprogid); + if (res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS; + if (res != ERROR_SUCCESS) goto error_close_coclass_key; + } + } + +error_close_coclass_key: + RegCloseKey(coclass_key); +error_return: + return res != ERROR_SUCCESS ? HRESULT_FROM_WIN32(res) : S_OK; +} + +/*********************************************************************** + * regsvr_key_guid + */ +static LONG register_key_guid(HKEY base, WCHAR const *name, GUID const *guid) +{ + WCHAR buf[39]; + + StringFromGUID2(guid, buf, 39); + return register_key_defvalueW(base, name, buf); +} + +/*********************************************************************** + * regsvr_key_defvalueW + */ +static LONG register_key_defvalueW( + HKEY base, + WCHAR const *name, + WCHAR const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExW(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + (lstrlenW(value) + 1) * sizeof(WCHAR)); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_key_defvalueA + */ +static LONG register_key_defvalueA( + HKEY base, + WCHAR const *name, + char const *value) +{ + LONG res; + HKEY key; + + res = RegCreateKeyExW(base, name, 0, NULL, 0, + KEY_READ | KEY_WRITE, NULL, &key, NULL); + if (res != ERROR_SUCCESS) return res; + res = RegSetValueExA(key, NULL, 0, REG_SZ, (CONST BYTE*)value, + lstrlenA(value) + 1); + RegCloseKey(key); + return res; +} + +/*********************************************************************** + * regsvr_progid + */ +static LONG register_progid( + WCHAR const *clsid, + char const *progid, + char const *curver_progid, + char const *name, + char const *extra) +{ + LONG res; + HKEY progid_key; + + res = RegCreateKeyExA(HKEY_CLASSES_ROOT, progid, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &progid_key, NULL); + if (res != ERROR_SUCCESS) return res; + + if (name) { + res = RegSetValueExA(progid_key, NULL, 0, REG_SZ, + (CONST BYTE*)name, strlen(name) + 1); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (clsid) { + res = register_key_defvalueW(progid_key, clsid_keyname, clsid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (curver_progid) { + res = register_key_defvalueA(progid_key, curver_keyname, + curver_progid); + if (res != ERROR_SUCCESS) goto error_close_progid_key; + } + + if (extra) { + HKEY extra_key; + + res = RegCreateKeyExA(progid_key, extra, 0, + NULL, 0, KEY_READ | KEY_WRITE, NULL, + &extra_key, NULL); + if (res == ERROR_SUCCESS) + RegCloseKey(extra_key); + } + +error_close_progid_key: + RegCloseKey(progid_key); + return res; +} + +/*********************************************************************** + * coclass list + */ +static struct regsvr_coclass const coclass_list[] = { + { + &CLSID_ACLMulti, + "Multiple AutoComplete List Container", + NULL, + "browseui.dll", + "Apartment" + }, + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * interface list + */ + +static struct regsvr_interface const interface_list[] = { + { NULL } /* list terminator */ +}; + +/*********************************************************************** + * DllRegisterServer (HHCTRL.@) + */ +HRESULT WINAPI DllRegisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = register_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = register_interfaces(interface_list); + return hr; +} + +/*********************************************************************** + * DllUnregisterServer (HHCTRL.@) + */ +HRESULT WINAPI DllUnregisterServer(void) +{ + HRESULT hr; + + TRACE("\n"); + + hr = unregister_coclasses(coclass_list); + if (SUCCEEDED(hr)) + hr = unregister_interfaces(interface_list); + return hr; +} Propchange: trunk/reactos/dll/win32/browseui/regsvr.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/browseui/version.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/version… ============================================================================== --- trunk/reactos/dll/win32/browseui/version.rc (added) +++ trunk/reactos/dll/win32/browseui/version.rc Mon Oct 1 23:09:53 2007 @@ -1,0 +1,27 @@ +/* + * Copyright 2003 Francois Gouget (for CodeWeavers) + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_OLESELFREGISTER +#define WINE_FILEDESCRIPTION_STR "Wine core dll" +#define WINE_FILENAME_STR "browseui.dll" +#define WINE_FILEVERSION 6,0,2900,2180 +#define WINE_FILEVERSION_STR "6.0.2900.2180" +#define WINE_PRODUCTVERSION 6,0,2900,2180 +#define WINE_PRODUCTVERSION_STR "6.0.2900.2180" + +#include "wine/wine_common_ver.rc" Propchange: trunk/reactos/dll/win32/browseui/version.rc ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 2 months

[hpoussin] 29335: Prepare import of browseui.dll

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 1 23:09:07 2007 New Revision: 29335 URL: http://svn.reactos.org/svn/reactos?rev=29335&view=rev Log: Prepare import of browseui.dll Added: trunk/reactos/dll/win32/browseui/ (with props) Modified: trunk/reactos/baseaddress.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff trunk/reactos/dll/win32/win32.rbuild trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/baseaddress.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=293… ============================================================================== --- trunk/reactos/baseaddress.rbuild (original) +++ trunk/reactos/baseaddress.rbuild Mon Oct 1 23:09:07 2007 @@ -37,6 +37,7 @@ <property name="BASEADDRESS_OLEACC" value="0x69640000" /> <property name="BASEADDRESS_WINMM" value="0x697d0000" /> <property name="BASEADDRESS_MSIMG32" value="0x69cc0000" /> + <property name="BASEADDRESS_BROWSEUI" value="0x69cc0000" /> <property name="BASEADDRESS_NETPLWIZ" value="0x6a240000" /> <property name="BASEADDRESS_SHELL32" value="0x6a360000" /> <property name="BASEADDRESS_UNICODE" value="0x6b200000" /> 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 (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Oct 1 23:09:07 2007 @@ -159,6 +159,7 @@ dll\win32\advpack\advpack.dll 1 dll\win32\aclui\aclui.dll 1 dll\win32\avifil32\avifil32.dll 1 +dll\win32\browseui.dll 1 dll\win32\cabinet\cabinet.dll 1 dll\win32\cards\cards.dll 1 dll\win32\cfgmgr32\cfgmgr32.dll 1 Propchange: trunk/reactos/dll/win32/browseui/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Mon Oct 1 23:09:07 2007 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Modified: trunk/reactos/dll/win32/win32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev… ============================================================================== --- trunk/reactos/dll/win32/win32.rbuild (original) +++ trunk/reactos/dll/win32/win32.rbuild Mon Oct 1 23:09:07 2007 @@ -22,6 +22,9 @@ <directory name="beepmidi"> <xi:include href="beepmidi/beepmidi.rbuild" /> </directory> +<directory name="browseui"> + <xi:include href="browseui/browseui.rbuild" /> +</directory> <directory name="cabinet"> <xi:include href="cabinet/cabinet.rbuild" /> </directory> Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE (original) +++ trunk/reactos/media/doc/README.WINE Mon Oct 1 23:09:07 2007 @@ -33,6 +33,7 @@ reactos/dll/win32/advpack # Autosync reactos/dll/win32/avifil32 # Autosync +reactos/dll/win32/browseui # Autosync reactos/dll/win32/cabinet # Autosync reactos/dll/win32/clusapi # Autosync reactos/dll/win32/comcat # Autosync

17 years, 2 months

[fireball] 29334: - Almost completely fix the hack in IopParseDevice which was resulting in "FIXME: Broken Parse due to invalid DesiredAccess" messages, by changing some calls to IoGetDeviceObjectPointer to use FILE_READ_ATTRIBUTES instead of FILE_READ_DATA (so that the volume doesn't get mounted).

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 1 22:04:42 2007 New Revision: 29334 URL: http://svn.reactos.org/svn/reactos?rev=29334&view=rev Log: - Almost completely fix the hack in IopParseDevice which was resulting in "FIXME: Broken Parse due to invalid DesiredAccess" messages, by changing some calls to IoGetDeviceObjectPointer to use FILE_READ_ATTRIBUTES instead of FILE_READ_DATA (so that the volume doesn't get mounted). Modified: trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c (contents, props changed) trunk/reactos/ntoskrnl/io/iomgr/file.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c Mon Oct 1 22:04:42 2007 @@ -305,7 +305,7 @@ /* Get the drives sector size */ Status = IoGetDeviceObjectPointer(DeviceName, - FILE_READ_DATA, + FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject); if (!NT_SUCCESS(Status)) @@ -481,10 +481,10 @@ NULL); Status = ZwOpenFile(&FileHandle, - 0x10001, + FILE_READ_DATA | SYNCHRONIZE, &ObjectAttributes, &StatusBlock, - 1, + FILE_SHARE_READ, FILE_SYNCHRONOUS_IO_NONALERT); if (NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c Mon Oct 1 22:04:42 2007 @@ -154,7 +154,7 @@ /* Get the device pointer */ Status = IoGetDeviceObjectPointer(&DeviceName, - FILE_READ_DATA, + FILE_READ_ATTRIBUTES, &FileObject, &DeviceObject); *DiskDeviceObject = DeviceObject; Propchange: trunk/reactos/ntoskrnl/io/iomgr/arcname.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Mon Oct 1 22:04:42 2007 @@ -390,27 +390,15 @@ /* Check if this is a direct open */ if (!(RemainingName->Length) && !(OpenPacket->RelatedFileObject) && -#if 0 // USETUP IS BROKEN! - ((DesiredAccess & ~(SYNCHRONIZE | - FILE_READ_ATTRIBUTES | - READ_CONTROL | - ACCESS_SYSTEM_SECURITY | - WRITE_OWNER | - WRITE_DAC)) && -#endif + (((DesiredAccess & ~(SYNCHRONIZE | + FILE_READ_ATTRIBUTES | + READ_CONTROL | + ACCESS_SYSTEM_SECURITY | + WRITE_OWNER | + WRITE_DAC)) == 0) || + (wcsstr(CompleteName->Buffer, L"Harddisk"))) && !(UseDummyFile)) { - if (DesiredAccess & ~(SYNCHRONIZE | - FILE_READ_ATTRIBUTES | - READ_CONTROL | - ACCESS_SYSTEM_SECURITY | - WRITE_OWNER | - WRITE_DAC)) - { - DPRINT1("FIXME: Broken Parse due to invalid DesiredAccess: %lx\n", - DesiredAccess); - } - /* Remember this for later */ DirectOpen = TRUE; } Propchange: trunk/reactos/ntoskrnl/io/iomgr/file.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

17 years, 2 months

[hpoussin] 29333: Display error location when possible

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 1 22:02:45 2007 New Revision: 29333 URL: http://svn.reactos.org/svn/reactos?rev=29333&view=rev Log: Display error location when possible Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/compilationunit.cpp trunk/reactos/tools/rbuild/include.cpp trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Mon Oct 1 22:02:45 2007 @@ -3221,7 +3221,9 @@ if ( m.bootstrap != NULL ) { FileLocation targetFile ( OutputDirectory, - bootcdDirectory + sSep + m.bootstrap->base, + m.bootstrap->base.length () > 0 + ? bootcdDirectory + sSep + m.bootstrap->base + : bootcdDirectory, m.bootstrap->nameoncd ); OutputCopyCommand ( *m.output, targetFile ); } @@ -3256,7 +3258,9 @@ if ( m.bootstrap != NULL ) { FileLocation targetDirectory ( OutputDirectory, - bootcdDirectory + sSep + m.bootstrap->base, + m.bootstrap->base.length () > 0 + ? bootcdDirectory + sSep + m.bootstrap->base + : bootcdDirectory, "" ); out.push_back ( targetDirectory ); } Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Mon Oct 1 22:02:45 2007 @@ -50,8 +50,10 @@ source = new FileLocation ( SourceDirectory, path, - cdfileNode.value ); + cdfileNode.value, + &cdfileNode ); target = new FileLocation ( OutputDirectory, target_relative_directory, - nameoncd ? att->value : cdfileNode.value ); + nameoncd ? att->value : cdfileNode.value, + &cdfileNode ); } Modified: trunk/reactos/tools/rbuild/compilationunit.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilationun… ============================================================================== --- trunk/reactos/tools/rbuild/compilationunit.cpp (original) +++ trunk/reactos/tools/rbuild/compilationunit.cpp Mon Oct 1 22:02:45 2007 @@ -102,7 +102,8 @@ { return new FileLocation ( IntermediateDirectory, module ? module->output->relative_path : "", - local_name ); + local_name, + node ); } File* file = files[0]; Modified: trunk/reactos/tools/rbuild/include.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/include.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/include.cpp (original) +++ trunk/reactos/tools/rbuild/include.cpp Mon Oct 1 22:02:45 2007 @@ -108,7 +108,8 @@ directory = new FileLocation ( root, relative_path, - "" ); + "", + node ); } DirectoryLocation Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Mon Oct 1 22:02:45 2007 @@ -49,12 +49,14 @@ source = new FileLocation ( source_directory, path, - node.value ); + node.value, + &node ); target = new FileLocation ( InstallDirectory, base && base->value != "." ? base->value : "", newname ? newname->value - : node.value ); + : node.value, + &node ); } Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Oct 1 22:02:45 2007 @@ -280,7 +280,8 @@ output = new FileLocation ( GetTargetDirectoryTree (), modulePath, - name + extension ); + name + extension, + &moduleNode ); att = moduleNode.GetAttribute ( "unicode", false ); if ( att != NULL ) @@ -408,7 +409,8 @@ const XMLAttribute* installbase = moduleNode.GetAttribute ( "installbase", false ); install = new FileLocation ( InstallDirectory, installbase ? installbase->value : "", - att->value ); + att->value, + &moduleNode ); } else install = NULL; @@ -774,14 +776,14 @@ if ( pos == string::npos ) { pch = new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path, e.value ) ); + e, *this, FileLocation ( SourceDirectory, relative_path, e.value, &e ) ); } else { string dir = e.value.substr ( 0, pos ); string name = e.value.substr ( pos + 1); pch = new PchFile ( - e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name ) ); + e, *this, FileLocation ( SourceDirectory, relative_path + sSep + dir, name, &e ) ); } subs_invalid = true; } @@ -1556,7 +1558,8 @@ { source = new FileLocation ( directory, module.output->relative_path, - definition->value ); + definition->value, + &node ); } else { @@ -1564,7 +1567,8 @@ string name = definition->value.substr ( index + 1); source = new FileLocation ( directory, NormalizeFilename ( module.output->relative_path + sSep + dir ), - name ); + name, + &node ); } } Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Mon Oct 1 22:02:45 2007 @@ -101,7 +101,8 @@ FileLocation::FileLocation ( const DirectoryLocation directory, const std::string& relative_path, - const std::string& name ) + const std::string& name, + const XMLElement *node ) : directory ( directory ), relative_path ( NormalizeFilename ( relative_path ) ), name ( name ) @@ -114,18 +115,32 @@ ( relative_path.length () > 3 && relative_path.find ( ':' ) != string::npos ) ) { - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid relative path '%s'", - relative_path.c_str () ); + if ( node ) + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s' at %s", + relative_path.c_str (), + node->location.c_str () ); + else + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid relative path '%s'", + relative_path.c_str () ); } if ( name.find_first_of ( "/\\:" ) != string::npos ) { - throw InvalidOperationException ( __FILE__, - __LINE__, - "Invalid file name '%s'", - name.c_str () ); + if ( node ) + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid file name '%s' at %s", + name.c_str (), + node->location.c_str () ); + else + throw InvalidOperationException ( __FILE__, + __LINE__, + "Invalid file name '%s'", + name.c_str () ); } } Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Oct 1 22:02:45 2007 @@ -316,7 +316,8 @@ FileLocation ( const DirectoryLocation directory, const std::string& relative_path, - const std::string& name ); + const std::string& name, + const XMLElement *node = NULL ); FileLocation ( const FileLocation& other ); };

17 years, 2 months

[fireball] 29332: - KeRosCaptureUserStackBackTrace is now created, which calls RtlWalkFrameChain with the user-mode flag, meaning that bugchecks finally show the user-mode stack again! - KeRosDumpStackFrames is fixed so that if the EIP can't be found in a module list, it's still displayed (just without the module name). Previously the EIP would not be shown, resulting in code running on the heap/stack/somewhere else not being shown as part of the trace.

by fireball＠svn.reactos.org

Author: fireball Date: Mon Oct 1 21:58:49 2007 New Revision: 29332 URL: http://svn.reactos.org/svn/reactos?rev=29332&view=rev Log: - KeRosCaptureUserStackBackTrace is now created, which calls RtlWalkFrameChain with the user-mode flag, meaning that bugchecks finally show the user-mode stack again! - KeRosDumpStackFrames is fixed so that if the EIP can't be found in a module list, it's still displayed (just without the module name). Previously the EIP would not be shown, resulting in code running on the heap/stack/somewhere else not being shown as part of the trace. Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c (contents, props changed) trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/lib/rtl/exception.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/libsupp.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/libsupp.c (original) +++ trunk/reactos/dll/ntdll/rtl/libsupp.c Mon Oct 1 21:58:49 2007 @@ -14,6 +14,19 @@ #include <debug.h> /* FUNCTIONS ***************************************************************/ + +/* + * @implemented + */ +ULONG +NTAPI +RtlWalkFrameChain(OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags) +{ + /* Not implemented for user-mode */ + return 0; +} BOOLEAN NTAPI Propchange: trunk/reactos/dll/ntdll/rtl/libsupp.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h (original) +++ trunk/reactos/include/ndk/rtlfuncs.h Mon Oct 1 21:58:49 2007 @@ -449,6 +449,15 @@ // Tracing Functions // NTSYSAPI +ULONG +NTAPI +RtlWalkFrameChain( + OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags +); + +NTSYSAPI USHORT NTAPI RtlLogStackBackTrace( Modified: trunk/reactos/lib/rtl/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/exception.c?rev=29… ============================================================================== --- trunk/reactos/lib/rtl/exception.c (original) +++ trunk/reactos/lib/rtl/exception.c Mon Oct 1 21:58:49 2007 @@ -116,110 +116,6 @@ /* * @implemented */ -ULONG -NTAPI -RtlWalkFrameChain(OUT PVOID *Callers, - IN ULONG Count, - IN ULONG Flags) -{ - ULONG_PTR Stack, NewStack, StackBegin, StackEnd; - ULONG Eip; - BOOLEAN Result, StopSearch = FALSE; - ULONG i = 0; - - /* Get current EBP */ -#if defined(_M_IX86) -#if defined __GNUC__ - __asm__("mov %%ebp, %0" : "=r" (Stack) : ); -#elif defined(_MSC_VER) - __asm mov Stack, ebp -#endif -#elif defined(_M_MIPS) - __asm__("move $sp, %0" : "=r" (Stack) : ); -#elif defined(_M_PPC) - __asm__("mr %0,1" : "=r" (Stack) : ); -#else -#error Unknown architecture -#endif - - /* Set it as the stack begin limit as well */ - StackBegin = (ULONG_PTR)Stack; - - /* Check if we're called for non-logging mode */ - if (!Flags) - { - /* Get the actual safe limits */ - Result = RtlpCaptureStackLimits((ULONG_PTR)Stack, - &StackBegin, - &StackEnd); - if (!Result) return 0; - } - - /* Use a SEH block for maximum protection */ - _SEH_TRY - { - /* Loop the frames */ - for (i = 0; i < Count; i++) - { - /* - * Leave if we're past the stack, - * if we're before the stack, - * or if we've reached ourselves. - */ - if ((Stack >= StackEnd) || - (!i ? (Stack < StackBegin) : (Stack <= StackBegin)) || - ((StackEnd - Stack) < (2 * sizeof(ULONG_PTR)))) - { - /* We're done or hit a bad address */ - break; - } - - /* Get new stack and EIP */ - NewStack = *(PULONG_PTR)Stack; - Eip = *(PULONG_PTR)(Stack + sizeof(ULONG_PTR)); - - /* Check if the new pointer is above the oldone and past the end */ - if (!((Stack < NewStack) && (NewStack < StackEnd))) - { - /* Stop searching after this entry */ - StopSearch = TRUE; - } - - /* Also make sure that the EIP isn't a stack address */ - if ((StackBegin < Eip) && (Eip < StackEnd)) break; - - /* Check if we reached a user-mode address */ - if (!(Flags) && !(Eip & 0x80000000)) break; - - /* Save this frame */ - Callers[i] = (PVOID)Eip; - - /* Check if we should continue */ - if (StopSearch) - { - /* Return the next index */ - i++; - break; - } - - /* Move to the next stack */ - Stack = NewStack; - } - } - _SEH_HANDLE - { - /* No index */ - i = 0; - } - _SEH_END; - - /* Return frames parsed */ - return i; -} - -/* - * @implemented - */ USHORT NTAPI RtlCaptureStackBackTrace(IN ULONG FramesToSkip, Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=2933… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c (original) +++ trunk/reactos/ntoskrnl/ke/bug.c Mon Oct 1 21:58:49 2007 @@ -136,6 +136,97 @@ return(FALSE); } +PVOID +NTAPI +KiRosPcToUserFileHeader(IN PVOID Eip, + OUT PLDR_DATA_TABLE_ENTRY *LdrEntry) +{ + PVOID ImageBase, EipBase = NULL; + PLDR_DATA_TABLE_ENTRY Entry; + PLIST_ENTRY ListHead, NextEntry; + + /* + * We know this is valid because we should only be called after a + * succesfull address from RtlWalkFrameChain for UserMode, which + * validates everything for us. + */ + ListHead = &KeGetCurrentThread()-> + Teb->ProcessEnvironmentBlock->Ldr->InLoadOrderModuleList; + + /* Set list pointers and make sure it's valid */ + NextEntry = ListHead->Flink; + if (NextEntry) + { + /* Start loop */ + while (NextEntry != ListHead) + { + /* Get the loader entry */ + Entry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; + ImageBase = Entry->DllBase; + + /* Check if this is the right one */ + if (((ULONG_PTR)Eip >= (ULONG_PTR)Entry->DllBase) && + ((ULONG_PTR)Eip < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) + { + /* Return this entry */ + *LdrEntry = Entry; + EipBase = ImageBase; + break; + } + } + } + + /* Return the base address */ + return EipBase; +} + +USHORT +NTAPI +KeRosCaptureUserStackBackTrace(IN ULONG FramesToSkip, + IN ULONG FramesToCapture, + OUT PVOID *BackTrace, + OUT PULONG BackTraceHash OPTIONAL) +{ + PVOID Frames[2 * 64]; + ULONG FrameCount; + ULONG Hash = 0, i; + + /* Skip a frame for the caller */ + FramesToSkip++; + + /* Don't go past the limit */ + if ((FramesToCapture + FramesToSkip) >= 128) return 0; + + /* Do the back trace */ + FrameCount = RtlWalkFrameChain(Frames, FramesToCapture + FramesToSkip, 1); + + /* Make sure we're not skipping all of them */ + if (FrameCount <= FramesToSkip) return 0; + + /* Loop all the frames */ + for (i = 0; i < FramesToCapture; i++) + { + /* Don't go past the limit */ + if ((FramesToSkip + i) >= FrameCount) break; + + /* Save this entry and hash it */ + BackTrace[i] = Frames[FramesToSkip + i]; + Hash += PtrToUlong(BackTrace[i]); + } + + /* Write the hash */ + if (BackTraceHash) *BackTraceHash = Hash; + + /* Clear the other entries and return count */ + RtlFillMemoryUlong(Frames, 128, 0); + return (USHORT)i; +} + VOID NTAPI KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, @@ -176,7 +267,38 @@ Addr -= (ULONG_PTR)LdrEntry->DllBase; DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); } - + else if (Addr) + { + /* Print only the address */ + DbgPrint("<%x>", Addr); + } + + /* Go to the next frame */ + DbgPrint("\n"); + } + + /* Get the current frames */ + FrameCount = KeRosCaptureUserStackBackTrace(-1, 32, (PVOID*)Frames, NULL); + + /* Now loop them */ + for (i = 0; i < FrameCount; i++) + { + /* Get the EIP */ + Addr = Frames[i]; + + /* Get the base for this file */ + if (KiRosPcToUserFileHeader((PVOID)Addr, &LdrEntry)) + { + /* Print out the module name */ + Addr -= (ULONG_PTR)LdrEntry->DllBase; + DbgPrint("<%wZ: %x>", &LdrEntry->FullDllName, Addr); + } + else if (Addr) + { + /* Print only the address */ + DbgPrint("<%x>", Addr); + } + /* Go to the next frame */ DbgPrint("\n"); } Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Mon Oct 1 21:58:49 2007 @@ -255,6 +255,144 @@ return TRUE; } +/* + * @implemented + */ +ULONG +NTAPI +RtlWalkFrameChain(OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags) +{ + ULONG_PTR Stack, NewStack, StackBegin, StackEnd; + ULONG Eip; + BOOLEAN Result, StopSearch = FALSE; + ULONG i = 0; + PKTHREAD Thread = KeGetCurrentThread(); + PTEB Teb; + PKTRAP_FRAME TrapFrame; + + /* Get current EBP */ +#if defined(_M_IX86) +#if defined __GNUC__ + __asm__("mov %%ebp, %0" : "=r" (Stack) : ); +#elif defined(_MSC_VER) + __asm mov Stack, ebp +#endif +#elif defined(_M_MIPS) + __asm__("move $sp, %0" : "=r" (Stack) : ); +#elif defined(_M_PPC) + __asm__("mr %0,1" : "=r" (Stack) : ); +#else +#error Unknown architecture +#endif + + /* Set it as the stack begin limit as well */ + StackBegin = (ULONG_PTR)Stack; + + /* Check if we're called for non-logging mode */ + if (!Flags) + { + /* Get the actual safe limits */ + Result = RtlpCaptureStackLimits((ULONG_PTR)Stack, + &StackBegin, + &StackEnd); + if (!Result) return 0; + } + + /* Use a SEH block for maximum protection */ + _SEH_TRY + { + /* Check if we want the user-mode stack frame */ + if (Flags == 1) + { + /* Get the trap frame and TEB */ + TrapFrame = Thread->TrapFrame; + Teb = Thread->Teb; + + /* Make sure we can trust the TEB and trap frame */ + if (!(Teb) || + !((PVOID)((ULONG_PTR)TrapFrame & 0x80000000)) || + ((PVOID)TrapFrame <= (PVOID)Thread->StackLimit) || + ((PVOID)TrapFrame >= (PVOID)Thread->StackBase) || + (KeIsAttachedProcess()) || + (KeGetCurrentIrql() >= DISPATCH_LEVEL)) + { + /* Invalid or unsafe attempt to get the stack */ + return 0; + } + + /* Get the stack limits */ + StackBegin = (ULONG_PTR)Teb->Tib.StackLimit; + StackEnd = (ULONG_PTR)Teb->Tib.StackBase; + Stack = TrapFrame->Ebp; + + /* Validate them */ + if (StackEnd <= StackBegin) return 0; + ProbeForRead((PVOID)StackBegin, + StackEnd - StackBegin, + sizeof(CHAR)); + } + + /* Loop the frames */ + for (i = 0; i < Count; i++) + { + /* + * Leave if we're past the stack, + * if we're before the stack, + * or if we've reached ourselves. + */ + if ((Stack >= StackEnd) || + (!i ? (Stack < StackBegin) : (Stack <= StackBegin)) || + ((StackEnd - Stack) < (2 * sizeof(ULONG_PTR)))) + { + /* We're done or hit a bad address */ + break; + } + + /* Get new stack and EIP */ + NewStack = *(PULONG_PTR)Stack; + Eip = *(PULONG_PTR)(Stack + sizeof(ULONG_PTR)); + + /* Check if the new pointer is above the oldone and past the end */ + if (!((Stack < NewStack) && (NewStack < StackEnd))) + { + /* Stop searching after this entry */ + StopSearch = TRUE; + } + + /* Also make sure that the EIP isn't a stack address */ + if ((StackBegin < Eip) && (Eip < StackEnd)) break; + + /* Check if we reached a user-mode address */ + if (!(Flags) && !(Eip & 0x80000000)) break; + + /* Save this frame */ + Callers[i] = (PVOID)Eip; + + /* Check if we should continue */ + if (StopSearch) + { + /* Return the next index */ + i++; + break; + } + + /* Move to the next stack */ + Stack = NewStack; + } + } + _SEH_HANDLE + { + /* No index */ + i = 0; + } + _SEH_END; + + /* Return frames parsed */ + return i; +} + /* RTL Atom Tables ************************************************************/ NTSTATUS Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Mon Oct 1 21:58:49 2007 @@ -1543,8 +1543,7 @@ { NTSTATUS Status = STATUS_SUCCESS; - /* remove this when all spi are implement */ - DPRINT1("UserSystemParametersInfo_StructGet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); + DPRINT("UserSystemParametersInfo_StructGet SPI Action 0x%x (uiParam: 0x%x, fWinIni: 0x%x)\n",uiAction, uiParam, fWinIni); _SEH_TRY {

17 years, 2 months

[gedmurphy] 29331: - half implement support for multiple monitors to desk.cpl - people with more than one monitor can now use this applet in windows without it crashing

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 1 19:44:53 2007 New Revision: 29331 URL: http://svn.reactos.org/svn/reactos?rev=29331&view=rev Log: - half implement support for multiple monitors to desk.cpl - people with more than one monitor can now use this applet in windows without it crashing Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Mon Oct 1 19:44:53 2007 @@ -330,10 +330,35 @@ 1, (LPARAM)&monitors); } - else - { - /* FIXME: multi video adapter */ - /* FIXME: choose selected adapter being the primary one */ + else /* FIXME: incomplete! */ + { + PMONSL_MONINFO pMonitors; + INT i; + + SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); + OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); + + pMonitors = (PMONSL_MONINFO)HeapAlloc(GetProcessHeap(), 0, sizeof(MONSL_MONINFO) * Result); + if (pMonitors) + { + INT hack = 1280; + for (i = 0; i < Result; i++) + { + pMonitors[i].Position.x = hack * i; + pMonitors[i].Position.y = 0; + pMonitors[i].Size.cx = pGlobalData->DisplayDeviceList->CurrentSettings->dmPelsWidth; + pMonitors[i].Size.cy = pGlobalData->DisplayDeviceList->CurrentSettings->dmPelsHeight; + pMonitors[i].Flags = 0; + } + + SendDlgItemMessage(hwndDlg, + IDC_SETTINGS_MONSEL, + MSLM_SETMONITORSINFO, + Result, + (LPARAM)pMonitors); + + HeapFree(GetProcessHeap(), 0, pMonitors); + } } pGlobalData->hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_MONITOR), IMAGE_BITMAP, 0, 0, LR_LOADTRANSPARENT);

17 years, 2 months

[hpoussin] 29330: Rename 'base' to 'installbase' for CdFile, InstallFile and Bootstrap Patch by Marc Piulachs, marc dot piulachs at codexchange dot net See issue #2706 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Oct 1 18:19:27 2007 New Revision: 29330 URL: http://svn.reactos.org/svn/reactos?rev=29330&view=rev Log: Rename 'base' to 'installbase' for CdFile, InstallFile and Bootstrap Patch by Marc Piulachs, marc dot piulachs at codexchange dot net See issue #2706 for more details. Modified: trunk/reactos/base/services/services.rbuild trunk/reactos/base/setup/reactos/reactos.rbuild trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/setup/welcome/welcome.rbuild trunk/reactos/base/shell/explorer/explorer.rbuild trunk/reactos/boot/bootdata/bootdata.rbuild trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/drivers/base/bootvid/bootvid.rbuild trunk/reactos/drivers/base/kdcom/kdcom.rbuild trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild trunk/reactos/drivers/setup/blue/blue.rbuild trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild trunk/reactos/drivers/storage/class/class2/class2.rbuild trunk/reactos/drivers/storage/class/disk/disk.rbuild trunk/reactos/drivers/storage/floppy/floppy.rbuild trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild trunk/reactos/drivers/storage/scsiport/scsiport.rbuild trunk/reactos/hal/halppc/up/halup.rbuild trunk/reactos/hal/halx86/mp/halmp.rbuild trunk/reactos/hal/halx86/up/halup.rbuild trunk/reactos/media/drivers/etc/etc.rbuild trunk/reactos/media/fonts/fonts.rbuild trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/nls/nls.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/rbuild/bootstrap.cpp trunk/reactos/tools/rbuild/cdfile.cpp trunk/reactos/tools/rbuild/doc/rbuild.txt trunk/reactos/tools/rbuild/installfile.cpp trunk/reactos/tools/rbuild/project.dtd Modified: trunk/reactos/base/services/services.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/services.rbu… ============================================================================== --- trunk/reactos/base/services/services.rbuild (original) +++ trunk/reactos/base/services/services.rbuild Mon Oct 1 18:19:27 2007 @@ -1,22 +1,22 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -<directory name="audiosrv"> - <xi:include href="audiosrv/audiosrv.rbuild" /> -</directory> -<directory name="dhcp"> - <xi:include href="dhcp/dhcp.rbuild" /> -</directory> -<directory name="eventlog"> - <xi:include href="eventlog/eventlog.rbuild" /> -</directory> -<directory name="rpcss"> - <xi:include href="rpcss/rpcss.rbuild" /> -</directory> -<directory name="tcpsvcs"> - <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> -</directory> -<directory name="umpnpmgr"> - <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> -</directory> + <directory name="audiosrv"> + <xi:include href="audiosrv/audiosrv.rbuild" /> + </directory> + <directory name="dhcp"> + <xi:include href="dhcp/dhcp.rbuild" /> + </directory> + <directory name="eventlog"> + <xi:include href="eventlog/eventlog.rbuild" /> + </directory> + <directory name="rpcss"> + <xi:include href="rpcss/rpcss.rbuild" /> + </directory> + <directory name="tcpsvcs"> + <xi:include href="tcpsvcs/tcpsvcs.rbuild" /> + </directory> + <directory name="umpnpmgr"> + <xi:include href="umpnpmgr/umpnpmgr.rbuild" /> + </directory> </group> Modified: trunk/reactos/base/setup/reactos/reactos.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/reactos… ============================================================================== --- trunk/reactos/base/setup/reactos/reactos.rbuild (original) +++ trunk/reactos/base/setup/reactos/reactos.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="reactos" type="win32gui"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="reactos">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false"> - <bootstrap base="$(CDOUTPUT)/system32" nameoncd="smss.exe" /> + <bootstrap installbase="$(CDOUTPUT)/system32" nameoncd="smss.exe" /> <include base="usetup">.</include> <include base="zlib">.</include> <include base="inflib">.</include> Modified: trunk/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rbuild (original) +++ trunk/reactos/base/setup/welcome/welcome.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> Modified: trunk/reactos/base/shell/explorer/explorer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rbuild (original) +++ trunk/reactos/base/shell/explorer/explorer.rbuild Mon Oct 1 18:19:27 2007 @@ -70,7 +70,7 @@ <file>i386-stub-win32.c</file> <file>explorer.rc</file> </module> -<installfile base=".">explorer-cfg-template.xml</installfile> +<installfile installbase=".">explorer-cfg-template.xml</installfile> <directory name="notifyhook"> <xi:include href="notifyhook/notifyhook.rbuild" /> </directory> Modified: trunk/reactos/boot/bootdata/bootdata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootdata.rbu… ============================================================================== --- trunk/reactos/boot/bootdata/bootdata.rbuild (original) +++ trunk/reactos/boot/bootdata/bootdata.rbuild Mon Oct 1 18:19:27 2007 @@ -4,12 +4,12 @@ <cdfile>autorun.inf</cdfile> <cdfile>icon.ico</cdfile> <cdfile>readme.txt</cdfile> - <cdfile base="$(CDOUTPUT)">hivecls.inf</cdfile> - <cdfile base="$(CDOUTPUT)">hivedef.inf</cdfile> - <cdfile base="$(CDOUTPUT)">hivesft.inf</cdfile> - <cdfile base="$(CDOUTPUT)">hivesys.inf</cdfile> - <cdfile base="$(CDOUTPUT)">txtsetup.sif</cdfile> - <cdfile base="$(CDOUTPUT)">unattend.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile> + <cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile> + <cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> Modified: trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/bootsect/boot… ============================================================================== --- trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild (original) +++ trunk/reactos/boot/freeldr/bootsect/bootsect.rbuild Mon Oct 1 18:19:27 2007 @@ -2,27 +2,27 @@ <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> <module name="dosmbr" type="bootsector" > - <bootstrap base="loader" nameoncd="dosmbr.bin" /> + <bootstrap installbase="loader" nameoncd="dosmbr.bin" /> <file>dosmbr.asm</file> </module> <module name="ext2" type="bootsector"> - <bootstrap base="loader" nameoncd="ext2.bin" /> + <bootstrap installbase="loader" nameoncd="ext2.bin" /> <file>ext2.asm</file> </module> <module name="fat32" type="bootsector"> - <bootstrap base="loader" nameoncd="fat32.bin" /> + <bootstrap installbase="loader" nameoncd="fat32.bin" /> <file>fat32.asm</file> </module> <module name="fat" type="bootsector"> - <bootstrap base="loader" nameoncd="fat.bin" /> + <bootstrap installbase="loader" nameoncd="fat.bin" /> <file>fat.asm</file> </module> <module name="isoboot" type="bootsector"> - <bootstrap base="loader" nameoncd="isoboot.bin" /> + <bootstrap installbase="loader" nameoncd="isoboot.bin" /> <file>isoboot.asm</file> </module> <module name="isobtrt" type="bootsector"> - <bootstrap base="loader" nameoncd="isobtrt.bin" /> + <bootstrap installbase="loader" nameoncd="isobtrt.bin" /> <file>isobtrt.asm</file> </module> </group> Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.rbuild Mon Oct 1 18:19:27 2007 @@ -3,7 +3,7 @@ <group> <if property="ARCH" value="i386"> <module name="freeldr" type="bootloader"> - <bootstrap base="loader" /> + <bootstrap installbase="loader" /> <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> Modified: trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setup… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild (original) +++ trunk/reactos/boot/freeldr/freeldr/setupldr.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="setupldr" type="bootloader"> - <bootstrap base="loader" /> + <bootstrap installbase="loader" /> <library>freeldr_startup</library> <library>freeldr_base64k</library> <library>freeldr_base</library> Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../tools/rbuild/project.dtd"> <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> - <bootstrap base="$(CDOUTPUT)/system32" /> + <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll.def" /> <include base="ntdll">inc</include> <include base="ReactOS">include/reactos/subsys</include> Modified: trunk/reactos/drivers/base/bootvid/bootvid.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.rbuild (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="bootvid" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="bootvid.dll"> <importlibrary definition="bootvid.def"></importlibrary> - <bootstrap base="$(CDOUTPUT)" nameoncd="bootvid.dll" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="bootvid.dll" /> <include base="bootvid">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/base/kdcom/kdcom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/kdcom/kdcom.r… ============================================================================== --- trunk/reactos/drivers/base/kdcom/kdcom.rbuild (original) +++ trunk/reactos/drivers/base/kdcom/kdcom.rbuild Mon Oct 1 18:19:27 2007 @@ -1,11 +1,11 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> - <importlibrary definition="kdcom.def"></importlibrary> - <bootstrap base="$(CDOUTPUT)" nameoncd="kdcom.dll" /> - <include base="kdcom">.</include> - <define name="__USE_W32API" /> - <library>ntoskrnl</library> - <library>hal</library> - <file>kdbg.c</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll"> + <importlibrary definition="kdcom.def"></importlibrary> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" /> + <include base="kdcom">.</include> + <define name="__USE_W32API" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>kdbg.c</file> +</module> Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="cdfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="ntfs" type="kernelmodedriver" installbase="system32/drivers" installname="ntfs.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="ntfs">.</include> <define name="__USE_W32API" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/v… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/vfat/vfatfs.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="vfatfs">.</include> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="i8042prt" type="kernelmodedriver" installbase="system32/drivers" installname="i8042prt.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="i8042prt">.</include> <define name="__USE_W32API" /> <define name="__REACTOS__" /> Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="kbdclass" type="kernelmodedriver" installbase="system32/drivers" installname="kbdclass.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="NDEBUG" /> <library>pseh</library> Modified: trunk/reactos/drivers/setup/blue/blue.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.rb… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.rbuild (original) +++ trunk/reactos/drivers/setup/blue/blue.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="cdrom" type="kernelmodedriver" installbase="system32/drivers" installname="cdrom.sys" allowwarnings="true"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> Modified: trunk/reactos/drivers/storage/class/class2/class2.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/clas… ============================================================================== --- trunk/reactos/drivers/storage/class/class2/class2.rbuild (original) +++ trunk/reactos/drivers/storage/class/class2/class2.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="class2" type="kernelmodedriver" installbase="system32/drivers" installname="class2.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <importlibrary definition="class2.def" /> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/class/disk/disk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk/disk.rbuild (original) +++ trunk/reactos/drivers/storage/class/disk/disk.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="disk" type="kernelmodedriver" installbase="system32/drivers" installname="disk.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/floppy/floppy.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.rbuild (original) +++ trunk/reactos/drivers/storage/floppy/floppy.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="floppy" type="kernelmodedriver" installbase="system32/drivers" installname="floppy.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="floppy">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/atapi/… ============================================================================== --- trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild (original) +++ trunk/reactos/drivers/storage/ide/atapi/atapi.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="atapi" type="kernelmodedriver" installbase="system32/drivers" installname="atapi.sys" allowwarnings="true"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="atapi">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild (original) +++ trunk/reactos/drivers/storage/ide/uniata/uniata.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="uniata" type="kernelmodedriver" installbase="system32/drivers" allowwarnings="true" installname="uniata.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <define name="_DEBUG" /> <include base="uniata">.</include> Modified: trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/buslo… ============================================================================== --- trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild (original) +++ trunk/reactos/drivers/storage/port/buslogic/buslogic.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="buslogic" type="kernelmodedriver" installbase="system32/drivers" installname="buslogic.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <define name="__USE_W32API" /> <include base="buslogic">.</include> <library>ntoskrnl</library> Modified: trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/port/diskd… ============================================================================== --- trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild (original) +++ trunk/reactos/drivers/storage/port/diskdump/diskdump.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="diskdump.def" /> <define name="__USE_W32API" /> <include base="ReactOS">include/reactos/drivers</include> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.rbuild (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.rbuild Mon Oct 1 18:19:27 2007 @@ -1,13 +1,13 @@ -<?xml version="1.0"?> -<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> - <bootstrap base="$(CDOUTPUT)" /> - <define name="__USE_W32API" /> - <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport.def" /> - <include base="scsiport">.</include> - <library>ntoskrnl</library> - <library>hal</library> - <file>scsiport.c</file> - <file>scsiport.rc</file> -</module> +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> + <bootstrap installbase="$(CDOUTPUT)" /> + <define name="__USE_W32API" /> + <define name="_SCSIPORT_" /> + <importlibrary definition="scsiport.def" /> + <include base="scsiport">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>scsiport.c</file> + <file>scsiport.rc</file> +</module> Modified: trunk/reactos/hal/halppc/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halppc/up/halup.rbuild (original) +++ trunk/reactos/hal/halppc/up/halup.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halppc_up" type="kernelmodedll"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="reactos" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="halppc_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/hal/halx86/mp/halmp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/mp/halmp.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/mp/halmp.rbuild (original) +++ trunk/reactos/hal/halx86/mp/halmp.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halmp" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/hal/halx86/up/halup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/up/halup.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/up/halup.rbuild (original) +++ trunk/reactos/hal/halx86/up/halup.rbuild Mon Oct 1 18:19:27 2007 @@ -2,7 +2,7 @@ <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> <module name="halup" type="kernelmodedll" entrypoint="0"> <importlibrary definition="../../hal/hal.def" /> - <bootstrap base="$(CDOUTPUT)" nameoncd="hal.dll" /> + <bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" /> <include base="hal_generic">../include</include> <include base="ntoskrnl">include</include> <define name="_DISABLE_TIDENTS" /> Modified: trunk/reactos/media/drivers/etc/etc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/drivers/etc/etc.rbui… ============================================================================== --- trunk/reactos/media/drivers/etc/etc.rbuild (original) +++ trunk/reactos/media/drivers/etc/etc.rbuild Mon Oct 1 18:19:27 2007 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group> - <cdfile base="$(CDOUTPUT)">services</cdfile> - <installfile base="system32/drivers/etc">services</installfile> + <cdfile installbase="$(CDOUTPUT)">services</cdfile> + <installfile installbase="system32/drivers/etc">services</installfile> <if property="KDBG" value="1"> - <cdfile base="$(CDOUTPUT)">KDBinit</cdfile> - <installfile base="system32/drivers/etc">KDBinit</installfile> + <cdfile installbase="$(CDOUTPUT)">KDBinit</cdfile> + <installfile installbase="system32/drivers/etc">KDBinit</installfile> </if> </group> Modified: trunk/reactos/media/fonts/fonts.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/fonts/fonts.rbuild?r… ============================================================================== --- trunk/reactos/media/fonts/fonts.rbuild (original) +++ trunk/reactos/media/fonts/fonts.rbuild Mon Oct 1 18:19:27 2007 @@ -1,55 +1,55 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> -<installfile base="media/fonts">DejaVuSans-Bold.ttf </installfile> -<installfile base="media/fonts">DejaVuSans.ttf</installfile> -<installfile base="media/fonts">DejaVuSans-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSansCondensed.ttf</installfile> -<installfile base="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSans-ExtraLight.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSansMono-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSans-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-Italic.ttf</installfile> -<installfile base="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> -<installfile base="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> -<installfile base="media/fonts">c0419bt_.ttf</installfile> -<installfile base="media/fonts">c0582bt_.ttf</installfile> -<installfile base="media/fonts">c0583bt_.ttf</installfile> -<installfile base="media/fonts">c0611bt_.ttf</installfile> -<installfile base="media/fonts">c0632bt_.ttf</installfile> -<installfile base="media/fonts">c0633bt_.ttf</installfile> -<installfile base="media/fonts">c0648bt_.ttf</installfile> -<installfile base="media/fonts">c0649bt_.ttf</installfile> -<installfile base="media/fonts">cour.ttf</installfile> -<installfile base="media/fonts">courb.ttf</installfile> -<installfile base="media/fonts">courbi.ttf</installfile> -<installfile base="media/fonts">helb____.ttf</installfile> -<installfile base="media/fonts">Marlett.ttf</installfile> -<installfile base="media/fonts">timr____.ttf</installfile> -<installfile base="media/fonts">UTB_____.ttf</installfile> -<installfile base="media/fonts">UTBI____.ttf</installfile> -<installfile base="media/fonts">UTI_____.ttf</installfile> -<installfile base="media/fonts">UTRG____.ttf</installfile> -<installfile base="media/fonts">Vera.ttf</installfile> -<installfile base="media/fonts">VeraBd.ttf</installfile> -<installfile base="media/fonts">VeraBI.ttf</installfile> -<installfile base="media/fonts">VeraIt.ttf</installfile> -<installfile base="media/fonts">VeraMoBd.ttf</installfile> -<installfile base="media/fonts">VeraMoBI.ttf</installfile> -<installfile base="media/fonts">VeraMoIt.ttf</installfile> -<installfile base="media/fonts">VeraMono.ttf</installfile> -<installfile base="media/fonts">VeraSe.ttf</installfile> -<installfile base="media/fonts">VeraSeBd.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-Bold.ttf </installfile> + <installfile installbase="media/fonts">DejaVuSans.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansCondensed-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-ExtraLight.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSansMono-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSans-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Bold.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldOblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Oblique.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-Italic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerif-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-BoldItalic.ttf</installfile> + <installfile installbase="media/fonts">DejaVuSerifCondensed-Italic.ttf</installfile> + <installfile installbase="media/fonts">c0419bt_.ttf</installfile> + <installfile installbase="media/fonts">c0582bt_.ttf</installfile> + <installfile installbase="media/fonts">c0583bt_.ttf</installfile> + <installfile installbase="media/fonts">c0611bt_.ttf</installfile> + <installfile installbase="media/fonts">c0632bt_.ttf</installfile> + <installfile installbase="media/fonts">c0633bt_.ttf</installfile> + <installfile installbase="media/fonts">c0648bt_.ttf</installfile> + <installfile installbase="media/fonts">c0649bt_.ttf</installfile> + <installfile installbase="media/fonts">cour.ttf</installfile> + <installfile installbase="media/fonts">courb.ttf</installfile> + <installfile installbase="media/fonts">courbi.ttf</installfile> + <installfile installbase="media/fonts">helb____.ttf</installfile> + <installfile installbase="media/fonts">Marlett.ttf</installfile> + <installfile installbase="media/fonts">timr____.ttf</installfile> + <installfile installbase="media/fonts">UTB_____.ttf</installfile> + <installfile installbase="media/fonts">UTBI____.ttf</installfile> + <installfile installbase="media/fonts">UTI_____.ttf</installfile> + <installfile installbase="media/fonts">UTRG____.ttf</installfile> + <installfile installbase="media/fonts">Vera.ttf</installfile> + <installfile installbase="media/fonts">VeraBd.ttf</installfile> + <installfile installbase="media/fonts">VeraBI.ttf</installfile> + <installfile installbase="media/fonts">VeraIt.ttf</installfile> + <installfile installbase="media/fonts">VeraMoBd.ttf</installfile> + <installfile installbase="media/fonts">VeraMoBI.ttf</installfile> + <installfile installbase="media/fonts">VeraMoIt.ttf</installfile> + <installfile installbase="media/fonts">VeraMono.ttf</installfile> + <installfile installbase="media/fonts">VeraSe.ttf</installfile> + <installfile installbase="media/fonts">VeraSeBd.ttf</installfile> </group> Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild (original) +++ trunk/reactos/media/inf/inf.rbuild Mon Oct 1 18:19:27 2007 @@ -1,23 +1,23 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <installfile base="inf">acpi.inf</installfile> - <installfile base="inf">cdrom.inf</installfile> - <installfile base="inf">display.inf</installfile> - <installfile base="inf">hdc.inf</installfile> - <installfile base="inf">keyboard.inf</installfile> - <installfile base="inf">layout.inf</installfile> - <installfile base="inf">machine.inf</installfile> - <installfile base="inf">msmouse.inf</installfile> - <installfile base="inf">NET_NIC.inf</installfile> - <installfile base="inf">netamd.inf</installfile> - <installfile base="inf">netisa.inf</installfile> - <installfile base="inf">netrtpnt.inf</installfile> - <installfile base="inf">nettcpip.inf</installfile> - <installfile base="inf">ports.inf</installfile> - <installfile base="inf">scsi.inf</installfile> - <installfile base="inf" root="output">syssetup.inf</installfile> - <installfile base="inf">usbport.inf</installfile> - <installfile base="inf">usbstor.inf</installfile> - <installfile base="inf">xboxdisp.inf</installfile> + <installfile installbase="inf">acpi.inf</installfile> + <installfile installbase="inf">cdrom.inf</installfile> + <installfile installbase="inf">display.inf</installfile> + <installfile installbase="inf">hdc.inf</installfile> + <installfile installbase="inf">keyboard.inf</installfile> + <installfile installbase="inf">layout.inf</installfile> + <installfile installbase="inf">machine.inf</installfile> + <installfile installbase="inf">msmouse.inf</installfile> + <installfile installbase="inf">NET_NIC.inf</installfile> + <installfile installbase="inf">netamd.inf</installfile> + <installfile installbase="inf">netisa.inf</installfile> + <installfile installbase="inf">netrtpnt.inf</installfile> + <installfile installbase="inf">nettcpip.inf</installfile> + <installfile installbase="inf">ports.inf</installfile> + <installfile installbase="inf">scsi.inf</installfile> + <installfile installbase="inf" root="output">syssetup.inf</installfile> + <installfile installbase="inf">usbport.inf</installfile> + <installfile installbase="inf">usbstor.inf</installfile> + <installfile installbase="inf">xboxdisp.inf</installfile> </group> Modified: trunk/reactos/media/nls/nls.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/nls.rbuild?rev=2… ============================================================================== --- trunk/reactos/media/nls/nls.rbuild (original) +++ trunk/reactos/media/nls/nls.rbuild Mon Oct 1 18:19:27 2007 @@ -1,62 +1,62 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> -<cdfile base="$(CDOUTPUT)">c_437.nls</cdfile> -<cdfile base="$(CDOUTPUT)">c_1252.nls</cdfile> -<cdfile base="$(CDOUTPUT)">l_intl.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)">c_437.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)">c_1252.nls</cdfile> + <cdfile installbase="$(CDOUTPUT)">l_intl.nls</cdfile> -<installfile base="system32">c_037.nls</installfile> -<installfile base="system32">c_424.nls</installfile> -<installfile base="system32">c_437.nls</installfile> -<installfile base="system32">c_500.nls</installfile> -<installfile base="system32">c_737.nls</installfile> -<installfile base="system32">c_775.nls</installfile> -<installfile base="system32">c_850.nls</installfile> -<installfile base="system32">c_852.nls</installfile> -<installfile base="system32">c_855.nls</installfile> -<installfile base="system32">c_856.nls</installfile> -<installfile base="system32">c_857.nls</installfile> -<installfile base="system32">c_860.nls</installfile> -<installfile base="system32">c_861.nls</installfile> -<installfile base="system32">c_862.nls</installfile> -<installfile base="system32">c_863.nls</installfile> -<installfile base="system32">c_864.nls</installfile> -<installfile base="system32">c_865.nls</installfile> -<installfile base="system32">c_866.nls</installfile> -<installfile base="system32">c_869.nls</installfile> -<installfile base="system32">c_874.nls</installfile> -<installfile base="system32">c_875.nls</installfile> -<installfile base="system32">c_878.nls</installfile> -<installfile base="system32">c_932.nls</installfile> -<installfile base="system32">c_936.nls</installfile> -<installfile base="system32">c_949.nls</installfile> -<installfile base="system32">c_950.nls</installfile> -<installfile base="system32">c_1006.nls</installfile> -<installfile base="system32">c_1026.nls</installfile> -<installfile base="system32">c_1250.nls</installfile> -<installfile base="system32">c_1251.nls</installfile> -<installfile base="system32">c_1252.nls</installfile> -<installfile base="system32">c_1253.nls</installfile> -<installfile base="system32">c_1254.nls</installfile> -<installfile base="system32">c_1255.nls</installfile> -<installfile base="system32">c_1256.nls</installfile> -<installfile base="system32">c_1257.nls</installfile> -<installfile base="system32">c_1258.nls</installfile> -<installfile base="system32">c_10000.nls</installfile> -<installfile base="system32">c_10006.nls</installfile> -<installfile base="system32">c_10007.nls</installfile> -<installfile base="system32">c_10029.nls</installfile> -<installfile base="system32">c_10079.nls</installfile> -<installfile base="system32">c_10081.nls</installfile> -<installfile base="system32">c_20866.nls</installfile> -<installfile base="system32">c_28591.nls</installfile> -<installfile base="system32">c_28592.nls</installfile> -<installfile base="system32">c_28593.nls</installfile> -<installfile base="system32">c_28594.nls</installfile> -<installfile base="system32">c_28595.nls</installfile> -<installfile base="system32">c_28596.nls</installfile> -<installfile base="system32">c_28597.nls</installfile> -<installfile base="system32">c_28598.nls</installfile> -<installfile base="system32">c_28599.nls</installfile> -<installfile base="system32">l_intl.nls</installfile> + <installfile installbase="system32">c_037.nls</installfile> + <installfile installbase="system32">c_424.nls</installfile> + <installfile installbase="system32">c_437.nls</installfile> + <installfile installbase="system32">c_500.nls</installfile> + <installfile installbase="system32">c_737.nls</installfile> + <installfile installbase="system32">c_775.nls</installfile> + <installfile installbase="system32">c_850.nls</installfile> + <installfile installbase="system32">c_852.nls</installfile> + <installfile installbase="system32">c_855.nls</installfile> + <installfile installbase="system32">c_856.nls</installfile> + <installfile installbase="system32">c_857.nls</installfile> + <installfile installbase="system32">c_860.nls</installfile> + <installfile installbase="system32">c_861.nls</installfile> + <installfile installbase="system32">c_862.nls</installfile> + <installfile installbase="system32">c_863.nls</installfile> + <installfile installbase="system32">c_864.nls</installfile> + <installfile installbase="system32">c_865.nls</installfile> + <installfile installbase="system32">c_866.nls</installfile> + <installfile installbase="system32">c_869.nls</installfile> + <installfile installbase="system32">c_874.nls</installfile> + <installfile installbase="system32">c_875.nls</installfile> + <installfile installbase="system32">c_878.nls</installfile> + <installfile installbase="system32">c_932.nls</installfile> + <installfile installbase="system32">c_936.nls</installfile> + <installfile installbase="system32">c_949.nls</installfile> + <installfile installbase="system32">c_950.nls</installfile> + <installfile installbase="system32">c_1006.nls</installfile> + <installfile installbase="system32">c_1026.nls</installfile> + <installfile installbase="system32">c_1250.nls</installfile> + <installfile installbase="system32">c_1251.nls</installfile> + <installfile installbase="system32">c_1252.nls</installfile> + <installfile installbase="system32">c_1253.nls</installfile> + <installfile installbase="system32">c_1254.nls</installfile> + <installfile installbase="system32">c_1255.nls</installfile> + <installfile installbase="system32">c_1256.nls</installfile> + <installfile installbase="system32">c_1257.nls</installfile> + <installfile installbase="system32">c_1258.nls</installfile> + <installfile installbase="system32">c_10000.nls</installfile> + <installfile installbase="system32">c_10006.nls</installfile> + <installfile installbase="system32">c_10007.nls</installfile> + <installfile installbase="system32">c_10029.nls</installfile> + <installfile installbase="system32">c_10079.nls</installfile> + <installfile installbase="system32">c_10081.nls</installfile> + <installfile installbase="system32">c_20866.nls</installfile> + <installfile installbase="system32">c_28591.nls</installfile> + <installfile installbase="system32">c_28592.nls</installfile> + <installfile installbase="system32">c_28593.nls</installfile> + <installfile installbase="system32">c_28594.nls</installfile> + <installfile installbase="system32">c_28595.nls</installfile> + <installfile installbase="system32">c_28596.nls</installfile> + <installfile installbase="system32">c_28597.nls</installfile> + <installfile installbase="system32">c_28598.nls</installfile> + <installfile installbase="system32">c_28599.nls</installfile> + <installfile installbase="system32">l_intl.nls</installfile> </group> Modified: trunk/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Mon Oct 1 18:19:27 2007 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../tools/rbuild/project.dtd"> <module name="ntoskrnl" type="kernel" installbase="system32" installname="ntoskrnl.exe"> - <bootstrap base="$(CDOUTPUT)" /> + <bootstrap installbase="$(CDOUTPUT)" /> <importlibrary definition="ntoskrnl.def" /> <define name="_DISABLE_TIDENTS" /> <define name="__NTOSKRNL__" /> Modified: trunk/reactos/tools/rbuild/bootstrap.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/bootstrap.cpp… ============================================================================== --- trunk/reactos/tools/rbuild/bootstrap.cpp (original) +++ trunk/reactos/tools/rbuild/bootstrap.cpp Mon Oct 1 18:19:27 2007 @@ -97,7 +97,7 @@ "<bootstrap> is not applicable for this module type." ); } - const XMLAttribute* att = node.GetAttribute ( "base", false ); + const XMLAttribute* att = node.GetAttribute ( "installbase", false ); if ( att != NULL ) base = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); else Modified: trunk/reactos/tools/rbuild/cdfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/cdfile.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/cdfile.cpp (original) +++ trunk/reactos/tools/rbuild/cdfile.cpp Mon Oct 1 18:19:27 2007 @@ -39,7 +39,7 @@ const string& path ) : XmlNode ( project, cdfileNode ) { - const XMLAttribute* att = cdfileNode.GetAttribute ( "base", false ); + const XMLAttribute* att = cdfileNode.GetAttribute ( "installbase", false ); string target_relative_directory; if ( att != NULL ) target_relative_directory = ReplaceVariable ( "$(CDOUTPUT)", Environment::GetCdOutputPath (), att->value ); Modified: trunk/reactos/tools/rbuild/doc/rbuild.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/doc/rbuild.tx… ============================================================================== --- trunk/reactos/tools/rbuild/doc/rbuild.txt (original) +++ trunk/reactos/tools/rbuild/doc/rbuild.txt Mon Oct 1 18:19:27 2007 @@ -177,10 +177,10 @@ A bootstrap element specifies that the generated file should be put on the bootable CD as a bootstrap file. Syntax: - <bootstrap base="reactos" nameoncd="halmp.dll" /> - -Attributes: - base - Put file in this directory on the bootable CD. This attribute is optional. + <bootstrap installbase="reactos" nameoncd="halmp.dll" /> + +Attributes: + installbase - Put file in this directory on the bootable CD. This attribute is optional. nameoncd - Name of file on the bootable CD. This attribute is optional. Value: @@ -195,10 +195,10 @@ A cdfile element specifies the name of a file that is to be put on the bootable CD. Syntax: - <cdfile base="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile> - -Attributes: - base - Put file in this directory on the bootable CD. This attribute is optional. + <cdfile installbase="reactos" nameoncd="ReadMe.txt">ReadMe.txt</cdfile> + +Attributes: + installbase - Put file in this directory on the bootable CD. This attribute is optional. nameoncd - Name of file on the bootable CD. This attribute is optional. Value: @@ -392,10 +392,10 @@ An installfile element specifies the name of a file that is to be installed when using 'make install'. Syntax: - <installfile base="reactos" newname="ReadMe.txt">ReadMe.txt</installfile> - -Attributes: - base - Put file in this directory within the install directory. This attribute is optional. + <installfile installbase="reactos" newname="ReadMe.txt">ReadMe.txt</installfile> + +Attributes: + installbase - Put file in this directory within the install directory. This attribute is optional. newname - Name of file within the install directory. This attribute is optional. Value: Modified: trunk/reactos/tools/rbuild/installfile.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/installfile.c… ============================================================================== --- trunk/reactos/tools/rbuild/installfile.cpp (original) +++ trunk/reactos/tools/rbuild/installfile.cpp Mon Oct 1 18:19:27 2007 @@ -27,7 +27,7 @@ const string& path ) : XmlNode(project, installfileNode ) { - const XMLAttribute* base = node.GetAttribute ( "base", false ); + const XMLAttribute* base = node.GetAttribute ( "installbase", false ); const XMLAttribute* newname = node.GetAttribute ( "newname", false ); DirectoryLocation source_directory = SourceDirectory; Modified: trunk/reactos/tools/rbuild/project.dtd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.dtd?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.dtd (original) +++ trunk/reactos/tools/rbuild/project.dtd Mon Oct 1 18:19:27 2007 @@ -22,14 +22,14 @@ <!ELEMENT bootstrap EMPTY> <!ATTLIST bootstrap - base %Text; #IMPLIED - nameoncd %Text; #IMPLIED + installbase %Text; #IMPLIED + nameoncd %Text; #IMPLIED > <!ELEMENT cdfile (#PCDATA)> <!ATTLIST cdfile - base %Text; #IMPLIED - nameoncd %Text; #IMPLIED + installbase %Text; #IMPLIED + nameoncd %Text; #IMPLIED > <!ELEMENT compilerflag (#PCDATA)> @@ -55,8 +55,8 @@ <!ELEMENT installfile (#PCDATA)> <!ATTLIST installfile - base %Text; #IMPLIED - root (intermediate|output) #IMPLIED + installbase %Text; #IMPLIED + root (intermediate|output) #IMPLIED > <!ELEMENT group (cdfile*|define*|directory*|file*|if*|ifnot*|include*|installfile*|property*|module*|group*|xi:include*)+>

17 years, 2 months

[gedmurphy] 29329: use w3seek's control for single monitors displays

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Mon Oct 1 17:54:54 2007 New Revision: 29329 URL: http://svn.reactos.org/svn/reactos?rev=29329&view=rev Log: use w3seek's control for single monitors displays Modified: trunk/reactos/dll/cpl/desk/settings.c Modified: trunk/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/settings.c?re… ============================================================================== --- trunk/reactos/dll/cpl/desk/settings.c (original) +++ trunk/reactos/dll/cpl/desk/settings.c Mon Oct 1 17:54:54 2007 @@ -314,9 +314,21 @@ } else if (Result == 1) { + MONSL_MONINFO monitors; + /* Single video adapter */ SendDlgItemMessage(hwndDlg, IDC_SETTINGS_DEVICE, WM_SETTEXT, 0, (LPARAM)pGlobalData->DisplayDeviceList->DeviceDescription); OnDisplayDeviceChanged(hwndDlg, pGlobalData, pGlobalData->DisplayDeviceList); + + monitors.Position.x = monitors.Position.y = 0; + monitors.Size.cx = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsWidth; + monitors.Size.cy = pGlobalData->CurrentDisplayDevice->CurrentSettings->dmPelsHeight; + monitors.Flags = 0; + SendDlgItemMessage(hwndDlg, + IDC_SETTINGS_MONSEL, + MSLM_SETMONITORSINFO, + 1, + (LPARAM)&monitors); } else {

17 years, 2 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 October 2007