Ros-diffs February 2006

ros-diffs@reactos.org

5 participants
47 discussions

[martinf] 107: XMLStorage update to prepare for rbuild integration

by martinf＠svn.reactos.org

XMLStorage update to prepare for rbuild integration Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h _____ Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp --- trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp 2006-02-08 08:47:46 UTC (rev 106) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.cpp 2006-02-12 10:35:41 UTC (rev 107) @@ -4,7 +4,7 @@ // // xmlstorage.cpp // - // Copyright (c) 2004, 2005 Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005, 2006 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -48,7 +48,8 @@ #ifdef __GNUC__ const LPCXSSTR XMLStorage::XS_TRUE = XS_TRUE_STR; const LPCXSSTR XMLStorage::XS_FALSE = XS_FALSE_STR; -const LPCXSSTR XMLStorage::XS_NUMBERFMT = XS_NUMBERFMT_STR; +const LPCXSSTR XMLStorage::XS_INTFMT = XS_INTFMT_STR; +const LPCXSSTR XMLStorage::XS_FLOATFMT = XS_FLOATFMT_STR; #endif @@ -143,7 +144,7 @@ if (slash == path) return NULL; - int l = slash? slash-path: strlen(path); + size_t l = slash? slash-path: strlen(path); std::string comp(path, l); path += l; @@ -265,201 +266,6 @@ } - /// read XML stream into XML tree below _pos -XML_Status XMLReaderBase::read() -{ - XML_Status status = XML_STATUS_OK; - - while(status == XML_STATUS_OK) { - char* buffer = (char*) XML_GetBuffer(_parser, BUFFER_LEN); - - int l = read_buffer(buffer, BUFFER_LEN); - if (l < 0) - break; - - status = XML_ParseBuffer(_parser, l, false); - } - - if (status != XML_STATUS_ERROR) - status = XML_ParseBuffer(_parser, 0, true); - - if (_pos->_children.empty()) - _pos->_trailing.append(_content); - else - _pos->_children.back()->_trailing.append(_content); - - _content.erase(); - - return status; -} - - - /// store XML version and encoding into XML reader -void XMLCALL XMLReaderBase::XML_XmlDeclHandler(void* userData, const XML_Char* version, const XML_Char* encoding, int standalone) -{ - XMLReaderBase* pReader = (XMLReaderBase*) userData; - - if (version) - pReader->_xml_version = version; - - if (encoding) - pReader->_encoding = encoding; -} - - /// notifications about XML start tag -void XMLCALL XMLReaderBase::XML_StartElementHandler(void* userData, const XML_Char* name, const XML_Char** atts) -{ - XMLReaderBase* pReader = (XMLReaderBase*) userData; - XMLPos& pos = pReader->_pos; - - // search for end of first line - const char* s = pReader->_content.c_str(); - const char* p = s; - const char* e = p + pReader->_content.length(); - - for(; p<e; ++p) - if (*p == '\n') { - ++p; - break; - } - - if (p != s) - if (pos->_children.empty()) { // no children in last node? - if (pReader->_last_tag == TAG_START) - pos->_content.append(s, p-s); - else if (pReader->_last_tag == TAG_END) - pos->_trailing.append(s, p-s); - // else TAG_NONE -> don't store white space in root node - } else - pos->_children.back()->_trailing.append(s, p-s); - - std::string leading; - - if (p != e) - leading.assign(p, e-p); - - XMLNode* node = new XMLNode(String_from_XML_Char(name), leading); - - pos.add_down(node); - - while(*atts) { - const XML_Char* attr_name = *atts++; - const XML_Char* attr_value = *atts++; - - (*node)[String_from_XML_Char(attr_name)] = String_from_XML_Char(attr_value); - } - - pReader->_last_tag = TAG_START; - pReader->_content.erase(); -} - - /// notifications about XML end tag -void XMLCALL XMLReaderBase::XML_EndElementHandler(void* userData, const XML_Char* name) -{ - XMLReaderBase* pReader = (XMLReaderBase*) userData; - XMLPos& pos = pReader->_pos; - - // search for end of first line - const char* s = pReader->_content.c_str(); - const char* p = s; - const char* e = p + pReader->_content.length(); - - for(; p<e; ++p) - if (*p == '\n') { - ++p; - break; - } - - if (p != s) - if (pos->_children.empty()) // no children in current node? - pos->_content.append(s, p-s); - else - if (pReader->_last_tag == TAG_START) - pos->_content.append(s, p-s); - else - pos->_children.back()->_trailing.append(s, p-s); - - if (p != e) - pos->_end_leading.assign(p, e-p); - - pos.back(); - - pReader->_last_tag = TAG_END; - pReader->_content.erase(); -} - - /// store content, white space and comments -void XMLCALL XMLReaderBase::XML_DefaultHandler(void* userData, const XML_Char* s, int len) -{ - XMLReaderBase* pReader = (XMLReaderBase*) userData; - - pReader->_content.append(s, len); -} - - - /// return error strings for Expat errors -std::string XMLReaderBase::get_error_string() const -{ - XML_Error error = XML_GetErrorCode(_parser); - - switch(error) { - case XML_ERROR_NONE: return "XML_ERROR_NONE"; - case XML_ERROR_NO_MEMORY: return "XML_ERROR_NO_MEMORY"; - case XML_ERROR_SYNTAX: return "XML_ERROR_SYNTAX"; - case XML_ERROR_NO_ELEMENTS: return "XML_ERROR_NO_ELEMENTS"; - case XML_ERROR_INVALID_TOKEN: return "XML_ERROR_INVALID_TOKEN"; - case XML_ERROR_UNCLOSED_TOKEN: return "XML_ERROR_UNCLOSED_TOKEN"; - case XML_ERROR_PARTIAL_CHAR: return "XML_ERROR_PARTIAL_CHAR"; - case XML_ERROR_TAG_MISMATCH: return "XML_ERROR_TAG_MISMATCH"; - case XML_ERROR_DUPLICATE_ATTRIBUTE: return "XML_ERROR_DUPLICATE_ATTRIBUTE"; - case XML_ERROR_JUNK_AFTER_DOC_ELEMENT: return "XML_ERROR_JUNK_AFTER_DOC_ELEMENT"; - case XML_ERROR_PARAM_ENTITY_REF: return "XML_ERROR_PARAM_ENTITY_REF"; - case XML_ERROR_UNDEFINED_ENTITY: return "XML_ERROR_UNDEFINED_ENTITY"; - case XML_ERROR_RECURSIVE_ENTITY_REF: return "XML_ERROR_RECURSIVE_ENTITY_REF"; - case XML_ERROR_ASYNC_ENTITY: return "XML_ERROR_ASYNC_ENTITY"; - case XML_ERROR_BAD_CHAR_REF: return "XML_ERROR_BAD_CHAR_REF"; - case XML_ERROR_BINARY_ENTITY_REF: return "XML_ERROR_BINARY_ENTITY_REF"; - case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF: return "XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF"; - case XML_ERROR_MISPLACED_XML_PI: return "XML_ERROR_MISPLACED_XML_PI"; - case XML_ERROR_UNKNOWN_ENCODING: return "XML_ERROR_UNKNOWN_ENCODING"; - case XML_ERROR_INCORRECT_ENCODING: return "XML_ERROR_INCORRECT_ENCODING"; - case XML_ERROR_UNCLOSED_CDATA_SECTION: return "XML_ERROR_UNCLOSED_CDATA_SECTION"; - case XML_ERROR_EXTERNAL_ENTITY_HANDLING: return "XML_ERROR_EXTERNAL_ENTITY_HANDLING"; - case XML_ERROR_NOT_STANDALONE: return "XML_ERROR_NOT_STANDALONE"; - case XML_ERROR_UNEXPECTED_STATE: return "XML_ERROR_UNEXPECTED_STATE"; - case XML_ERROR_ENTITY_DECLARED_IN_PE: return "XML_ERROR_ENTITY_DECLARED_IN_PE"; - case XML_ERROR_FEATURE_REQUIRES_XML_DTD: return "XML_ERROR_FEATURE_REQUIRES_XML_DTD"; - case XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING: return "XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING"; - case XML_ERROR_UNBOUND_PREFIX: return "XML_ERROR_UNBOUND_PREFIX"; - // EXPAT version >= 1.95.8 -#if XML_MAJOR_VERSION>1 || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION>95) || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION==95 && XML_MICRO_VERSION>7) - case XML_ERROR_UNDECLARING_PREFIX: return "XML_ERROR_UNDECLARING_PREFIX"; - case XML_ERROR_INCOMPLETE_PE: return "XML_ERROR_INCOMPLETE_PE"; - case XML_ERROR_XML_DECL: return "XML_ERROR_XML_DECL"; - case XML_ERROR_TEXT_DECL: return "XML_ERROR_TEXT_DECL"; - case XML_ERROR_PUBLICID: return "XML_ERROR_PUBLICID"; - case XML_ERROR_SUSPENDED: return "XML_ERROR_SUSPENDED"; - case XML_ERROR_NOT_SUSPENDED: return "XML_ERROR_NOT_SUSPENDED"; - case XML_ERROR_ABORTED: return "XML_ERROR_ABORTED"; - case XML_ERROR_FINISHED: return "XML_ERROR_FINISHED"; - case XML_ERROR_SUSPEND_PE: return "XML_ERROR_SUSPEND_PE"; -#endif -#if XML_MAJOR_VERSION>=2 - /* Added in 2.0. */ - case XML_ERROR_RESERVED_PREFIX_XML: return "XML_ERROR_RESERVED_PREFIX_XML"; - case XML_ERROR_RESERVED_PREFIX_XMLNS: return "XML_ERROR_RESERVED_PREFIX_XMLNS"; - case XML_ERROR_RESERVED_NAMESPACE_URI: return "XML_ERROR_RESERVED_NAMESPACE_URI"; -#endif - } - - std::ostringstream out; - - out << "XML parser error #" << error; - - return out.str(); -} - - /// encode XML string literals std::string EncodeXMLString(const XS_String& str) { @@ -635,4 +441,284 @@ } + /// read XML stream into XML tree below _pos +XML_Status XMLReaderBase::read() +{ + XML_Status status = XML_STATUS_OK; + + while(status == XML_STATUS_OK) { + char* buffer = (char*) XML_GetBuffer(_parser, BUFFER_LEN); + + size_t l = read_buffer(buffer, BUFFER_LEN); + if ((int)l < 0) + break; + + status = XML_ParseBuffer(_parser, l, false); + } + + if (status != XML_STATUS_ERROR) + status = XML_ParseBuffer(_parser, 0, true); + + finish_read(); + + return status; +} + + + /// return current parser position as string +std::string XMLReaderBase::get_position() const +{ + int line = XML_GetCurrentLineNumber(_parser); + int column = XML_GetCurrentColumnNumber(_parser); + + std::ostringstream out; + out << "(" << line << ") : [column " << column << "]"; + + return out.str(); +} + + +#ifdef XMLNODE_LOCATION + +XMLLocation XMLReaderBase::get_location() const +{ + int line = XML_GetCurrentLineNumber(_parser); + int column = XML_GetCurrentColumnNumber(_parser); + + return XMLLocation(_display_path, line, column); +} + +std::string XMLLocation::str() const +{ + std::ostringstream out; + + if (_pdisplay_path) + out << _pdisplay_path; + + out << "(" << _line << ") : [column " << _column << "]"; + + return out.str(); +} + +#endif + + + /// return current error code from Expat +XML_Error XMLReaderBase::get_error_code() const +{ + return XML_GetErrorCode(_parser); +} + + + /// store XML version and encoding into XML reader +void XMLCALL XMLReaderBase::XML_XmlDeclHandler(void* userData, const XML_Char* version, const XML_Char* encoding, int standalone) +{ + XMLReaderBase* pReader = (XMLReaderBase*) userData; + + pReader->XmlDeclHandler(version, encoding, standalone); +} + + /// notifications about XML start tag +void XMLCALL XMLReaderBase::XML_StartElementHandler(void* userData, const XML_Char* name, const XML_Char** atts) +{ + XMLReaderBase* pReader = (XMLReaderBase*) userData; + + XMLNode::AttributeMap attributes; + + while(*atts) { + const XML_Char* attr_name = *atts++; + const XML_Char* attr_value = *atts++; + + attributes[String_from_XML_Char(attr_name)] = String_from_XML_Char(attr_value); + } + + pReader->StartElementHandler(String_from_XML_Char(name), attributes); +} + + /// notifications about XML end tag +void XMLCALL XMLReaderBase::XML_EndElementHandler(void* userData, const XML_Char* name) +{ + XMLReaderBase* pReader = (XMLReaderBase*) userData; + + pReader->EndElementHandler(); +} + + /// store content, white space and comments +void XMLCALL XMLReaderBase::XML_DefaultHandler(void* userData, const XML_Char* s, int len) +{ + XMLReaderBase* pReader = (XMLReaderBase*) userData; + + pReader->DefaultHandler(s, len); +} + + + /// return error strings for Expat errors +std::string XMLReaderBase::get_error_string() const +{ + XML_Error error = XML_GetErrorCode(_parser); + + switch(error) { + case XML_ERROR_NONE: return "XML_ERROR_NONE"; + case XML_ERROR_NO_MEMORY: return "XML_ERROR_NO_MEMORY"; + case XML_ERROR_SYNTAX: return "XML_ERROR_SYNTAX"; + case XML_ERROR_NO_ELEMENTS: return "XML_ERROR_NO_ELEMENTS"; + case XML_ERROR_INVALID_TOKEN: return "XML_ERROR_INVALID_TOKEN"; + case XML_ERROR_UNCLOSED_TOKEN: return "XML_ERROR_UNCLOSED_TOKEN"; + case XML_ERROR_PARTIAL_CHAR: return "XML_ERROR_PARTIAL_CHAR"; + case XML_ERROR_TAG_MISMATCH: return "XML_ERROR_TAG_MISMATCH"; + case XML_ERROR_DUPLICATE_ATTRIBUTE: return "XML_ERROR_DUPLICATE_ATTRIBUTE"; + case XML_ERROR_JUNK_AFTER_DOC_ELEMENT: return "XML_ERROR_JUNK_AFTER_DOC_ELEMENT"; + case XML_ERROR_PARAM_ENTITY_REF: return "XML_ERROR_PARAM_ENTITY_REF"; + case XML_ERROR_UNDEFINED_ENTITY: return "XML_ERROR_UNDEFINED_ENTITY"; + case XML_ERROR_RECURSIVE_ENTITY_REF: return "XML_ERROR_RECURSIVE_ENTITY_REF"; + case XML_ERROR_ASYNC_ENTITY: return "XML_ERROR_ASYNC_ENTITY"; + case XML_ERROR_BAD_CHAR_REF: return "XML_ERROR_BAD_CHAR_REF"; + case XML_ERROR_BINARY_ENTITY_REF: return "XML_ERROR_BINARY_ENTITY_REF"; + case XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF: return "XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF"; + case XML_ERROR_MISPLACED_XML_PI: return "XML_ERROR_MISPLACED_XML_PI"; + case XML_ERROR_UNKNOWN_ENCODING: return "XML_ERROR_UNKNOWN_ENCODING"; + case XML_ERROR_INCORRECT_ENCODING: return "XML_ERROR_INCORRECT_ENCODING"; + case XML_ERROR_UNCLOSED_CDATA_SECTION: return "XML_ERROR_UNCLOSED_CDATA_SECTION"; + case XML_ERROR_EXTERNAL_ENTITY_HANDLING: return "XML_ERROR_EXTERNAL_ENTITY_HANDLING"; + case XML_ERROR_NOT_STANDALONE: return "XML_ERROR_NOT_STANDALONE"; + case XML_ERROR_UNEXPECTED_STATE: return "XML_ERROR_UNEXPECTED_STATE"; + case XML_ERROR_ENTITY_DECLARED_IN_PE: return "XML_ERROR_ENTITY_DECLARED_IN_PE"; + case XML_ERROR_FEATURE_REQUIRES_XML_DTD: return "XML_ERROR_FEATURE_REQUIRES_XML_DTD"; + case XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING: return "XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING"; + case XML_ERROR_UNBOUND_PREFIX: return "XML_ERROR_UNBOUND_PREFIX"; + // EXPAT version >= 1.95.8 +#if XML_MAJOR_VERSION>1 || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION>95) || (XML_MAJOR_VERSION==1 && XML_MINOR_VERSION==95 && XML_MICRO_VERSION>7) + case XML_ERROR_UNDECLARING_PREFIX: return "XML_ERROR_UNDECLARING_PREFIX"; + case XML_ERROR_INCOMPLETE_PE: return "XML_ERROR_INCOMPLETE_PE"; + case XML_ERROR_XML_DECL: return "XML_ERROR_XML_DECL"; + case XML_ERROR_TEXT_DECL: return "XML_ERROR_TEXT_DECL"; + case XML_ERROR_PUBLICID: return "XML_ERROR_PUBLICID"; + case XML_ERROR_SUSPENDED: return "XML_ERROR_SUSPENDED"; + case XML_ERROR_NOT_SUSPENDED: return "XML_ERROR_NOT_SUSPENDED"; + case XML_ERROR_ABORTED: return "XML_ERROR_ABORTED"; + case XML_ERROR_FINISHED: return "XML_ERROR_FINISHED"; + case XML_ERROR_SUSPEND_PE: return "XML_ERROR_SUSPEND_PE"; +#endif +#if XML_MAJOR_VERSION>=2 + /* Added in 2.0. */ + case XML_ERROR_RESERVED_PREFIX_XML: return "XML_ERROR_RESERVED_PREFIX_XML"; + case XML_ERROR_RESERVED_PREFIX_XMLNS: return "XML_ERROR_RESERVED_PREFIX_XMLNS"; + case XML_ERROR_RESERVED_NAMESPACE_URI: return "XML_ERROR_RESERVED_NAMESPACE_URI"; +#endif + } + + std::ostringstream out; + + out << "XML parser error #" << error; + + return out.str(); +} + + +void XMLReaderBase::finish_read() +{ + if (_pos->_children.empty()) + _pos->_trailing.append(_content); + else + _pos->_children.back()->_trailing.append(_content); + + _content.erase(); +} + + + /// store XML version and encoding into XML reader +void XMLReaderBase::XmlDeclHandler(const XML_Char* version, const XML_Char* encoding, int standalone) +{ + if (version) + _xml_version = version; + + if (encoding) + _encoding = encoding; +} + + + /// 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* p = s; + const char* e = p + _content.length(); + + for(; p<e; ++p) + if (*p == '\n') { + ++p; + break; + } + + if (p != s) + if (_pos->_children.empty()) { // no children in last node? + if (_last_tag == TAG_START) + _pos->_content.append(s, p-s); + else if (_last_tag == TAG_END) + _pos->_trailing.append(s, p-s); + // else TAG_NONE -> don't store white space in root node + } else + _pos->_children.back()->_trailing.append(s, p-s); + + std::string leading; + + if (p != e) + leading.assign(p, e-p); + + XMLNode* node = new XMLNode(name, leading); + + _pos.add_down(node); + +#ifdef XMLNODE_LOCATION + node->_location = get_location(); +#endif + + node->_attributes = attributes; + + _last_tag = TAG_START; + _content.erase(); +} + + /// 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(); + + for(; p<e; ++p) + if (*p == '\n') { + ++p; + 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 + _pos->_children.back()->_trailing.append(s, p-s); + + if (p != e) + _pos->_end_leading.assign(p, e-p); + + _pos.back(); + + _last_tag = TAG_END; + _content.erase(); +} + + /// store content, white space and comments +void XMLReaderBase::DefaultHandler(const XML_Char* s, int len) +{ + _content.append(s, len); +} + + +XS_String XMLWriter::s_empty_attr; + } // namespace XMLStorage _____ Modified: trunk/reactos/base/shell/explorer/utility/xmlstorage.h --- trunk/reactos/base/shell/explorer/utility/xmlstorage.h 2006-02-08 08:47:46 UTC (rev 106) +++ trunk/reactos/base/shell/explorer/utility/xmlstorage.h 2006-02-12 10:35:41 UTC (rev 107) @@ -4,7 +4,7 @@ // // xmlstorage.h // - // Copyright (c) 2004, 2005 Martin Fuchs <martin-fuchs(a)gmx.net> + // Copyright (c) 2004, 2005, 2006 Martin Fuchs <martin-fuchs(a)gmx.net> // @@ -38,19 +38,91 @@ #ifndef _XMLSTORAGE_H + +#if _MSC_VER>=1400 +#ifndef _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES +#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES 1 +#define _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT 1 +#define _CRT_SECURE_CPP_OVERLOAD_SECURE_NAMES 1 +#endif +#endif + + +#ifndef _NO_EXPAT + +//#include "expat.h" #include <expat/expat.h> +#else + +typedef char XML_Char; + +enum XML_Status { + XML_STATUS_ERROR = 0, + XML_STATUS_OK = 1 +}; + +enum XML_Error { + XML_ERROR_NONE, + XML_ERROR_FAILURE +}; + +#endif + + #ifdef _MSC_VER -#pragma comment(lib, "libexpat.lib") #pragma warning(disable: 4786) + +#ifndef _NO_COMMENT +#ifndef _NO_EXPAT +#ifdef XML_STATIC +#ifndef _DEBUG +#pragma comment(lib, "libexpatMT") #endif +#else +#pragma comment(lib, "libexpat") +#endif +#endif +#ifndef _STRING_DEFINED // _STRING_DEFINED only allowed if using xmlstorage.cpp embedded in the project +#if defined(_DEBUG) && defined(_DLL) // DEBUG version only supported with MSVCRTD +#if _MSC_VER==1400 +#pragma comment(lib, "xmlstorage-vc8d") +#else +#pragma comment(lib, "xmlstorage-vc6d") +#endif +#else +#ifdef _DLL +#if _MSC_VER==1400 +#pragma comment(lib, "xmlstorage-vc8") +#else +#pragma comment(lib, "xmlstorage-vc6") +#endif +#elif defined(_MT) +#if _MSC_VER==1400 +#pragma comment(lib, "xmlstorage-vc8t") +#else +#pragma comment(lib, "xmlstorage-vc6t") +#endif +#else + // -ML is no more supported by VS2005. +#pragma comment(lib, "xmlstorage-vc6l") +#endif +#endif +#endif // _STRING_DEFINED +#endif // _NO_COMMENT + +#endif // _MSC_VER + + #include <windows.h> // for LPCTSTR #ifdef UNICODE +#ifndef _UNICODE #define _UNICODE #endif +#endif #include <tchar.h> #include <malloc.h> @@ -81,6 +153,7 @@ #define XS_icmp stricmp #define XS_nicmp strnicmp #define XS_toi atoi +#define XS_tod strtod #define XS_len strlen #define XS_snprintf snprintf #define XS_vsnprintf vsnprintf @@ -92,14 +165,19 @@ #define XS_icmp _tcsicmp #define XS_nicmp _tcsnicmp #define XS_toi _ttoi +#define XS_tod _tcstod #define XS_len _tcslen #define XS_snprintf _sntprintf #define XS_vsnprintf _vsntprintf #endif #ifndef COUNTOF +#if _MSC_VER>=1400 +#define COUNTOF _countof +#else #define COUNTOF(b) (sizeof(b)/sizeof(b[0])) #endif +#endif #if defined(_STRING_DEFINED) && !defined(XS_STRING_UTF8) @@ -269,7 +347,6 @@ typedef std::filebuf STDIO_FILEBUF; #endif - struct FileHolder { FileHolder(LPCTSTR path, LPCTSTR mode) @@ -382,6 +459,34 @@ #endif +#ifdef XMLNODE_LOCATION + /// location of XML Node including XML file name +struct XMLLocation +{ + XMLLocation() + : _pdisplay_path(NULL), + _line(0), + _column(0) + { + } + + XMLLocation(const char* display_path, int line, int column) + : _pdisplay_path(display_path), + _line(line), + _column(column) + { + } + + std::string str() const; + +protected: + const char* _pdisplay_path; // character pointer for fast reference + int _line; + int _column; +}; +#endif + + /// in memory representation of an XML node struct XMLNode : public XS_String { @@ -454,7 +559,8 @@ } XMLNode(const XMLNode& other) - : _attributes(other._attributes), + : XS_String(other), + _attributes(other._attributes), _leading(other._leading), _content(other._content), _end_leading(other._end_leading), @@ -462,6 +568,10 @@ { for(Children::const_iterator it=other._children.begin(); it!=other._children.end(); ++it) _children.push_back(new XMLNode(**it)); + +#ifdef XMLNODE_LOCATION + _location = other._location; +#endif } ~XMLNode() @@ -588,6 +698,16 @@ return _children; } + const AttributeMap& get_attributes() const + { + return _attributes; + } + + AttributeMap& get_attributes() + { + return _attributes; + } + XS_String get_content() const { #ifdef XS_STRING_UTF8 @@ -605,6 +725,10 @@ _content.assign(EncodeXMLString(s.c_str())); } +#ifdef XMLNODE_LOCATION + const XMLLocation& get_location() const {return _location;} +#endif + enum WRITE_MODE { FORMAT_SMART = 0, /// preserve original white space and comments if present; pretty print otherwise FORMAT_ORIGINAL = 1, /// write XML stream preserving original white space and comments @@ -639,6 +763,10 @@ std::string _end_leading; std::string _trailing; +#ifdef XMLNODE_LOCATION + XMLLocation _location; +#endif + XMLNode* get_first_child() const { if (!_children.empty()) @@ -706,9 +834,9 @@ /// relative XPath create function XMLNode* create_relative(const char* path); - void write_worker(std::ostream& out, int indent) const; - void pretty_write_worker(std::ostream& out, int indent) const; - void smart_write_worker(std::ostream& out, int indent) const; + void write_worker(std::ostream& out, int indent) const; + void pretty_write_worker(std::ostream& out, int indent) const; + void smart_write_worker(std::ostream& out, int indent) const; }; @@ -1242,17 +1370,20 @@ #define XS_TRUE_STR XS_TEXT("true") #define XS_FALSE_STR XS_TEXT("false") -#define XS_NUMBERFMT_STR XS_TEXT("%d") +#define XS_INTFMT_STR XS_TEXT("%d") +#define XS_FLOATFMT_STR XS_TEXT("%f") // work around GCC's wide string constant bug #ifdef __GNUC__ extern const LPCXSSTR XS_TRUE; extern const LPCXSSTR XS_FALSE; -extern const LPCXSSTR XS_NUMBERFMT; +extern const LPCXSSTR XS_INTFMT; +extern const LPCXSSTR XS_FLOATFMT; #else #define XS_TRUE XS_TRUE_STR #define XS_FALSE XS_FALSE_STR -#define XS_NUMBERFMT XS_NUMBERFMT_STR +#define XS_INTFMT XS_INTFMT_STR +#define XS_FLOATFMT XS_FLOATFMT_STR #endif @@ -1380,7 +1511,7 @@ operator XS_String() const { XS_CHAR buffer[32]; - XS_snprintf(buffer, COUNTOF(buffer), XS_NUMBERFMT, _value); + XS_snprintf(buffer, COUNTOF(buffer), XS_INTFMT, _value); return buffer; } @@ -1416,7 +1547,7 @@ void assign(int value) { XS_CHAR buffer[32]; - XS_snprintf(buffer, COUNTOF(buffer), XS_NUMBERFMT, value); + XS_snprintf(buffer, COUNTOF(buffer), XS_INTFMT, value); _ref.assign(buffer); } @@ -1425,6 +1556,89 @@ }; + /// type converter for numeric data +struct XMLDouble +{ + XMLDouble(double value) + : _value(value) + { + } + + XMLDouble(LPCXSSTR value, double def=0.) + { + LPTSTR end; + + if (value && *value) + _value = XS_tod(value, &end); + else + _value = def; + } + + XMLDouble(const XMLNode* node, const XS_String& attr_name, double def=0.) + { + LPTSTR end; + const XS_String& value = node->get(attr_name); + + if (!value.empty()) + _value = XS_tod(value.c_str(), &end); + else + _value = def; + } + + operator double() const + { + return _value; + } + + operator XS_String() const + { + XS_CHAR buffer[32]; + XS_snprintf(buffer, COUNTOF(buffer), XS_FLOATFMT, _value); + return buffer; + } + +protected: + double _value; + +private: + void operator=(const XMLDouble&); // disallow assignment operations +}; + + /// type converter for numeric data with write access +struct XMLDoubleRef +{ + XMLDoubleRef(XMLNode* node, const XS_String& attr_name, double def=0.) + : _ref((*node)[attr_name]) + { + if (_ref.empty()) + assign(def); + } + + XMLDoubleRef& operator=(double value) + { + assign(value); + + return *this; + } + + operator double() const + { + LPTSTR end; + return XS_tod(_ref.c_str(), &end); + } + + void assign(double value) + { + XS_CHAR buffer[32]; + XS_snprintf(buffer, COUNTOF(buffer), XS_FLOATFMT, value); + _ref.assign(buffer); + } + +protected: + XS_String& _ref; +}; + + /// type converter for string data struct XMLString { @@ -1552,24 +1766,20 @@ XML_Status read(); - virtual int read_buffer(char* buffer, int len) = 0; + std::string get_position() const; + std::string get_instructions() const {return _instructions;} - std::string get_position() const - { - int line = XML_GetCurrentLineNumber(_parser); - int column = XML_GetCurrentColumnNumber(_parser); + XML_Error get_error_code() const; + std::string get_error_string() const; - std::ostringstream out; - out << "(" << line << ") : [column " << column << "]"; +#ifdef XMLNODE_LOCATION + const char* _display_path; // character pointer for fast reference in XMLLocation - return out.str(); - } + XMLLocation get_location() const; +#endif - std::string get_instructions() const {return _instructions;} + virtual int read_buffer(char* buffer, int len) = 0; - XML_Error get_error_code() {return XML_GetErrorCode(_parser);} - std::string get_error_string() const; - protected: XMLPos _pos; XML_Parser _parser; @@ -1580,6 +1790,13 @@ std::string _content; enum {TAG_NONE, TAG_START, TAG_END} _last_tag; + void finish_read(); + + virtual void XmlDeclHandler(const XML_Char* version, const XML_Char* encoding, int standalone); + virtual void StartElementHandler(const XS_String& name, const XMLNode::AttributeMap& attributes); + virtual void EndElementHandler(); + virtual void DefaultHandler(const XML_Char* s, int len); + static void XMLCALL XML_XmlDeclHandler(void* userData, const XML_Char* version, const XML_Char* encoding, int standalone); static void XMLCALL XML_StartElementHandler(void* userData, const XML_Char* name, const XML_Char** atts); static void XMLCALL XML_EndElementHandler(void* userData, const XML_Char* name); @@ -1612,7 +1829,7 @@ }; - /// management of XML file headers + /// Management of XML file headers struct XMLHeader { XMLHeader(const std::string& xml_version="1.0", const std::string& encoding="UTF-8", const std::string& doctype="") @@ -1659,13 +1876,11 @@ read(path); } - std::istream& read(std::istream& in) + bool read(std::istream& in) { XMLReader reader(this, in); - read(reader); - - return in; + return read(reader); } bool read(LPCTSTR path) @@ -1700,6 +1915,11 @@ bool read(XMLReaderBase& reader, const std::string& display_path) { +#ifdef XMLNODE_LOCATION + // make a string copy to handle temporary string objects + _display_path = display_path; + reader._display_path = _display_path.c_str(); +#endif XML_Status status = reader.read(); _header._additional = reader.get_instructions(); @@ -1750,6 +1970,10 @@ XMLHeader _header; XML_Error _last_error; std::string _last_error_msg; + +#ifdef XMLNODE_LOCATION + std::string _display_path; +#endif }; @@ -1848,7 +2072,7 @@ void set_content(const XS_String& s) { [truncated at 1000 lines; 24 more skipped]

