Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[aandrejevic] 60486: [SOFT386] Fix the header in soft386.h.
by aandrejevic＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: aandrejevic Date: Mon Sep 30 22:13:51 2013 New Revision: 60486 URL: http://svn.reactos.org/svn/reactos?rev=60486&view=rev Log: [SOFT386] Fix the header in soft386.h. Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h Modified: branches/ntvdm/include/reactos/libs/soft386/soft386.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/soft… ============================================================================== --- branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/soft386/soft386.h [iso-8859-1] Mon Sep 30 22:13:51 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: soft386.h - * PURPOSE: Header file for Soft386. - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * soft386.h + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _SOFT386_H_

1 0

[aandrejevic] 60485: [SOFT386] Change the license of Soft386 to GPLv2. The previous license was also GPLv2, but it had a runtime linking exception. The new license is the original GPLv2 with no exc...
by aandrejevic＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: aandrejevic Date: Mon Sep 30 22:01:38 2013 New Revision: 60485 URL: http://svn.reactos.org/svn/reactos?rev=60485&view=rev Log: [SOFT386] Change the license of Soft386 to GPLv2. The previous license was also GPLv2, but it had a runtime linking exception. The new license is the original GPLv2 with no exceptions. Added: branches/ntvdm/lib/soft386/COPYING (with props) Modified: branches/ntvdm/lib/soft386/common.c branches/ntvdm/lib/soft386/common.h branches/ntvdm/lib/soft386/common.inl branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h branches/ntvdm/lib/soft386/opgroups.c branches/ntvdm/lib/soft386/opgroups.h branches/ntvdm/lib/soft386/soft386.c Added: branches/ntvdm/lib/soft386/COPYING URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/COPYING?rev=6… ============================================================================== --- branches/ntvdm/lib/soft386/COPYING (added) +++ branches/ntvdm/lib/soft386/COPYING [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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 + + 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) <year> <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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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) year 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 Lesser General +Public License instead of this License. Propchange: branches/ntvdm/lib/soft386/COPYING ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ntvdm/lib/soft386/common.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.c?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.c [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: common.c - * PURPOSE: Common functions used internally by Soft386. - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * common.c + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* INCLUDES *******************************************************************/ Modified: branches/ntvdm/lib/soft386/common.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.h?rev=… ============================================================================== --- branches/ntvdm/lib/soft386/common.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.h [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: common.h - * PURPOSE: Common functions used internally by Soft386 (header file). - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * common.h + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _COMMON_H_ Modified: branches/ntvdm/lib/soft386/common.inl URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/common.inl?re… ============================================================================== --- branches/ntvdm/lib/soft386/common.inl [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/common.inl [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: common.inl - * PURPOSE: Common functions used internally by Soft386 (inlined funtions). - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * common.inl + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* PUBLIC FUNCTIONS ***********************************************************/ Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: opcodes.c - * PURPOSE: Opcode handlers. - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * opcodes.c + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* INCLUDES *******************************************************************/ Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: opcodes.h - * PURPOSE: Opcode handlers. (header file) - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * opcodes.h + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _OPCODES_H_ Modified: branches/ntvdm/lib/soft386/opgroups.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.c?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.c [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: opgroups.c - * PURPOSE: Opcode group handlers. - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * opgroups.c + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* INCLUDES *******************************************************************/ Modified: branches/ntvdm/lib/soft386/opgroups.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opgroups.h?re… ============================================================================== --- branches/ntvdm/lib/soft386/opgroups.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opgroups.h [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: opgroups.h - * PURPOSE: Opcode group handlers. (header file) - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * opgroups.h + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef _OPGROUPS_H_ Modified: branches/ntvdm/lib/soft386/soft386.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/soft386.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/soft386.c [iso-8859-1] Mon Sep 30 22:01:38 2013 @@ -1,9 +1,22 @@ /* - * COPYRIGHT: GPL - See COPYING in the top level directory - * PROJECT: 386/486 CPU Emulation Library - * FILE: soft386.c - * PURPOSE: Functions meant for use by the host. - * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Soft386 386/486 CPU Emulation Library + * soft386.c + * + * Copyright (C) 2013 Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * + * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* INCLUDES *******************************************************************/

1 0

