Ros-diffs February 2006

ros-diffs@reactos.org

5 participants
47 discussions

[martinf] 105: rosapps: add zoomin to new repository

by martinf＠svn.reactos.org

rosapps: add zoomin to new repository Modified: trunk/rosapps/Doxyfile Modified: trunk/rosapps/copying Added: trunk/rosapps/devutils/directory.rbuild Added: trunk/rosapps/devutils/zoomin/ Added: trunk/rosapps/devutils/zoomin/framewnd.c Added: trunk/rosapps/devutils/zoomin/framewnd.h Added: trunk/rosapps/devutils/zoomin/main.c Added: trunk/rosapps/devutils/zoomin/main.h Added: trunk/rosapps/devutils/zoomin/resource.h Added: trunk/rosapps/devutils/zoomin/zoomin.ico Added: trunk/rosapps/devutils/zoomin/zoomin.rbuild Added: trunk/rosapps/devutils/zoomin/zoomin.rc Modified: trunk/rosapps/directory.rbuild Modified: trunk/rosapps/readme.txt _____ Modified: trunk/rosapps/Doxyfile --- trunk/rosapps/Doxyfile 2006-02-07 20:44:01 UTC (rev 104) +++ trunk/rosapps/Doxyfile 2006-02-07 20:56:41 UTC (rev 105) @@ -1,206 +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 +# 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 Property changes on: trunk/rosapps/Doxyfile ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/rosapps/copying --- trunk/rosapps/copying 2006-02-07 20:44:01 UTC (rev 104) +++ trunk/rosapps/copying 2006-02-07 20:56:41 UTC (rev 105) @@ -1,340 +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. + + 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 [truncated at 1000 lines; 908 more skipped]

18 years, 5 months

[martinf] 116: fix build with _ROS_ define

by martinf＠svn.reactos.org