18 years, 10 months

[martinf] 106: .xml -> .rbuild

by martinf＠svn.reactos.org

.xml -> .rbuild Modified: trunk/rosapps/devutils/directory.rbuild Modified: trunk/rosapps/directory.rbuild _____ Modified: trunk/rosapps/devutils/directory.rbuild --- trunk/rosapps/devutils/directory.rbuild 2006-02-07 20:56:41 UTC (rev 105) +++ trunk/rosapps/devutils/directory.rbuild 2006-02-08 08:47:46 UTC (rev 106) @@ -2,14 +2,14 @@ <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">  <directory name="zoomin"> - <xi:include href="zoomin/zoomin.xml" /> + <xi:include href="zoomin/zoomin.rbuild" /> </directory> </rbuild> _____ Modified: trunk/rosapps/directory.rbuild --- trunk/rosapps/directory.rbuild 2006-02-07 20:56:41 UTC (rev 105) +++ trunk/rosapps/directory.rbuild 2006-02-08 08:47:46 UTC (rev 106) @@ -1,58 +1,58 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="devutils"> - <xi:include href="devutils/directory.xml" /> + <xi:include href="devutils/directory.rbuild" /> </directory> <directory name="notevil"> - <xi:include href="notevil/notevil.xml" /> + <xi:include href="notevil/notevil.rbuild" /> </directory> <directory name="packmgr"> - <xi:include href="packmgr/directory.xml" /> + <xi:include href="packmgr/directory.rbuild" /> </directory>  </rbuild>