[tfaber] 60484: [NTOS:CC] - Remove CacheSegmentSize - Misc simplifications and style improvements CORE-7491
by tfaber＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: tfaber Date: Mon Sep 30 20:06:18 2013 New Revision: 60484 URL: http://svn.reactos.org/svn/reactos?rev=60484&view=rev Log: [NTOS:CC] - Remove CacheSegmentSize - Misc simplifications and style improvements CORE-7491 Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/include/internal/cc.h trunk/reactos/ntoskrnl/include/internal/tag.h Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Mon Sep 30 20:06:18 2013 @@ -19,6 +19,7 @@ #define MAX_ZERO_LENGTH (256 * 1024) #define MAX_RW_LENGTH (256 * 1024) +C_ASSERT(MAX_RW_LENGTH <= VACB_MAPPING_GRANULARITY); ULONG CcFastMdlReadWait; ULONG CcFastMdlReadNotPossible; @@ -88,7 +89,7 @@ if (current->Valid) { TempLength = min(VACB_MAPPING_GRANULARITY, Length); - memcpy(Buffer, current->BaseAddress, TempLength); + RtlCopyMemory(Buffer, current->BaseAddress, TempLength); Buffer = (PVOID)((ULONG_PTR)Buffer + TempLength); @@ -130,7 +131,7 @@ while ((current2 != NULL) && !current2->Valid && (current_size < MAX_RW_LENGTH)) { PVOID address = current2->BaseAddress; - for (i = 0; i < (VACB_MAPPING_GRANULARITY / PAGE_SIZE); i++, address = RVA(address, PAGE_SIZE)) + for (i = 0; i < VACB_MAPPING_GRANULARITY / PAGE_SIZE; i++, address = RVA(address, PAGE_SIZE)) { *MdlPages++ = MmGetPfnForProcess(NULL, address); } @@ -173,7 +174,7 @@ previous = current; current = current->NextInChain; TempLength = min(VACB_MAPPING_GRANULARITY, Length); - memcpy(Buffer, previous->BaseAddress, TempLength); + RtlCopyMemory(Buffer, previous->BaseAddress, TempLength); Buffer = (PVOID)((ULONG_PTR)Buffer + TempLength); @@ -229,7 +230,7 @@ return Status; } - if (VACB_MAPPING_GRANULARITY > Size) + if (Size < VACB_MAPPING_GRANULARITY) { RtlZeroMemory((char*)CacheSeg->BaseAddress + Size, VACB_MAPPING_GRANULARITY - Size); @@ -381,10 +382,10 @@ TempLength = ReadOffset % VACB_MAPPING_GRANULARITY; if (TempLength != 0) { - TempLength = min (Length, VACB_MAPPING_GRANULARITY - TempLength); + TempLength = min(Length, VACB_MAPPING_GRANULARITY - TempLength); Status = CcRosRequestCacheSegment(Bcb, ROUND_DOWN(ReadOffset, - VACB_MAPPING_GRANULARITY), + VACB_MAPPING_GRANULARITY), &BaseAddress, &Valid, &CacheSeg); if (!NT_SUCCESS(Status)) { @@ -404,8 +405,9 @@ return FALSE; } } - memcpy (Buffer, (char*)BaseAddress + ReadOffset % VACB_MAPPING_GRANULARITY, - TempLength); + RtlCopyMemory(Buffer, + (char*)BaseAddress + ReadOffset % VACB_MAPPING_GRANULARITY, + TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); ReadLength += TempLength; Length -= TempLength; @@ -415,7 +417,7 @@ while (Length > 0) { - TempLength = min(max(VACB_MAPPING_GRANULARITY, MAX_RW_LENGTH), Length); + TempLength = min(VACB_MAPPING_GRANULARITY, Length); Status = ReadCacheSegmentChain(Bcb, ReadOffset, TempLength, Buffer); if (!NT_SUCCESS(Status)) { @@ -498,7 +500,7 @@ { ULONG ROffset; ROffset = ROUND_DOWN(WriteOffset, VACB_MAPPING_GRANULARITY); - TempLength = min (Length, VACB_MAPPING_GRANULARITY - TempLength); + TempLength = min(Length, VACB_MAPPING_GRANULARITY - TempLength); Status = CcRosRequestCacheSegment(Bcb, ROffset, &BaseAddress, &Valid, &CacheSeg); if (!NT_SUCCESS(Status)) @@ -512,8 +514,9 @@ return FALSE; } } - memcpy ((char*)BaseAddress + WriteOffset % VACB_MAPPING_GRANULARITY, - Buffer, TempLength); + RtlCopyMemory((char*)BaseAddress + WriteOffset % VACB_MAPPING_GRANULARITY, + Buffer, + TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, TRUE, FALSE); Length -= TempLength; @@ -524,7 +527,7 @@ while (Length > 0) { - TempLength = min (VACB_MAPPING_GRANULARITY, Length); + TempLength = min(VACB_MAPPING_GRANULARITY, Length); Status = CcRosRequestCacheSegment(Bcb, WriteOffset, &BaseAddress, @@ -542,7 +545,7 @@ return FALSE; } } - memcpy (BaseAddress, Buffer, TempLength); + RtlCopyMemory(BaseAddress, Buffer, TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, TRUE, FALSE); Length -= TempLength; WriteOffset += TempLength; @@ -749,13 +752,14 @@ Status); } } - TempLength = min (CurrentLength, VACB_MAPPING_GRANULARITY - Offset); + TempLength = min(CurrentLength, VACB_MAPPING_GRANULARITY - Offset); } else { TempLength = VACB_MAPPING_GRANULARITY; } - memset ((PUCHAR)current->BaseAddress + Offset, 0, TempLength); + RtlZeroMemory((PUCHAR)current->BaseAddress + Offset, + TempLength); WriteOffset.QuadPart += TempLength; CurrentLength -= TempLength; Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=60484… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Mon Sep 30 20:06:18 2013 @@ -87,7 +87,7 @@ /* Call old ROS cache init function */ CcRosInitializeFileCache(FileObject, - /*PAGE_SIZE*/ VACB_MAPPING_GRANULARITY, CallBacks, + CallBacks, LazyWriterContext); } Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6048… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Mon Sep 30 20:06:18 2013 @@ -88,7 +88,7 @@ } } - *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % VACB_MAPPING_GRANULARITY)); + *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + ReadOffset % VACB_MAPPING_GRANULARITY); iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); if (iBcb == NULL) { @@ -96,7 +96,7 @@ return FALSE; } - memset(iBcb, 0, sizeof(INTERNAL_BCB)); + RtlZeroMemory(iBcb, sizeof(*iBcb)); iBcb->PFCB.NodeTypeCode = 0xDE45; /* Undocumented (CAPTIVE_PUBLIC_BCB_NODETYPECODE) */ iBcb->PFCB.NodeByteSize = sizeof(PUBLIC_BCB); iBcb->PFCB.MappedLength = Length; Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon Sep 30 20:06:18 2013 @@ -53,7 +53,7 @@ static LIST_ENTRY CacheSegmentListHead; static LIST_ENTRY CacheSegmentLRUListHead; static LIST_ENTRY ClosedListHead; -ULONG DirtyPageCount=0; +ULONG DirtyPageCount = 0; KGUARDED_MUTEX ViewLock; @@ -171,7 +171,7 @@ KeReleaseGuardedMutex(&ViewLock); } - return(Status); + return Status; } NTSTATUS @@ -273,7 +273,7 @@ KeLeaveCriticalRegion(); DPRINT("CcRosFlushDirtyPages() finished\n"); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -396,7 +396,7 @@ DPRINT("Evicted %lu cache pages\n", (*NrFreed)); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -448,7 +448,7 @@ KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, FALSE); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* Returns with Cache Segment Lock Held! */ @@ -540,7 +540,7 @@ KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, FALSE); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -562,7 +562,7 @@ CacheSeg = CcRosLookupCacheSegment(Bcb, FileOffset); if (CacheSeg == NULL) { - return(STATUS_UNSUCCESSFUL); + return STATUS_UNSUCCESSFUL; } KeAcquireGuardedMutex(&ViewLock); @@ -593,7 +593,7 @@ KeReleaseGuardedMutex(&ViewLock); KeReleaseMutex(&CacheSeg->Mutex, FALSE); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } static @@ -713,7 +713,9 @@ #ifdef CACHE_BITMAP KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); - StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, VACB_MAPPING_GRANULARITY / PAGE_SIZE, CiCacheSegMappingRegionHint); + StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, + VACB_MAPPING_GRANULARITY / PAGE_SIZE, + CiCacheSegMappingRegionHint); if (StartingOffset == 0xffffffff) { @@ -764,7 +766,7 @@ MmMapMemoryArea(current->BaseAddress, VACB_MAPPING_GRANULARITY, MC_CACHE, PAGE_READWRITE); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -815,7 +817,7 @@ } } - for (i = 0; i < (Length / VACB_MAPPING_GRANULARITY); i++) + for (i = 0; i < Length / VACB_MAPPING_GRANULARITY; i++) { if (i == 0) { @@ -831,7 +833,7 @@ ASSERT(Previous); Previous->NextInChain = NULL; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -883,7 +885,7 @@ DPRINT("*BaseAddress %p\n", *BaseAddress); *CacheSeg = current; *BaseOffset = current->FileOffset; - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -902,19 +904,19 @@ ASSERT(Bcb); - if ((FileOffset % VACB_MAPPING_GRANULARITY) != 0) + if (FileOffset % VACB_MAPPING_GRANULARITY != 0) { DPRINT1("Bad fileoffset %x should be multiple of %x", FileOffset, VACB_MAPPING_GRANULARITY); KeBugCheck(CACHE_MANAGER); } - return(CcRosGetCacheSegment(Bcb, + return CcRosGetCacheSegment(Bcb, FileOffset, &BaseOffset, BaseAddress, UptoDate, - CacheSeg)); + CacheSeg); } #ifdef CACHE_BITMAP #else @@ -977,7 +979,7 @@ RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize); - CiCacheSegMappingRegionHint = min (CiCacheSegMappingRegionHint, Base); + CiCacheSegMappingRegionHint = min(CiCacheSegMappingRegionHint, Base); KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql); #else @@ -989,7 +991,7 @@ MmUnlockAddressSpace(MmGetKernelAddressSpace()); #endif ExFreeToNPagedLookasideList(&CacheSegLookasideList, CacheSeg); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -1143,7 +1145,7 @@ ExFreeToNPagedLookasideList(&BcbLookasideList, Bcb); KeAcquireGuardedMutex(&ViewLock); } - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } VOID @@ -1243,7 +1245,7 @@ } } KeReleaseGuardedMutex(&ViewLock); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS @@ -1286,7 +1288,6 @@ NTAPI CcRosInitializeFileCache ( PFILE_OBJECT FileObject, - ULONG CacheSegmentSize, PCACHE_MANAGER_CALLBACKS CallBacks, PVOID LazyWriterContext) /* @@ -1296,8 +1297,8 @@ PBCB Bcb; Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p, CacheSegmentSize %lu)\n", - FileObject, Bcb, CacheSegmentSize); + DPRINT("CcRosInitializeFileCache(FileObject 0x%p, Bcb 0x%p)\n", + FileObject, Bcb); KeAcquireGuardedMutex(&ViewLock); if (Bcb == NULL) @@ -1306,15 +1307,14 @@ if (Bcb == NULL) { KeReleaseGuardedMutex(&ViewLock); - return(STATUS_UNSUCCESSFUL); - } - memset(Bcb, 0, sizeof(BCB)); + return STATUS_UNSUCCESSFUL; + } + RtlZeroMemory(Bcb, sizeof(*Bcb)); ObReferenceObjectByPointer(FileObject, FILE_ALL_ACCESS, NULL, KernelMode); Bcb->FileObject = FileObject; - Bcb->CacheSegmentSize = CacheSegmentSize; Bcb->Callbacks = CallBacks; Bcb->LazyWriteContext = LazyWriterContext; if (FileObject->FsContext) @@ -1340,7 +1340,7 @@ } KeReleaseGuardedMutex(&ViewLock); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } /* @@ -1396,13 +1396,17 @@ KeBugCheck(CACHE_MANAGER); } - Buffer = ExAllocatePool(NonPagedPool, CI_CACHESEG_MAPPING_REGION_SIZE / (PAGE_SIZE * 8)); + Buffer = ExAllocatePoolWithTag(NonPagedPool, + CI_CACHESEG_MAPPING_REGION_SIZE / (PAGE_SIZE * 8), + TAG_CC); if (!Buffer) { KeBugCheck(CACHE_MANAGER); } - RtlInitializeBitMap(&CiCacheSegMappingRegionAllocMap, Buffer, CI_CACHESEG_MAPPING_REGION_SIZE / PAGE_SIZE); + RtlInitializeBitMap(&CiCacheSegMappingRegionAllocMap, + Buffer, + CI_CACHESEG_MAPPING_REGION_SIZE / PAGE_SIZE); RtlClearAllBits(&CiCacheSegMappingRegionAllocMap); KeInitializeSpinLock(&CiCacheSegMappingRegionLock); @@ -1441,11 +1445,3 @@ } /* EOF */ - - - - - - - - Modified: trunk/reactos/ntoskrnl/include/internal/cc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cc.h [iso-8859-1] Mon Sep 30 20:06:18 2013 @@ -108,7 +108,6 @@ BOOLEAN RemoveOnClose; ULONG TimeStamp; PFILE_OBJECT FileObject; - ULONG CacheSegmentSize; LARGE_INTEGER AllocationSize; LARGE_INTEGER FileSize; PCACHE_MANAGER_CALLBACKS Callbacks; @@ -294,7 +293,6 @@ NTAPI CcRosInitializeFileCache( PFILE_OBJECT FileObject, - ULONG CacheSegmentSize, PCACHE_MANAGER_CALLBACKS CallBacks, PVOID LazyWriterContext ); Modified: trunk/reactos/ntoskrnl/include/internal/tag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/tag.h [iso-8859-1] Mon Sep 30 20:06:18 2013 @@ -1,6 +1,7 @@ #pragma once /* formerly located in cc/view.c */ +#define TAG_CC ' cC' #define TAG_CSEG 'GESC' #define TAG_BCB ' BCB' #define TAG_IBCB 'BCBi'