fix build with _ROS_ define Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp _____ Modified: trunk/reactos/base/shell/explorer/shell/mainframe.cpp --- trunk/reactos/base/shell/explorer/shell/mainframe.cpp 2006-02-15 19:35:08 UTC (rev 115) +++ trunk/reactos/base/shell/explorer/shell/mainframe.cpp 2006-02-21 20:54:10 UTC (rev 116) @@ -298,7 +298,7 @@ case WM_DESTROY: break; - case WM_SIZE: + case WM_SIZE: { #ifdef _ROS_ ///@todo Work around to display rebar in ROS (with flickering) as long as the control isn't fixed int height = SendMessage(_hwndrebar, RB_GETBARHEIGHT, 0, 0); MoveWindow(_hwndrebar, 0, 0, LOWORD(lparam), height, TRUE); @@ -306,7 +306,7 @@ resize_frame(LOWORD(lparam), HIWORD(lparam)); SendMessage(_hwndrebar, WM_SIZE, 0, 0); #endif - break; // do not pass message to DefFrameProc + break;} // do not pass message to DefFrameProc case WM_GETMINMAXINFO: { LPMINMAXINFO lpmmi = (LPMINMAXINFO)lparam;

18 years, 6 months

[martinf] 115: explorer: beginnings of bengali translation (not yet integrated into the compile process)

by martinf＠svn.reactos.org

explorer: beginnings of bengali translation (not yet integrated into the compile process) Added: trunk/reactos/base/shell/explorer/explorer-bn.rc _____ Added: trunk/reactos/base/shell/explorer/explorer-bn.rc --- trunk/reactos/base/shell/explorer/explorer-bn.rc 2006-02-15 17:58:49 UTC (rev 114) +++ trunk/reactos/base/shell/explorer/explorer-bn.rc 2006-02-15 19:35:08 UTC (rev 115) @@ -0,0 +1,396 @@ +//Microsoft Developer Studio generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include <windows.h> + +/////////////////////////////////////////////////////////////////////// ////// +#undef APSTUDIO_READONLY_SYMBOLS + +/////////////////////////////////////////////////////////////////////// ////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +/////////////////////////////////////////////////////////////////////// ////// +// +// Menu +// + +IDM_MDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&File" + BEGIN + MENUITEM "&Execute...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_FILE_EXIT + END + POPUP "&View" + BEGIN + MENUITEM "&Toolbar", ID_VIEW_TOOL_BAR + MENUITEM "&Extra Bar", ID_VIEW_EXTRA_BAR + MENUITEM "&Drivebar", ID_VIEW_DRIVE_BAR, CHECKED + MENUITEM "S&ide Bar", ID_VIEW_SIDE_BAR + MENUITEM "&Status Bar", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&Refresh\tF5", ID_REFRESH + MENUITEM "F&ull Screen\tCtrl+Shift+S", ID_VIEW_FULLSCREEN + MENUITEM "SDI", ID_VIEW_SDI + END + POPUP "&Window" + BEGIN + MENUITEM "New &Window", ID_WINDOW_NEW + MENUITEM "Cascading\tShift+F5", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically\tShift+F4", ID_WINDOW_TILE_VERT + MENUITEM "Arrange Automatically", ID_WINDOW_AUTOSORT + MENUITEM "Arrange &Symbols", ID_WINDOW_ARRANGE + END + POPUP "&Tools" + BEGIN + MENUITEM "&Options", ID_TOOLS_OPTIONS + END + POPUP "&Help" + BEGIN + MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + MENUITEM "About &OS...", ID_ABOUT_WINDOWS + END +END + +IDM_DESKTOPBAR MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Settings...", ID_DESKTOPBAR_SETTINGS + MENUITEM "&Task Manager...", ID_TASKMGR + MENUITEM SEPARATOR + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_VOLUME MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "Open Volume Control", ID_TRAY_VOLUME + MENUITEM "Adjust Audio Properties", ID_VOLUME_PROPERTIES + END +END + +IDM_NOTIFYAREA MENU DISCARDABLE +BEGIN + POPUP "" + BEGIN + MENUITEM "&Show hidden icons", ID_SHOW_HIDDEN_ICONS + MENUITEM "Show Icon &Button", ID_SHOW_ICON_BUTTON + MENUITEM "&Configure Notifications...", ID_CONFIG_NOTIFYAREA + MENUITEM "Adjust Date/&Time...", ID_CONFIG_TIME + MENUITEM SEPARATOR + MENUITEM "&About Explorer...", ID_ABOUT_EXPLORER + END +END + +IDM_SDIFRAME MENU DISCARDABLE +BEGIN + POPUP "&evÀ" + BEGIN + MENUITEM "&cwiPvjbv...", ID_EXECUTE + MENUITEM SEPARATOR + MENUITEM "&e? Kiv", ID_FILE_EXIT + END + POPUP "&cÍ`k®b" + BEGIN + MENUITEM "&mnvqK evÀ", ID_VIEW_TOOL_BAR + MENUITEM "cvkª® evÀ", ID_VIEW_SIDE_BAR, GRAYED + MENUITEM "&Ae»Æv wbç`®kK evÀ", ID_VIEW_STATUSBAR + MENUITEM SEPARATOR + MENUITEM "&cyY:mçZR Kiv", ID_REFRESH + MENUITEM "mñ·~Y® c`®vq", ID_VIEW_FULLSCREEN + MENUITEM "&e¹gyLx Kg®çÂ?", ID_VIEW_MDI + END + POPUP "&mnvqK" + BEGIN + MENUITEM "&wba®vib", ID_TOOLS_OPTIONS + END + POPUP "&mvnvh¿" + BEGIN + MENUITEM "&we»ùviK mñ·®çK...", ID_ABOUT_EXPLORER + END +END + + +/////////////////////////////////////////////////////////////////////// ////// +// +// Dialog +// + +IDD_EXECUTE DIALOG DISCARDABLE 15, 13, 210, 63 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Execute" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",101,"Static",SS_SIMPLE | SS_NOPREFIX,3,6,150,10 + CONTROL "&Command:",-1,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,3, + 18,60,10 + EDITTEXT 201,3,29,134,12,ES_AUTOHSCROLL + CONTROL "As &Symbol",214,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,3, + 45,71,12 + DEFPUSHBUTTON "&OK",1,158,6,47,14 + PUSHBUTTON "&Cancel",2,158,23,47,14 + PUSHBUTTON "&Help",254,158,43,47,14 +END + +IDD_SEARCH_PROGRAM DIALOGEX 0, 0, 200, 65 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Search Program in Startmenu" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + LTEXT "&Filter:",IDC_STATIC,7,9,18,8 + EDITTEXT IDC_FILTER,34,7,100,14,ES_AUTOHSCROLL + CONTROL "List1",IDC_PROGRAMS_FOUND,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | + WS_TABSTOP,7,25,186,33 + PUSHBUTTON "&Check Entries",IDC_CHECK_ENTRIES,143,7,50,14 +END + +IDD_DESKBAR_DESKTOP DIALOG DISCARDABLE 0, 0, 212, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Desktop Properties" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Please select your prefered icon alignment algorithm:", + IDC_STATIC,7,7,166,8 + CONTROL "left/top dwn",IDC_ICON_ALIGN_0,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,25,46,44 + CONTROL "left/top right",IDC_ICON_ALIGN_1,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,25,46,44 + CONTROL "right/top left",IDC_ICON_ALIGN_2,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,25,46,44 + CONTROL "rig./top dwn",IDC_ICON_ALIGN_3,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,25,46,44 + CONTROL "left/bot. up",IDC_ICON_ALIGN_4,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,73,46,44 + CONTROL "left/bot. right",IDC_ICON_ALIGN_5,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,73,46,44 + CONTROL "right/bot. left",IDC_ICON_ALIGN_6,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,73,46,44 + CONTROL "rig./bot. dwn",IDC_ICON_ALIGN_7,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,159,73,46,44 + CONTROL "border down",IDC_ICON_ALIGN_8,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,7,121,46,44 + CONTROL "border H/V",IDC_ICON_ALIGN_9,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,57,121,46,44 + CONTROL "round about",IDC_ICON_ALIGN_10,"Button",BS_OWNERDRAW | + BS_BOTTOM | WS_TABSTOP,110,121,46,44 + CONTROL "",IDC_ICON_ALIGN_11,"Button",BS_OWNERDRAW | BS_BOTTOM | + WS_TABSTOP,159,121,46,44 + CONTROL "Display &Version Number",ID_DESKTOP_VERSION,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,177,91,10 +END + +IDD_DESKBAR_TASKBAR DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Taskbar Properties" +FONT 8, "MS Sans Serif" +BEGIN + CONTROL "show &clock",ID_SHOW_CLOCK,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,152,52,10 + CONTROL "&hide inactive notification icons", + ID_HIDE_INACTIVE_ICONS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,174,111,10 + PUSHBUTTON "&Notifications...",ID_CONFIG_NOTIFYAREA,153,173,50,14 +END + +IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 194 +STYLE WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Startmenu Properties" +FONT 8, "MS Sans Serif" +BEGIN +END + +IDD_NOTIFYAREA DIALOGEX 0, 0, 208, 174 +STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | + WS_SYSMENU | WS_THICKFRAME +EXSTYLE WS_EX_APPWINDOW +CAPTION "Configure Notification Icons" +FONT 8, "MS Sans Serif", 0, 0, 0x1 +BEGIN + CONTROL "Tree1",IDC_NOTIFY_ICONS,"SysTreeView32",TVS_HASLINES | + TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,194,31 + LTEXT "&Tooltip Text:",IDC_LABEL1,7,44,40,8 + EDITTEXT IDC_NOTIFY_TOOLTIP,58,42,143,14,ES_AUTOHSCROLL + LTEXT "W&indow Title:",IDC_LABEL2,7,63,44,8 + EDITTEXT IDC_NOTIFY_TITLE,58,60,143,14,ES_AUTOHSCROLL + LTEXT "&Module Path:",IDC_LABEL3,7,81,43,8 + EDITTEXT IDC_NOTIFY_MODULE,58,78,143,14,ES_AUTOHSCROLL + GROUPBOX "&Display Mode",IDC_LABEL4,7,96,157,28 + CONTROL "&show",IDC_NOTIFY_SHOW,"Button",BS_AUTORADIOBUTTON | + WS_TABSTOP,15,108,33,10 + CONTROL "&hide",IDC_NOTIFY_HIDE,"Button",BS_AUTORADIOBUTTON,66, + 108,29,10 + CONTROL "a&utohide",IDC_NOTIFY_AUTOHIDE,"Button", + BS_AUTORADIOBUTTON,112,108,43,10 + ICON "",IDC_PICTURE,173,101,21,20 + LTEXT "&Last Change:",IDC_LABEL6,7,132,43,8 + EDITTEXT IDC_LAST_CHANGE,59,129,105,14,ES_AUTOHSCROLL | + ES_READONLY + CONTROL "sho&w hidden",ID_SHOW_HIDDEN_ICONS,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,154,56,10 + DEFPUSHBUTTON "&OK",IDOK,91,153,50,14,WS_GROUP + PUSHBUTTON "&Cancel",IDCANCEL,151,153,50,14 +END + +IDD_MDI_SDI DIALOGEX 0, 0, 194, 157 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_APPWINDOW +CAPTION "cQø`gZ Kg®çÂ? wbqÜ?b" +FONT 12, "SutonnyMJ", 0, 0, 0x1 +BEGIN + LTEXT "Avcbvi cQø`gZ Kg®çÂ? wba®vib Kiôb :-",IDC_STATIC,23,7, + 160,8 + CONTROL "&e¹gyLx Kg®çÂ ?",IDC_MDI,"Button",BS_AUTORADIOBUTTON | + WS_GROUP | WS_TABSTOP,23,31,124,10 + CONTROL "&GKgyLx Kg®çÂ ?",IDC_SDI,"Button",BS_AUTORADIOBUTTON,23, + 61,118,10 + CONTROL 170,IDC_STATIC,"Static",SS_BITMAP,145,23,15,13 + CONTROL 171,IDC_STATIC,"Static",SS_BITMAP,145,57,15,13 + CONTROL "GKwU Kg®çÂå? DcevÀ çLvjv",IDC_SEPARATE_SUBFOLDERS, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,23,90,135,10 + LTEXT "GB wbqgvejx mKj Kg®çÂç?i Rb¿ wbw`®¾ nçe",IDC_STATIC,23, + 118,174,22 + DEFPUSHBUTTON "&OK",IDOK,48,140,50,10,WS_GROUP + PUSHBUTTON "&evwZj",IDCANCEL,106,140,50,10 +END + +IDD_ABOUT_EXPLORER DIALOG DISCARDABLE 0, 0, 199, 106 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "About ReactOS Explorer" +FONT 10, "MS Sans Serif" +BEGIN + LTEXT "ReactOS Explorer",IDC_ROS_EXPLORER,91,13,104,11 + LTEXT "V 0.9",IDC_VERSION_TXT,91,27,104,8 + LTEXT "(c) 2003-2005 Martin Fuchs",IDC_STATIC,91,42,104,8 + LTEXT "",IDC_WIN_VERSION,91,58,98,22 + LTEXT "http://www.sky.franken.de/explorer/",IDC_WWW,17,84,129, + 8 + CONTROL "&OK",IDOK,"Button",BS_OWNERDRAW | BS_FLAT | WS_GROUP, + 154,90,38,12 +END + + +#ifdef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE MOVEABLE PURE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE MOVEABLE PURE +BEGIN + "#include <windows.h>\r\n" + "\0" +END + +3 TEXTINCLUDE MOVEABLE PURE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +/////////////////////////////////////////////////////////////////////// ////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TITLE "we»ùviK" + IDS_START "Kvh®Kvix ZvwjKv" + IDS_LOGOFF "Log Off..." + IDS_SHUTDOWN "e? Kiv..." + IDS_LAUNCH "cwiPvjbv..." + IDS_START_HELP "mvnvh¿" + IDS_SEARCH_FILES "Abym?vb..." + IDS_DOCUMENTS "Z_¿ fv?vi" + IDS_FAVORITES "fvj jvMv" + IDS_PROGRAMS "Kg®" + IDS_SETTINGS "wbqÜ?b" + IDS_EXPLORE "we»ùvi Kiv" + IDS_EMPTY "(Empty)" + IDS_RECENT "mgmvgwqK Z_¿" + IDS_ADMIN "cÍkvmwbK" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_STARTMENU "Kvh®Kvix ZvwjKv" + IDS_MINIMIZE_ALL "mKj evÀ A`äk¿ Kiv" + IDS_DESKTOP_NUM "çW»ïUc %d" + IDS_VOLUME "AvIqvR" + IDS_ITEMS_CUR "Pjgvb ch®vq" + IDS_ITEMS_CONFIGURED "MVb êkwj" + IDS_ITEMS_VISIBLE "m`äk" + IDS_ITEMS_HIDDEN "A`äk¿" + IDS_NOTIFY_SHOW "ç`Lvçbv" + IDS_NOTIFY_HIDE "jyKvçbv" + IDS_NOTIFY_AUTOHIDE "Avcbv Avcwb jywKçq hvIqv" + IDS_SHOW_HIDDEN_ICONS "A`äk¿ cÍwZK ç`Lvçbv" + IDS_HIDE_ICONS "cÍwZK jyKvçbv " + IDS_TERMINATE "çivm we»ùviK e? Kiv" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_NETWORK "RvjK" + IDS_CONNECTIONS "RvjçKi mñ·®K" + IDS_DRIVES "wefvM" + IDS_SEARCH_COMPUTER "Kwñ·DUvi Abym?vb..." + IDS_SETTINGS_MENU "ZvwjKv wba®vib" + IDS_CONTROL_PANEL "wbqÜ?b åKø`¬" + IDS_PRINTERS "wcÍøUvi (Qvcv hÜ?)" + IDS_BROWSE "dvBj wbçq bvovPvov Kiv" + IDS_SEARCH_PRG "Kg® Abym?vb...." + IDS_ALL_USERS "mKj e¿enviKvix\\" + IDS_SEARCH "Abym?vb\n" + IDS_ABOUT_EXPLORER "&we»ùviK mñ·®çK..." + IDS_LAUNCH_MANY_PROGRAMS + "You have selected more than one program.\nAre you sure you want to launch all of them?" + IDS_DESKTOPBAR_SETTINGS "çW»ïUc wbqÜ?b" + IDS_DESKTOP "çW»ïUc" + IDS_TASKBAR "Kvh®Kvix `?" +END + +#endif // English (U.S.) resources +/////////////////////////////////////////////////////////////////////// ////// + + + +#ifndef APSTUDIO_INVOKED +/////////////////////////////////////////////////////////////////////// ////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +/////////////////////////////////////////////////////////////////////// ////// +#endif // not APSTUDIO_INVOKED +

18 years, 6 months

[gedmurphy] 114: - close single or all MDI client windows

by gedmurphy＠svn.reactos.org

- close single or all MDI client windows - add edit colour dialog - switch menus on/off according to status - add open / saveas dialogs Modified: trunk/reactos/base/applications/imagesoft/about.c Modified: trunk/reactos/base/applications/imagesoft/en.rc Added: trunk/reactos/base/applications/imagesoft/opensave.c Modified: trunk/reactos/base/applications/imagesoft/paint.c Modified: trunk/reactos/base/applications/imagesoft/paint.h Modified: trunk/reactos/base/applications/imagesoft/resource.h _____ Modified: trunk/reactos/base/applications/imagesoft/about.c --- trunk/reactos/base/applications/imagesoft/about.c 2006-02-14 17:39:13 UTC (rev 113) +++ trunk/reactos/base/applications/imagesoft/about.c 2006-02-15 17:58:49 UTC (rev 114) @@ -1,4 +1,3 @@ - #include "paint.h" extern HINSTANCE hInstance; _____ Modified: trunk/reactos/base/applications/imagesoft/en.rc --- trunk/reactos/base/applications/imagesoft/en.rc 2006-02-14 17:39:13 UTC (rev 113) +++ trunk/reactos/base/applications/imagesoft/en.rc 2006-02-15 17:58:49 UTC (rev 114) @@ -3,8 +3,9 @@ POPUP "&File" BEGIN MENUITEM "New...", ID_NEW - MENUITEM "Open...", ID_OPEN, GRAYED - MENUITEM "Close...", ID_CLOSE, GRAYED + MENUITEM "Open...", ID_OPEN + MENUITEM "Close", ID_CLOSE, GRAYED + MENUITEM "Close all", ID_CLOSEALL, GRAYED MENUITEM SEPARATOR MENUITEM "Save", ID_SAVE, GRAYED MENUITEM "Save As", ID_SAVEAS, GRAYED @@ -16,7 +17,7 @@ MENUITEM SEPARATOR MENUITEM "E&xit", ID_EXIT END - POPUP "Edit", GRAYED + POPUP "Edit" BEGIN MENUITEM "Undo", ID_UNDO, GRAYED MENUITEM "Redo", ID_REDO, GRAYED @@ -28,7 +29,7 @@ MENUITEM SEPARATOR MENUITEM "Select All", ID_SELALL, GRAYED END - POPUP "Image", GRAYED + POPUP "Image" BEGIN MENUITEM "Crop", -1, GRAYED MENUITEM "Resize", -1, GRAYED @@ -40,8 +41,12 @@ MENUITEM SEPARATOR MENUITEM "Attributes", -1, GRAYED END - POPUP "Window", GRAYED + POPUP "Colours" BEGIN + MENUITEM "Edit Colours...", ID_EDITCOLOURS + END + POPUP "Window" + BEGIN MENUITEM "Tile", -1 MENUITEM "Cascade", -1 END @@ -85,3 +90,18 @@ IDS_CURPOS "Cursor : %d,%d" IDS_READY "Ready" END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "New" + IDS_TOOLTIP_OPEN "Open" + IDS_TOOLTIP_SAVE "Save" + IDS_TOOLTIP_PRINTPRE "Print preview" + IDS_TOOLTIP_PRINT "Print" + IDS_TOOLTIP_CUT "Cut" + IDS_TOOLTIP_COPY "Copy" + IDS_TOOLTIP_PASTE "Paste" + IDS_TOOLTIP_UNDO "Undo" + IDS_TOOLTIP_REDO "Redo" +END _____ Added: trunk/reactos/base/applications/imagesoft/opensave.c --- trunk/reactos/base/applications/imagesoft/opensave.c 2006-02-14 17:39:13 UTC (rev 113) +++ trunk/reactos/base/applications/imagesoft/opensave.c 2006-02-15 17:58:49 UTC (rev 114) @@ -0,0 +1,90 @@ +#include "paint.h" + +static OPENFILENAME ofn; + +/* + * Initialize file open / save structure + */ +VOID FileInitialize(HWND hwnd) +{ + ZeroMemory(&ofn, sizeof(ofn)); + ofn.lStructSize = sizeof(OPENFILENAME); + ofn.hwndOwner = hwnd; + ofn.nMaxFile = MAX_PATH; + ofn.nMaxFileTitle = MAX_PATH; + ofn.lpstrDefExt = _T("bmp"); + +} + +/* + * Write the file to disk + */ +BOOL DoWriteFile(LPCTSTR pszFileName) +{ + return TRUE; +} + +/* + * Read the file from disk + */ +BOOL DoReadFile(LPCTSTR pszFileName) +{ + return TRUE; +} + + +/* + * Show the file open dialog + */ +VOID DoOpenFile(HWND hwnd) +{ + TCHAR szFileName[MAX_PATH] = _T(""); + static TCHAR Filter[] = _T("All image files (*.gif,*.bmp,*.jpg,*.jpeg,*.tif,*.png)\0*.gif,*.bmp,*.jpg,*.jpeg,*.tif,* .png\0") \ + _T("All files (*.*)\0*.*\0") \ + _T("Graphics Interchange format (*gif)\0*.gif\0") \ + _T("Windows Bitmap (*bmp)\0*.bmp\0") \ + _T("JPEG File Interchange Format (*jpg,*.jpeg)\0*.jpg,*.jpeg\0") \ + _T("TAG Image File Format (*tif)\0*.tif\0") \ + _T("Portable Network Graphics (*png)\0*.png\0\0"); + + ofn.lpstrFilter = Filter; + ofn.lpstrFile = szFileName; + ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + + if (GetOpenFileName(&ofn)) + { + if (DoReadFile(szFileName)) + return; + } + + if (CommDlgExtendedError() != CDERR_GENERALCODES) + MessageBox(NULL, _T("Open file failed"), NULL, 0); +} + + +/* + * Show the file saveas dialog + */ +VOID DoSaveFile(HWND hwnd) +{ + TCHAR szFileName[MAX_PATH] = _T(""); + static TCHAR Filter[] = _T("Graphics Interchange format (*gif)\0*.gif\0") \ + _T("Windows Bitmap (*bmp)\0*.bmp\0") \ + _T("JPEG File Interchange Format (*jpg,*.jpeg)\0*.jpg,*.jpeg\0") \ + _T("TAG Image File Format (*tif)\0*.tif\0") \ + _T("Portable Network Graphics (*png)\0*.png\0\0"); + + ofn.lpstrFilter = Filter; + ofn.lpstrFile = szFileName; + ofn.Flags = OFN_EXPLORER | OFN_PATHMUSTEXIST | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT; + + if (GetSaveFileName(&ofn)) + { + if (DoWriteFile(szFileName)) + return; + } + + if (CommDlgExtendedError() != CDERR_GENERALCODES) + MessageBox(NULL, _T("Save to file failed"), NULL, 0); +} + _____ Modified: trunk/reactos/base/applications/imagesoft/paint.c --- trunk/reactos/base/applications/imagesoft/paint.c 2006-02-14 17:39:13 UTC (rev 113) +++ trunk/reactos/base/applications/imagesoft/paint.c 2006-02-15 17:58:49 UTC (rev 114) @@ -1,12 +1,3 @@ -/* - * PROJECT: ReactOS Services - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/system/servman/servman.c - * PURPOSE: Main window message handler - * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> - * - */ - #include "paint.h" #define ID_MDI_FIRSTCHILD 50000 @@ -20,39 +11,46 @@ HWND hMDIClient; HWND hStatus; HWND hTool; +HWND hwndRebar; HMENU hShortcutMenu; +/* + * Initialize the structure and send a message to the MDI + * frame requesting a new new child window. + */ HWND CreateNewMDIChild(HWND hMDIClient) { - MDICREATESTRUCT mcs; - HWND hChild; - TCHAR Buf[15]; - static DWORD MDINum = 1; + MDICREATESTRUCT mcs; + HWND hChild; + TCHAR Buf[15]; + static DWORD MDINum = 1; - _sntprintf(Buf, sizeof(Buf) / sizeof(TCHAR), _T("Untitled%d"), MDINum); + _sntprintf(Buf, sizeof(Buf) / sizeof(TCHAR), _T("Untitled%d"), MDINum); - mcs.szTitle = Buf; - mcs.szClass = ChildClassName; - mcs.hOwner = hInstance; - mcs.x = mcs.cx = CW_USEDEFAULT; - mcs.y = mcs.cy = CW_USEDEFAULT; - mcs.style = MDIS_ALLCHILDSTYLES; + mcs.szTitle = Buf; + mcs.szClass = ChildClassName; + mcs.hOwner = hInstance; + mcs.x = mcs.cx = CW_USEDEFAULT; + mcs.y = mcs.cy = CW_USEDEFAULT; + mcs.style = MDIS_ALLCHILDSTYLES; - hChild = (HWND)SendMessage(hMDIClient, WM_MDICREATE, 0, (LONG)&mcs); - if(!hChild) - { - MessageBox(hMDIClient, _T("MDI Child creation failed."), _T("Error!"), - MB_ICONEXCLAMATION | MB_OK); + hChild = (HWND)SendMessage(hMDIClient, WM_MDICREATE, 0, (LONG)&mcs); + if(!hChild) + { + MessageBox(hMDIClient, _T("MDI Child creation failed."), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); return hChild; - } + } - MDINum++; - return hChild; + MDINum++; + return hChild; } - +/* + * Main program message handler + */ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch(msg) @@ -70,28 +68,28 @@ { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ {STD_FILENEW, ID_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0, 0}, /* new */ {STD_FILEOPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ - {STD_FILESAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + {STD_FILESAVE, ID_SAVE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0}, /* save */ /* Note: First item for a seperator is its width in pixels */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {STD_PRINTPRE, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ - {STD_PRINT, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ + {STD_PRINTPRE, ID_PRINTPRE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* print */ + {STD_PRINT, ID_PRINT, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {STD_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ - {STD_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ - {STD_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ + {STD_CUT, ID_CUT, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ + {STD_COPY, ID_COPY, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ + {STD_PASTE, ID_PASTE, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ - {STD_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ - {STD_REDOW, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ + {STD_UNDO, ID_UNDO, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ + {STD_REDOW, ID_REDO, TBSTATE_INDETERMINATE, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ }; -/* ======================== Create Toolbar ============================== */ +/* ======================== Create Std Toolbar ============================== */ /* Create Toolbar */ hTool = CreateWindowEx(0, @@ -132,6 +130,11 @@ +/* ======================== Create Floating Toolbar ============================== */ + + + + /* ======================== Create Status Bar ============================== */ hStatus = CreateWindowEx(0, @@ -144,10 +147,10 @@ hInstance, NULL); if(hStatus == NULL) - MessageBox(hwnd, _T("Could not create status bar."), + MessageBox(hwnd, _T("Could not create status bar."), _T("Error!"), MB_OK | MB_ICONERROR); - SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths); + SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths); /* ======================== Create Popup Menu ============================== */ @@ -158,73 +161,78 @@ /* ======================= Create MDI Client ============================= */ - /* Find window menu where children will be listed */ - ccs.hWindowMenu = GetSubMenu(GetMenu(hwnd), 3); - ccs.idFirstChild = ID_MDI_FIRSTCHILD; + /* Find window menu where children will be listed */ + ccs.hWindowMenu = GetSubMenu(GetMenu(hwnd), 4); + ccs.idFirstChild = ID_MDI_FIRSTCHILD; - hMDIClient = CreateWindowEx(WS_EX_CLIENTEDGE, - _T("mdiclient"), - NULL, - WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL | WS_VISIBLE, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - CW_USEDEFAULT, - hwnd, - (HMENU)IDC_MAIN_MDI, - GetModuleHandle(NULL), - (LPVOID)&ccs); + hMDIClient = CreateWindowEx(WS_EX_CLIENTEDGE, + _T("mdiclient"), + NULL, + WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL | WS_VISIBLE, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + hwnd, + (HMENU)IDC_MAIN_MDI, + GetModuleHandle(NULL), + (LPVOID)&ccs); - if(hMDIClient == NULL) - MessageBox(hwnd, _T("Could not create MDI client."), - _T("Error!"), MB_OK | MB_ICONERROR); + if(hMDIClient == NULL) + MessageBox(hwnd, _T("Could not create MDI client."), + _T("Error!"), MB_OK | MB_ICONERROR); +/* ======================= Miscelaneous ============================= */ + /* indicate program is ready in the status bar */ LoadString(hInstance, IDS_READY, Buf, sizeof(Buf) / sizeof(TCHAR)); SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)Buf); + /* inilalize file open/save structure */ + FileInitialize(hwnd); + } break; case WM_SIZE: { - RECT rcTool; - int iToolHeight; + RECT rcTool; + int iToolHeight; - RECT rcStatus; - int iStatusHeight; + RECT rcStatus; + int iStatusHeight; - HWND hMDI; - int iMDIHeight; - RECT rcClient; + HWND hMDI; + int iMDIHeight; + RECT rcClient; - /* Size toolbar and get height */ + /* Size toolbar and get height */ hTool = GetDlgItem(hwnd, IDC_TOOLBAR); - SendMessage(hTool, TB_AUTOSIZE, 0, 0); + SendMessage(hTool, TB_AUTOSIZE, 0, 0); - GetWindowRect(hTool, &rcTool); - iToolHeight = rcTool.bottom - rcTool.top; + GetWindowRect(hTool, &rcTool); + iToolHeight = rcTool.bottom - rcTool.top; - /* Size status bar and get height */ - hStatus = GetDlgItem(hwnd, IDC_STATUSBAR); - SendMessage(hStatus, WM_SIZE, 0, 0); + /* Size status bar and get height */ + hStatus = GetDlgItem(hwnd, IDC_STATUSBAR); + SendMessage(hStatus, WM_SIZE, 0, 0); - GetWindowRect(hStatus, &rcStatus); - iStatusHeight = rcStatus.bottom - rcStatus.top; + GetWindowRect(hStatus, &rcStatus); + iStatusHeight = rcStatus.bottom - rcStatus.top; - /* Calculate remaining height and size list view */ - GetClientRect(hwnd, &rcClient); + /* Calculate remaining height and size for the MDI frame */ + GetClientRect(hwnd, &rcClient); - iMDIHeight = rcClient.bottom - iToolHeight - iStatusHeight; + iMDIHeight = rcClient.bottom - iToolHeight - iStatusHeight; - hMDI = GetDlgItem(hwnd, IDC_MAIN_MDI); - SetWindowPos(hMDIClient, NULL, 0, iToolHeight, rcClient.right, iMDIHeight, SWP_NOZORDER); - } - break; + hMDI = GetDlgItem(hwnd, IDC_MAIN_MDI); + SetWindowPos(hMDIClient, NULL, 0, iToolHeight, rcClient.right, iMDIHeight, SWP_NOZORDER); + } + break; - case WM_NOTIFY: + case WM_NOTIFY: { NMHDR* nm = (NMHDR*) lParam; @@ -243,43 +251,43 @@ switch (idButton) { case ID_NEW: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PROP); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEW); break; case ID_OPEN: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_OPEN); break; case ID_SAVE: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXPORT); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_SAVE); break; case ID_PRINTPRE: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEW); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PRINTPRE); break; case ID_PRINT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_START); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PRINT); break; case ID_CUT: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_STOP); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_CUT); break; case ID_COPY: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PAUSE); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_COPY); break; case ID_PASTE: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PASTE); break; case ID_UNDO: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_UNDO); break; case ID_REDO: - lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REDO); break; } @@ -306,25 +314,67 @@ case WM_COMMAND: - switch(LOWORD(wParam)) - { - case ID_NEW: - CreateNewMDIChild(hMDIClient); - break; + switch(LOWORD(wParam)) + { + case ID_NEW: + CreateNewMDIChild(hMDIClient); + break; - case ID_REFRESH: + case ID_OPEN: + DoOpenFile(hwnd); break; - - case ID_HELP: - MessageBox(NULL, _T("Help is not yet implemented\n"), - _T("Note!"), MB_OK | MB_ICONINFORMATION); + case ID_SAVEAS: + DoSaveFile(hwnd); break; + case ID_CLOSE: + { + /* close the active child window */ + HWND hChild = (HWND)SendMessage(hMDIClient, WM_MDIGETACTIVE,0,0); + if(hChild) + { + SendMessage(hChild, WM_CLOSE, 0, 0); + } + } + break; + + case ID_CLOSEALL: + { + HWND hChild; + /* loop until all windows have been closed */ + while ((hChild = (HWND)SendMessage(hMDIClient, WM_MDIGETACTIVE,0,0)) != NULL) + { + SendMessage(hChild, WM_CLOSE, 0, 0); + } + } + break; + case ID_EXIT: PostMessage(hwnd, WM_CLOSE, 0, 0); break; + case ID_EDITCOLOURS: + { + /* open up the colour selection dialog */ + + static CHOOSECOLOR cc; + static COLORREF crCustColors[16]; + + cc.lStructSize = sizeof(CHOOSECOLOR); + cc.hwndOwner = hwnd; + cc.hInstance = NULL; + cc.rgbResult = RGB(0x80, 0x80, 0x80); + cc.lpCustColors = crCustColors; + cc.Flags = CC_RGBINIT | CC_FULLOPEN; + cc.lCustData = 0; + cc.lpfnHook = NULL; + cc.lpTemplateName = NULL; + + ChooseColor(&cc); + } + break; + case ID_WINDOW_TILE: SendMessage(hMDIClient, WM_MDITILE, 0, 0); break; @@ -340,67 +390,50 @@ (DLGPROC)AboutDialogProc); break; - default: - { - if(LOWORD(wParam) >= ID_MDI_FIRSTCHILD) - { - DefFrameProc(hwnd, hMDIClient, WM_COMMAND, wParam, lParam); - } - else - { - HWND hChild = (HWND)SendMessage(hMDIClient, WM_MDIGETACTIVE,0,0); - if(hChild) - { - SendMessage(hChild, WM_COMMAND, wParam, lParam); - } - } - } + default: + /* Catch all commands that I didn't process directly and do + * a check to see if the value is greater than or equal to + * ID_MDI_FIRSTCHILD. If it is, then the user has clicked + * on one of the Window menu items and we send the message + * on to DefFrameProc() for processing. + */ + if(LOWORD(wParam) >= ID_MDI_FIRSTCHILD) + DefFrameProc(hwnd, hMDIClient, WM_COMMAND, wParam, lParam); + else + { + HWND hChild = (HWND)SendMessage(hMDIClient, WM_MDIGETACTIVE,0,0); + if(hChild) + SendMessage(hChild, WM_COMMAND, wParam, lParam); + } } break; - case WM_CLOSE: + case WM_CLOSE: DestroyMenu(hShortcutMenu); - DestroyWindow(hwnd); - break; + DestroyWindow(hwnd); + break; - case WM_DESTROY: - PostQuitMessage(0); - break; + case WM_DESTROY: + PostQuitMessage(0); + break; - default: - return DefFrameProc(hwnd, hMDIClient, msg, wParam, lParam); + default: + return DefFrameProc(hwnd, hMDIClient, msg, wParam, lParam); } return 0; } -void GetLargestDisplayMode(int *pcxBitmap, int *pcyBitmap) -{ - DEVMODE devmode; - int iModeNum = 0; - - *pcxBitmap = *pcyBitmap = 0; - - ZeroMemory(&devmode, sizeof(DEVMODE)); - devmode.dmSize = sizeof(DEVMODE); - - while (EnumDisplaySettings (NULL, iModeNum++, &devmode)) - { - *pcxBitmap = max (*pcxBitmap, (int) devmode.dmPelsWidth); - *pcyBitmap = max (*pcyBitmap, (int) devmode.dmPelsHeight); - } -} - - - +/* + * MDI child window message handler + */ LRESULT CALLBACK MDIChildWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - static BOOL fLeftButtonDown, fRightButtonDown ; - static HBITMAP hBitmap; - static HDC hdcMem; - static int cxBitmap, cyBitmap, cxClient, cyClient, xMouse, yMouse; - HDC hdc; - PAINTSTRUCT ps; + static BOOL fLeftButtonDown, fRightButtonDown; + static HDC hdcMem; + static INT cxClient, cyClient, xMouse, yMouse; + HDC hdc; + PAINTSTRUCT ps; switch(msg) { @@ -428,16 +461,20 @@ SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)Buf); } - EnableMenuItem(hMenu, 1, MF_BYPOSITION | EnableFlag); - EnableMenuItem(hMenu, 2, MF_BYPOSITION | EnableFlag); - EnableMenuItem(hMenu, 3, MF_BYPOSITION | EnableFlag); + EnableMenuItem(hMenu, 1, MF_BYPOSITION | EnableFlag); /* edit */ + EnableMenuItem(hMenu, 2, MF_BYPOSITION | EnableFlag); /* image */ + EnableMenuItem(hMenu, 3, MF_BYPOSITION | EnableFlag); /* colours */ + EnableMenuItem(hMenu, 4, MF_BYPOSITION | EnableFlag); /* window */ hFileMenu = GetSubMenu(hMenu, 0); -// EnableMenuItem(hFileMenu, ID_FILE_SAVEAS, MF_BYCOMMAND | EnableFlag); + EnableMenuItem(hFileMenu, ID_SAVEAS, MF_BYCOMMAND | EnableFlag); -// EnableMenuItem(hFileMenu, ID_FILE_CLOSE, MF_BYCOMMAND | EnableFlag); -// EnableMenuItem(hFileMenu, ID_FILE_CLOSEALL, MF_BYCOMMAND | EnableFlag); + EnableMenuItem(hFileMenu, ID_CLOSE, MF_BYCOMMAND | EnableFlag); + EnableMenuItem(hFileMenu, ID_CLOSEALL, MF_BYCOMMAND | EnableFlag); + SendMessage(hTool, TB_SETSTATE, ID_COPY, + (LPARAM)MAKELONG(TBSTATE_ENABLED, 0)); + DrawMenuBar(hMainWnd); } break; @@ -523,21 +560,7 @@ case WM_COMMAND: switch(LOWORD(wParam)) { -/* case ID_OPEN: - DoFileOpen(hwnd); - break; - case ID_SAVEAS: - DoFileSave(hwnd); - break; - case ID_CUT: - SendDlgItemMessage(hwnd, IDC_CHILD_EDIT, WM_CUT, 0, 0); - break; - case ID_COPY: - SendDlgItemMessage(hwnd, IDC_CHILD_EDIT, WM_COPY, 0, 0); - break; - case ID_PASTE: - SendDlgItemMessage(hwnd, IDC_CHILD_EDIT, WM_PASTE, 0, 0); -*/ break; + } break; @@ -545,38 +568,49 @@ return DefMDIChildProc(hwnd, msg, wParam, lParam); default: + { + TCHAR Buf[6]; + + /* indicate program is ready in the status bar */ + LoadString(hInstance, IDS_READY, Buf, sizeof(Buf) / sizeof(TCHAR)); + SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)Buf); + return DefMDIChildProc(hwnd, msg, wParam, lParam); + } } return 0; } - +/* + * Register the MDI child window class + */ BOOL SetUpMDIChildWindowClass(HINSTANCE hInstance) { WNDCLASSEX wc; - wc.cbSize = sizeof(WNDCLASSEX); - wc.style = CS_HREDRAW | CS_VREDRAW; - wc.lpfnWndProc = MDIChildWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = hInstance; - wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = ChildClassName; - wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = MDIChildWndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = ChildClassName; + wc.hIconSm = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); - if(!RegisterClassEx(&wc)) - { - MessageBox(0, _T("Could Not Register Child Window"), _T("Error!"), - MB_ICONEXCLAMATION | MB_OK); - return FALSE; - } - else - return TRUE; + if(!RegisterClassEx(&wc)) + { + MessageBox(0, _T("Could Not Register Child Window"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return FALSE; + } + else + return TRUE; } #ifdef _MSC_VER @@ -587,10 +621,13 @@ { WNDCLASSEX wc; MSG Msg; + INITCOMMONCONTROLSEX icex; hInstance = hThisInstance; - InitCommonControls(); + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_BAR_CLASSES; + InitCommonControlsEx(&icex); wc.cbSize = sizeof(WNDCLASSEX); wc.style = 0; @@ -616,19 +653,18 @@ if(!SetUpMDIChildWindowClass(hInstance)) return 0; - hMainWnd = CreateWindowEx( - 0, - AppClassName, - _T("ImageSoft"), - WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, - CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, - NULL, NULL, hInstance, NULL); + hMainWnd = CreateWindowEx(0, + AppClassName, + _T("ImageSoft"), + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, + CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, + NULL, NULL, hInstance, NULL); if(hMainWnd == NULL) { - MessageBox(NULL, _T("Window Creation Failed!"), _T("Error!"), - MB_ICONEXCLAMATION | MB_OK); - return 0; + MessageBox(NULL, _T("Window Creation Failed!"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return 0; } ShowWindow(hMainWnd, nCmdShow); _____ Modified: trunk/reactos/base/applications/imagesoft/paint.h --- trunk/reactos/base/applications/imagesoft/paint.h 2006-02-14 17:39:13 UTC (rev 113) +++ trunk/reactos/base/applications/imagesoft/paint.h 2006-02-15 17:58:49 UTC (rev 114) @@ -14,4 +14,8 @@ BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); +VOID FileInitialize (HWND hwnd); +VOID DoOpenFile(HWND hwnd); +VOID DoSaveFile(HWND hwnd); + #endif /* __SERVMAN_H */ _____ Modified: trunk/reactos/base/applications/imagesoft/resource.h --- trunk/reactos/base/applications/imagesoft/resource.h 2006-02-14 17:39:13 UTC (rev 113) +++ trunk/reactos/base/applications/imagesoft/resource.h 2006-02-15 17:58:49 UTC (rev 114) @@ -7,19 +7,21 @@ #define ID_NEW 2000 #define ID_OPEN 2001 #define ID_CLOSE 2002 -#define ID_SAVE 2003 -#define ID_SAVEAS 2004 -#define ID_PRINTPRE 2005 -#define ID_PRINT 2006 -#define ID_PROP 2007 -#define ID_CUT 2008 -#define ID_COPY 2009 -#define ID_PASTE 2010 -#define ID_PASTENEWIMAGE 2011 -#define ID_UNDO 2012 -#define ID_REDO 2013 -#define ID_SELALL 2014 -#define ID_EXIT 2015 +#define ID_CLOSEALL 2003 +#define ID_SAVE 2004 +#define ID_SAVEAS 2005 +#define ID_PRINTPRE 2006 +#define ID_PRINT 2007 +#define ID_PROP 2008 +#define ID_CUT 2009 +#define ID_COPY 2010 +#define ID_PASTE 2011 +#define ID_PASTENEWIMAGE 2012 +#define ID_UNDO 2013 +#define ID_REDO 2014 +#define ID_SELALL 2015 +#define ID_EXIT 2016 +#define ID_EDITCOLOURS 2017 #define ID_REFRESH 3000 #define ID_HELP 3001 @@ -33,18 +35,18 @@ /* tooltips */ -#define IDS_TOOLTIP_PROP 6000 -#define IDS_TOOLTIP_REFRESH 6001 -#define IDS_TOOLTIP_EXPORT 6002 -#define IDS_TOOLTIP_START 6003 -#define IDS_TOOLTIP_STOP 6004 -#define IDS_TOOLTIP_PAUSE 6005 -#define IDS_TOOLTIP_RESTART 6006 -#define IDS_TOOLTIP_NEW 6007 -#define IDS_TOOLTIP_HELP 6008 -#define IDS_TOOLTIP_EXIT 6009 +#define IDS_TOOLTIP_NEW 6000 +#define IDS_TOOLTIP_OPEN 6001 +#define IDS_TOOLTIP_SAVE 6002 +#define IDS_TOOLTIP_PRINTPRE 6003 +#define IDS_TOOLTIP_PRINT 6004 +#define IDS_TOOLTIP_CUT 6005 +#define IDS_TOOLTIP_COPY 6006 +#define IDS_TOOLTIP_PASTE 6007 +#define IDS_TOOLTIP_UNDO 6008 +#define IDS_TOOLTIP_REDO 6009 -#define IDI_ICON 50 +#define IDI_ICON 50 #define IDB_BUTTONS 51 /* toolbar buttons */

18 years, 6 months

[gedmurphy] 113: the beginnings of a native image viewing and paint program

by gedmurphy＠svn.reactos.org

the beginnings of a native image viewing and paint program Added: trunk/reactos/base/applications/imagesoft/ Added: trunk/reactos/base/applications/imagesoft/about.c Added: trunk/reactos/base/applications/imagesoft/en.rc Added: trunk/reactos/base/applications/imagesoft/paint.c Added: trunk/reactos/base/applications/imagesoft/paint.h Added: trunk/reactos/base/applications/imagesoft/paint.rc Added: trunk/reactos/base/applications/imagesoft/res/ Added: trunk/reactos/base/applications/imagesoft/res/imagesoft.ico Added: trunk/reactos/base/applications/imagesoft/resource.h _____ Added: trunk/reactos/base/applications/imagesoft/about.c --- trunk/reactos/base/applications/imagesoft/about.c 2006-02-12 22:21:56 UTC (rev 112) +++ trunk/reactos/base/applications/imagesoft/about.c 2006-02-14 17:39:13 UTC (rev 113) @@ -0,0 +1,45 @@ + +#include "paint.h" + +extern HINSTANCE hInstance; + +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif +BOOL CALLBACK +AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + HWND hLicenseEditWnd; + HICON hIcon = NULL; + TCHAR strLicense[700]; + + switch (message) + { + case WM_INITDIALOG: + + hIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); + SendMessage(hDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIcon); + + hLicenseEditWnd = GetDlgItem(hDlg, IDC_LICENSE_EDIT); + + LoadString(hInstance, IDS_LICENSE, strLicense, + sizeof(strLicense) / sizeof(TCHAR)); + + SetWindowText(hLicenseEditWnd, strLicense); + + return TRUE; + + case WM_COMMAND: + + if ((LOWORD(wParam) == IDOK) || (LOWORD(wParam) == IDCANCEL)) + { + DestroyIcon(hIcon); + EndDialog(hDlg, LOWORD(wParam)); + return TRUE; + } + + break; + } + + return FALSE; +} _____ Added: trunk/reactos/base/applications/imagesoft/en.rc --- trunk/reactos/base/applications/imagesoft/en.rc 2006-02-12 22:21:56 UTC (rev 112) +++ trunk/reactos/base/applications/imagesoft/en.rc 2006-02-14 17:39:13 UTC (rev 113) @@ -0,0 +1,87 @@ +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "New...", ID_NEW + MENUITEM "Open...", ID_OPEN, GRAYED + MENUITEM "Close...", ID_CLOSE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Save", ID_SAVE, GRAYED + MENUITEM "Save As", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Print Preview", ID_PRINTPRE, GRAYED + MENUITEM "Print...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "Properties...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "E&xit", ID_EXIT + END + POPUP "Edit", GRAYED + BEGIN + MENUITEM "Undo", ID_UNDO, GRAYED + MENUITEM "Redo", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "Cut", ID_CUT, GRAYED + MENUITEM "Copy", ID_COPY, GRAYED + MENUITEM "Paste", ID_PASTE, GRAYED + MENUITEM "Paste as new image",ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Select All", ID_SELALL, GRAYED + END + POPUP "Image", GRAYED + BEGIN + MENUITEM "Crop", -1, GRAYED + MENUITEM "Resize", -1, GRAYED + MENUITEM "Rotate", -1, GRAYED + MENUITEM "Flip", -1, GRAYED + MENUITEM "Stretch", -1, GRAYED + MENUITEM "Skew", -1, GRAYED + MENUITEM "Invert Colours", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Attributes", -1, GRAYED + END + POPUP "Window", GRAYED + BEGIN + MENUITEM "Tile", -1 + MENUITEM "Cascade", -1 + END + POPUP "Help" + BEGIN + MENUITEM "About...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_ABOUTBOX DIALOGEX 22,16,190,182 +CAPTION "About ImageSoft" +FONT 8,"Tahoma",0,0 +STYLE WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 + PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 + ICON IDI_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 +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou 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." +END + +/* status bar info */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_CURPOS "Cursor : %d,%d" + IDS_READY "Ready" +END _____ Added: trunk/reactos/base/applications/imagesoft/paint.c --- trunk/reactos/base/applications/imagesoft/paint.c 2006-02-12 22:21:56 UTC (rev 112) +++ trunk/reactos/base/applications/imagesoft/paint.c 2006-02-14 17:39:13 UTC (rev 113) @@ -0,0 +1,646 @@ +/* + * PROJECT: ReactOS Services + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/system/servman/servman.c + * PURPOSE: Main window message handler + * COPYRIGHT: Copyright 2005 - 2006 Ged Murphy <gedmurphy(a)gmail.com> + * + */ + +#include "paint.h" + +#define ID_MDI_FIRSTCHILD 50000 + +const TCHAR AppClassName[] = _T("Parent"); +const TCHAR ChildClassName[] = _T("Child"); + + +HINSTANCE hInstance; +HWND hMainWnd; +HWND hMDIClient; +HWND hStatus; +HWND hTool; +HMENU hShortcutMenu; + + +HWND CreateNewMDIChild(HWND hMDIClient) +{ + MDICREATESTRUCT mcs; + HWND hChild; + TCHAR Buf[15]; + static DWORD MDINum = 1; + + _sntprintf(Buf, sizeof(Buf) / sizeof(TCHAR), _T("Untitled%d"), MDINum); + + mcs.szTitle = Buf; + mcs.szClass = ChildClassName; + mcs.hOwner = hInstance; + mcs.x = mcs.cx = CW_USEDEFAULT; + mcs.y = mcs.cy = CW_USEDEFAULT; + mcs.style = MDIS_ALLCHILDSTYLES; + + hChild = (HWND)SendMessage(hMDIClient, WM_MDICREATE, 0, (LONG)&mcs); + if(!hChild) + { + MessageBox(hMDIClient, _T("MDI Child creation failed."), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return hChild; + } + + MDINum++; + return hChild; +} + + + +LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch(msg) + { + case WM_CREATE: + { + CLIENTCREATESTRUCT ccs; + TBADDBITMAP tbab; + INT iImageOffset; + INT statwidths[] = {300, 450, 550, -1}; /* widths of status bar */ + TCHAR Buf[6]; + + /* Toolbar buttons */ + TBBUTTON tbb [NUM_BUTTONS] = + { /* iBitmap, idCommand, fsState, fsStyle, bReserved[2], dwData, iString */ + {STD_FILENEW, ID_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, {0}, 0, 0}, /* new */ + {STD_FILEOPEN, ID_OPEN, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* open */ + {STD_FILESAVE, ID_SAVE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0}, /* save */ + + /* Note: First item for a seperator is its width in pixels */ + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {STD_PRINTPRE, ID_PRINTPRE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print */ + {STD_PRINT, ID_PRINT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* print preview */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {STD_CUT, ID_CUT, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* cut */ + {STD_COPY, ID_COPY, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* copy */ + {STD_PASTE, ID_PASTE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* paste */ + + {10, 0, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0}, /* separator */ + + {STD_UNDO, ID_UNDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* undo */ + {STD_REDOW, ID_REDO, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, /* redo */ + }; + + +/* ======================== Create Toolbar ============================== */ + + /* Create Toolbar */ + hTool = CreateWindowEx(0, + TOOLBARCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | TBSTYLE_FLAT | TBSTYLE_TOOLTIPS, + 0, 0, 0, 0, + hwnd, + (HMENU)IDC_TOOLBAR, + hInstance, + NULL); + if(hTool == NULL) + MessageBox(hwnd, _T("Could not create tool bar."), _T("Error!"), MB_OK | MB_ICONERROR); + + /* Send the TB_BUTTONSTRUCTSIZE message, which is required for backward compatibility */ + SendMessage(hTool, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + + /* Add custom images */ + tbab.hInst = HINST_COMMCTRL; + tbab.nID = IDB_STD_SMALL_COLOR; + iImageOffset = (INT)SendMessage(hTool, TB_ADDBITMAP, NUM_BUTTONS, (LPARAM)&tbab); + /* tbb[0].iBitmap += iImageOffset; / * properties * / + tbb[1].iBitmap += iImageOffset; / * refresh * / + tbb[2].iBitmap += iImageOffset; / * export * / + tbb[4].iBitmap += iImageOffset; / * create * / + tbb[6].iBitmap += iImageOffset; / * start * / + tbb[7].iBitmap += iImageOffset; / * stop * / + tbb[8].iBitmap += iImageOffset; / * pause * / + tbb[9].iBitmap += iImageOffset; / * restart * / + tbb[11].iBitmap += iImageOffset; / * help * / + tbb[12].iBitmap += iImageOffset; / * exit * / +*/ + /* Add buttons to toolbar */ + SendMessage(hTool, TB_ADDBUTTONS, NUM_BUTTONS, (LPARAM) &tbb); + + /* Show toolbar */ + ShowWindow(hTool, SW_SHOWNORMAL); + + + +/* ======================== Create Status Bar ============================== */ + + hStatus = CreateWindowEx(0, + STATUSCLASSNAME, + NULL, + WS_CHILD | WS_VISIBLE | SBARS_SIZEGRIP, + 0, 0, 0, 0, + hwnd, + (HMENU)IDC_STATUSBAR, + hInstance, + NULL); + if(hStatus == NULL) + MessageBox(hwnd, _T("Could not create status bar."), + _T("Error!"), MB_OK | MB_ICONERROR); + + SendMessage(hStatus, SB_SETPARTS, sizeof(statwidths)/sizeof(int), (LPARAM)statwidths); + + +/* ======================== Create Popup Menu ============================== */ + + hShortcutMenu = LoadMenu(hInstance, MAKEINTRESOURCE (IDR_POPUP)); + hShortcutMenu = GetSubMenu(hShortcutMenu, 0); + + +/* ======================= Create MDI Client ============================= */ + + /* Find window menu where children will be listed */ + ccs.hWindowMenu = GetSubMenu(GetMenu(hwnd), 3); + ccs.idFirstChild = ID_MDI_FIRSTCHILD; + + hMDIClient = CreateWindowEx(WS_EX_CLIENTEDGE, + _T("mdiclient"), + NULL, + WS_CHILD | WS_CLIPCHILDREN | WS_VSCROLL | WS_HSCROLL | WS_VISIBLE, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + CW_USEDEFAULT, + hwnd, + (HMENU)IDC_MAIN_MDI, + GetModuleHandle(NULL), + (LPVOID)&ccs); + + + if(hMDIClient == NULL) + MessageBox(hwnd, _T("Could not create MDI client."), + _T("Error!"), MB_OK | MB_ICONERROR); + + + /* indicate program is ready in the status bar */ + LoadString(hInstance, IDS_READY, Buf, sizeof(Buf) / sizeof(TCHAR)); + SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)Buf); + + } + break; + + case WM_SIZE: + { + RECT rcTool; + int iToolHeight; + + RECT rcStatus; + int iStatusHeight; + + HWND hMDI; + int iMDIHeight; + RECT rcClient; + + /* Size toolbar and get height */ + hTool = GetDlgItem(hwnd, IDC_TOOLBAR); + SendMessage(hTool, TB_AUTOSIZE, 0, 0); + + GetWindowRect(hTool, &rcTool); + iToolHeight = rcTool.bottom - rcTool.top; + + /* Size status bar and get height */ + hStatus = GetDlgItem(hwnd, IDC_STATUSBAR); + SendMessage(hStatus, WM_SIZE, 0, 0); + + GetWindowRect(hStatus, &rcStatus); + iStatusHeight = rcStatus.bottom - rcStatus.top; + + /* Calculate remaining height and size list view */ + GetClientRect(hwnd, &rcClient); + + iMDIHeight = rcClient.bottom - iToolHeight - iStatusHeight; + + hMDI = GetDlgItem(hwnd, IDC_MAIN_MDI); + SetWindowPos(hMDIClient, NULL, 0, iToolHeight, rcClient.right, iMDIHeight, SWP_NOZORDER); + } + break; + + case WM_NOTIFY: + { + NMHDR* nm = (NMHDR*) lParam; + + switch (nm->code) + { + case TTN_GETDISPINFO: + { + LPTOOLTIPTEXT lpttt; + UINT idButton; + + lpttt = (LPTOOLTIPTEXT) lParam; + + /* Specify the resource identifier of the descriptive + * text for the given button. */ + idButton = (UINT)lpttt->hdr.idFrom; + switch (idButton) + { + case ID_NEW: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PROP); + break; + + case ID_OPEN: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_REFRESH); + break; + + case ID_SAVE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXPORT); + break; + + case ID_PRINTPRE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_NEW); + break; + + case ID_PRINT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_START); + break; + + case ID_CUT: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_STOP); + break; + + case ID_COPY: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_PAUSE); + break; + + case ID_PASTE: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_RESTART); + break; + + case ID_UNDO: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_HELP); + break; + + case ID_REDO: + lpttt->lpszText = MAKEINTRESOURCE(IDS_TOOLTIP_EXIT); + break; + + } + } + break; + + default: + break; + } + } + break; + + case WM_CONTEXTMENU: + { + int xPos, yPos; + + xPos = GET_X_LPARAM(lParam); + yPos = GET_Y_LPARAM(lParam); + + TrackPopupMenuEx(hShortcutMenu, TPM_RIGHTBUTTON, + xPos, yPos, hwnd, NULL); + } + break; + + case WM_COMMAND: + + switch(LOWORD(wParam)) + { + case ID_NEW: + CreateNewMDIChild(hMDIClient); + break; + + case ID_REFRESH: + break; + + + case ID_HELP: + MessageBox(NULL, _T("Help is not yet implemented\n"), + _T("Note!"), MB_OK | MB_ICONINFORMATION); + break; + + case ID_EXIT: + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + + case ID_WINDOW_TILE: + SendMessage(hMDIClient, WM_MDITILE, 0, 0); + break; + + case ID_WINDOW_CASCADE: + SendMessage(hMDIClient, WM_MDICASCADE, 0, 0); + break; + + case ID_ABOUT: + DialogBox(hInstance, + MAKEINTRESOURCE(IDD_ABOUTBOX), + hMainWnd, + (DLGPROC)AboutDialogProc); + break; + + default: + { + if(LOWORD(wParam) >= ID_MDI_FIRSTCHILD) + { + DefFrameProc(hwnd, hMDIClient, WM_COMMAND, wParam, lParam); + } + else + { + HWND hChild = (HWND)SendMessage(hMDIClient, WM_MDIGETACTIVE,0,0); + if(hChild) + { + SendMessage(hChild, WM_COMMAND, wParam, lParam); + } + } + } + } + break; + + case WM_CLOSE: + DestroyMenu(hShortcutMenu); + DestroyWindow(hwnd); + break; + + case WM_DESTROY: + PostQuitMessage(0); + break; + + default: + return DefFrameProc(hwnd, hMDIClient, msg, wParam, lParam); + } + return 0; +} + + +void GetLargestDisplayMode(int *pcxBitmap, int *pcyBitmap) +{ + DEVMODE devmode; + int iModeNum = 0; + + *pcxBitmap = *pcyBitmap = 0; + + ZeroMemory(&devmode, sizeof(DEVMODE)); + devmode.dmSize = sizeof(DEVMODE); + + while (EnumDisplaySettings (NULL, iModeNum++, &devmode)) + { + *pcxBitmap = max (*pcxBitmap, (int) devmode.dmPelsWidth); + *pcyBitmap = max (*pcyBitmap, (int) devmode.dmPelsHeight); + } +} + + + +LRESULT CALLBACK MDIChildWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static BOOL fLeftButtonDown, fRightButtonDown ; + static HBITMAP hBitmap; + static HDC hdcMem; + static int cxBitmap, cyBitmap, cxClient, cyClient, xMouse, yMouse; + HDC hdc; + PAINTSTRUCT ps; + + switch(msg) + { + case WM_CREATE: + break; + + case WM_MDIACTIVATE: + { + HMENU hMenu, hFileMenu; + UINT EnableFlag; + + hMenu = GetMenu(hMainWnd); + if(hwnd == (HWND)lParam) + { /* being activated, enable the menus */ + EnableFlag = MF_ENABLED; + } + else + { + TCHAR Buf[6]; + /* being de-activated, gray the menus */ + EnableFlag = MF_GRAYED; + + /* indicate program is ready in the status bar */ + LoadString(hInstance, IDS_READY, Buf, sizeof(Buf) / sizeof(TCHAR)); + SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)Buf); + } + + EnableMenuItem(hMenu, 1, MF_BYPOSITION | EnableFlag); + EnableMenuItem(hMenu, 2, MF_BYPOSITION | EnableFlag); + EnableMenuItem(hMenu, 3, MF_BYPOSITION | EnableFlag); + + hFileMenu = GetSubMenu(hMenu, 0); +// EnableMenuItem(hFileMenu, ID_FILE_SAVEAS, MF_BYCOMMAND | EnableFlag); + +// EnableMenuItem(hFileMenu, ID_FILE_CLOSE, MF_BYCOMMAND | EnableFlag); +// EnableMenuItem(hFileMenu, ID_FILE_CLOSEALL, MF_BYCOMMAND | EnableFlag); + + DrawMenuBar(hMainWnd); + } + break; + + case WM_MOUSEMOVE: + { + POINT pt; + TCHAR Buf[200]; + TCHAR Cur[15]; + + pt.x = LOWORD(lParam); + pt.y = HIWORD(lParam); + + /* set cursor location in the status bar */ + LoadString(hInstance, IDS_CURPOS, Cur, sizeof(Cur) / sizeof(TCHAR)); + _sntprintf(Buf, sizeof(Buf) / sizeof(TCHAR), Cur, pt.x, pt.y); + SendMessage(hStatus, SB_SETTEXT, 0, (LPARAM)Buf); + + if (!fLeftButtonDown && !fRightButtonDown) + return 0; + + hdc = GetDC(hwnd); + + SelectObject(hdc, + GetStockObject(fLeftButtonDown ? BLACK_PEN : WHITE_PEN) ); + + SelectObject(hdcMem, + GetStockObject(fLeftButtonDown ? BLACK_PEN : WHITE_PEN) ); + + MoveToEx (hdc, xMouse, yMouse, NULL); + MoveToEx (hdcMem, xMouse, yMouse, NULL); + + xMouse = (short) LOWORD(lParam); + yMouse = (short) HIWORD(lParam); + + LineTo(hdc, xMouse, yMouse); + LineTo(hdcMem, xMouse, yMouse); + + ReleaseDC(hwnd, hdc); + } + break; + + case WM_LBUTTONDOWN: + if (!fRightButtonDown) + SetCapture(hwnd); + + xMouse = LOWORD(lParam); + yMouse = HIWORD(lParam); + fLeftButtonDown = TRUE; + break; + + case WM_LBUTTONUP: + if (fLeftButtonDown) + SetCapture(NULL); + + fLeftButtonDown = FALSE; + break; + + case WM_RBUTTONDOWN: + if (!fLeftButtonDown) + SetCapture(hwnd); + + xMouse = LOWORD(lParam); + yMouse = HIWORD(lParam); + fRightButtonDown = TRUE; + break; + + case WM_RBUTTONUP: + if (fRightButtonDown) + SetCapture(NULL); + + fRightButtonDown = FALSE; + break; + + case WM_PAINT: + hdc = BeginPaint(hwnd, &ps); + + BitBlt(hdc, 0, 0, cxClient, cyClient, hdcMem, 0, 0, SRCCOPY); + + EndPaint(hwnd, &ps); + break; + + case WM_COMMAND: + switch(LOWORD(wParam)) + { +/* case ID_OPEN: + DoFileOpen(hwnd); + break; + case ID_SAVEAS: + DoFileSave(hwnd); + break; + case ID_CUT: + SendDlgItemMessage(hwnd, IDC_CHILD_EDIT, WM_CUT, 0, 0); + break; + case ID_COPY: + SendDlgItemMessage(hwnd, IDC_CHILD_EDIT, WM_COPY, 0, 0); + break; + case ID_PASTE: + SendDlgItemMessage(hwnd, IDC_CHILD_EDIT, WM_PASTE, 0, 0); +*/ break; + } + break; + + case WM_SIZE: + return DefMDIChildProc(hwnd, msg, wParam, lParam); + + default: + return DefMDIChildProc(hwnd, msg, wParam, lParam); + + } + return 0; +} + + +BOOL SetUpMDIChildWindowClass(HINSTANCE hInstance) +{ + WNDCLASSEX wc; + + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = MDIChildWndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)GetStockObject(WHITE_BRUSH); + wc.lpszMenuName = NULL; + wc.lpszClassName = ChildClassName; + wc.hIconSm = LoadIcon(NULL, IDI_APPLICATION); + + if(!RegisterClassEx(&wc)) + { + MessageBox(0, _T("Could Not Register Child Window"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return FALSE; + } + else + return TRUE; +} + +#ifdef _MSC_VER +#pragma warning(disable : 4100) +#endif +int WINAPI WinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, + LPSTR lpCmdLine, int nCmdShow) +{ + WNDCLASSEX wc; + MSG Msg; + + hInstance = hThisInstance; + + InitCommonControls(); + + wc.cbSize = sizeof(WNDCLASSEX); + wc.style = 0; + wc.lpfnWndProc = WndProc; + wc.cbClsExtra = 0; + wc.cbWndExtra = 0; + wc.hInstance = hInstance; + wc.hIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_ICON)); + wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); + wc.lpszClassName = AppClassName; + wc.hIconSm = (HICON)LoadImage(hInstance, + MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0); + + if(!RegisterClassEx(&wc)) + { + MessageBox(NULL, _T("Window Registration Failed!"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return 0; + } + + if(!SetUpMDIChildWindowClass(hInstance)) + return 0; + + hMainWnd = CreateWindowEx( + 0, + AppClassName, + _T("ImageSoft"), + WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN, + CW_USEDEFAULT, CW_USEDEFAULT, 800, 600, + NULL, NULL, hInstance, NULL); + + if(hMainWnd == NULL) + { + MessageBox(NULL, _T("Window Creation Failed!"), _T("Error!"), + MB_ICONEXCLAMATION | MB_OK); + return 0; + } + + ShowWindow(hMainWnd, nCmdShow); + UpdateWindow(hMainWnd); + + while( GetMessage( &Msg, NULL, 0, 0 ) ) + { + if (!TranslateMDISysAccel(hMDIClient, &Msg)) + { + TranslateMessage(&Msg); + DispatchMessage(&Msg); + } + } + return (int)Msg.wParam; +} _____ Added: trunk/reactos/base/applications/imagesoft/paint.h --- trunk/reactos/base/applications/imagesoft/paint.h 2006-02-12 22:21:56 UTC (rev 112) +++ trunk/reactos/base/applications/imagesoft/paint.h 2006-02-14 17:39:13 UTC (rev 113) @@ -0,0 +1,17 @@ +#ifndef __PAINT_H +#define __PAINT_H + +//#define WIN32_LEAN_AND_MEAN +#include <windows.h> +#include <windowsx.h> /* GET_X/Y_LPARAM */ +#include <stdio.h> +#include <tchar.h> +#include <commctrl.h> +#include "resource.h" + +#define MAX_KEY_LENGTH 256 +#define NUM_BUTTONS 13 + +BOOL CALLBACK AboutDialogProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); + +#endif /* __SERVMAN_H */ _____ Added: trunk/reactos/base/applications/imagesoft/paint.rc --- trunk/reactos/base/applications/imagesoft/paint.rc 2006-02-12 22:21:56 UTC (rev 112) +++ trunk/reactos/base/applications/imagesoft/paint.rc 2006-02-14 17:39:13 UTC (rev 113) @@ -0,0 +1,17 @@ +#include <windows.h> +#include <commctrl.h> +#include "resource.h" + + +//#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Service Manager\0" +//#define REACTOS_STR_INTERNAL_NAME "services\0" +//#define REACTOS_STR_ORIGINAL_FILENAME "services.exe\0" +//#include <reactos/version.rc> + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +IDI_ICON ICON "res/ImageSoft.ico" + +#include "En.rc" + + _____ Added: trunk/reactos/base/applications/imagesoft/res/imagesoft.ico (Binary files differ) Property changes on: trunk/reactos/base/applications/imagesoft/res/imagesoft.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Added: trunk/reactos/base/applications/imagesoft/resource.h --- trunk/reactos/base/applications/imagesoft/resource.h 2006-02-12 22:21:56 UTC (rev 112) +++ trunk/reactos/base/applications/imagesoft/resource.h 2006-02-14 17:39:13 UTC (rev 113) @@ -0,0 +1,68 @@ +#define IDC_STATIC -1 + +#define IDC_TOOLBAR 1001 +#define IDC_STATUSBAR 1002 +#define IDC_MAIN_MDI 1004 + +#define ID_NEW 2000 +#define ID_OPEN 2001 +#define ID_CLOSE 2002 +#define ID_SAVE 2003 +#define ID_SAVEAS 2004 +#define ID_PRINTPRE 2005 +#define ID_PRINT 2006 +#define ID_PROP 2007 +#define ID_CUT 2008 +#define ID_COPY 2009 +#define ID_PASTE 2010 +#define ID_PASTENEWIMAGE 2011 +#define ID_UNDO 2012 +#define ID_REDO 2013 +#define ID_SELALL 2014 +#define ID_EXIT 2015 + +#define ID_REFRESH 3000 +#define ID_HELP 3001 +#define ID_WINDOW_TILE 3002 +#define ID_WINDOW_CASCADE 3003 + +/* Menu */ +#define IDR_MAINMENU 102 +#define IDR_POPUP 103 +#define ID_ABOUT 4031 + + +/* tooltips */ +#define IDS_TOOLTIP_PROP 6000 +#define IDS_TOOLTIP_REFRESH 6001 +#define IDS_TOOLTIP_EXPORT 6002 +#define IDS_TOOLTIP_START 6003 +#define IDS_TOOLTIP_STOP 6004 +#define IDS_TOOLTIP_PAUSE 6005 +#define IDS_TOOLTIP_RESTART 6006 +#define IDS_TOOLTIP_NEW 6007 +#define IDS_TOOLTIP_HELP 6008 +#define IDS_TOOLTIP_EXIT 6009 + +#define IDI_ICON 50 +#define IDB_BUTTONS 51 + +/* toolbar buttons */ +#define TBICON_PROP 0 +#define TBICON_REFRESH 1 +#define TBICON_EXPORT 2 +#define TBICON_CREATE 3 +#define TBICON_START 4 +#define TBICON_STOP 5 +#define TBICON_PAUSE 6 +#define TBICON_RESTART 7 +#define TBICON_HELP 8 +#define TBICON_EXIT 9 + +/* about box info */ +#define IDD_ABOUTBOX 200 +#define IDC_LICENSE_EDIT 201 +#define IDS_LICENSE 202 + +#define IDS_CURPOS 550 +#define IDS_READY 551

18 years, 6 months

[martinf] 112: adapted buildno tool to new XML routines

by martinf＠svn.reactos.org

adapted buildno tool to new XML routines Modified: branches/expat-rbuild/reactos/tools/buildno/buildno.cpp Added: branches/expat-rbuild/reactos/tools/buildno/buildno.dsp Added: branches/expat-rbuild/reactos/tools/buildno/buildno.dsw Modified: branches/expat-rbuild/reactos/tools/buildno/buildno.mak Property changes on: branches/expat-rbuild/reactos/tools/buildno ___________________________________________________________________ Name: svn:ignore + Debug Release *.opt *.ncb _____ Modified: branches/expat-rbuild/reactos/tools/buildno/buildno.cpp --- branches/expat-rbuild/reactos/tools/buildno/buildno.cpp 2006-02-12 22:21:11 UTC (rev 111) +++ branches/expat-rbuild/reactos/tools/buildno/buildno.cpp 2006-02-12 22:21:56 UTC (rev 112) @@ -35,7 +35,10 @@ #define ros_mkdir(dir, mode) mkdir((dir), (mode)) #endif #include "version.h" + #include "xml.h" +using namespace XMLStorage; +using namespace std; #define FALSE 0 #define TRUE 1 @@ -115,6 +118,9 @@ unsigned int length; int dllversion = KERNEL_VERSION_MAJOR + 42; + if (!filename || !*filename) + return 1; + s1 = s = (char *) malloc(256 * 1024); s = s + sprintf (s, "/* Do not edit - Machine generated */\n"); @@ -236,73 +242,42 @@ return 0; } -static char * +static string GetRev(void) { - static char Unknown[] = "UNKNOWN"; - static char Revision[10]; /* 999999999 revisions should be enough for everyone... */ + try { + XMLDoc doc; - try - { - XMLElement *head; + if (!doc.read(".svn/entries")) + doc.read("_svn/entries"); - try - { - head = XMLLoadFile(".svn/entries"); - } - catch(XMLFileNotFoundException) - { - head = XMLLoadFile("_svn/entries"); - } - XMLElement *entries = head->subElements[0]; - for (size_t i = 0; i < entries->subElements.size(); i++) - { - XMLElement *entry = entries->subElements[i]; - if ("entry" == entry->name) - { - bool GotName = false; - bool GotKind = false; - bool GotRevision = false; - for (size_t j = 0; j < entry->attributes.size(); j++) - { - XMLAttribute *Attribute = entry->attributes[j]; - if ("name" == Attribute->name && "" == Attribute->value) - { - GotName = true; - } - if ("kind" == Attribute->name && "dir" == Attribute->value) - { - GotKind = true; - } - if ("revision" == Attribute->name) - { - if (sizeof(Revision) <= Attribute->value.length() + 1) - { - strcpy(Revision, "revtoobig"); - } - else - { - strcpy(Revision, Attribute->value.c_str()); - } - GotRevision = true; - } - if (GotName && GotKind && GotRevision) - { - delete head; - return Revision; - } - } - } - } + XMLPos pos(&doc); - delete head; - } - catch(...) - { - ; - } + // enter the "wc-entries" root element + if (pos.go_down("wc-entries")) { + // enumerate all "entry" children elements + const_XMLChildrenFilter entries(pos, "entry"); - return Unknown; + for(const_XMLChildrenFilter::const_iterator it=entries.begin(); it!=entries.end(); ++it) { + const XMLNode& entry = **it; + + string kind = entry.get("kind"); + string name = entry.get("name"); + string revision = entry.get("revision"); + + if (kind=="dir" && name=="" && !revision.empty()) + return revision; + } + + pos.back(); + } + } + catch(exception& e) + { + fprintf(stderr, "Exception: %s\n", e.what()); + } + + return "UNKNOWN"; } @@ -402,7 +377,7 @@ */ build = t1_tm->tm_year * 10000 + (t1_tm->tm_mon + 1) * 100 + t1_tm->tm_mday; - sprintf(buildstr, "%d-r%s", build, GetRev()); + sprintf(buildstr, "%d-r%s", build, GetRev().c_str()); if (! quiet) { _____ Added: branches/expat-rbuild/reactos/tools/buildno/buildno.dsp --- branches/expat-rbuild/reactos/tools/buildno/buildno.dsp 2006-02-12 22:21:11 UTC (rev 111) +++ branches/expat-rbuild/reactos/tools/buildno/buildno.dsp 2006-02-12 22:21:56 UTC (rev 112) @@ -0,0 +1,104 @@ +# Microsoft Developer Studio Project File - Name="buildno" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Console Application" 0x0103 + +CFG=buildno - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "buildno.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "buildno.mak" CFG="buildno - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "buildno - Win32 Release" (based on "Win32 (x86) Console Application") +!MESSAGE "buildno - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +RSC=rc.exe + +!IF "$(CFG)" == "buildno - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "Release" +# PROP BASE Intermediate_Dir "Release" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "Release" +# PROP Intermediate_Dir "Release" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I ".." /I "..\..\include\reactos" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_ROS_" /D "HAVE_EXPAT_CONFIG_H" /D XMLCALL="" /D XMLIMPORT="" /D "_NO_COMMENT" /D "XMLNODE_LOCATION" /YX /FD /c +# ADD BASE RSC /l 0x407 /d "NDEBUG" +# ADD RSC /l 0x407 /d "NDEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 + +!ELSEIF "$(CFG)" == "buildno - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "Debug" +# PROP BASE Intermediate_Dir "Debug" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "Debug" +# PROP Intermediate_Dir "Debug" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "..\..\include\reactos" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_ROS_" /D "HAVE_EXPAT_CONFIG_H" /D XMLCALL="" /D XMLIMPORT="" /D "_NO_COMMENT" /D "XMLNODE_LOCATION" /FR /YX /FD /GZ /c +# ADD BASE RSC /l 0x407 /d "_DEBUG" +# ADD RSC /l 0x407 /d "_DEBUG" +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept + +!ENDIF + +# Begin Target + +# Name "buildno - Win32 Release" +# Name "buildno - Win32 Debug" +# Begin Source File + +SOURCE=.\buildno.cpp +# End Source File +# Begin Source File + +SOURCE=..\expat\xmlparse.c +# End Source File +# Begin Source File + +SOURCE=..\expat\xmlrole.c +# End Source File +# Begin Source File + +SOURCE=..\xmlstorage.cpp +# End Source File +# Begin Source File + +SOURCE=..\expat\xmltok.c +# End Source File +# End Target +# End Project Property changes on: branches/expat-rbuild/reactos/tools/buildno/buildno.dsp ___________________________________________________________________ Name: svn:eol-style + CRLF _____ Added: branches/expat-rbuild/reactos/tools/buildno/buildno.dsw --- branches/expat-rbuild/reactos/tools/buildno/buildno.dsw 2006-02-12 22:21:11 UTC (rev 111) +++ branches/expat-rbuild/reactos/tools/buildno/buildno.dsw 2006-02-12 22:21:56 UTC (rev 112) @@ -0,0 +1,29 @@ +Microsoft Developer Studio Workspace File, Format Version 6.00 +# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! + +####################################################################### ######## + +Project: "buildno"=".\buildno.dsp" - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +####################################################################### ######## + +Global: + +Package=<5> +{{{ +}}} + +Package=<3> +{{{ +}}} + +####################################################################### ######## + Property changes on: branches/expat-rbuild/reactos/tools/buildno/buildno.dsw ___________________________________________________________________ Name: svn:eol-style + CRLF _____ Modified: branches/expat-rbuild/reactos/tools/buildno/buildno.mak --- branches/expat-rbuild/reactos/tools/buildno/buildno.mak 2006-02-12 22:21:11 UTC (rev 111) +++ branches/expat-rbuild/reactos/tools/buildno/buildno.mak 2006-02-12 22:21:56 UTC (rev 112) @@ -25,14 +25,15 @@ BUILDNO_OBJECTS = \ $(addprefix $(INTERMEDIATE_), $(BUILDNO_SOURCES:.cpp=.o)) -BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) +BUILDNO_HOST_CXXFLAGS = -I$(TOOLS_BASE) -Iinclude/reactos $(TOOLS_CPPFLAGS) \ + -DXMLNODE_LOCATION -DHAVE_EXPAT_CONFIG_H -DXMLCALL="" -DXMLIMPORT="" -D_ROS_ BUILDNO_HOST_LFLAGS = $(TOOLS_LFLAGS) .PHONY: buildno buildno: $(BUILDNO_TARGET) -$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(XML_SSPRINTF_OBJECTS) | $(BUILDNO_OUT) +$(BUILDNO_TARGET): $(BUILDNO_OBJECTS) $(TOOLS_OBJECTS) $(EXPAT_OBJECTS) | $(BUILDNO_OUT) $(ECHO_LD) ${host_gpp} $^ $(BUILDNO_HOST_LFLAGS) -o $@

18 years, 6 months

[martinf] 111: first draft of rbuild with Expat integration

by martinf＠svn.reactos.org

first draft of rbuild with Expat integration current state: builds and runs with MSVC, still problems with GCC Modified: branches/expat-rbuild/reactos/Makefile Modified: branches/expat-rbuild/reactos/ReactOS.rbuild Modified: branches/expat-rbuild/reactos/base/applications/applications.rbuild Modified: branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild Modified: branches/expat-rbuild/reactos/base/applications/games/directory.rbuild Modified: branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair e.rbuild Modified: branches/expat-rbuild/reactos/base/applications/games/winemine/winemine. rbuild Modified: branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb uild Modified: branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild Modified: branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild Modified: branches/expat-rbuild/reactos/base/base.rbuild Modified: branches/expat-rbuild/reactos/base/setup/setup.rbuild Modified: branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild Modified: branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild Modified: branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild Modified: branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild Modified: branches/expat-rbuild/reactos/base/shell/shell.rbuild Modified: branches/expat-rbuild/reactos/base/system/system.rbuild Modified: branches/expat-rbuild/reactos/baseaddress.rbuild Modified: branches/expat-rbuild/reactos/boot/boot.rbuild Modified: branches/expat-rbuild/reactos/include/reactos/debug.h Modified: branches/expat-rbuild/reactos/lib/directory.rbuild Modified: branches/expat-rbuild/reactos/lib/inflib/builddep.h Modified: branches/expat-rbuild/reactos/lib/inflib/infcore.c Modified: branches/expat-rbuild/reactos/lib/inflib/infget.c Modified: branches/expat-rbuild/reactos/lib/inflib/infhostgen.c Modified: branches/expat-rbuild/reactos/lib/inflib/infhostget.c Modified: branches/expat-rbuild/reactos/lib/inflib/infhostglue.c Modified: branches/expat-rbuild/reactos/lib/inflib/infhostput.c Modified: branches/expat-rbuild/reactos/lib/inflib/infput.c Modified: branches/expat-rbuild/reactos/media/media.rbuild Modified: branches/expat-rbuild/reactos/subsystems/subsystems.rbuild Added: branches/expat-rbuild/reactos/tools/expat/ Added: branches/expat-rbuild/reactos/tools/expat/ascii.h Added: branches/expat-rbuild/reactos/tools/expat/asciitab.h Added: branches/expat-rbuild/reactos/tools/expat/expat.h Added: branches/expat-rbuild/reactos/tools/expat/expat_config.h Added: branches/expat-rbuild/reactos/tools/expat/expat_external.h Added: branches/expat-rbuild/reactos/tools/expat/iasciitab.h Added: branches/expat-rbuild/reactos/tools/expat/internal.h Added: branches/expat-rbuild/reactos/tools/expat/latin1tab.h Added: branches/expat-rbuild/reactos/tools/expat/nametab.h Added: branches/expat-rbuild/reactos/tools/expat/utf8tab.h Added: branches/expat-rbuild/reactos/tools/expat/xmlparse.c Added: branches/expat-rbuild/reactos/tools/expat/xmlrole.c Added: branches/expat-rbuild/reactos/tools/expat/xmlrole.h Added: branches/expat-rbuild/reactos/tools/expat/xmltok.c Added: branches/expat-rbuild/reactos/tools/expat/xmltok.h Added: branches/expat-rbuild/reactos/tools/expat/xmltok_impl.c Added: branches/expat-rbuild/reactos/tools/expat/xmltok_impl.h Added: branches/expat-rbuild/reactos/tools/expat/xmltok_ns.c Modified: branches/expat-rbuild/reactos/tools/rbuild/automaticdependency.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/backend.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/backend.h Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/devcpp/devcpp.h Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.c pp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/mingw/proxymakefile.c pp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/genguid.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/msvc.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/msvc.h Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/msvcmaker.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/bootstrap.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/cdfile.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/compilationunit.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/compilationunitsupportcode.cp p Modified: branches/expat-rbuild/reactos/tools/rbuild/compilerflag.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/define.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/directory.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/exception.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/exception.h Modified: branches/expat-rbuild/reactos/tools/rbuild/filesupportcode.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/global.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/include.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/installfile.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/linkerflag.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/linkerscript.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/module.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/pch.h Modified: branches/expat-rbuild/reactos/tools/rbuild/project.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.dsp Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.h Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.mak Modified: branches/expat-rbuild/reactos/tools/rbuild/rbuild.vcproj Modified: branches/expat-rbuild/reactos/tools/rbuild/stubbedcomponent.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/syssetupgenerator.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/test.h Modified: branches/expat-rbuild/reactos/tools/rbuild/testsupportcode.cpp Modified: branches/expat-rbuild/reactos/tools/rbuild/wineresource.cpp Modified: branches/expat-rbuild/reactos/tools/ssprintf.cpp Modified: branches/expat-rbuild/reactos/tools/tools.mak Modified: branches/expat-rbuild/reactos/tools/xml.cpp Modified: branches/expat-rbuild/reactos/tools/xml.h Added: branches/expat-rbuild/reactos/tools/xmlstorage.cpp Added: branches/expat-rbuild/reactos/tools/xmlstorage.h _____ Modified: branches/expat-rbuild/reactos/Makefile --- branches/expat-rbuild/reactos/Makefile 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/Makefile 2006-02-12 22:21:11 UTC (rev 111) @@ -38,7 +38,7 @@ # This can require several minutes to complete. If you only need to check # dependencies for a single or few modules then you can use the # module_depends targets instead. This target can also repair a damaged or -# missing makefile.auto if needed. +# missing Makefile.auto if needed. # # module_depends # These targets do a dependency check of individual modules. Replace module @@ -109,7 +109,7 @@ # -r Input XML # # ROS_AUTOMAKE -# Alternate name of makefile.auto +# Alternate name of Makefile.auto # # check for versions of make that don't have features we need... @@ -131,7 +131,7 @@ .PHONY: clean ifeq ($(ROS_AUTOMAKE),) -ROS_AUTOMAKE=makefile.auto +ROS_AUTOMAKE=Makefile.auto endif all: $(ROS_AUTOMAKE) @@ -486,5 +486,5 @@ .PHONY: depends depends: - @-$(rm) makefile.auto + @-$(rm) Makefile.auto @$(MAKE) $(filter-out depends, $(MAKECMDGOALS)) _____ Modified: branches/expat-rbuild/reactos/ReactOS.rbuild --- branches/expat-rbuild/reactos/ReactOS.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/ReactOS.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,4 +1,4 @@ -<?xml version="1.0"?> +<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <project name="ReactOS" makefile="makefile.auto" xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="config.rbuild"> _____ Modified: branches/expat-rbuild/reactos/base/applications/applications.rbuild --- branches/expat-rbuild/reactos/base/applications/applications.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/applications.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group>  - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild --- branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/devmgr/devmgrapp.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="devmgrapp" type="win32cui" installbase="system32" installname="devmgr.exe"> <define name="__USE_W32API" /> <define name="DEFINE_GUID" /> @@ -13,5 +12,4 @@ <file>devmgr.c</file> <efile>devmgr.rc</efile> </module> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/applications/games/directory.rbuild --- branches/expat-rbuild/reactos/base/applications/games/directory.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/games/directory.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group>  - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair e.rbuild --- branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair e.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/games/solitaire/solitair e.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group>  - </group> </rbuild> \ No newline at end of file _____ Modified: branches/expat-rbuild/reactos/base/applications/games/winemine/winemine. rbuild --- branches/expat-rbuild/reactos/base/applications/games/winemine/winemine. rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/games/winemine/winemine. rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group>  - </group> </rbuild> \ No newline at end of file _____ Modified: branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb uild --- branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb uild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/getfirefox/getfirefox.rb uild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="getfirefox" type="win32gui" installbase="system32" installname="getfirefox.exe"> <include base="getfirefox">.</include> <define name="UNICODE" /> @@ -18,5 +17,4 @@ <file>getfirefox.c</file> <file>getfirefox.rc</file> </module> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild --- branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/hostname/hostname.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,11 +1,9 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="hostname" type="win32cui" installbase="system32" installname="hostname.exe" allowwarnings="true"> <define name="__USE_W32API" /> <library>kernel32</library> <file>hostname.c</file> <file>hostname.rc</file> </module> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild --- branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/applications/shutdown/shutdown.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,11 +1,9 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="shutdown" type="win32cui" installbase="system32" installname="shutdown.exe"> <include base="shutdown">.</include> <define name="__USE_W32API" /> <define name="WINVER">0x0501</define> <file>shutdown.c</file> </module> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/base.rbuild --- branches/expat-rbuild/reactos/base/base.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/base.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <directory name="applications"> <xi:include href="applications/applications.rbuild" /> </directory> @@ -18,5 +17,4 @@ <directory name="system"> <xi:include href="system/system.rbuild" /> </directory> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/setup/setup.rbuild --- branches/expat-rbuild/reactos/base/setup/setup.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/setup/setup.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,8 +1,6 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <directory name="welcome"> <xi:include href="welcome/welcome.rbuild" /> </directory> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild --- branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/setup/welcome/welcome.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe"> <bootstrap base="reactos" /> <include base="welcome">.</include> @@ -15,5 +14,4 @@ <file>welcome.c</file> <file>welcome.rc</file> </module> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild --- branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/shell/cmd/cmd.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="cmd_base" type="objectlibrary"> <include base="ReactOS">include/wine</include> <include base="cmd_base">.</include> @@ -78,5 +77,4 @@ <directory name="tests"> <xi:include href="tests/cmd_test.xml" /> </directory> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild --- branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/shell/cmd/tests/cmd_test.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <module name="cmd_test" type="test"> <include base="rtshared">.</include> <include base="ReactOS">include/wine</include> @@ -16,5 +15,4 @@ <file>setup.c</file> <xi:include href="stubs.xml" /> </module> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild --- branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/shell/cmd/tests/stubs.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <component name="kernel32.dll"> <symbol>FindFirstFileA@8</symbol> <symbol>GetLastError@0</symbol> @@ -85,5 +84,4 @@ <symbol>InterlockedDecrement@4</symbol> <symbol>ReleaseSemaphore@12</symbol> </component> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/shell/shell.rbuild --- branches/expat-rbuild/reactos/base/shell/shell.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/shell/shell.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group>  - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/base/system/system.rbuild --- branches/expat-rbuild/reactos/base/system/system.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/base/system/system.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,8 +1,6 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group>  - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/baseaddress.rbuild --- branches/expat-rbuild/reactos/baseaddress.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/baseaddress.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> -<group> <property name="BASEADDRESS_DPLAYX" value="0x5E080000" /> <property name="BASEADDRESS_DPLAY" value="0x71E80000" /> <property name="BASEADDRESS_REGTESTS" value="0x07000000" /> @@ -122,5 +121,4 @@ <property name="BASEADDRESS_KERNEL32" value="0x7c800000" /> <property name="BASEADDRESS_NTDLL" value="0x7C900000" /> <property name="BASEADDRESS_FREETYPE" value="0x7F000000" /> -</group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/boot/boot.rbuild --- branches/expat-rbuild/reactos/boot/boot.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/boot/boot.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,11 +1,9 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <directory name="bootcd"> <xi:include href="bootcd/bootcd.rbuild" /> </directory> <directory name="freeldr"> <xi:include href="freeldr/freeldr.rbuild" /> </directory> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/include/reactos/debug.h --- branches/expat-rbuild/reactos/include/reactos/debug.h 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/include/reactos/debug.h 2006-02-12 22:21:11 UTC (rev 111) @@ -99,9 +99,14 @@ #else +#ifdef _MSC_VER + #define DPRINT1 + #define DPRINT +#else /* On non-debug builds, we never show these */ #define DPRINT1(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) #define DPRINT(...) do { if(0) { DbgPrint(__VA_ARGS__); } } while(0) +#endif #define CHECKPOINT1 #define CHECKPOINT _____ Modified: branches/expat-rbuild/reactos/lib/directory.rbuild --- branches/expat-rbuild/reactos/lib/directory.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/directory.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,8 +1,6 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <directory name="rossym"> <xi:include href="rossym/rossym.rbuild" /> </directory> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/lib/inflib/builddep.h --- branches/expat-rbuild/reactos/lib/inflib/builddep.h 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/builddep.h 2006-02-12 22:21:11 UTC (rev 111) @@ -45,7 +45,7 @@ #define STRFMT "%s" #ifdef _MSC_VER -#define strcasecmp stricmp +#define strcasecmp _stricmp #endif extern unsigned long DbgPrint(char *Fmt, ...); _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infcore.c --- branches/expat-rbuild/reactos/lib/inflib/infcore.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infcore.c 2006-02-12 22:21:11 UTC (rev 111) @@ -10,7 +10,9 @@ #include "inflib.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #define CONTROL_Z '\x1a' _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infget.c --- branches/expat-rbuild/reactos/lib/inflib/infget.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infget.c 2006-02-12 22:21:11 UTC (rev 111) @@ -10,7 +10,9 @@ #include "inflib.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infhostgen.c --- branches/expat-rbuild/reactos/lib/inflib/infhostgen.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infhostgen.c 2006-02-12 22:21:11 UTC (rev 111) @@ -11,7 +11,9 @@ #include "inflib.h" #include "infhost.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> /* PUBLIC FUNCTIONS *********************************************************/ _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infhostget.c --- branches/expat-rbuild/reactos/lib/inflib/infhostget.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infhostget.c 2006-02-12 22:21:11 UTC (rev 111) @@ -11,7 +11,9 @@ #include "inflib.h" #include "infhost.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> int _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infhostglue.c --- branches/expat-rbuild/reactos/lib/inflib/infhostglue.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infhostglue.c 2006-02-12 22:21:11 UTC (rev 111) @@ -8,7 +8,9 @@ #include "inflib.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> unsigned long _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infhostput.c --- branches/expat-rbuild/reactos/lib/inflib/infhostput.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infhostput.c 2006-02-12 22:21:11 UTC (rev 111) @@ -9,7 +9,9 @@ #include "inflib.h" #include "infhost.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> int _____ Modified: branches/expat-rbuild/reactos/lib/inflib/infput.c --- branches/expat-rbuild/reactos/lib/inflib/infput.c 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/lib/inflib/infput.c 2006-02-12 22:21:11 UTC (rev 111) @@ -8,7 +8,9 @@ #include "inflib.h" +#ifndef NDEBUG #define NDEBUG +#endif #include <debug.h> #define EOL _T("\r\n") _____ Modified: branches/expat-rbuild/reactos/media/media.rbuild --- branches/expat-rbuild/reactos/media/media.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/media/media.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,9 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <group> <directory name="fonts"> <xi:include href="fonts/fonts.rbuild" /> </directory> - </group> </rbuild> _____ Modified: branches/expat-rbuild/reactos/subsystems/subsystems.rbuild --- branches/expat-rbuild/reactos/subsystems/subsystems.rbuild 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/subsystems/subsystems.rbuild 2006-02-12 22:21:11 UTC (rev 111) @@ -1,6 +1,5 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> -<group>  -</group> </rbuild> _____ Added: branches/expat-rbuild/reactos/tools/expat/ascii.h --- branches/expat-rbuild/reactos/tools/expat/ascii.h 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/tools/expat/ascii.h 2006-02-12 22:21:11 UTC (rev 111) @@ -0,0 +1,85 @@ +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. +*/ + +#define ASCII_A 0x41 +#define ASCII_B 0x42 +#define ASCII_C 0x43 +#define ASCII_D 0x44 +#define ASCII_E 0x45 +#define ASCII_F 0x46 +#define ASCII_G 0x47 +#define ASCII_H 0x48 +#define ASCII_I 0x49 +#define ASCII_J 0x4A +#define ASCII_K 0x4B +#define ASCII_L 0x4C +#define ASCII_M 0x4D +#define ASCII_N 0x4E +#define ASCII_O 0x4F +#define ASCII_P 0x50 +#define ASCII_Q 0x51 +#define ASCII_R 0x52 +#define ASCII_S 0x53 +#define ASCII_T 0x54 +#define ASCII_U 0x55 +#define ASCII_V 0x56 +#define ASCII_W 0x57 +#define ASCII_X 0x58 +#define ASCII_Y 0x59 +#define ASCII_Z 0x5A + +#define ASCII_a 0x61 +#define ASCII_b 0x62 +#define ASCII_c 0x63 +#define ASCII_d 0x64 +#define ASCII_e 0x65 +#define ASCII_f 0x66 +#define ASCII_g 0x67 +#define ASCII_h 0x68 +#define ASCII_i 0x69 +#define ASCII_j 0x6A +#define ASCII_k 0x6B +#define ASCII_l 0x6C +#define ASCII_m 0x6D +#define ASCII_n 0x6E +#define ASCII_o 0x6F +#define ASCII_p 0x70 +#define ASCII_q 0x71 +#define ASCII_r 0x72 +#define ASCII_s 0x73 +#define ASCII_t 0x74 +#define ASCII_u 0x75 +#define ASCII_v 0x76 +#define ASCII_w 0x77 +#define ASCII_x 0x78 +#define ASCII_y 0x79 +#define ASCII_z 0x7A + +#define ASCII_0 0x30 +#define ASCII_1 0x31 +#define ASCII_2 0x32 +#define ASCII_3 0x33 +#define ASCII_4 0x34 +#define ASCII_5 0x35 +#define ASCII_6 0x36 +#define ASCII_7 0x37 +#define ASCII_8 0x38 +#define ASCII_9 0x39 + +#define ASCII_TAB 0x09 +#define ASCII_SPACE 0x20 +#define ASCII_EXCL 0x21 +#define ASCII_QUOT 0x22 +#define ASCII_AMP 0x26 +#define ASCII_APOS 0x27 +#define ASCII_MINUS 0x2D +#define ASCII_PERIOD 0x2E +#define ASCII_COLON 0x3A +#define ASCII_SEMI 0x3B +#define ASCII_LT 0x3C +#define ASCII_EQUALS 0x3D +#define ASCII_GT 0x3E +#define ASCII_LSQB 0x5B +#define ASCII_RSQB 0x5D +#define ASCII_UNDERSCORE 0x5F Property changes on: branches/expat-rbuild/reactos/tools/expat/ascii.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: branches/expat-rbuild/reactos/tools/expat/asciitab.h --- branches/expat-rbuild/reactos/tools/expat/asciitab.h 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/tools/expat/asciitab.h 2006-02-12 22:21:11 UTC (rev 111) @@ -0,0 +1,36 @@ +/* Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. +*/ + +/* 0x00 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 0x04 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 0x08 */ BT_NONXML, BT_S, BT_LF, BT_NONXML, +/* 0x0C */ BT_NONXML, BT_CR, BT_NONXML, BT_NONXML, +/* 0x10 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 0x14 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 0x18 */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 0x1C */ BT_NONXML, BT_NONXML, BT_NONXML, BT_NONXML, +/* 0x20 */ BT_S, BT_EXCL, BT_QUOT, BT_NUM, +/* 0x24 */ BT_OTHER, BT_PERCNT, BT_AMP, BT_APOS, +/* 0x28 */ BT_LPAR, BT_RPAR, BT_AST, BT_PLUS, +/* 0x2C */ BT_COMMA, BT_MINUS, BT_NAME, BT_SOL, +/* 0x30 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT, +/* 0x34 */ BT_DIGIT, BT_DIGIT, BT_DIGIT, BT_DIGIT, +/* 0x38 */ BT_DIGIT, BT_DIGIT, BT_COLON, BT_SEMI, +/* 0x3C */ BT_LT, BT_EQUALS, BT_GT, BT_QUEST, +/* 0x40 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX, +/* 0x44 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT, +/* 0x48 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x4C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x50 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x54 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x58 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_LSQB, +/* 0x5C */ BT_OTHER, BT_RSQB, BT_OTHER, BT_NMSTRT, +/* 0x60 */ BT_OTHER, BT_HEX, BT_HEX, BT_HEX, +/* 0x64 */ BT_HEX, BT_HEX, BT_HEX, BT_NMSTRT, +/* 0x68 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x6C */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x70 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x74 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, +/* 0x78 */ BT_NMSTRT, BT_NMSTRT, BT_NMSTRT, BT_OTHER, +/* 0x7C */ BT_VERBAR, BT_OTHER, BT_OTHER, BT_OTHER, Property changes on: branches/expat-rbuild/reactos/tools/expat/asciitab.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: branches/expat-rbuild/reactos/tools/expat/expat.h --- branches/expat-rbuild/reactos/tools/expat/expat.h 2006-02-12 19:55:49 UTC (rev 110) +++ branches/expat-rbuild/reactos/tools/expat/expat.h 2006-02-12 22:21:11 UTC (rev 111) @@ -0,0 +1,1013 @@ +/* Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd + See the file COPYING for copying permission. +*/ + +#ifndef Expat_INCLUDED +#define Expat_INCLUDED 1 + +#ifdef __VMS +/* 0 1 2 3 0 1 2 3 + 1234567890123456789012345678901 1234567890123456789012345678901 */ +#define XML_SetProcessingInstructionHandler XML_SetProcessingInstrHandler +#define XML_SetUnparsedEntityDeclHandler XML_SetUnparsedEntDeclHandler +#define XML_SetStartNamespaceDeclHandler XML_SetStartNamespcDeclHandler +#define XML_SetExternalEntityRefHandlerArg XML_SetExternalEntRefHandlerArg +#endif + +#include <stdlib.h> +#include "expat_external.h" + +#ifdef __cplusplus +extern "C" { +#endif + +struct XML_ParserStruct; +typedef struct XML_ParserStruct *XML_Parser; + +/* Should this be defined using stdbool.h when C99 is available? */ +typedef unsigned char XML_Bool; +#define XML_TRUE ((XML_Bool) 1) +#define XML_FALSE ((XML_Bool) 0) + +/* The XML_Status enum gives the possible return values for several + API functions. The preprocessor #defines are included so this + stanza can be added to code that still needs to support older + versions of Expat 1.95.x: + + #ifndef XML_STATUS_OK + #define XML_STATUS_OK 1 + #define XML_STATUS_ERROR 0 + #endif + + Otherwise, the #define hackery is quite ugly and would have been + dropped. +*/ +enum XML_Status { + XML_STATUS_ERROR = 0, +#define XML_STATUS_ERROR XML_STATUS_ERROR + XML_STATUS_OK = 1, +#define XML_STATUS_OK XML_STATUS_OK + XML_STATUS_SUSPENDED = 2 +#define XML_STATUS_SUSPENDED XML_STATUS_SUSPENDED +}; + +enum XML_Error { + XML_ERROR_NONE, + XML_ERROR_NO_MEMORY, + XML_ERROR_SYNTAX, + XML_ERROR_NO_ELEMENTS, + XML_ERROR_INVALID_TOKEN, + XML_ERROR_UNCLOSED_TOKEN, + XML_ERROR_PARTIAL_CHAR, + XML_ERROR_TAG_MISMATCH, + XML_ERROR_DUPLICATE_ATTRIBUTE, + XML_ERROR_JUNK_AFTER_DOC_ELEMENT, + XML_ERROR_PARAM_ENTITY_REF, + XML_ERROR_UNDEFINED_ENTITY, + XML_ERROR_RECURSIVE_ENTITY_REF, + XML_ERROR_ASYNC_ENTITY, + XML_ERROR_BAD_CHAR_REF, + XML_ERROR_BINARY_ENTITY_REF, + XML_ERROR_ATTRIBUTE_EXTERNAL_ENTITY_REF, + XML_ERROR_MISPLACED_XML_PI, + XML_ERROR_UNKNOWN_ENCODING, + XML_ERROR_INCORRECT_ENCODING, + XML_ERROR_UNCLOSED_CDATA_SECTION, + XML_ERROR_EXTERNAL_ENTITY_HANDLING, + XML_ERROR_NOT_STANDALONE, + XML_ERROR_UNEXPECTED_STATE, + XML_ERROR_ENTITY_DECLARED_IN_PE, + XML_ERROR_FEATURE_REQUIRES_XML_DTD, + XML_ERROR_CANT_CHANGE_FEATURE_ONCE_PARSING, + /* Added in 1.95.7. */ + XML_ERROR_UNBOUND_PREFIX, + /* Added in 1.95.8. */ + XML_ERROR_UNDECLARING_PREFIX, + XML_ERROR_INCOMPLETE_PE, + XML_ERROR_XML_DECL, + XML_ERROR_TEXT_DECL, + XML_ERROR_PUBLICID, + XML_ERROR_SUSPENDED, + XML_ERROR_NOT_SUSPENDED, + XML_ERROR_ABORTED, + XML_ERROR_FINISHED, + XML_ERROR_SUSPEND_PE, + /* Added in 2.0. */ + XML_ERROR_RESERVED_PREFIX_XML, + XML_ERROR_RESERVED_PREFIX_XMLNS, + XML_ERROR_RESERVED_NAMESPACE_URI +}; + +enum XML_Content_Type { + XML_CTYPE_EMPTY = 1, + XML_CTYPE_ANY, + XML_CTYPE_MIXED, + XML_CTYPE_NAME, + XML_CTYPE_CHOICE, + XML_CTYPE_SEQ +}; + +enum XML_Content_Quant { + XML_CQUANT_NONE, + XML_CQUANT_OPT, + XML_CQUANT_REP, + XML_CQUANT_PLUS +}; + +/* If type == XML_CTYPE_EMPTY or XML_CTYPE_ANY, then quant will be + XML_CQUANT_NONE, and the other fields will be zero or NULL. + If type == XML_CTYPE_MIXED, then quant will be NONE or REP and + numchildren will contain number of elements that may be mixed in + and children point to an array of XML_Content cells that will be + all of XML_CTYPE_NAME type with no quantification. + + If type == XML_CTYPE_NAME, then the name points to the name, and + the numchildren field will be zero and children will be NULL. The + quant fields indicates any quantifiers placed on the name. + + CHOICE and SEQ will have name NULL, the number of children in + numchildren and children will point, recursively, to an array + of XML_Content cells. + + The EMPTY, ANY, and MIXED types will only occur at top level. +*/ + +typedef struct XML_cp XML_Content; + +struct XML_cp { + enum XML_Content_Type type; + enum XML_Content_Quant quant; + XML_Char * name; + unsigned int numchildren; + XML_Content * children; +}; + + +/* This is called for an element declaration. See above for + description of the model argument. It's the caller's responsibility + to free model when finished with it. +*/ +typedef void (XMLCALL *XML_ElementDeclHandler) (void *userData, + const XML_Char *name, + XML_Content *model); + +XMLPARSEAPI(void) +XML_SetElementDeclHandler(XML_Parser parser, + XML_ElementDeclHandler eldecl); + +/* The Attlist declaration handler is called for *each* attribute. So + a single Attlist declaration with multiple attributes declared will + generate multiple calls to this handler. The "default" parameter + may be NULL in the case of the "#IMPLIED" or "#REQUIRED" + keyword. The "isrequired" parameter will be true and the default + value will be NULL in the case of "#REQUIRED". If "isrequired" is + true and default is non-NULL, then this is a "#FIXED" default. +*/ +typedef void (XMLCALL *XML_AttlistDeclHandler) ( + void *userData, + const XML_Char *elname, + const XML_Char *attname, + const XML_Char *att_type, + const XML_Char *dflt, + int isrequired); + +XMLPARSEAPI(void) +XML_SetAttlistDeclHandler(XML_Parser parser, + XML_AttlistDeclHandler attdecl); + +/* The XML declaration handler is called for *both* XML declarations + and text declarations. The way to distinguish is that the version + parameter will be NULL for text declarations. The encoding + parameter may be NULL for XML declarations. The standalone + parameter will be -1, 0, or 1 indicating respectively that there + was no standalone parameter in the declaration, that it was given + as no, or that it was given as yes. +*/ +typedef void (XMLCALL *XML_XmlDeclHandler) (void *userData, + const XML_Char *version, + const XML_Char *encoding, + int standalone); + +XMLPARSEAPI(void) +XML_SetXmlDeclHandler(XML_Parser parser, + XML_XmlDeclHandler xmldecl); + + +typedef struct { + void *(*malloc_fcn)(size_t size); + void *(*realloc_fcn)(void *ptr, size_t size); + void (*free_fcn)(void *ptr); +} XML_Memory_Handling_Suite; + +/* Constructs a new parser; encoding is the encoding specified by the + external protocol or NULL if there is none specified. +*/ +XMLPARSEAPI(XML_Parser) +XML_ParserCreate(const XML_Char *encoding); + +/* Constructs a new parser and namespace processor. Element type + names and attribute names that belong to a namespace will be + expanded; unprefixed attribute names are never expanded; unprefixed + element type names are expanded only if there is a default + namespace. The expanded name is the concatenation of the namespace + URI, the namespace separator character, and the local part of the + name. If the namespace separator is '\0' then the namespace URI + and the local part will be concatenated without any separator. + It is a programming error to use the separator '\0' with namespace + triplets (see XML_SetReturnNSTriplet). +*/ +XMLPARSEAPI(XML_Parser) +XML_ParserCreateNS(const XML_Char *encoding, XML_Char namespaceSeparator); + + +/* Constructs a new parser using the memory management suite referred to + by memsuite. If memsuite is NULL, then use the standard library memory + suite. If namespaceSeparator is non-NULL it creates a parser with + namespace processing as described above. The character pointed at + will serve as the namespace separator. + + All further memory operations used for the created parser will come from + the given suite. +*/ +XMLPARSEAPI(XML_Parser) +XML_ParserCreate_MM(const XML_Char *encoding, + const XML_Memory_Handling_Suite *memsuite, + const XML_Char *namespaceSeparator); + +/* Prepare a parser object to be re-used. This is particularly + valuable when memory allocation overhead is disproportionatly high, + such as when a large number of small documnents need to be parsed. + All handlers are cleared from the parser, except for the + unknownEncodingHandler. The parser's external state is re-initialized + except for the values of ns and ns_triplets. + + Added in Expat 1.95.3. +*/ +XMLPARSEAPI(XML_Bool) +XML_ParserReset(XML_Parser parser, const XML_Char *encoding); + +/* atts is array of name/value pairs, terminated by 0; + names and values are 0 terminated. +*/ +typedef void (XMLCALL *XML_StartElementHandler) (void *userData, + const XML_Char *name, + const XML_Char **atts); + +typedef void (XMLCALL *XML_EndElementHandler) (void *userData, + const XML_Char *name); + + +/* s is not 0 terminated. */ +typedef void (XMLCALL *XML_CharacterDataHandler) (void *userData, + const XML_Char *s, + int len); + +/* target and data are 0 terminated */ +typedef void (XMLCALL *XML_ProcessingInstructionHandler) ( + void *userData, + const XML_Char *target, + const XML_Char *data); + +/* data is 0 terminated */ +typedef void (XMLCALL *XML_CommentHandler) (void *userData, + const XML_Char *data); + +typedef void (XMLCALL *XML_StartCdataSectionHandler) (void *userData); +typedef void (XMLCALL *XML_EndCdataSectionHandler) (void *userData); + +/* This is called for any characters in the XML document for which + there is no applicable handler. This includes both characters that + are part of markup which is of a kind that is not reported + (comments, markup declarations), or characters that are part of a + construct which could be reported but for which no handler has been + supplied. The characters are passed exactly as they were in the XML + document except that they will be encoded in UTF-8 or UTF-16. + Line boundaries are not normalized. Note that a byte order mark + character is not passed to the default handler. There are no + guarantees about how characters are divided between calls to the + default handler: for example, a comment might be split between + multiple calls. +*/ +typedef void (XMLCALL *XML_DefaultHandler) (void *userData, + const XML_Char *s, + int len); + +/* This is called for the start of the DOCTYPE declaration, before + any DTD or internal subset is parsed. +*/ +typedef void (XMLCALL *XML_StartDoctypeDeclHandler) ( + void *userData, + const XML_Char *doctypeName, + const XML_Char *sysid, + const XML_Char *pubid, + int has_internal_subset); + +/* This is called for the start of the DOCTYPE declaration when the + closing > is encountered, but after processing any external + subset. +*/ +typedef void (XMLCALL *XML_EndDoctypeDeclHandler)(void *userData); + +/* This is called for entity declarations. The is_parameter_entity + argument will be non-zero if the entity is a parameter entity, zero + otherwise. + + For internal entities (<!ENTITY foo "bar">), value will + be non-NULL and systemId, publicID, and notationName will be NULL. + The value string is NOT nul-terminated; the length is provided in + the value_length argument. Since it is legal to have zero-length + values, do not use this argument to test for internal entities. + + For external entities, value will be NULL and systemId will be + non-NULL. The publicId argument will be NULL unless a public + identifier was provided. The notationName argument will have a + non-NULL value only for unparsed entity declarations. + + Note that is_parameter_entity can't be changed to XML_Bool, since + that would break binary compatibility. +*/ +typedef void (XMLCALL *XML_EntityDeclHandler) ( + void *userData, + const XML_Char *entityName, + int is_parameter_entity, + const XML_Char *value, [truncated at 1000 lines; 25969 more skipped]

18 years, 6 months

[martinf] 110: new branch for rbuild with Expat integration

by martinf＠svn.reactos.org

new branch for rbuild with Expat integration Added: branches/expat-rbuild/reactos/ _____ Copied: branches/expat-rbuild/reactos (from rev 109, trunk/reactos)

18 years, 6 months

[martinf] 109: new branch for rbuild with Expat integration

by martinf＠svn.reactos.org

new branch for rbuild with Expat integration Added: branches/expat-rbuild/

18 years, 6 months

[martinf] 108: winefile: don't compile Wine specific functions

by martinf＠svn.reactos.org

winefile: don't compile Wine specific functions Modified: trunk/reactos/base/applications/winefile/winefile.c _____ Modified: trunk/reactos/base/applications/winefile/winefile.c --- trunk/reactos/base/applications/winefile/winefile.c 2006-02-12 10:35:41 UTC (rev 107) +++ trunk/reactos/base/applications/winefile/winefile.c 2006-02-12 16:59:54 UTC (rev 108) @@ -239,6 +239,8 @@ } +#ifdef __WINE__ + static VOID WineLicense(HWND Wnd) { TCHAR cap[20], text[1024]; @@ -255,9 +257,6 @@ MessageBox(Wnd, text, cap, MB_ICONEXCLAMATION | MB_OK); } - -#ifdef __WINE__ - #ifdef UNICODE /* call vswprintf() in msvcrt.dll */

18 years, 6 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