18 years, 10 months

[martinf] 104: rosapps: add directory structure

by martinf＠svn.reactos.org

rosapps: add directory structure Added: trunk/rosapps/cmdutils/ Added: trunk/rosapps/demos/ Added: trunk/rosapps/devutils/ Added: trunk/rosapps/games/ Added: trunk/rosapps/lib/ Added: trunk/rosapps/net/ Added: trunk/rosapps/sysutils/ Added: trunk/rosapps/tests/

18 years, 10 months

[martinf] 103: rosapps: add root files

by martinf＠svn.reactos.org

rosapps: add root files Added: trunk/rosapps/Doxyfile Added: trunk/rosapps/Makefile Added: trunk/rosapps/copying Added: trunk/rosapps/directory.rbuild Added: trunk/rosapps/readme.txt _____ Added: trunk/rosapps/Doxyfile --- trunk/rosapps/Doxyfile 2006-02-07 20:40:25 UTC (rev 102) +++ trunk/rosapps/Doxyfile 2006-02-07 20:40:49 UTC (rev 103) @@ -0,0 +1,206 @@ +# Doxyfile 1.3.5 + +#---------------------------------------------------------------------- ----- +# Project related configuration options +#---------------------------------------------------------------------- ----- +PROJECT_NAME = "ROSApps" +PROJECT_NUMBER = +OUTPUT_DIRECTORY = doxy-doc +OUTPUT_LANGUAGE = English +USE_WINDOWS_ENCODING = YES +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +ALWAYS_DETAILED_SEC = NO +INLINE_INHERITED_MEMB = NO +FULL_PATH_NAMES = YES +STRIP_FROM_PATH = D:\osexperts\ +SHORT_NAMES = NO +JAVADOC_AUTOBRIEF = YES +MULTILINE_CPP_IS_BRIEF = NO +DETAILS_AT_TOP = NO +INHERIT_DOCS = NO +DISTRIBUTE_GROUP_DOC = NO +TAB_SIZE = 8 +ALIASES = +OPTIMIZE_OUTPUT_FOR_C = NO +OPTIMIZE_OUTPUT_JAVA = NO +SUBGROUPING = YES +#---------------------------------------------------------------------- ----- +# Build related configuration options +#---------------------------------------------------------------------- ----- +EXTRACT_ALL = YES +EXTRACT_PRIVATE = NO +EXTRACT_STATIC = NO +EXTRACT_LOCAL_CLASSES = NO +HIDE_UNDOC_MEMBERS = NO +HIDE_UNDOC_CLASSES = NO +HIDE_FRIEND_COMPOUNDS = NO +HIDE_IN_BODY_DOCS = NO +INTERNAL_DOCS = YES +CASE_SENSE_NAMES = YES +HIDE_SCOPE_NAMES = NO +SHOW_INCLUDE_FILES = YES +INLINE_INFO = YES +SORT_MEMBER_DOCS = YES +GENERATE_TODOLIST = YES +GENERATE_TESTLIST = YES +GENERATE_BUGLIST = YES +GENERATE_DEPRECATEDLIST= YES +ENABLED_SECTIONS = +MAX_INITIALIZER_LINES = 30 +SHOW_USED_FILES = YES +#---------------------------------------------------------------------- ----- +# configuration options related to warning and progress messages +#---------------------------------------------------------------------- ----- +QUIET = NO +HAVE_DOT = YES +WARN_IF_UNDOCUMENTED = NO +WARN_IF_DOC_ERROR = YES +WARN_FORMAT = "$file:$line: $text" +WARN_LOGFILE = +#---------------------------------------------------------------------- ----- +# configuration options related to the input files +#---------------------------------------------------------------------- ----- +INPUT = . +FILE_PATTERNS = *.c \ + *.h +RECURSIVE = YES +EXCLUDE = +EXCLUDE_SYMLINKS = NO +EXCLUDE_PATTERNS = +EXAMPLE_PATH = +EXAMPLE_PATTERNS = +EXAMPLE_RECURSIVE = YES +IMAGE_PATH = +INPUT_FILTER = +FILTER_SOURCE_FILES = NO +#---------------------------------------------------------------------- ----- +# configuration options related to source browsing +#---------------------------------------------------------------------- ----- +SOURCE_BROWSER = NO +INLINE_SOURCES = YES +STRIP_CODE_COMMENTS = YES +REFERENCED_BY_RELATION = YES +REFERENCES_RELATION = YES +VERBATIM_HEADERS = NO +#---------------------------------------------------------------------- ----- +# configuration options related to the alphabetical class index +#---------------------------------------------------------------------- ----- +ALPHABETICAL_INDEX = YES +COLS_IN_ALPHA_INDEX = 5 +IGNORE_PREFIX = +#---------------------------------------------------------------------- ----- +# configuration options related to the HTML output +#---------------------------------------------------------------------- ----- +GENERATE_HTML = YES +HTML_OUTPUT = html +HTML_FILE_EXTENSION = .html +HTML_HEADER = +HTML_FOOTER = +HTML_STYLESHEET = +HTML_ALIGN_MEMBERS = YES +GENERATE_HTMLHELP = NO +CHM_FILE = +HHC_LOCATION = +GENERATE_CHI = NO +BINARY_TOC = NO +TOC_EXPAND = NO +DISABLE_INDEX = NO +ENUM_VALUES_PER_LINE = 4 +GENERATE_TREEVIEW = YES +TREEVIEW_WIDTH = 200 +#---------------------------------------------------------------------- ----- +# configuration options related to the LaTeX output +#---------------------------------------------------------------------- ----- +GENERATE_LATEX = NO +LATEX_OUTPUT = latex +LATEX_CMD_NAME = latex +MAKEINDEX_CMD_NAME = makeindex +COMPACT_LATEX = NO +PAPER_TYPE = a4wide +EXTRA_PACKAGES = +LATEX_HEADER = +PDF_HYPERLINKS = NO +USE_PDFLATEX = NO +LATEX_BATCHMODE = NO +LATEX_HIDE_INDICES = NO +#---------------------------------------------------------------------- ----- +# configuration options related to the RTF output +#---------------------------------------------------------------------- ----- +GENERATE_RTF = NO +RTF_OUTPUT = rtf +COMPACT_RTF = YES +RTF_HYPERLINKS = YES +RTF_STYLESHEET_FILE = +RTF_EXTENSIONS_FILE = +#---------------------------------------------------------------------- ----- +# configuration options related to the man page output +#---------------------------------------------------------------------- ----- +GENERATE_MAN = NO +MAN_OUTPUT = man +MAN_EXTENSION = .3 +MAN_LINKS = NO +#---------------------------------------------------------------------- ----- +# configuration options related to the XML output +#---------------------------------------------------------------------- ----- +GENERATE_XML = NO +XML_OUTPUT = xml +XML_SCHEMA = +XML_DTD = +#---------------------------------------------------------------------- ----- +# configuration options for the AutoGen Definitions output +#---------------------------------------------------------------------- ----- +GENERATE_AUTOGEN_DEF = NO +#---------------------------------------------------------------------- ----- +# configuration options related to the Perl module output +#---------------------------------------------------------------------- ----- +GENERATE_PERLMOD = NO +PERLMOD_LATEX = NO +PERLMOD_PRETTY = YES +PERLMOD_MAKEVAR_PREFIX = +#---------------------------------------------------------------------- ----- +# Configuration options related to the preprocessor +#---------------------------------------------------------------------- ----- +ENABLE_PREPROCESSING = NO +MACRO_EXPANSION = NO +EXPAND_ONLY_PREDEF = NO +SEARCH_INCLUDES = YES +INCLUDE_PATH = ../reactos/include +INCLUDE_FILE_PATTERNS = *.h +PREDEFINED = +EXPAND_AS_DEFINED = +SKIP_FUNCTION_MACROS = YES +#---------------------------------------------------------------------- ----- +# Configuration::addtions related to external references +#---------------------------------------------------------------------- ----- +TAGFILES = +GENERATE_TAGFILE = +ALLEXTERNALS = NO +EXTERNAL_GROUPS = YES +PERL_PATH = /usr/bin/perl +#---------------------------------------------------------------------- ----- +# Configuration options related to the dot tool +#---------------------------------------------------------------------- ----- +CLASS_DIAGRAMS = YES +HIDE_UNDOC_RELATIONS = NO +HAVE_DOT = YES +CLASS_GRAPH = YES +COLLABORATION_GRAPH = YES +UML_LOOK = NO +TEMPLATE_RELATIONS = NO +INCLUDE_GRAPH = YES +INCLUDED_BY_GRAPH = YES +CALL_GRAPH = YES +GRAPHICAL_HIERARCHY = YES +DOT_IMAGE_FORMAT = png +DOT_PATH = +DOTFILE_DIRS = +MAX_DOT_GRAPH_WIDTH = 1024 +MAX_DOT_GRAPH_HEIGHT = 1024 +MAX_DOT_GRAPH_DEPTH = 0 +GENERATE_LEGEND = YES +DOT_CLEANUP = YES +#---------------------------------------------------------------------- ----- +# Configuration::addtions related to the search engine +#---------------------------------------------------------------------- ----- +SEARCHENGINE = YES _____ Added: trunk/rosapps/Makefile --- trunk/rosapps/Makefile 2006-02-07 20:40:25 UTC (rev 102) +++ trunk/rosapps/Makefile 2006-02-07 20:40:49 UTC (rev 103) @@ -0,0 +1,13 @@ +all: + @echo To build "rosapps" there are two paths: + @echo --- + @echo 1. copy the rosapps folder into the reactos\modules folder + @echo 2. link reactos/modules/rosapps to rosapps + @echo UNIX + @echo cd $${ROS_SRC_ROOT}/reactos/modules + @echo ln -s $${ROS_SRC_ROOT}/rosapps rosapps + @echo WINDOWS + @echo cd %%ROS_SRC_ROOT%%\reactos\modules + @echo junction rosapps %%ROS_SRC_ROOT%%\rosapps + @echo --- + @echo Eventually you can run "make depends" in the \reactos directory to compile it. Property changes on: trunk/rosapps/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/rosapps/copying --- trunk/rosapps/copying 2006-02-07 20:40:25 UTC (rev 102) +++ trunk/rosapps/copying 2006-02-07 20:40:49 UTC (rev 103) @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. _____ Added: trunk/rosapps/directory.rbuild --- trunk/rosapps/directory.rbuild 2006-02-07 20:40:25 UTC (rev 102) +++ trunk/rosapps/directory.rbuild 2006-02-07 20:40:49 UTC (rev 103) @@ -0,0 +1,58 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="cmdutils"> + <xi:include href="cmdutils/cmdutils.xml" /> + </directory> + + <directory name="demos"> + <xi:include href="demos/directory.xml" /> + </directory> + + <directory name="devutils"> + <xi:include href="devutils/directory.xml" /> + </directory> + + <directory name="dflat32"> + <xi:include href="dflat32/dflat32.xml" /> + </directory> + + <directory name="games"> + <xi:include href="games/directory.xml" /> + </directory> + + <directory name="mc"> + <xi:include href="mc/mc.xml" /> + </directory> + + <directory name="net"> + <xi:include href="net/directory.xml" /> + </directory> + + <directory name="notevil"> + <xi:include href="notevil/notevil.xml" /> + </directory> + + <directory name="packmgr"> + <xi:include href="packmgr/directory.xml" /> + </directory> + + <directory name="sysutils"> + <xi:include href="sysutils/sysutils.xml" /> + </directory> + + <directory name="templates"> + <xi:include href="templates/directory.xml" /> + </directory> + <directory name="tests"> + <xi:include href="tests/directory.xml" /> + </directory> + +</rbuild> Property changes on: trunk/rosapps/directory.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/rosapps/readme.txt --- trunk/rosapps/readme.txt 2006-02-07 20:40:25 UTC (rev 102) +++ trunk/rosapps/readme.txt 2006-02-07 20:40:49 UTC (rev 103) @@ -0,0 +1,17 @@ +$Id: readme.txt 15922 2005-06-15 17:42:12Z mbosma $ + +This directory contains extra applicatons for ReactOS. +Make sure you also have a copy of the rest of the ReactOS +source before you attempt to build anything in this module. + +The following is a short decription of each. Check for a +readme.txt under each application for more details. + +CMDUTILS: External commands for CMD. +DEVUTILS: Extra developer tools. +DFLAT32 : Console text editor +GAMES : The start of the ReactOS games collection +MC : Midnight Commander +NET : Network tools: Ncftp, etc... +NOTEVIL : ReactOS Coders Console Parade. +SYSUTILS: System Utilities. Property changes on: trunk/rosapps/readme.txt ___________________________________________________________________ Name: svn:eol-style + native