1 0

[spetreolle] 60483: [DSOUND] Fix version.rc inclusion.
by spetreolle＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: spetreolle Date: Mon Sep 30 19:58:15 2013 New Revision: 60483 URL: http://svn.reactos.org/svn/reactos?rev=60483&view=rev Log: [DSOUND] Fix version.rc inclusion. Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt Modified: trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dsound/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dsound/CMakeLists.txt [iso-8859-1] Mon Sep 30 19:58:15 2013 @@ -18,9 +18,10 @@ primary.c propset.c sound3d.c + version.rc ${CMAKE_CURRENT_BINARY_DIR}/dsound.def) -set_module_type(dsound win32dll version.rc) +set_module_type(dsound win32dll) target_link_libraries(dsound dxguid uuid wine) add_importlibs(dsound ole32 advapi32 user32 msvcrt kernel32 ntdll) add_cd_file(TARGET dsound DESTINATION reactos/system32 FOR all)

1 0

[ekohl] 60482: [LSASRV] Move the session functions into a separate file and implement basic session management routines.
by ekohl＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: ekohl Date: Mon Sep 30 19:49:46 2013 New Revision: 60482 URL: http://svn.reactos.org/svn/reactos?rev=60482&view=rev Log: [LSASRV] Move the session functions into a separate file and implement basic session management routines. Added: trunk/reactos/dll/win32/lsasrv/session.c (with props) Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt trunk/reactos/dll/win32/lsasrv/authpackage.c trunk/reactos/dll/win32/lsasrv/lsasrv.c trunk/reactos/dll/win32/lsasrv/lsasrv.h Modified: trunk/reactos/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Mon Sep 30 19:49:46 2013 @@ -18,6 +18,7 @@ privileges.c registry.c security.c + session.c utils.c lsasrv.rc ${CMAKE_CURRENT_BINARY_DIR}/lsasrv_stubs.c Modified: trunk/reactos/dll/win32/lsasrv/authpackage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/authpacka… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/authpackage.c [iso-8859-1] Mon Sep 30 19:49:46 2013 @@ -31,6 +31,9 @@ typedef PVOID PLSA_CLIENT_REQUEST; +typedef NTSTATUS (NTAPI *PLSA_CREATE_LOGON_SESSION)(PLUID); +typedef NTSTATUS (NTAPI *PLSA_DELETE_LOGON_SESSION)(PLUID); + typedef PVOID (NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); typedef VOID (NTAPI *PLSA_FREE_LSA_HEAP)(PVOID); typedef NTSTATUS (NTAPI *PLSA_ALLOCATE_CLIENT_BUFFER)(PLSA_CLIENT_REQUEST, ULONG, PVOID*); @@ -42,8 +45,8 @@ typedef struct LSA_DISPATCH_TABLE { - PVOID /*PLSA_CREATE_LOGON_SESSION */ CreateLogonSession; - PVOID /*PLSA_DELETE_LOGON_SESSION */ DeleteLogonSession; + PLSA_CREATE_LOGON_SESSION CreateLogonSession; + PLSA_DELETE_LOGON_SESSION DeleteLogonSession; PVOID /*PLSA_ADD_CREDENTIAL */ AddCredential; PVOID /*PLSA_GET_CREDENTIALS */ GetCredentials; PVOID /*PLSA_DELETE_CREDENTIAL */ DeleteCredential; @@ -295,26 +298,6 @@ static -NTSTATUS -NTAPI -LsapCreateLogonSession(IN PLUID LogonId) -{ - TRACE("()\n"); - return STATUS_SUCCESS; -} - - -static -NTSTATUS -NTAPI -LsapDeleteLogonSession(IN PLUID LogonId) -{ - TRACE("()\n"); - return STATUS_SUCCESS; -} - - -static PVOID NTAPI LsapAllocateHeap(IN ULONG Length) @@ -454,8 +437,7 @@ &PackageId, NULL); - - return STATUS_SUCCESS; + return Status; } Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.c?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.c [iso-8859-1] Mon Sep 30 19:49:46 2013 @@ -136,6 +136,9 @@ /* Initialize the LSA database */ LsapInitDatabase(); + + /* Initialize logon sessions */ + LsapInitLogonSessions(); /* Initialize registered authentication packages */ Status = LsapInitAuthPackages(); Modified: trunk/reactos/dll/win32/lsasrv/lsasrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/lsasrv.h?… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/lsasrv.h [iso-8859-1] Mon Sep 30 19:49:46 2013 @@ -383,6 +383,18 @@ LsapCreateSecretSd(PSECURITY_DESCRIPTOR *SecretSd, PULONG SecretSdSize); +/* session.c */ +VOID +LsapInitLogonSessions(VOID); + +NTSTATUS +NTAPI +LsapCreateLogonSession(IN PLUID LogonId); + +NTSTATUS +NTAPI +LsapDeleteLogonSession(IN PLUID LogonId); + /* utils.c */ INT LsapLoadString(HINSTANCE hInstance, Added: trunk/reactos/dll/win32/lsasrv/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/session.c… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/session.c (added) +++ trunk/reactos/dll/win32/lsasrv/session.c [iso-8859-1] Mon Sep 30 19:49:46 2013 @@ -0,0 +1,113 @@ +/* + * PROJECT: Local Security Authority Server DLL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/lsasrv/session.c + * PURPOSE: Logon session management routines + * COPYRIGHT: Copyright 2013 Eric Kohl + */ + +/* INCLUDES ****************************************************************/ + +#include "lsasrv.h" + +WINE_DEFAULT_DEBUG_CHANNEL(lsasrv); + +typedef struct _LSAP_LOGON_SESSION +{ + LIST_ENTRY Entry; + LUID LogonId; +} LSAP_LOGON_SESSION, *PLSAP_LOGON_SESSION; + + +/* GLOBALS *****************************************************************/ + +LIST_ENTRY SessionListHead; +ULONG SessionCount; + +/* FUNCTIONS ***************************************************************/ + +VOID +LsapInitLogonSessions(VOID) +{ + InitializeListHead(&SessionListHead); + SessionCount = 0; +} + + +static +PLSAP_LOGON_SESSION +LsapGetLogonSession(IN PLUID LogonId) +{ + PLIST_ENTRY SessionEntry; + PLSAP_LOGON_SESSION CurrentSession; + + SessionEntry = SessionListHead.Flink; + while (SessionEntry != &SessionListHead) + { + CurrentSession = CONTAINING_RECORD(SessionEntry, + LSAP_LOGON_SESSION, + Entry); + if (RtlEqualLuid(&CurrentSession->LogonId, LogonId)) + return CurrentSession; + + SessionEntry = SessionEntry->Flink; + } + + return NULL; +} + + +NTSTATUS +NTAPI +LsapCreateLogonSession(IN PLUID LogonId) +{ + PLSAP_LOGON_SESSION Session; + + TRACE("()\n"); + + /* Fail, if a session already exists */ + if (LsapGetLogonSession(LogonId) != NULL) + return STATUS_LOGON_SESSION_COLLISION; + + /* Allocate a new session entry */ + Session = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(LSAP_LOGON_SESSION)); + if (Session == NULL) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Initialize the session entry */ + RtlCopyLuid(&Session->LogonId, LogonId); + + /* Insert the new session into the session list */ + InsertTailList(&SessionListHead, &Session->Entry); + SessionCount++; + + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI +LsapDeleteLogonSession(IN PLUID LogonId) +{ + PLSAP_LOGON_SESSION Session; + + TRACE("()\n"); + + /* Fail, if the session does not exist */ + Session = LsapGetLogonSession(LogonId); + if (Session == NULL) + return STATUS_NO_SUCH_LOGON_SESSION; + + /* Remove the session entry from the list */ + RemoveEntryList(&Session->Entry); + SessionCount--; + + /* Free the session entry */ + RtlFreeHeap(RtlGetProcessHeap(), 0, Session); + + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/dll/win32/lsasrv/session.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 60481: [NTOSKRNL] - BCB::CacheSegmentSize has no reason to vary at runtime. Replace it with the constant VACB_MAPPING_GRANULARITY.
by tfaber＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: tfaber Date: Mon Sep 30 19:40:09 2013 New Revision: 60481 URL: http://svn.reactos.org/svn/reactos?rev=60481&view=rev Log: [NTOSKRNL] - BCB::CacheSegmentSize has no reason to vary at runtime. Replace it with the constant VACB_MAPPING_GRANULARITY. Modified: trunk/reactos/ntoskrnl/cc/copy.c trunk/reactos/ntoskrnl/cc/fs.c trunk/reactos/ntoskrnl/cc/pin.c trunk/reactos/ntoskrnl/cc/view.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/copy.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/copy.c [iso-8859-1] Mon Sep 30 19:40:09 2013 @@ -87,7 +87,7 @@ */ if (current->Valid) { - TempLength = min(Bcb->CacheSegmentSize, Length); + TempLength = min(VACB_MAPPING_GRANULARITY, Length); memcpy(Buffer, current->BaseAddress, TempLength); Buffer = (PVOID)((ULONG_PTR)Buffer + TempLength); @@ -116,7 +116,7 @@ while ((current2 != NULL) && !current2->Valid && (current_size < MAX_RW_LENGTH)) { current2 = current2->NextInChain; - current_size += Bcb->CacheSegmentSize; + current_size += VACB_MAPPING_GRANULARITY; } /* @@ -130,12 +130,12 @@ while ((current2 != NULL) && !current2->Valid && (current_size < MAX_RW_LENGTH)) { PVOID address = current2->BaseAddress; - for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++, address = RVA(address, PAGE_SIZE)) + for (i = 0; i < (VACB_MAPPING_GRANULARITY / PAGE_SIZE); i++, address = RVA(address, PAGE_SIZE)) { *MdlPages++ = MmGetPfnForProcess(NULL, address); } current2 = current2->NextInChain; - current_size += Bcb->CacheSegmentSize; + current_size += VACB_MAPPING_GRANULARITY; } /* @@ -172,14 +172,14 @@ { previous = current; current = current->NextInChain; - TempLength = min(Bcb->CacheSegmentSize, Length); + TempLength = min(VACB_MAPPING_GRANULARITY, Length); memcpy(Buffer, previous->BaseAddress, TempLength); Buffer = (PVOID)((ULONG_PTR)Buffer + TempLength); Length = Length - TempLength; CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); - current_size += Bcb->CacheSegmentSize; + current_size += VACB_MAPPING_GRANULARITY; } } } @@ -200,9 +200,9 @@ SegOffset.QuadPart = CacheSeg->FileOffset; Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; + if (Size > VACB_MAPPING_GRANULARITY) + { + Size = VACB_MAPPING_GRANULARITY; } Mdl = IoAllocateMdl(CacheSeg->BaseAddress, Size, FALSE, FALSE, NULL); @@ -229,10 +229,10 @@ return Status; } - if (CacheSeg->Bcb->CacheSegmentSize > Size) + if (VACB_MAPPING_GRANULARITY > Size) { RtlZeroMemory((char*)CacheSeg->BaseAddress + Size, - CacheSeg->Bcb->CacheSegmentSize - Size); + VACB_MAPPING_GRANULARITY - Size); } return STATUS_SUCCESS; @@ -253,9 +253,9 @@ CacheSeg->Dirty = FALSE; SegOffset.QuadPart = CacheSeg->FileOffset; Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; + if (Size > VACB_MAPPING_GRANULARITY) + { + Size = VACB_MAPPING_GRANULARITY; } // // Nonpaged pool PDEs in ReactOS must actually be synchronized between the @@ -363,7 +363,7 @@ current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (!current->Valid && - DoSegmentsIntersect(current->FileOffset, Bcb->CacheSegmentSize, + DoSegmentsIntersect(current->FileOffset, VACB_MAPPING_GRANULARITY, ReadOffset, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -378,13 +378,13 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldirql); } - TempLength = ReadOffset % Bcb->CacheSegmentSize; + TempLength = ReadOffset % VACB_MAPPING_GRANULARITY; if (TempLength != 0) { - TempLength = min (Length, Bcb->CacheSegmentSize - TempLength); + TempLength = min (Length, VACB_MAPPING_GRANULARITY - TempLength); Status = CcRosRequestCacheSegment(Bcb, ROUND_DOWN(ReadOffset, - Bcb->CacheSegmentSize), + VACB_MAPPING_GRANULARITY), &BaseAddress, &Valid, &CacheSeg); if (!NT_SUCCESS(Status)) { @@ -404,7 +404,7 @@ return FALSE; } } - memcpy (Buffer, (char*)BaseAddress + ReadOffset % Bcb->CacheSegmentSize, + memcpy (Buffer, (char*)BaseAddress + ReadOffset % VACB_MAPPING_GRANULARITY, TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); ReadLength += TempLength; @@ -415,7 +415,7 @@ while (Length > 0) { - TempLength = min(max(Bcb->CacheSegmentSize, MAX_RW_LENGTH), Length); + TempLength = min(max(VACB_MAPPING_GRANULARITY, MAX_RW_LENGTH), Length); Status = ReadCacheSegmentChain(Bcb, ReadOffset, TempLength, Buffer); if (!NT_SUCCESS(Status)) { @@ -479,7 +479,7 @@ CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (!CacheSeg->Valid && - DoSegmentsIntersect(CacheSeg->FileOffset, Bcb->CacheSegmentSize, + DoSegmentsIntersect(CacheSeg->FileOffset, VACB_MAPPING_GRANULARITY, WriteOffset, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -493,12 +493,12 @@ KeReleaseSpinLock(&Bcb->BcbLock, oldirql); } - TempLength = WriteOffset % Bcb->CacheSegmentSize; + TempLength = WriteOffset % VACB_MAPPING_GRANULARITY; if (TempLength != 0) { ULONG ROffset; - ROffset = ROUND_DOWN(WriteOffset, Bcb->CacheSegmentSize); - TempLength = min (Length, Bcb->CacheSegmentSize - TempLength); + ROffset = ROUND_DOWN(WriteOffset, VACB_MAPPING_GRANULARITY); + TempLength = min (Length, VACB_MAPPING_GRANULARITY - TempLength); Status = CcRosRequestCacheSegment(Bcb, ROffset, &BaseAddress, &Valid, &CacheSeg); if (!NT_SUCCESS(Status)) @@ -512,7 +512,7 @@ return FALSE; } } - memcpy ((char*)BaseAddress + WriteOffset % Bcb->CacheSegmentSize, + memcpy ((char*)BaseAddress + WriteOffset % VACB_MAPPING_GRANULARITY, Buffer, TempLength); CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, TRUE, FALSE); @@ -524,7 +524,7 @@ while (Length > 0) { - TempLength = min (Bcb->CacheSegmentSize, Length); + TempLength = min (VACB_MAPPING_GRANULARITY, Length); Status = CcRosRequestCacheSegment(Bcb, WriteOffset, &BaseAddress, @@ -534,7 +534,7 @@ { return FALSE; } - if (!Valid && TempLength < Bcb->CacheSegmentSize) + if (!Valid && TempLength < VACB_MAPPING_GRANULARITY) { if (!NT_SUCCESS(ReadCacheSegment(CacheSeg))) { @@ -699,7 +699,7 @@ CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); if (!CacheSeg->Valid && - DoSegmentsIntersect(CacheSeg->FileOffset, Bcb->CacheSegmentSize, + DoSegmentsIntersect(CacheSeg->FileOffset, VACB_MAPPING_GRANULARITY, WriteOffset.u.LowPart, Length)) { KeReleaseSpinLock(&Bcb->BcbLock, oldirql); @@ -716,7 +716,7 @@ while (Length > 0) { ULONG Offset; - Offset = WriteOffset.u.LowPart % Bcb->CacheSegmentSize; + Offset = WriteOffset.u.LowPart % VACB_MAPPING_GRANULARITY; if (Length + Offset > MAX_ZERO_LENGTH) { CurrentLength = MAX_ZERO_LENGTH - Offset; @@ -735,9 +735,9 @@ while (current != NULL) { - Offset = WriteOffset.u.LowPart % Bcb->CacheSegmentSize; + Offset = WriteOffset.u.LowPart % VACB_MAPPING_GRANULARITY; if ((Offset != 0) || - (Offset + CurrentLength < Bcb->CacheSegmentSize)) + (Offset + CurrentLength < VACB_MAPPING_GRANULARITY)) { if (!current->Valid) { @@ -749,11 +749,11 @@ Status); } } - TempLength = min (CurrentLength, Bcb->CacheSegmentSize - Offset); + TempLength = min (CurrentLength, VACB_MAPPING_GRANULARITY - Offset); } else { - TempLength = Bcb->CacheSegmentSize; + TempLength = VACB_MAPPING_GRANULARITY; } memset ((PUCHAR)current->BaseAddress + Offset, 0, TempLength); Modified: trunk/reactos/ntoskrnl/cc/fs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/fs.c?rev=60481… ============================================================================== --- trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/fs.c [iso-8859-1] Mon Sep 30 19:40:09 2013 @@ -173,7 +173,7 @@ if (current->Dirty) { RemoveEntryList(&current->DirtySegmentListEntry); - DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE; + DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; } InsertHeadList(&FreeListHead, &current->BcbSegmentListEntry); } Modified: trunk/reactos/ntoskrnl/cc/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/pin.c?rev=6048… ============================================================================== --- trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/pin.c [iso-8859-1] Mon Sep 30 19:40:09 2013 @@ -57,12 +57,12 @@ Bcb->AllocationSize.QuadPart, Bcb->FileSize.QuadPart); - if (ReadOffset % Bcb->CacheSegmentSize + Length > Bcb->CacheSegmentSize) + if (ReadOffset % VACB_MAPPING_GRANULARITY + Length > VACB_MAPPING_GRANULARITY) { return FALSE; } - ROffset = ROUND_DOWN(ReadOffset, Bcb->CacheSegmentSize); + ROffset = ROUND_DOWN(ReadOffset, VACB_MAPPING_GRANULARITY); Status = CcRosRequestCacheSegment(Bcb, ROffset, pBuffer, @@ -88,7 +88,7 @@ } } - *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % Bcb->CacheSegmentSize)); + *pBuffer = (PVOID)((ULONG_PTR)(*pBuffer) + (ReadOffset % VACB_MAPPING_GRANULARITY)); iBcb = ExAllocateFromNPagedLookasideList(&iBcbLookasideList); if (iBcb == NULL) { Modified: trunk/reactos/ntoskrnl/cc/view.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=604… ============================================================================== --- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Mon Sep 30 19:40:09 2013 @@ -164,7 +164,7 @@ CacheSegment->Dirty = FALSE; RemoveEntryList(&CacheSegment->DirtySegmentListEntry); - DirtyPageCount -= CacheSegment->Bcb->CacheSegmentSize / PAGE_SIZE; + DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; CcRosCacheSegmentDecRefCount(CacheSegment); KeReleaseSpinLock(&CacheSegment->Bcb->BcbLock, oldIrql); @@ -243,7 +243,7 @@ continue; } - PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; + PagesPerSegment = VACB_MAPPING_GRANULARITY / PAGE_SIZE; KeReleaseGuardedMutex(&ViewLock); @@ -329,7 +329,7 @@ KeReleaseGuardedMutex(&ViewLock); /* Page out the segment */ - for (i = 0; i < current->Bcb->CacheSegmentSize / PAGE_SIZE; i++) + for (i = 0; i < VACB_MAPPING_GRANULARITY / PAGE_SIZE; i++) { Page = (PFN_NUMBER)(MmGetPhysicalAddress((PUCHAR)current->BaseAddress + (i * PAGE_SIZE)).QuadPart >> PAGE_SHIFT); @@ -356,7 +356,7 @@ InsertHeadList(&FreeList, &current->BcbSegmentListEntry); /* Calculate how many pages we freed for Mm */ - PagesPerSegment = current->Bcb->CacheSegmentSize / PAGE_SIZE; + PagesPerSegment = VACB_MAPPING_GRANULARITY / PAGE_SIZE; PagesFreed = min(PagesPerSegment, Target); Target -= PagesFreed; (*NrFreed) += PagesFreed; @@ -427,7 +427,7 @@ if (!WasDirty && CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); - DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; + DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } if (Mapped) @@ -474,7 +474,7 @@ { current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if (IsPointInSegment(current->FileOffset, Bcb->CacheSegmentSize, + if (IsPointInSegment(current->FileOffset, VACB_MAPPING_GRANULARITY, FileOffset)) { CcRosCacheSegmentIncRefCount(current); @@ -523,7 +523,7 @@ if (!CacheSeg->Dirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); - DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; + DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } else { @@ -576,7 +576,7 @@ if (!WasDirty && NowDirty) { InsertTailList(&DirtySegmentListHead, &CacheSeg->DirtySegmentListEntry); - DirtyPageCount += Bcb->CacheSegmentSize / PAGE_SIZE; + DirtyPageCount += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } CcRosCacheSegmentDecRefCount(CacheSeg); @@ -628,7 +628,7 @@ current->Valid = FALSE; current->Dirty = FALSE; current->PageOut = FALSE; - current->FileOffset = ROUND_DOWN(FileOffset, Bcb->CacheSegmentSize); + current->FileOffset = ROUND_DOWN(FileOffset, VACB_MAPPING_GRANULARITY); current->Bcb = Bcb; #if DBG if ( Bcb->Trace ) @@ -661,7 +661,7 @@ { current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, BcbSegmentListEntry); - if (IsPointInSegment(current->FileOffset, Bcb->CacheSegmentSize, + if (IsPointInSegment(current->FileOffset, VACB_MAPPING_GRANULARITY, FileOffset)) { CcRosCacheSegmentIncRefCount(current); @@ -713,7 +713,7 @@ #ifdef CACHE_BITMAP KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql); - StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, Bcb->CacheSegmentSize / PAGE_SIZE, CiCacheSegMappingRegionHint); + StartingOffset = RtlFindClearBitsAndSet(&CiCacheSegMappingRegionAllocMap, VACB_MAPPING_GRANULARITY / PAGE_SIZE, CiCacheSegMappingRegionHint); if (StartingOffset == 0xffffffff) { @@ -725,7 +725,7 @@ if (CiCacheSegMappingRegionHint == StartingOffset) { - CiCacheSegMappingRegionHint += Bcb->CacheSegmentSize / PAGE_SIZE; + CiCacheSegMappingRegionHint += VACB_MAPPING_GRANULARITY / PAGE_SIZE; } KeReleaseSpinLock(&CiCacheSegMappingRegionLock, oldIrql); @@ -735,7 +735,7 @@ Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), 0, // nothing checks for cache_segment mareas, so set to 0 &current->BaseAddress, - Bcb->CacheSegmentSize, + VACB_MAPPING_GRANULARITY, PAGE_READWRITE, (PMEMORY_AREA*)&current->MemoryArea, FALSE, @@ -761,7 +761,7 @@ } #endif - MmMapMemoryArea(current->BaseAddress, Bcb->CacheSegmentSize, + MmMapMemoryArea(current->BaseAddress, VACB_MAPPING_GRANULARITY, MC_CACHE, PAGE_READWRITE); return(STATUS_SUCCESS); @@ -784,17 +784,17 @@ DPRINT("CcRosGetCacheSegmentChain()\n"); - Length = ROUND_UP(Length, Bcb->CacheSegmentSize); + Length = ROUND_UP(Length, VACB_MAPPING_GRANULARITY); CacheSegList = _alloca(sizeof(PCACHE_SEGMENT) * - (Length / Bcb->CacheSegmentSize)); + (Length / VACB_MAPPING_GRANULARITY)); /* * Look for a cache segment already mapping the same data. */ - for (i = 0; i < (Length / Bcb->CacheSegmentSize); i++) - { - ULONG CurrentOffset = FileOffset + (i * Bcb->CacheSegmentSize); + for (i = 0; i < (Length / VACB_MAPPING_GRANULARITY); i++) + { + ULONG CurrentOffset = FileOffset + (i * VACB_MAPPING_GRANULARITY); current = CcRosLookupCacheSegment(Bcb, CurrentOffset); if (current != NULL) { @@ -815,7 +815,7 @@ } } - for (i = 0; i < (Length / Bcb->CacheSegmentSize); i++) + for (i = 0; i < (Length / VACB_MAPPING_GRANULARITY); i++) { if (i == 0) { @@ -902,10 +902,10 @@ ASSERT(Bcb); - if ((FileOffset % Bcb->CacheSegmentSize) != 0) + if ((FileOffset % VACB_MAPPING_GRANULARITY) != 0) { DPRINT1("Bad fileoffset %x should be multiple of %x", - FileOffset, Bcb->CacheSegmentSize); + FileOffset, VACB_MAPPING_GRANULARITY); KeBugCheck(CACHE_MANAGER); } @@ -958,7 +958,7 @@ } #endif #ifdef CACHE_BITMAP - RegionSize = CacheSeg->Bcb->CacheSegmentSize / PAGE_SIZE; + RegionSize = VACB_MAPPING_GRANULARITY / PAGE_SIZE; /* Unmap all the pages. */ for (i = 0; i < RegionSize; i++) @@ -1054,10 +1054,10 @@ KeReleaseGuardedMutex(&ViewLock); } - Offset.QuadPart += Bcb->CacheSegmentSize; - if (Length > Bcb->CacheSegmentSize) + Offset.QuadPart += VACB_MAPPING_GRANULARITY; + if (Length > VACB_MAPPING_GRANULARITY) { - Length -= Bcb->CacheSegmentSize; + Length -= VACB_MAPPING_GRANULARITY; } else { @@ -1121,7 +1121,7 @@ if (current->Dirty) { RemoveEntryList(&current->DirtySegmentListEntry); - DirtyPageCount -= Bcb->CacheSegmentSize / PAGE_SIZE; + DirtyPageCount -= VACB_MAPPING_GRANULARITY / PAGE_SIZE; DPRINT1("Freeing dirty segment\n"); } InsertHeadList(&FreeList, &current->BcbSegmentListEntry); Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Sep 30 19:40:09 2013 @@ -1177,7 +1177,7 @@ Process = PsGetCurrentProcess(); PageAddr = MiMapPageInHyperSpace(Process, *Page, &Irql); - CacheSegOffset = (ULONG_PTR)(BaseOffset + CacheSeg->Bcb->CacheSegmentSize - FileOffset); + CacheSegOffset = (ULONG_PTR)(BaseOffset + VACB_MAPPING_GRANULARITY - FileOffset); Length = RawLength - SegOffset; if (Length <= CacheSegOffset && Length <= PAGE_SIZE) {