18 years, 10 months

[martinf] 102: rosapps: add notevil to new repo

by martinf＠svn.reactos.org

rosapps: add notevil to new repo Added: trunk/rosapps/notevil/ Added: trunk/rosapps/notevil/notevil.c Added: trunk/rosapps/notevil/notevil.rbuild Added: trunk/rosapps/notevil/notevil.rc Added: trunk/rosapps/notevil/readme.txt Added: trunk/rosapps/notevil/resource.h Property changes on: trunk/rosapps/notevil ___________________________________________________________________ Name: svn:history + ------------------------------------------------------------------------ r20944 | hbirr | 2006-01-18 00:14:51 +0100 (Mi, 18 Jan 2006) | 2 lines Removed my name from the hall of fame. Since it seems, that parts of ReactOS are implemented by ripping code from Windows, it isn't longer honourable to find my name inside the sources of ReactOS. ------------------------------------------------------------------------ r18720 | gvg | 2005-10-23 20:54:23 +0200 (So, 23 Okt 2005) | 2 lines SVN maintenance ------------------------------------------------------------------------ r17609 | hpoussin | 2005-09-02 23:13:10 +0200 (Fr, 02 Sep 2005) | 2 lines RmRemove warnings ------------------------------------------------------------------------ r16719 | mf | 2005-07-24 23:44:45 +0200 (So, 24 Jul 2005) | 1 line set eol-style for XML files in rosapps ------------------------------------------------------------------------ r15923 | mbosma | 2005-06-15 19:51:54 +0200 (Mi, 15 Jun 2005) | 1 line delete .cvsignore ------------------------------------------------------------------------ r15921 | mbosma | 2005-06-15 19:37:14 +0200 (Mi, 15 Jun 2005) | 1 line remove old makefile ------------------------------------------------------------------------ r15920 | mbosma | 2005-06-15 19:19:52 +0200 (Mi, 15 Jun 2005) | 1 line Created XML makefiles for rosapps. You need to checkout /rosapps in your /reactos folder to use it. This projects do not build: /lib/dflat32 and /welcome (I don't know if they did before). Winemine does not work. (but it builds) /test makefiles are not done yet. ------------------------------------------------------------------------ r15091 | sedwards | 2005-05-07 23:24:31 +0200 (Sa, 07 Mai 2005) | 1 line remove trailing whitespace at end of lines ------------------------------------------------------------------------ r14515 | sedwards | 2005-04-05 21:17:21 +0200 (Di, 05 Apr 2005) | 1 line __USE_W32API ------------------------------------------------------------------------ r13389 | ea | 2005-02-02 22:40:33 +0100 (Mi, 02 Feb 2005) | 1 line Make Jim Tabor visible. ------------------------------------------------------------------------ r13381 | jimtabor | 2005-02-01 18:40:21 +0100 (Di, 01 Feb 2005) | 1 line Added Jimtabor to list. ------------------------------------------------------------------------ r13088 | ea | 2005-01-16 23:53:36 +0100 (So, 16 Jan 2005) | 1 line Alex Ionescu added. ------------------------------------------------------------------------ r11299 | gvg | 2004-10-17 00:30:19 +0200 (So, 17 Okt 2004) | 2 lines Centralize definition of version resource ------------------------------------------------------------------------ r6284 | gvg | 2003-10-11 23:06:18 +0200 (Sa, 11 Okt 2003) | 5 lines Added Mark Tempel, Art Yerkes, Martin Fuchs, Vizzini, Filip Navara, Andrew Greenwood, Thomas Weidenmueller and Jonathan Wilson to list of coders. Split up STRINGTABLE resource. ------------------------------------------------------------------------ r5181 | royce | 2003-07-20 08:51:29 +0200 (So, 20 Jul 2003) | 2 lines added myself to the "notevil" list ------------------------------------------------------------------------ r5004 | sedwards | 2003-07-06 06:48:53 +0200 (So, 06 Jul 2003) | 2 lines update cvsingnore files ------------------------------------------------------------------------ r4860 | ea | 2003-06-07 11:43:16 +0200 (Sa, 07 Jun 2003) | 2 lines fireball added ------------------------------------------------------------------------ r4823 | ea | 2003-06-02 14:30:05 +0200 (Mo, 02 Jun 2003) | 5 lines Campbell and Dalsnes added to the coders directory. By the way: - who's fireball@mok ? - how do I add Unicode strings to RC files? ------------------------------------------------------------------------ r4000 | robd | 2003-01-15 20:55:29 +0100 (Mi, 15 Jan 2003) | 2 lines Mainly standardisation of makefiles, now support make install rules and use ros headers... ------------------------------------------------------------------------ r3930 | ea | 2003-01-04 16:21:18 +0100 (Sa, 04 Jan 2003) | 2 lines Eugene Ingerman, Guido de Jong, Jurgen van Gael, Marty Dill, and Ge van Geldorp added to the list of ROS coders. ------------------------------------------------------------------------ r3454 | chorns | 2002-09-03 20:44:19 +0200 (Di, 03 Sep 2002) | 4 lines Don't try to build modules that won't build. Support latest MinGW releases. Support building on linux. ------------------------------------------------------------------------ r3388 | robd | 2002-08-25 08:47:16 +0200 (So, 25 Aug 2002) | 2 lines Fixes for building with __MINGW32_VERSION 2.1 ------------------------------------------------------------------------ r3189 | robd | 2002-07-07 21:47:04 +0200 (So, 07 Jul 2002) | 2 lines Added entry for new coder. ------------------------------------------------------------------------ r2689 | ea | 2002-03-09 17:04:50 +0100 (Sa, 09 Mrz 2002) | 3 lines I added Steven Edwards and KJK::Hyperion to the rccp. More to come as soon as I finish scanning the cvs-commit list. ------------------------------------------------------------------------ r2299 | ea | 2001-10-16 23:02:02 +0200 (Di, 16 Okt 2001) | 3 lines Fixes to compile the whole set of ROS applications. Hartmut Birr added to the ROS console parade. ------------------------------------------------------------------------ r2111 | ea | 2001-07-28 10:02:05 +0200 (Sa, 28 Jul 2001) | 2 lines cmd, more, tee, y, notevil, sysutils linked to msvcrt.dll. ------------------------------------------------------------------------ r1629 | phreak | 2001-02-18 20:31:38 +0100 (So, 18 Feb 2001) | 2 lines Switched to using waitable timers instead of Sleep(), gives more accurate time cycles, also added some small optimizations ------------------------------------------------------------------------ r1587 | phreak | 2001-01-31 04:03:20 +0100 (Mi, 31 Jan 2001) | 2 lines Minor fix ------------------------------------------------------------------------ r1526 | phreak | 2001-01-16 21:58:58 +0100 (Di, 16 Jan 2001) | 2 lines Fixed bug with screen buffers larger than console window ( i.e. scrollback buffers ) ------------------------------------------------------------------------ r1355 | ea | 2000-09-13 01:21:20 +0200 (Mi, 13 Sep 2000) | 2 lines Added Casper to the coders parade. ------------------------------------------------------------------------ r963 | ea | 2000-01-23 23:52:57 +0100 (So, 23 Jan 2000) | 2 lines Coders directory updated. ------------------------------------------------------------------------ r679 | ekohl | 1999-10-04 00:10:15 +0200 (Mo, 04 Okt 1999) | 2 lines Made notevil screen size aware. ------------------------------------------------------------------------ r468 | ea | 1999-05-15 09:23:34 +0200 (Sa, 15 Mai 1999) | 2 lines *** empty log message *** _____ Added: trunk/rosapps/notevil/notevil.c --- trunk/rosapps/notevil/notevil.c 2006-02-07 20:39:48 UTC (rev 101) +++ trunk/rosapps/notevil/notevil.c 2006-02-07 20:40:25 UTC (rev 102) @@ -0,0 +1,267 @@ +/* $Id$ + * + * notevil.c + * + * -------------------------------------------------------------------- + * + * This software is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This software 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 + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this software; see the file COPYING.LIB. If + * not, write to the Free Software Foundation, Inc., 675 Mass Ave, + * Cambridge, MA 02139, USA. + * + * -------------------------------------------------------------------- + * ReactOS Coders Console Parade + * + * 19990411 EA + * 19990515 EA + */ +//#define UNICODE +#include <windows.h> +#include <stdio.h> +#include <stdlib.h> +#include <tchar.h> +#include "resource.h" + +LPCTSTR app_name = _TEXT("notevil"); + +HANDLE myself; +HANDLE ScreenBuffer; +CONSOLE_SCREEN_BUFFER_INFO ScreenBufferInfo; +HANDLE WaitableTimer; + +void +WriteStringAt( + LPTSTR lpString, + COORD xy, + WORD wColor + ) +{ + DWORD cWritten = 0; + WORD wLen = lstrlen(lpString); + + if (0 == wLen) + return; + // don't bother writing text when erasing + if( wColor ) + WriteConsoleOutputCharacter( ScreenBuffer, + lpString, + wLen, + xy, + & cWritten + ); + FillConsoleOutputAttribute( + ScreenBuffer, + wColor, + wLen, + xy, + & cWritten + ); +} + + +#ifdef DISPLAY_COORD +void +WriteCoord(COORD c) +{ + COORD xy = {0,0}; + TCHAR buf [40]; + + wsprintf( + buf, + _TEXT("x=%02d y=%02d"), + c.X, + c.Y + ); + WriteStringAt( + buf, + xy, + (BACKGROUND_RED | BACKGROUND_GREEN | BACKGROUND_BLUE) + ); +} +#endif /* def DISPLAY_COORD */ + + +INT +GetNextString( + LPTSTR Buffer, + INT BufferSize, + DWORD *Index + ) +{ + if (RES_LAST_INDEX == *Index) + { + *Index = RES_FIRST_INDEX; + } + else + { + ++*Index; + } + LoadString( + myself, + *Index, + Buffer, + BufferSize + ); + return 0; +} + + +VOID +DisplayTitle(VOID) +{ + LPTSTR szTitle = _TEXT("ReactOS Coders Console Parade"); + COORD xy; + + xy.X = (ScreenBufferInfo.dwSize.X - lstrlen(szTitle)) / 2; + xy.Y = ScreenBufferInfo.dwSize.Y / 2; + + WriteStringAt( + szTitle, + xy, + (FOREGROUND_GREEN | FOREGROUND_INTENSITY) + ); +} + + +#define RES_DELAY_CHANGE 12 +#define RES_BUFFER_SIZE 1024 +void +MainLoop(void) +{ + TCHAR NameString [RES_BUFFER_SIZE]; + DWORD NameIndex = 1; + INT NameLength = 0; + COORD xy; + INT n = RES_DELAY_CHANGE; + INT dir_y = 1; + INT dir_x = 1; + WORD wColor = 1; + + xy.X = ScreenBufferInfo.dwSize.X / 2; + xy.Y = ScreenBufferInfo.dwSize.Y / 2; + + for ( ; 1; ++n ) + { + if (n == RES_DELAY_CHANGE) + { + n = GetNextString( + NameString, + RES_BUFFER_SIZE, + & NameIndex + ); + NameLength = lstrlen(NameString); + wColor++; + if ((wColor & 0x000F) == 0) + wColor = 1; + } + if (xy.X == 0) + { + if (dir_x == -1) + dir_x = 1; + } + else if (xy.X >= ScreenBufferInfo.dwSize.X - NameLength - 1) + { + if (dir_x == 1) + dir_x = -1; + } + xy.X += dir_x; + + if (xy.Y == 0) + { + if (dir_y == -1) + dir_y = 1; + } + else if (xy.Y >= ScreenBufferInfo.dwSize.Y - 1) + { + if (dir_y == 1) + dir_y = -1; + } + xy.Y += dir_y; +#ifdef DISPLAY_COORD + WriteCoord(xy); +#endif /* def DISPLAY_COORD */ + DisplayTitle(); + WriteStringAt( + NameString, + xy, + wColor + ); + WaitForSingleObject( WaitableTimer, INFINITE ); + WriteStringAt( + NameString, + xy, + 0 + ); + } +} + + +int +main( + int argc, + char *argv [] + ) +{ + LARGE_INTEGER lint; + DWORD Written; + COORD Coord = { 0, 0 }; + + myself = GetModuleHandle(NULL); + + GetConsoleScreenBufferInfo (GetStdHandle(STD_OUTPUT_HANDLE), + &ScreenBufferInfo); + ScreenBufferInfo.dwSize.X = ScreenBufferInfo.srWindow.Right - ScreenBufferInfo.srWindow.Left + 1; + ScreenBufferInfo.dwSize.Y = ScreenBufferInfo.srWindow.Bottom - ScreenBufferInfo.srWindow.Top + 1; + ScreenBuffer = CreateConsoleScreenBuffer( + GENERIC_WRITE, + 0, + NULL, + CONSOLE_TEXTMODE_BUFFER, + NULL + ); + if (INVALID_HANDLE_VALUE == ScreenBuffer) + { + _ftprintf( + stderr, + _TEXT("%s: could not create a new screen buffer\n"), + app_name + ); + return EXIT_FAILURE; + } + // Fill buffer with black background + FillConsoleOutputAttribute( ScreenBuffer, + 0, + ScreenBufferInfo.dwSize.X * ScreenBufferInfo.dwSize.Y, + Coord, + &Written ); + + WaitableTimer = CreateWaitableTimer( NULL, FALSE, NULL ); + if( WaitableTimer == INVALID_HANDLE_VALUE ) + { + printf( "CreateWaitabletimer() failed\n" ); + return 1; + } + lint.QuadPart = -2000000; + if( SetWaitableTimer( WaitableTimer, &lint, 200, NULL, NULL, FALSE ) == FALSE ) + { + printf( "SetWaitableTimer() failed: 0x%lx\n", GetLastError() ); + return 2; + } + SetConsoleActiveScreenBuffer(ScreenBuffer); + MainLoop(); + CloseHandle(ScreenBuffer); + return EXIT_SUCCESS; +} + + +/* EOF */ Property changes on: trunk/rosapps/notevil/notevil.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/rosapps/notevil/notevil.rbuild --- trunk/rosapps/notevil/notevil.rbuild 2006-02-07 20:39:48 UTC (rev 101) +++ trunk/rosapps/notevil/notevil.rbuild 2006-02-07 20:40:25 UTC (rev 102) @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="notevil" type="win32cui" installbase="system32" installname="notevil.exe"> + <include base="notevil">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + <file>notevil.c</file> + <file>notevil.rc</file> + </module> +</rbuild> Property changes on: trunk/rosapps/notevil/notevil.rbuild ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/rosapps/notevil/notevil.rc --- trunk/rosapps/notevil/notevil.rc 2006-02-07 20:39:48 UTC (rev 101) +++ trunk/rosapps/notevil/notevil.rc 2006-02-07 20:40:25 UTC (rev 102) @@ -0,0 +1,74 @@ +/* $Id: notevil.rc 20944 2006-01-17 23:14:51Z hbirr $ */ + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Coders Console Parade\0" +#define REACTOS_STR_INTERNAL_NAME "notevil\0" +#define REACTOS_STR_ORIGINAL_FILENAME "notevil.exe\0" +#include <reactos/version.rc> + +/* + * String table + * + * Order is the same as in the status report published weekly in + * the "ros-kernel" mailing list by Rex Jolliff. (obsolete) + * + * 20050116.EA: new coders are added scanning the ros-svn mailing + * list, in no particular order. Current order is kept for historical + * reason. + * + */ +STRINGTABLE MOVEABLE +BEGIN + 1, "Boudewijn Dekker (Ariadne)" + 2, "Robert Bergkvist (FragDance Galore)" + 3, "Arindam Das" + 4, "Boudewijn Dekker" + 5, "Jason Eager" + 6, "Jason Filby" + 7, "Rex Jolliff" + 8, "Eric Kohl" + 9, "Hans Kremer" + 10, "Frederik Leemans" + 11, "Jean Michault" + 12, "Jim Noeth" + 13, "Brian Palmer" + 14, "Matt Pyne" + 15, "Jason Weiler" +END + +STRINGTABLE MOVEABLE +BEGIN + 16, "David Welch" + 17, "Emanuele Aliberti" + 18, "Phillip Susi" + 19, "Paolo Pantaleo" + 20, "Hernan Ochoa" + 21, "Casper Hornstrup" + 22, "Steven Edwards" + 23, "KJK::Hyperion" + 24, "Robert Dickenson" + 25, "Eugene Ingerman" + 26, "Guido de Jong" + 27, "Jurgen van Gael" + 28, "Marty Dill" + 29, "Ge van Geldorp" + 30, "Richard Campbell" +END + +STRINGTABLE MOVEABLE +BEGIN + 31, "Gunnar Andre' Dalsnes" + 32, "Aleksey Bragin" + 33, "Royce Mitchell III" + 34, "Mark Tempel" + 35, "Art Yerkes" + 36, "Martin Fuchs" + 37, "Vizzini" + 38, "Filip Navara" + 39, "Andrew Greenwood" + 40, "Thomas Weidenmueller" + 41, "Jonathan Wilson" + 42, "Alex Ionescu" + 43, "Jim Tabor" +END + +/* EOF */ _____ Added: trunk/rosapps/notevil/readme.txt --- trunk/rosapps/notevil/readme.txt 2006-02-07 20:39:48 UTC (rev 101) +++ trunk/rosapps/notevil/readme.txt 2006-02-07 20:40:25 UTC (rev 102) @@ -0,0 +1,21 @@ +$Id: readme.txt 468 1999-05-15 07:23:34Z ea $ + +ReactOS Coders Console Parade +----------------------------- + +The name "notevil" is from the well known Easter egg +of the "3D Text (OpenGL)" screen saver, which +displays the NT programmers' names if one writes +"not evil" in the text box. + +To add a new name, add a new string in the +resource script notevil.rc (string index numbers must be +unique) and edit resource.h to update minimum and +maximum indices. + +Eventually run make. + +Written to test Win32 console functions implementation. + +___________ +19990411 EA Property changes on: trunk/rosapps/notevil/readme.txt ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/rosapps/notevil/resource.h --- trunk/rosapps/notevil/resource.h 2006-02-07 20:39:48 UTC (rev 101) +++ trunk/rosapps/notevil/resource.h 2006-02-07 20:40:25 UTC (rev 102) @@ -0,0 +1,2 @@ +#define RES_FIRST_INDEX 1 +#define RES_LAST_INDEX 44 Property changes on: trunk/rosapps/notevil/resource.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