1 0

[akhaldi] 60480: [DPLAYX_WINETEST] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: akhaldi Date: Mon Sep 30 18:15:14 2013 New Revision: 60480 URL: http://svn.reactos.org/svn/reactos?rev=60480&view=rev Log: [DPLAYX_WINETEST] * Import from Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/dplayx/ trunk/rostests/winetests/dplayx/CMakeLists.txt (with props) trunk/rostests/winetests/dplayx/dplayx.c (with props) trunk/rostests/winetests/dplayx/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/dplayx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/CMakeLis… Added: trunk/rostests/winetests/dplayx/dplayx.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/dplayx.c… Added: trunk/rostests/winetests/dplayx/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dplayx/testlist…

1 0

[akhaldi] 60479: [DPLAYX] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: akhaldi Date: Mon Sep 30 18:14:44 2013 New Revision: 60479 URL: http://svn.reactos.org/svn/reactos?rev=60479&view=rev Log: [DPLAYX] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/directx/wine/dplayx/dpinit.h Modified: trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c trunk/reactos/dll/directx/wine/dplayx/dplay.c trunk/reactos/dll/directx/wine/dplayx/dplay_global.h trunk/reactos/dll/directx/wine/dplayx/dplaysp.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h trunk/reactos/dll/directx/wine/dplayx/dplobby.c trunk/reactos/dll/directx/wine/dplayx/lobbysp.c trunk/reactos/dll/directx/wine/dplayx/lobbysp.h trunk/reactos/dll/directx/wine/dplayx/name_server.c trunk/reactos/dll/directx/wine/dplayx/name_server.h trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/wine/dplayx/dpclassfactory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Removed: trunk/reactos/dll/directx/wine/dplayx/dpinit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/dplay.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/dplay_global.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/dplaysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/dplayx_messages.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/dplobby.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/dp… Modified: trunk/reactos/dll/directx/wine/dplayx/lobbysp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/lo… Modified: trunk/reactos/dll/directx/wine/dplayx/lobbysp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/lo… Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/na… Modified: trunk/reactos/dll/directx/wine/dplayx/name_server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplayx/na… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