18 years, 10 months

[martinf] 101: rosapps/packmgr: add svn:history and make *.rbuild complete

by martinf＠svn.reactos.org

rosapps/packmgr: add svn:history and make *.rbuild complete Modified: trunk/rosapps/packmgr/cmd-line/rosget.rbuild Modified: trunk/rosapps/packmgr/directory.rbuild Modified: trunk/rosapps/packmgr/gui/packmgr.rbuild Modified: trunk/rosapps/packmgr/lib/package.rbuild Property changes on: trunk/rosapps/packmgr ___________________________________________________________________ Name: svn:history + ------------------------------------------------------------------------ r20963 | mbosma | 2006-01-21 18:37:04 +0100 (Sa, 21 Jan 2006) | 3 lines fix icon loading replace help icon with tango one use dot.ico from explorer as default icon ------------------------------------------------------------------------ r20543 | mbosma | 2006-01-03 12:49:59 +0100 (Di, 03 Jan 2006) | 2 lines fix typos. ------------------------------------------------------------------------ r20542 | mbosma | 2006-01-03 01:24:37 +0100 (Di, 03 Jan 2006) | 1 line fix spelling mistake. ------------------------------------------------------------------------ r20541 | mbosma | 2006-01-03 01:17:31 +0100 (Di, 03 Jan 2006) | 1 line Change URL to svn.reactos.org ------------------------------------------------------------------------ r20540 | mbosma | 2006-01-03 01:12:35 +0100 (Di, 03 Jan 2006) | 1 line Add some Apps and change tree version to the bare one. ------------------------------------------------------------------------ r20484 | mbosma | 2005-12-31 16:13:01 +0100 (Sa, 31 Dez 2005) | 1 line Add a tree file without subcategories. ------------------------------------------------------------------------ r19630 | weiden | 2005-11-26 12:26:01 +0100 (Sa, 26 Nov 2005) | 1 line allow warnings so it builds with g++ 4.0 ------------------------------------------------------------------------ r19627 | sgasiorek | 2005-11-26 11:40:21 +0100 (Sa, 26 Nov 2005) | 1 line removed not needed typecasts. thanks Thomas ------------------------------------------------------------------------ r19624 | sgasiorek | 2005-11-26 11:20:35 +0100 (Sa, 26 Nov 2005) | 1 line fixed reference to PML_TransError ------------------------------------------------------------------------ r19570 | sgasiorek | 2005-11-25 22:25:42 +0100 (Fr, 25 Nov 2005) | 3 lines - changed name of package library to package.dll - fixed PML_TransError function (possibly fixes bug 730) ------------------------------------------------------------------------ r18720 | gvg | 2005-10-23 20:54:23 +0200 (So, 23 Okt 2005) | 2 lines SVN maintenance ------------------------------------------------------------------------ r17726 | amunger | 2005-09-07 21:09:56 +0200 (Mi, 07 Sep 2005) | 2 lines Fix include so packlib builds after latest wine sync. ------------------------------------------------------------------------ r17143 | mf | 2005-08-07 09:33:14 +0200 (So, 07 Aug 2005) | 1 line update SVN properties ------------------------------------------------------------------------ r16719 | mf | 2005-07-24 23:44:45 +0200 (So, 24 Jul 2005) | 1 line set eol-style for XML files in rosapps ------------------------------------------------------------------------ r16606 | mf | 2005-07-17 12:39:01 +0200 (So, 17 Jul 2005) | 1 line ignore logfile ------------------------------------------------------------------------ r16593 | mbosma | 2005-07-16 12:23:10 +0200 (Sa, 16 Jul 2005) | 1 line HUMA2000: Spanish translation ------------------------------------------------------------------------ r15921 | mbosma | 2005-06-15 19:37:14 +0200 (Mi, 15 Jun 2005) | 1 line remove old makefile ------------------------------------------------------------------------ r15920 | mbosma | 2005-06-15 19:19:52 +0200 (Mi, 15 Jun 2005) | 1 line Created XML makefiles for rosapps. You need to checkout /rosapps in your /reactos folder to use it. This projects do not build: /lib/dflat32 and /welcome (I don't know if they did before). Winemine does not work. (but it builds) /test makefiles are not done yet. ------------------------------------------------------------------------ r15882 | mbosma | 2005-06-13 15:21:34 +0200 (Mo, 13 Jun 2005) | 1 line XML Makefiles ------------------------------------------------------------------------ r15501 | mbosma | 2005-05-26 12:01:14 +0200 (Do, 26 Mai 2005) | 1 line PackageManager ------------------------------------------------------------------------ r15336 | mbosma | 2005-05-16 13:14:04 +0200 (Mo, 16 Mai 2005) | 1 line PackageManager ------------------------------------------------------------------------ r15333 | mbosma | 2005-05-16 13:04:21 +0200 (Mo, 16 Mai 2005) | 1 line PackageManger: Globle Makefile ------------------------------------------------------------------------ r15332 | mbosma | 2005-05-16 12:53:46 +0200 (Mo, 16 Mai 2005) | 1 line PackageManager: German Translation and CreateOptions() ------------------------------------------------------------------------ r15219 | weiden | 2005-05-11 19:00:13 +0200 (Mi, 11 Mai 2005) | 1 line SVN maintainance ------------------------------------------------------------------------ r15218 | weiden | 2005-05-11 18:50:39 +0200 (Mi, 11 Mai 2005) | 1 line fixed warnings ------------------------------------------------------------------------ r15203 | mbosma | 2005-05-10 15:03:40 +0200 (Di, 10 Mai 2005) | 1 line Set language to czech not to english in cz.rc ------------------------------------------------------------------------ r14865 | navaraf | 2005-04-30 07:08:13 +0200 (Sa, 30 Apr 2005) | 2 lines Denzil <d3nzil(a)gmail.com> Czech translation of Package Manager (with minor corrections by myself). ------------------------------------------------------------------------ r14791 | mbosma | 2005-04-24 12:37:17 +0200 (So, 24 Apr 2005) | 1 line PackageManager: HTML Log ------------------------------------------------------------------------ r14734 | mbosma | 2005-04-21 18:28:44 +0200 (Do, 21 Apr 2005) | 1 line PackageManager: Uploaded forgotten File ------------------------------------------------------------------------ r14719 | mbosma | 2005-04-20 21:33:48 +0200 (Mi, 20 Apr 2005) | 1 line PackageManager: Corrected default setting ------------------------------------------------------------------------ r14718 | mbosma | 2005-04-20 21:01:30 +0200 (Mi, 20 Apr 2005) | 1 line PackageManager: Options.xml ------------------------------------------------------------------------ r14712 | mbosma | 2005-04-20 14:52:36 +0200 (Mi, 20 Apr 2005) | 1 line PackageManager: Changed download Server back to http://svn.reactos.com ------------------------------------------------------------------------ r14680 | mbosma | 2005-04-18 21:56:45 +0200 (Mo, 18 Apr 2005) | 1 line PackageManager: Changed Makefiles ------------------------------------------------------------------------ r14679 | mbosma | 2005-04-18 21:41:15 +0200 (Mo, 18 Apr 2005) | 1 line PackageManager: TARGET_INSTALLDIR = bin ------------------------------------------------------------------------ r14677 | mbosma | 2005-04-18 21:22:50 +0200 (Mo, 18 Apr 2005) | 1 line PackageManager: added missing package.h ------------------------------------------------------------------------ r14637 | mbosma | 2005-04-16 19:09:12 +0200 (Sa, 16 Apr 2005) | 1 line PackageManager: Ported GUI to C ------------------------------------------------------------------------ r14634 | mbosma | 2005-04-16 13:48:26 +0200 (Sa, 16 Apr 2005) | 1 line PackageManager: Little fix ------------------------------------------------------------------------ r14633 | mbosma | 2005-04-16 13:42:44 +0200 (Sa, 16 Apr 2005) | 1 line PackageManager: Changed download server to my own webspace. Because http://svn.reactos.com is still offline. ------------------------------------------------------------------------ r14632 | mbosma | 2005-04-16 13:11:52 +0200 (Sa, 16 Apr 2005) | 1 line PackageManager: Converted cmdline interface to C ------------------------------------------------------------------------ r14592 | mbosma | 2005-04-11 22:27:20 +0200 (Mo, 11 Apr 2005) | 1 line Package Manager: fixed HotKeys (thanks to w3seek) *shamed* ------------------------------------------------------------------------ r14590 | mbosma | 2005-04-11 19:59:52 +0200 (Mo, 11 Apr 2005) | 1 line PackageManager: Bug fix ------------------------------------------------------------------------ r14580 | mbosma | 2005-04-10 19:03:40 +0200 (So, 10 Apr 2005) | 1 line PackageManager: Cmdline fix ------------------------------------------------------------------------ r14576 | mbosma | 2005-04-10 17:34:15 +0200 (So, 10 Apr 2005) | 1 line PackageManager: Depencies ------------------------------------------------------------------------ r14562 | mbosma | 2005-04-09 15:48:31 +0200 (Sa, 09 Apr 2005) | 1 line ------------------------------------------------------------------------ r14556 | frik85 | 2005-04-08 21:31:08 +0200 (Fr, 08 Apr 2005) | 1 line update makefile (add ros-get) ------------------------------------------------------------------------ r14553 | mbosma | 2005-04-08 21:09:20 +0200 (Fr, 08 Apr 2005) | 3 lines PackageManager Created the commandline Interface Deleated subcategries ------------------------------------------------------------------------ r14481 | frik85 | 2005-04-03 21:06:49 +0200 (So, 03 Apr 2005) | 7 lines ReactOS Package Manager More information: http://reactos.com/wiki/index.php/ReactOS_Package_Manager * Maarten Bosma (Dr. Fred) * Klemens Friedl (frik85) _____ Modified: trunk/rosapps/packmgr/cmd-line/rosget.rbuild --- trunk/rosapps/packmgr/cmd-line/rosget.rbuild 2006-02-07 17:56:22 UTC (rev 100) +++ trunk/rosapps/packmgr/cmd-line/rosget.rbuild 2006-02-07 20:39:48 UTC (rev 101) @@ -1,4 +1,6 @@ -<module name="rosget" type="win32cui" installbase="system32" installname="rosget.exe"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="rosget" type="win32cui" installbase="system32" installname="rosget.exe"> <include base="package">.</include> <define name="__USE_W32API" /> <define name="UNICODE" /> @@ -9,4 +11,5 @@ <library>package</library> <file>main.c</file> <file>ros-get.rc</file> -</module> + </module> +</rbuild> _____ Modified: trunk/rosapps/packmgr/directory.rbuild --- trunk/rosapps/packmgr/directory.rbuild 2006-02-07 17:56:22 UTC (rev 100) +++ trunk/rosapps/packmgr/directory.rbuild 2006-02-07 20:39:48 UTC (rev 101) @@ -1,9 +1,12 @@ -<directory name="cmd-line"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <directory name="cmd-line"> <xi:include href="cmd-line/rosget.rbuild" /> -</directory> -<directory name="gui"> + </directory> + <directory name="gui"> <xi:include href="gui/packmgr.rbuild" /> -</directory> -<directory name="lib"> + </directory> + <directory name="lib"> <xi:include href="lib/package.rbuild" /> -</directory> \ No newline at end of file + </directory> +</rbuild> _____ Modified: trunk/rosapps/packmgr/gui/packmgr.rbuild --- trunk/rosapps/packmgr/gui/packmgr.rbuild 2006-02-07 17:56:22 UTC (rev 100) +++ trunk/rosapps/packmgr/gui/packmgr.rbuild 2006-02-07 20:39:48 UTC (rev 101) @@ -1,4 +1,6 @@ -<module name="packmgr" type="win32gui" installbase="system32" installname="packmgr.exe"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="packmgr" type="win32gui" installbase="system32" installname="packmgr.exe"> <include base="package">.</include> <include base="packmgr">.</include> <define name="__USE_W32API" /> @@ -13,4 +15,5 @@ <file>main.c</file> <file>packmgr.rc</file> -</module> + </module> +</rbuild> _____ Modified: trunk/rosapps/packmgr/lib/package.rbuild --- trunk/rosapps/packmgr/lib/package.rbuild 2006-02-07 17:56:22 UTC (rev 100) +++ trunk/rosapps/packmgr/lib/package.rbuild 2006-02-07 20:39:48 UTC (rev 101) @@ -1,4 +1,6 @@ -<module name="package" type="win32dll" installbase="system32" installname="package.dll" allowwarnings="true"> +<?xml version="1.0"?> +<rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="package" type="win32dll" installbase="system32" installname="package.dll" allowwarnings="true"> <importlibrary definition="package.def" /> <include base="package">.</include> @@ -22,4 +24,5 @@ <file>script.cpp</file> <file>tree.cpp</file> <file>package.rc</file> -</module> + </module> +</rbuild>

18 years, 10 months

[jimtabor] 100: Fix license header info.

by jimtabor＠svn.reactos.org

Fix license header info. Modified: trunk/reactos/drivers/sound/multimedia/portcls/portcls.c _____ Modified: trunk/reactos/drivers/sound/multimedia/portcls/portcls.c --- trunk/reactos/drivers/sound/multimedia/portcls/portcls.c 2006-02-07 06:43:37 UTC (rev 99) +++ trunk/reactos/drivers/sound/multimedia/portcls/portcls.c 2006-02-07 17:56:22 UTC (rev 100) @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Sound System * LICENSE: GPL - See COPYING in the top level directory - * FILE: drivers/multimedia/portcls/portcls.c + * FILE: drivers/sound/multimedia/portcls/portcls.c * PURPOSE: Audio Port Class Functions * PROGRAMMERS: *

18 years, 10 months

[jimtabor] 99: Add portcls to new branch.

by jimtabor＠svn.reactos.org

Add portcls to new branch. Added: trunk/reactos/drivers/sound/multimedia/ Added: trunk/reactos/drivers/sound/multimedia/portcls/ Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.c Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.def Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.h Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.rc _____ Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.c --- trunk/reactos/drivers/sound/multimedia/portcls/portcls.c 2006-02-06 20:32:56 UTC (rev 98) +++ trunk/reactos/drivers/sound/multimedia/portcls/portcls.c 2006-02-07 06:43:37 UTC (rev 99) @@ -0,0 +1,489 @@ +/* + * PROJECT: ReactOS Sound System + * LICENSE: GPL - See COPYING in the top level directory + * FILE: drivers/multimedia/portcls/portcls.c + * PURPOSE: Audio Port Class Functions + * PROGRAMMERS: + * + */ + +#include "portcls.h" + + +#define NDEBUG +#include <debug.h> + + +NTSTATUS STDCALL +DriverEntry(PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath) +{ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +ULONG STDCALL +DllInitialize(ULONG Unknown) +{ + return 0; +} + +/* + * @implemented + */ +ULONG STDCALL +DllUnload(VOID) +{ + return 0; +} + + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcAddAdapterDevice( + ULONG DriverObject, + ULONG PhysicalDeviceObject, + ULONG StartDevice, + ULONG MaxObjects, + ULONG DeviceExtensionSize +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcAddContentHandlers( + ULONG ContentId, + ULONG paHandlers, + ULONG NumHandlers +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCompleteIrp( + ULONG DeviceObject, + ULONG Irp, + ULONG Status +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCompletePendingPropertyRequest( + ULONG PropertyRequest, + ULONG NtStatus +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcCreateContentMixed( + ULONG paContentId, + ULONG cContentId, + ULONG pMixedContentId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcDestroyContent( + ULONG ContentId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcDispatchIrp( + ULONG DeviceObject, + ULONG Irp +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToDeviceObject( + ULONG ContentId, + ULONG Reserved, + ULONG DrmForward +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToFileObject( + ULONG ContentId, + ULONG FileObject +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardContentToInterface( + ULONG ContentId, + ULONG Unknown, + ULONG NumMethods +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcForwardIrpSynchronous( + ULONG DeviceObject, + ULONG Irp +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcGetContentRights( + ULONG ContentId, + ULONG DrmRights +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcGetDeviceProperty( + ULONG DeviceObject, + ULONG DeviceProperty, + ULONG BufferLength, + ULONG PropertyBuffer, + ULONG ResultLength +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +ULONGLONG STDCALL +PcGetTimeInterval( + ULONGLONG Timei +) +{ + LARGE_INTEGER CurrentTime; + + KeQuerySystemTime( &CurrentTime); + + return (Timei - CurrentTime.QuadPart); +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcInitializeAdapterDriver( + ULONG DriverObject, + ULONG RegistryPathName, + ULONG AddDevice +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewDmaChannel( + ULONG OutDmaChannel, + ULONG Unknown, + ULONG PoolType, + ULONG DeviceDescription, + ULONG DeviceObject +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewInterruptSync( + ULONG OutInterruptSync, + ULONG Unknown, + ULONG ResourceList, + ULONG ResourceIndex, + ULONG Mode +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewMiniport( + ULONG OutMiniport, + ULONG ClassId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewPort( + ULONG OutPort, + ULONG ClassId +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewRegistryKey( + ULONG OutRegistryKey, + ULONG Unknown, + ULONG RegistryKeyType, + ULONG DesiredAccess, + ULONG DeviceObject, + ULONG SubDevice, + ULONG ObjectAttributes, + ULONG CreateOptions, + ULONG Disposition +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewResourceList( + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG TranslatedResources, + ULONG UntranslatedResources +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewResourceSublist( + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG ParentList, + ULONG MaximumEntries +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcNewServiceGroup( + ULONG OutServiceGroup, + ULONG Unknown +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterAdapterPowerManagement( + ULONG Unknown, + ULONG pvContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterIoTimeout( + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnection( + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnectionFromExternal( + ULONG DeviceObject, + ULONG FromString, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterPhysicalConnectionToExternal( + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToString, + ULONG ToPin +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRegisterSubdevice( + ULONG DeviceObject, + ULONG SubdevName, + ULONG Unknown +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcRequestNewPowerState( + ULONG pDeviceObject, + ULONG RequestedNewState +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + +/* + * @unimplemented + */ +NTSTATUS STDCALL +PcUnregisterIoTimeout( + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext +) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} + Property changes on: trunk/reactos/drivers/sound/multimedia/portcls/portcls.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.def --- trunk/reactos/drivers/sound/multimedia/portcls/portcls.def 2006-02-06 20:32:56 UTC (rev 98) +++ trunk/reactos/drivers/sound/multimedia/portcls/portcls.def 2006-02-07 06:43:37 UTC (rev 99) @@ -0,0 +1,36 @@ +; +; Exports definition file for portcls.sys +; +EXPORTS +PcAddAdapterDevice@20 +PcAddContentHandlers@12 +PcCompleteIrp@12 +PcCompletePendingPropertyRequest@8 +PcCreateContentMixed@12 +PcDestroyContent@4 +PcDispatchIrp@8 +PcForwardContentToDeviceObject@12 +PcForwardContentToFileObject@8 +PcForwardContentToInterface@12 +PcForwardIrpSynchronous@8 +PcGetContentRights@8 +PcGetDeviceProperty@20 +PcGetTimeInterval@8 +PcInitializeAdapterDriver@12 +PcNewDmaChannel@20 +PcNewInterruptSync@20 +PcNewMiniport@8 +PcNewPort@8 +PcNewRegistryKey@36 +PcNewResourceList@20 +PcNewResourceSublist@20 +PcNewServiceGroup@8 +PcRegisterAdapterPowerManagement@8 +PcRegisterIoTimeout@12 +PcRegisterPhysicalConnection@20 +PcRegisterPhysicalConnectionFromExternal@20 +PcRegisterPhysicalConnectionToExternal@20 +PcRegisterSubdevice@12 +PcRequestNewPowerState@8 +PcUnregisterIoTimeout@12 + Property changes on: trunk/reactos/drivers/sound/multimedia/portcls/portcls.def ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.h --- trunk/reactos/drivers/sound/multimedia/portcls/portcls.h 2006-02-06 20:32:56 UTC (rev 98) +++ trunk/reactos/drivers/sound/multimedia/portcls/portcls.h 2006-02-07 06:43:37 UTC (rev 99) @@ -0,0 +1,253 @@ +/* + + Move to w32api when it is ready. + + */ +#ifndef _PORTCLS_H +#define _PORTCLS_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* This header is total bull**** */ + +#include <ntddk.h> + +#define PORTCLASSAPI extern + +PORTCLASSAPI NTSTATUS STDCALL +PcAddAdapterDevice( + ULONG DriverObject, + ULONG PhysicalDeviceObject, + ULONG StartDevice, + ULONG MaxObjects, + ULONG DeviceExtensionSize +); + +PORTCLASSAPI NTSTATUS STDCALL +PcAddContentHandlers( + ULONG ContentId, + ULONG paHandlers, + ULONG NumHandlers +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCompleteIrp( + ULONG DeviceObject, + ULONG Irp, + ULONG Status +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCompletePendingPropertyRequest( + ULONG PropertyRequest, + ULONG NtStatus +); + +PORTCLASSAPI NTSTATUS STDCALL +PcCreateContentMixed( + ULONG paContentId, + ULONG cContentId, + ULONG pMixedContentId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcDestroyContent( + ULONG ContentId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcDispatchIrp( + ULONG DeviceObject, + ULONG Irp +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToDeviceObject( + ULONG ContentId, + ULONG Reserved, + ULONG DrmForward +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToFileObject( + ULONG ContentId, + ULONG FileObject +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardContentToInterface( + ULONG ContentId, + ULONG Unknown, + ULONG NumMethods +); + +PORTCLASSAPI NTSTATUS STDCALL +PcForwardIrpSynchronous( + ULONG DeviceObject, + ULONG Irp +); + +PORTCLASSAPI NTSTATUS STDCALL +PcGetContentRights( + ULONG ContentId, + ULONG DrmRights +); + +PORTCLASSAPI NTSTATUS STDCALL +PcGetDeviceProperty( + ULONG DeviceObject, + ULONG DeviceProperty, + ULONG BufferLength, + ULONG PropertyBuffer, + ULONG ResultLength +); + +PORTCLASSAPI ULONGLONG STDCALL +PcGetTimeInterval( + ULONGLONG Timei +); + +PORTCLASSAPI NTSTATUS STDCALL +PcInitializeAdapterDriver( + ULONG DriverObject, + ULONG RegistryPathName, + ULONG AddDevice +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewDmaChannel( + ULONG OutDmaChannel, + ULONG Unknown, + ULONG PoolType, + ULONG DeviceDescription, + ULONG DeviceObject +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewInterruptSync( + ULONG OutInterruptSync, + ULONG Unknown, + ULONG ResourceList, + ULONG ResourceIndex, + ULONG Mode +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewMiniport( + ULONG OutMiniport, + ULONG ClassId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewPort( + ULONG OutPort, + ULONG ClassId +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewRegistryKey( + ULONG OutRegistryKey, + ULONG Unknown, + ULONG RegistryKeyType, + ULONG DesiredAccess, + ULONG DeviceObject, + ULONG SubDevice, + ULONG ObjectAttributes, + ULONG CreateOptions, + ULONG Disposition +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewResourceList( + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG TranslatedResources, + ULONG UntranslatedResources +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewResourceSublist( + ULONG OutResourceList, + ULONG Unknown, + ULONG PoolType, + ULONG ParentList, + ULONG MaximumEntries +); + +PORTCLASSAPI NTSTATUS STDCALL +PcNewServiceGroup( + ULONG OutServiceGroup, + ULONG Unknown +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterAdapterPowerManagement( + ULONG Unknown, + ULONG pvContext +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterIoTimeout( + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnection( + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnectionFromExternal( + ULONG DeviceObject, + ULONG FromString, + ULONG FromPin, + ULONG ToUnknown, + ULONG ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterPhysicalConnectionToExternal( + ULONG DeviceObject, + ULONG FromUnknown, + ULONG FromPin, + ULONG ToString, + ULONG ToPin +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRegisterSubdevice( + ULONG DeviceObject, + ULONG SubdevName, + ULONG Unknown +); + +PORTCLASSAPI NTSTATUS STDCALL +PcRequestNewPowerState( + ULONG pDeviceObject, + ULONG RequestedNewState +); + +PORTCLASSAPI NTSTATUS STDCALL +PcUnregisterIoTimeout( + ULONG pDeviceObject, + ULONG pTimerRoutine, + ULONG pContext +); + +#ifdef __cplusplus +} +#endif + +#endif Property changes on: trunk/reactos/drivers/sound/multimedia/portcls/portcls.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/drivers/sound/multimedia/portcls/portcls.rc --- trunk/reactos/drivers/sound/multimedia/portcls/portcls.rc 2006-02-06 20:32:56 UTC (rev 98) +++ trunk/reactos/drivers/sound/multimedia/portcls/portcls.rc 2006-02-07 06:43:37 UTC (rev 99) @@ -0,0 +1,5 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "PORTCLS Port Class Driver API\0" +#define REACTOS_STR_INTERNAL_NAME "portcls\0" +#define REACTOS_STR_ORIGINAL_FILENAME "portcls.sys\0" +#include <reactos/version.rc> Property changes on: trunk/reactos/drivers/sound/multimedia/portcls/portcls.rc ___________________________________________________________________ Name: svn:eol-style + native

18 years, 10 months

[gedmurphy] 98: - fix some buffer checks

by gedmurphy＠svn.reactos.org

- fix some buffer checks - remove item from listview when deleted Modified: trunk/reactos/base/applications/servman/En.rc Modified: trunk/reactos/base/applications/servman/about.c Modified: trunk/reactos/base/applications/servman/create.c Modified: trunk/reactos/base/applications/servman/delete.c Modified: trunk/reactos/base/applications/servman/geterror.c Modified: trunk/reactos/base/applications/servman/query.c Modified: trunk/reactos/base/applications/servman/resource.h Modified: trunk/reactos/base/applications/servman/servman.c _____ Modified: trunk/reactos/base/applications/servman/En.rc --- trunk/reactos/base/applications/servman/En.rc 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/En.rc 2006-02-06 20:32:56 UTC (rev 98) @@ -64,7 +64,7 @@ FONT 8,"Tahoma",0,0 STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Service Manager v0.3\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Service Manager v0.5\nCopyright (C) 2005-2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_SM_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -131,10 +131,10 @@ IDD_DLG_DELETE DIALOGEX 6,6,185,148 CAPTION "Delete a service" FONT 8,"Tahoma",0,0 -STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +STYLE WS_BORDER | WS_DLGFRAME | DS_MODALFRAME BEGIN - ICON IDI_WARNING, IDC_STATIC, 4, 5, 24, 22 - LTEXT "Are you sure you want to delete the following service? This cannot be undone once removed!", IDC_STATIC, 32, 9, 152, 17 + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "Are you sure you want to delete the following service? This cannot be undone once removed!", IDC_STATIC, 50, 6, 125, 25 LTEXT "Service Name:",IDC_STATIC, 6, 40, 80, 9 LTEXT "", IDC_DEL_NAME, 15, 53, 160, 15 EDITTEXT IDC_DEL_DESC, 6, 73, 174, 48, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_EX_STATICEDGE | ES_MULTILINE | ES_READONLY @@ -209,6 +209,9 @@ BEGIN IDS_PROGRESS_INFO_START "ReactOS is attempting to start the following service" IDS_PROGRESS_INFO_STOP "ReactOS is attempting to stop the following service" + IDS_CREATE_SUCCESS "Service Created Succesfully" + IDS_CREATE_REQ "* = required fields" + IDS_DELETE_STOP "You must manually stop the service before deleting!" END STRINGTABLE DISCARDABLE _____ Modified: trunk/reactos/base/applications/servman/about.c --- trunk/reactos/base/applications/servman/about.c 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/about.c 2006-02-06 20:32:56 UTC (rev 98) @@ -32,7 +32,8 @@ hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); - LoadString(hInstance, IDS_LICENSE, strLicense, 700); + LoadString(hInstance, IDS_LICENSE, strLicense, + sizeof(strLicense) / sizeof(TCHAR)); SetWindowText(hLicenseEditWnd, strLicense); _____ Modified: trunk/reactos/base/applications/servman/create.c --- trunk/reactos/base/applications/servman/create.c 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/create.c 2006-02-06 20:32:56 UTC (rev 98) @@ -10,6 +10,7 @@ #include "servman.h" extern HINSTANCE hInstance; +BOOL bHelpOpen = FALSE; BOOL Create(LPTSTR ServiceName, @@ -20,6 +21,7 @@ { SC_HANDLE hSCManager; SC_HANDLE hSc; + TCHAR Buf[32]; /* open handle to the SCM */ hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); @@ -51,7 +53,9 @@ SetDescription(ServiceName, Description); - DisplayString(_T("Service Succesfully Created")); + LoadString(hInstance, IDS_CREATE_SUCCESS, Buf, + sizeof(Buf) / sizeof(TCHAR)); + DisplayString(Buf); CloseServiceHandle(hSCManager); CloseServiceHandle(hSc); return TRUE; @@ -76,7 +80,8 @@ hHelp = GetDlgItem(hDlg, IDC_CREATE_HELP); - LoadString(hInstance, IDS_HELP_OPTIONS, Buf, 1000); + LoadString(hInstance, IDS_HELP_OPTIONS, Buf, + sizeof(Buf) / sizeof(TCHAR)); SetWindowText(hHelp, Buf); @@ -86,14 +91,13 @@ if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) { DestroyIcon(hIcon); - EndDialog(hDlg, LOWORD(wParam)); + DestroyWindow(hDlg); return TRUE; } break; case WM_DESTROY: - DestroyWindow(hDlg); - PostQuitMessage(0); + bHelpOpen = FALSE; break; } @@ -124,6 +128,7 @@ LPTSTR Description = NULL; LPTSTR Options = NULL; HWND hwnd; + TCHAR Buf[32]; INT iLen = 0; /* get service name */ @@ -140,7 +145,9 @@ } else { - MessageBox(NULL, _T("Items with a star are required"), NULL, 0); + LoadString(hInstance, IDS_CREATE_REQ, Buf, + sizeof(Buf) / sizeof(TCHAR)); + DisplayString(Buf); SetFocus(hwnd); break; } @@ -158,7 +165,9 @@ } else { - MessageBox(NULL, _T("Items with a star are required"), NULL, 0); + LoadString(hInstance, IDS_CREATE_REQ, Buf, + sizeof(Buf) / sizeof(TCHAR)); + DisplayString(Buf); SetFocus(hwnd); break; } @@ -176,7 +185,9 @@ } else { - MessageBox(NULL, _T("Items with a star are required"), NULL, 0); + LoadString(hInstance, IDS_CREATE_REQ, Buf, + sizeof(Buf) / sizeof(TCHAR)); + DisplayString(Buf); SetFocus(hwnd); break; } @@ -233,13 +244,17 @@ { HWND hHelp; - hHelp = CreateDialog(hInstance, - MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS), - hDlg, - (DLGPROC)CreateHelpDialogProc); - if(hHelp != NULL) + if (! bHelpOpen) { - ShowWindow(hHelp, SW_SHOW); + hHelp = CreateDialog(hInstance, + MAKEINTRESOURCE(IDD_DLG_HELP_OPTIONS), + hDlg, + (DLGPROC)CreateHelpDialogProc); + if(hHelp != NULL) + { + ShowWindow(hHelp, SW_SHOW); + bHelpOpen = TRUE; + } } } break; _____ Modified: trunk/reactos/base/applications/servman/delete.c --- trunk/reactos/base/applications/servman/delete.c 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/delete.c 2006-02-06 20:32:56 UTC (rev 98) @@ -92,7 +92,9 @@ switch (LOWORD(wParam)) { case IDOK: - DoDeleteService(hDlg); + if (DoDeleteService(hDlg)) + ListView_DeleteItem(hListView, GetSelectedItem()); + DestroyIcon(hIcon); EndDialog(hDlg, LOWORD(wParam)); return TRUE; _____ Modified: trunk/reactos/base/applications/servman/geterror.c --- trunk/reactos/base/applications/servman/geterror.c 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/geterror.c 2006-02-06 20:32:56 UTC (rev 98) @@ -36,6 +36,6 @@ VOID DisplayString(PTCHAR Msg) { - MessageBox(NULL, Msg, _T("..."), MB_OK); + MessageBox(NULL, Msg, _T("Note!"), MB_OK); } _____ Modified: trunk/reactos/base/applications/servman/query.c --- trunk/reactos/base/applications/servman/query.c 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/query.c 2006-02-06 20:32:56 UTC (rev 98) @@ -51,7 +51,7 @@ TCHAR szBuf[MAX_PATH]; LONG val; - + /* open the registry key for the service */ _sntprintf(buf, sizeof(buf) / sizeof(TCHAR), Path, ServiceName); RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -96,7 +96,7 @@ 0, KEY_READ, &hKey); - + ret = RegQueryValueEx(hKey, _T("Description"), NULL, @@ -207,8 +207,36 @@ } +VOID InitListViewImage(VOID) +{ + HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ + HIMAGELIST hSmall, hLarge; /* image list for other views */ + /* Create the icon image lists */ + hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 1, 1); + + hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), ILC_MASK | ILC_COLOR32, 1, 1); + + /* Add an icon to each image list */ + hSmIconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, 16, 16, 0); + ImageList_AddIcon(hSmall, hSmIconItem); + + hLgIconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), + IMAGE_ICON, 32, 32, 0); + ImageList_AddIcon(hLarge, hLgIconItem); + + /* assign the image to the list view */ + ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); + ListView_SetImageList(hListView, hLarge, LVSIL_NORMAL); + +} + + + BOOL RefreshServiceList(VOID) { @@ -221,35 +249,15 @@ ListView_DeleteAllItems(hListView); + InitListViewImage(); + NumServices = GetServiceList(); if (NumServices) { - HICON hSmIconItem, hLgIconItem; /* icon for list-view items */ - HIMAGELIST hSmall, hLarge; /* image list for other views */ TCHAR buf[300]; /* buffer to hold key path */ INT NumListedServ = 0; /* how many services were listed */ - /* Create the icon image lists */ - hSmall = ImageList_Create(GetSystemMetrics(SM_CXSMICON), - GetSystemMetrics(SM_CYSMICON), ILC_MASK | ILC_COLOR32, 1, 1); - - hLarge = ImageList_Create(GetSystemMetrics(SM_CXICON), - GetSystemMetrics(SM_CYICON), ILC_MASK | ILC_COLOR32, 1, 1); - - /* Add an icon to each image list */ - hSmIconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, 16, 16, 0); - ImageList_AddIcon(hSmall, hSmIconItem); - - hLgIconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), - IMAGE_ICON, 32, 32, 0); - ImageList_AddIcon(hLarge, hLgIconItem); - - /* assign the image to the list view */ - ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); - ListView_SetImageList(hListView, hLarge, LVSIL_NORMAL); - for (Index = 0; Index < NumServices; Index++) { HKEY hKey = NULL; _____ Modified: trunk/reactos/base/applications/servman/resource.h --- trunk/reactos/base/applications/servman/resource.h 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/resource.h 2006-02-06 20:32:56 UTC (rev 98) @@ -107,6 +107,8 @@ #define IDD_DLG_HELP_OPTIONS 8020 #define IDC_CREATE_HELP 8021 #define IDS_HELP_OPTIONS 8022 +#define IDS_CREATE_SUCCESS 8023 +#define IDS_CREATE_REQ 8024 /* delete service dialog */ @@ -114,6 +116,7 @@ #define IDC_DEL_GROUP 9001 #define IDC_DEL_NAME 9002 #define IDC_DEL_DESC 9003 +#define IDS_DELETE_STOP 9010 /* progress bar */ _____ Modified: trunk/reactos/base/applications/servman/servman.c --- trunk/reactos/base/applications/servman/servman.c 2006-02-05 20:18:58 UTC (rev 97) +++ trunk/reactos/base/applications/servman/servman.c 2006-02-06 20:32:56 UTC (rev 98) @@ -122,6 +122,7 @@ } + LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) @@ -229,35 +230,40 @@ /* name */ lvc.iSubItem = 0; lvc.cx = 150; - LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, 256); + LoadString(hInstance, IDS_FIRSTCOLUMN, szTemp, + sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 0, &lvc); /* description */ lvc.iSubItem = 1; lvc.cx = 240; - LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, 256); + LoadString(hInstance, IDS_SECONDCOLUMN, szTemp, + sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 1, &lvc); /* status */ lvc.iSubItem = 2; lvc.cx = 55; - LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, 256); + LoadString(hInstance, IDS_THIRDCOLUMN, szTemp, + sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 2, &lvc); /* startup type */ lvc.iSubItem = 3; lvc.cx = 80; - LoadString(hInstance, IDS_FOURTHCOLUMN, szTemp, 256); + LoadString(hInstance, IDS_FOURTHCOLUMN, szTemp, + sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 3, &lvc); /* logon as */ lvc.iSubItem = 4; lvc.cx = 100; - LoadString(hInstance, IDS_FITHCOLUMN, szTemp, 256); + LoadString(hInstance, IDS_FITHCOLUMN, szTemp, + sizeof(szTemp) / sizeof(TCHAR)); lvc.pszText = szTemp; ListView_InsertColumn(hListView, 4, &lvc); @@ -341,6 +347,10 @@ OpenPropSheet(hwnd); break; + case LVN_COLUMNCLICK: + + break; + case LVN_ITEMCHANGED: { LPNMLISTVIEW pnmv = (LPNMLISTVIEW) lParam; @@ -506,8 +516,10 @@ } else { - MessageBox(NULL, _T("You must manually stop the service before deleting!\n"), - _T("Note!"), MB_OK | MB_ICONINFORMATION); + TCHAR Buf[60]; + LoadString(hInstance, IDS_DELETE_STOP, Buf, + sizeof(Buf) / sizeof(TCHAR)); + DisplayString(Buf); } SetFocus(hListView);