1 0

[akhaldi] 60478: [DPLAY] * Sync with Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: akhaldi Date: Mon Sep 30 18:12:42 2013 New Revision: 60478 URL: http://svn.reactos.org/svn/reactos?rev=60478&view=rev Log: [DPLAY] * Sync with Wine 1.7.1. CORE-7469 Removed: trunk/reactos/dll/directx/wine/dplay/dplay_main.c Modified: trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplay/CMa… ============================================================================== --- trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt [iso-8859-1] Mon Sep 30 18:12:42 2013 @@ -1,14 +1,11 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) - spec2def(dplay.dll dplay.spec) add_library(dplay SHARED - dplay_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dplay.def) -set_module_type(dplay win32dll UNICODE) +set_module_type(dplay win32dll) add_importlibs(dplay dplayx msvcrt kernel32 ntdll) -add_dependencies(dplay psdk) add_cd_file(TARGET dplay DESTINATION reactos/system32 FOR all) Removed: trunk/reactos/dll/directx/wine/dplay/dplay_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplay/dpl… ============================================================================== --- trunk/reactos/dll/directx/wine/dplay/dplay_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dplay/dplay_main.c (removed) @@ -1 +0,0 @@ -/* nothing here yet */ Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Sep 30 18:12:42 2013 @@ -37,7 +37,7 @@ reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26 reactos/dll/directx/wine/dmusic # Synced to Wine-1.5.26 -reactos/dll/directx/wine/dplay # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplayx # Synced to Wine-1.5.26 reactos/dll/directx/wine/dsound # Synced to Wine-1.7.1 reactos/dll/directx/wine/dxdiagn # Synced to Wine-0_9_5

1 0

[akhaldi] 60477: [MMDEVAPI_WINETEST] * Import from Wine 1.7.1. CORE-7469
by akhaldi＠svn.reactos.org 30 Sep '13

30 Sep '13

Author: akhaldi Date: Mon Sep 30 13:35:12 2013 New Revision: 60477 URL: http://svn.reactos.org/svn/reactos?rev=60477&view=rev Log: [MMDEVAPI_WINETEST] * Import from Wine 1.7.1. CORE-7469 Added: trunk/rostests/winetests/mmdevapi/ trunk/rostests/winetests/mmdevapi/CMakeLists.txt (with props) trunk/rostests/winetests/mmdevapi/capture.c (with props) trunk/rostests/winetests/mmdevapi/dependency.c (with props) trunk/rostests/winetests/mmdevapi/mmdevenum.c (with props) trunk/rostests/winetests/mmdevapi/propstore.c (with props) trunk/rostests/winetests/mmdevapi/render.c (with props) trunk/rostests/winetests/mmdevapi/testlist.c (with props) Modified: trunk/rostests/winetests/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… Added: trunk/rostests/winetests/mmdevapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/CMakeL… Added: trunk/rostests/winetests/mmdevapi/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/captur… Added: trunk/rostests/winetests/mmdevapi/dependency.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/depend… Added: trunk/rostests/winetests/mmdevapi/mmdevenum.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/mmdeve… Added: trunk/rostests/winetests/mmdevapi/propstore.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/propst… Added: trunk/rostests/winetests/mmdevapi/render.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/render… Added: trunk/rostests/winetests/mmdevapi/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mmdevapi/testli…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013