18 years, 10 months

[gedmurphy] 97: ensure required fields are filled.

by gedmurphy＠svn.reactos.org

ensure required fields are filled. Modified: trunk/reactos/base/applications/servman/En.rc Modified: trunk/reactos/base/applications/servman/create.c _____ Modified: trunk/reactos/base/applications/servman/En.rc --- trunk/reactos/base/applications/servman/En.rc 2006-02-05 20:09:42 UTC (rev 96) +++ trunk/reactos/base/applications/servman/En.rc 2006-02-05 20:18:58 UTC (rev 97) @@ -118,9 +118,9 @@ CONTROL "",IDC_CREATE_PATH,"Edit",0x50010000,8,62,214,13,0x00000200 CONTROL "",IDC_CREATE_DESC,"Edit",0x50010000,10,97,210,48,0x00000200 CONTROL "",IDC_CREATE_OPTIONS,"Edit",0x50010000,10,162,210,13,0x00000200 - CONTROL "Service Name :",IDC_STATIC,"Static",0x50000202,12,12,54,9 - CONTROL "Display Name :",IDC_STATIC,"Static",0x50000202,12,33,54,9 - CONTROL "Path to executable :",IDC_STATIC,"Static",0x50000000,10,51,68,9 + CONTROL "*Service Name :",IDC_STATIC,"Static",0x50000202,12,12,54,9 + CONTROL "*Display Name :",IDC_STATIC,"Static",0x50000202,12,33,54,9 + CONTROL "*Path to executable :",IDC_STATIC,"Static",0x50000000,10,51,68,9 CONTROL "Description :",IDC_STATIC,"Static",0x50000000,12,86,44,9 CONTROL "OK",IDOK,"Button",0x50010000,126,192,44,13 CONTROL "Cancel",IDCANCEL,"Button",0x50010000,176,192,46,13 _____ Modified: trunk/reactos/base/applications/servman/create.c --- trunk/reactos/base/applications/servman/create.c 2006-02-05 20:09:42 UTC (rev 96) +++ trunk/reactos/base/applications/servman/create.c 2006-02-05 20:18:58 UTC (rev 97) @@ -138,6 +138,12 @@ } } + else + { + MessageBox(NULL, _T("Items with a star are required"), NULL, 0); + SetFocus(hwnd); + break; + } /* get display name */ iLen = 0; @@ -150,6 +156,12 @@ GetWindowText(hwnd, DisplayName, iLen+1); } + else + { + MessageBox(NULL, _T("Items with a star are required"), NULL, 0); + SetFocus(hwnd); + break; + } /* get binary path */ iLen = 0; @@ -162,6 +174,12 @@ GetWindowText(hwnd, BinPath, iLen+1); } + else + { + MessageBox(NULL, _T("Items with a star are required"), NULL, 0); + SetFocus(hwnd); + break; + } /* get description */ iLen = 0;

18 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2006