Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[tkreuzer] 43820: partly implement KdpSysWriteControlSpace

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 28 23:38:42 2009 New Revision: 43820 URL: http://svn.reactos.org/svn/reactos?rev=43820&view=rev Log: partly implement KdpSysWriteControlSpace Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Wed Oct 28 23:38:42 2009 @@ -226,9 +226,28 @@ IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + PVOID ControlStart; + PKPRCB Prcb = KiProcessorBlock[Processor]; + PKIPCR Pcr = CONTAINING_RECORD(Prcb, KIPCR, Prcb); + + switch (BaseAddress) + { + case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL: + /* Copy SpecialRegisters */ + ControlStart = &Prcb->ProcessorState.SpecialRegisters; + *ActualLength = sizeof(KSPECIAL_REGISTERS); + break; + + default: + *ActualLength = 0; + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } + + /* Copy the memory */ + RtlCopyMemory(ControlStart, Buffer, min(Length, *ActualLength)); + + return STATUS_SUCCESS; } NTSTATUS

15 years, 1 month

[sginsberg] 43819: - Merge 43818 to trunk. - Don't return any data for DbgKdSetBusDataApi either.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Wed Oct 28 22:49:58 2009 New Revision: 43819 URL: http://svn.reactos.org/svn/reactos?rev=43819&view=rev Log: - Merge 43818 to trunk. - Don't return any data for DbgKdSetBusDataApi either. Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Wed Oct 28 22:49:58 2009 @@ -674,7 +674,7 @@ /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, - Data, + NULL, &KdpContext); } @@ -815,7 +815,7 @@ /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, - Data, + NULL, &KdpContext); }

15 years, 1 month

[tkreuzer] 43818: [KD64] - KdpSetContext: don't include the CONTEXT data in the reply. WinDbg doesn't like that.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Oct 28 22:36:00 2009 New Revision: 43818 URL: http://svn.reactos.org/svn/reactos?rev=43818&view=rev Log: [KD64] - KdpSetContext: don't include the CONTEXT data in the reply. WinDbg doesn't like that. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Wed Oct 28 22:36:00 2009 @@ -675,7 +675,7 @@ /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, - Data, + NULL, &KdpContext); }

15 years, 1 month

[dgorbachev] 43817: - Add missing svn:eol-style properties. - Use consistent newline style. - Update file COPYING.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Wed Oct 28 21:13:23 2009 New Revision: 43817 URL: http://svn.reactos.org/svn/reactos?rev=43817&view=rev Log: - Add missing svn:eol-style properties. - Use consistent newline style. - Update file COPYING. Added: trunk/rostests/COPYING - copied, changed from r43816, trunk/rostests/copying Removed: trunk/rostests/copying Modified: trunk/rostests/apitests/w32kdll/directory.rbuild (props changed) trunk/rostests/dxtest/ddraw/ddraw.rbuild (contents, props changed) trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c (contents, props changed) trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c (contents, props changed) trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c (contents, props changed) trunk/rostests/tests/Imagelistviewer/imagelistviewer.rbuild (contents, props changed) trunk/rostests/tests/Imagelistviewer/main.c (contents, props changed) trunk/rostests/tests/Imagelistviewer/resource.h (contents, props changed) trunk/rostests/tests/readconsole/main.c (contents, props changed) trunk/rostests/win32/user32/kbdlayout/kbdlayout.c (contents, props changed) trunk/rostests/win32/user32/kbdlayout/kbdlayout.rbuild (contents, props changed) trunk/rostests/win32/user32/kbdlayout/resource.h (contents, props changed) trunk/rostests/winetests/rpcrt4/warningfix.diff (contents, props changed) trunk/rostests/winetests/user32/clipboard.c (props changed) trunk/rostests/winetests/user32/dce.c (props changed) trunk/rostests/winetests/user32/dde.c (props changed) trunk/rostests/winetests/user32/dialog.c (props changed) trunk/rostests/winetests/user32/edit.c (props changed) trunk/rostests/winetests/user32/input.c (props changed) trunk/rostests/winetests/user32/listbox.c (props changed) trunk/rostests/winetests/user32/menu.c (props changed) trunk/rostests/winetests/user32/monitor.c (props changed) trunk/rostests/winetests/user32/msg.c (props changed) trunk/rostests/winetests/user32/resource.c (props changed) trunk/rostests/winetests/user32/resource.rc (props changed) trunk/rostests/winetests/user32/sysparams.c (props changed) trunk/rostests/winetests/user32/testlist.c (props changed) trunk/rostests/winetests/user32/text.c (props changed) trunk/rostests/winetests/user32/user32.rbuild (props changed) trunk/rostests/winetests/user32/win.c (props changed) trunk/rostests/winetests/user32/winstation.c (props changed) trunk/rostests/winetests/user32/wsprintf.c (props changed) Copied: trunk/rostests/COPYING (from r43816, trunk/rostests/copying) URL: http://svn.reactos.org/svn/reactos/trunk/rostests/COPYING?p2=trunk/rostests… ============================================================================== --- trunk/rostests/copying [iso-8859-1] (original) +++ trunk/rostests/COPYING [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,13 +1,12 @@ - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 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 + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -16,7 +15,7 @@ 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 +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 @@ -56,8 +55,8 @@ The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE + + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -111,7 +110,7 @@ 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 @@ -169,7 +168,7 @@ 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 @@ -226,7 +225,7 @@ 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 @@ -256,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + 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 @@ -278,9 +277,9 @@ 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 + 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 @@ -292,7 +291,7 @@ 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> + 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 @@ -304,16 +303,16 @@ 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. + 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) 19yy name of author + 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. @@ -336,5 +335,5 @@ 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 +library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. Propchange: trunk/rostests/apitests/w32kdll/directory.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Removed: trunk/rostests/copying URL: http://svn.reactos.org/svn/reactos/trunk/rostests/copying?rev=43816&view=au… ============================================================================== --- trunk/rostests/copying [iso-8859-1] (original) +++ trunk/rostests/copying (removed) @@ -1,340 +1,0 @@ - - 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. Modified: trunk/rostests/dxtest/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/ddraw/ddraw.rbuild… ============================================================================== --- trunk/rostests/dxtest/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ trunk/rostests/dxtest/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,12 +1,12 @@ -<module name="ddraw_test" type="win32cui" allowwarnings="false"> - <include base="ddraw_test">.</include> - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - <library>ole32</library> - <library>ddraw</library> - <library>dxguid</library> - <file>ddraw_test.cpp</file> - <file>helper.cpp</file> - <file>testlist.cpp</file> -</module> +<module name="ddraw_test" type="win32cui" allowwarnings="false"> + <include base="ddraw_test">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <library>ole32</library> + <library>ddraw</library> + <library>dxguid</library> + <file>ddraw_test.cpp</file> + <file>helper.cpp</file> + <file>testlist.cpp</file> +</module> Propchange: trunk/rostests/dxtest/ddraw/ddraw.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,45 +1,45 @@ - -#include <stdio.h> -/* SDK/DDK/NDK Headers. */ -#include <windows.h> -#include <wingdi.h> -#include <winddi.h> -#include <d3dnthal.h> -#include <dll/directx/d3d8thk.h> -#include <ddrawi.h> -#include "test.h" - -/* - * Test see if we can delete a DirectDrawObject from win32k - * - */ -void -test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal) -{ - int fails=0; - BOOL retValue=FALSE; - DDHAL_CANCREATESURFACEDATA pCanCreateSurface; - DDSURFACEDESC2 desc; - - RtlZeroMemory(&pCanCreateSurface,sizeof(DDHAL_CANCREATESURFACEDATA)); - RtlZeroMemory(&desc,sizeof(DDSURFACEDESC2)); - - /* crash in windows 2000 */ - retValue = OsThunkDdCanCreateSurface(NULL,NULL); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdCanCreateSurface(NULL,NULL);\0"); - - retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,NULL); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdCanCreateSurface(hDirectDrawLocal,NULL);\0"); - - retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); - - pCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&desc; - desc.dwSize = sizeof(DDSURFACEDESC2); - - retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"4. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); - -} - - + +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include <ddrawi.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdCanCreateSurface(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + DDHAL_CANCREATESURFACEDATA pCanCreateSurface; + DDSURFACEDESC2 desc; + + RtlZeroMemory(&pCanCreateSurface,sizeof(DDHAL_CANCREATESURFACEDATA)); + RtlZeroMemory(&desc,sizeof(DDSURFACEDESC2)); + + /* crash in windows 2000 */ + retValue = OsThunkDdCanCreateSurface(NULL,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdCanCreateSurface(NULL,NULL);\0"); + + retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdCanCreateSurface(hDirectDrawLocal,NULL);\0"); + + retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); + + pCanCreateSurface.lpDDSurfaceDesc = (DDSURFACEDESC*)&desc; + desc.dwSize = sizeof(DDSURFACEDESC2); + + retValue = OsThunkDdCanCreateSurface(hDirectDrawLocal,(PDD_CANCREATESURFACEDATA)&pCanCreateSurface); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"4. NtGdiDdCanCreateSurface(hDirectDrawLocal,pCanCreateSurface);\0"); + +} + + Propchange: trunk/rostests/dxtest/win32kdxtest/NtGdiDdCanCreateSurface.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,40 +1,40 @@ -#include <stdio.h> -/* SDK/DDK/NDK Headers. */ -#include <windows.h> -#include <wingdi.h> -#include <winddi.h> -#include <d3dnthal.h> -#include <dll/directx/d3d8thk.h> -#include "test.h" - -/* - * Test see if we can delete a DirectDrawObject from win32k - * - */ -void -test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal) -{ - int fails=0; - BOOL retValue=FALSE; - DD_GETSCANLINEDATA puGetScanLineData; - - printf("Start testing of NtGdiDdGetScanLine\n"); - RtlZeroMemory(&puGetScanLineData,sizeof(DD_GETSCANLINEDATA)); - - retValue = OsThunkDdGetScanLine(NULL,NULL); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdGetScanLine(NULL,NULL);\0"); - - retValue = OsThunkDdGetScanLine(hDirectDrawLocal,NULL); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdGetScanLine(hDirectDrawLocal,NULL);\0"); - - puGetScanLineData.ddRVal = DDERR_GENERIC; - retValue = OsThunkDdGetScanLine(hDirectDrawLocal,&puGetScanLineData); - testing_eq(retValue,DDHAL_DRIVER_NOTHANDLED,fails,"3. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); - testing_noteq(puGetScanLineData.ddRVal,DD_OK,fails,"4. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); - testing_eq(puGetScanLineData.dwScanLine,0,fails,"4. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); - - - /* FIXME DDERR_VERTICALBLANKINPROGRESS test */ - - show_status(fails, "NtGdiDdGetScanLine\0"); -} +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdGetScanLine(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + DD_GETSCANLINEDATA puGetScanLineData; + + printf("Start testing of NtGdiDdGetScanLine\n"); + RtlZeroMemory(&puGetScanLineData,sizeof(DD_GETSCANLINEDATA)); + + retValue = OsThunkDdGetScanLine(NULL,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdGetScanLine(NULL,NULL);\0"); + + retValue = OsThunkDdGetScanLine(hDirectDrawLocal,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdGetScanLine(hDirectDrawLocal,NULL);\0"); + + puGetScanLineData.ddRVal = DDERR_GENERIC; + retValue = OsThunkDdGetScanLine(hDirectDrawLocal,&puGetScanLineData); + testing_eq(retValue,DDHAL_DRIVER_NOTHANDLED,fails,"3. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); + testing_noteq(puGetScanLineData.ddRVal,DD_OK,fails,"4. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); + testing_eq(puGetScanLineData.dwScanLine,0,fails,"4. NtGdiDdGetScanLine(hDirectDrawLocal,puGetScanLineData);\0"); + + + /* FIXME DDERR_VERTICALBLANKINPROGRESS test */ + + show_status(fails, "NtGdiDdGetScanLine\0"); +} Propchange: trunk/rostests/dxtest/win32kdxtest/NtGdiDdGetScanLine.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dxtest/win32kdxtest/NtGdi… ============================================================================== --- trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c [iso-8859-1] (original) +++ trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,46 +1,46 @@ -#include <stdio.h> -/* SDK/DDK/NDK Headers. */ -#include <windows.h> -#include <wingdi.h> -#include <winddi.h> -#include <d3dnthal.h> -#include <dll/directx/d3d8thk.h> - -#include <ddrawi.h> -#include "test.h" - -/* - * Test see if we can delete a DirectDrawObject from win32k - * - */ -void -test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal) -{ - int fails=0; - BOOL retValue=FALSE; - DDHAL_WAITFORVERTICALBLANKDATA pDdWaitForVerticalBlankData; - - RtlZeroMemory(&pDdWaitForVerticalBlankData,sizeof(DDHAL_WAITFORVERTICALBLANKDATA)); - - retValue = OsThunkDdWaitForVerticalBlank(NULL,NULL); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdWaitForVerticalBlank(NULL,NULL);\0"); - - retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,NULL); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); - - retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); - testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); - testing_eq(pDdWaitForVerticalBlankData.ddRVal, DD_OK,fails,"4. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); - - RtlZeroMemory(&pDdWaitForVerticalBlankData,sizeof(DDHAL_WAITFORVERTICALBLANKDATA)); - pDdWaitForVerticalBlankData.dwFlags = DDWAITVB_I_TESTVB; - retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); - - testing_eq(retValue, DDHAL_DRIVER_NOTHANDLED,fails,"5. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); - testing_noteq(pDdWaitForVerticalBlankData.ddRVal, DD_OK,fails,"6. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); - - retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); - - show_status(fails, "NtGdiDdWaitForVerticalBlank\0"); -} - +#include <stdio.h> +/* SDK/DDK/NDK Headers. */ +#include <windows.h> +#include <wingdi.h> +#include <winddi.h> +#include <d3dnthal.h> +#include <dll/directx/d3d8thk.h> + +#include <ddrawi.h> +#include "test.h" + +/* + * Test see if we can delete a DirectDrawObject from win32k + * + */ +void +test_NtGdiDdWaitForVerticalBlank(HANDLE hDirectDrawLocal) +{ + int fails=0; + BOOL retValue=FALSE; + DDHAL_WAITFORVERTICALBLANKDATA pDdWaitForVerticalBlankData; + + RtlZeroMemory(&pDdWaitForVerticalBlankData,sizeof(DDHAL_WAITFORVERTICALBLANKDATA)); + + retValue = OsThunkDdWaitForVerticalBlank(NULL,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"1. NtGdiDdWaitForVerticalBlank(NULL,NULL);\0"); + + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,NULL); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"2. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); + testing_eq(retValue, DDHAL_DRIVER_HANDLED,fails,"3. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + testing_eq(pDdWaitForVerticalBlankData.ddRVal, DD_OK,fails,"4. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + + RtlZeroMemory(&pDdWaitForVerticalBlankData,sizeof(DDHAL_WAITFORVERTICALBLANKDATA)); + pDdWaitForVerticalBlankData.dwFlags = DDWAITVB_I_TESTVB; + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); + + testing_eq(retValue, DDHAL_DRIVER_NOTHANDLED,fails,"5. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + testing_noteq(pDdWaitForVerticalBlankData.ddRVal, DD_OK,fails,"6. NtGdiDdWaitForVerticalBlank(hDirectDrawLocal,NULL);\0"); + + retValue = OsThunkDdWaitForVerticalBlank(hDirectDrawLocal,(PDD_WAITFORVERTICALBLANKDATA)&pDdWaitForVerticalBlankData); + + show_status(fails, "NtGdiDdWaitForVerticalBlank\0"); +} + Propchange: trunk/rostests/dxtest/win32kdxtest/NtGdiDdWaitForVerticalBlank.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/tests/Imagelistviewer/imagelistviewer.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/Imagelistviewer/ima… ============================================================================== --- trunk/rostests/tests/Imagelistviewer/imagelistviewer.rbuild [iso-8859-1] (original) +++ trunk/rostests/tests/Imagelistviewer/imagelistviewer.rbuild [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,9 +1,9 @@ -<module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe"> - <include base="Imagelistviewer">.</include> - <library>kernel32</library> - <library>user32</library> - <library>setupapi</library> - <library>comctl32</library> - <file>main.c</file> - <file>res.rc</file> -</module> +<module name="Imagelistviewer" type="win32gui" installbase="bin" installname="Imagelistviewer.exe"> + <include base="Imagelistviewer">.</include> + <library>kernel32</library> + <library>user32</library> + <library>setupapi</library> + <library>comctl32</library> + <file>main.c</file> + <file>res.rc</file> +</module> Propchange: trunk/rostests/tests/Imagelistviewer/imagelistviewer.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/tests/Imagelistviewer/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/Imagelistviewer/mai… ============================================================================== --- trunk/rostests/tests/Imagelistviewer/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/Imagelistviewer/main.c [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,146 +1,146 @@ -#include <windows.h> -#include <setupapi.h> -#include <tchar.h> -#include <stdlib.h> -#include "resource.h" - -typedef BOOL (WINAPI * SH_GIL_PROC)(HIMAGELIST *phLarge, HIMAGELIST *phSmall); -typedef BOOL (WINAPI * FII_PROC)(BOOL fFullInit); - -/*** Shell32 undoc'd functions ***/ - /* Shell_GetImageLists @71 */ - /* FileIconInit @660 */ - -BOOL -DisplayImageList(HWND hwnd, - UINT uID) -{ - HWND hLV; - SP_CLASSIMAGELIST_DATA ImageListData; - LV_ITEM lvItem; - TCHAR Buf[6]; - INT ImageListCount = -1; - INT i = 0; - - hLV = GetDlgItem(hwnd, IDC_LSTVIEW); - (void)ListView_DeleteAllItems(hLV); - - if (uID == IDC_SYSTEM) - { - HIMAGELIST hLarge, hSmall; - HMODULE hShell32; - SH_GIL_PROC Shell_GetImageLists; - FII_PROC FileIconInit; - - hShell32 = LoadLibrary(_T("shell32.dll")); - if(hShell32 == NULL) - return FALSE; - - Shell_GetImageLists = (SH_GIL_PROC)GetProcAddress(hShell32, (LPCSTR)71); - FileIconInit = (FII_PROC)GetProcAddress(hShell32, (LPCSTR)660); - - if(Shell_GetImageLists == NULL || FileIconInit == NULL) - { - FreeLibrary(hShell32); - return FALSE; - } - - FileIconInit(TRUE); - - Shell_GetImageLists(&hLarge, &hSmall); - - ImageListCount = ImageList_GetImageCount(hSmall); - - (void)ListView_SetImageList(hLV, - hSmall, - LVSIL_SMALL); - - FreeLibrary(hShell32); - } - else if (uID == IDC_DEVICE) - { - ImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); - SetupDiGetClassImageList(&ImageListData); - - ImageListCount = ImageList_GetImageCount(ImageListData.ImageList); - - (void)ListView_SetImageList(hLV, - ImageListData.ImageList, - LVSIL_SMALL); - } - else - return FALSE; - - lvItem.mask = LVIF_TEXT | LVIF_IMAGE; - - while (i <= ImageListCount) - { - lvItem.iItem = i; - lvItem.iSubItem = 0; - lvItem.pszText = _itot(i, Buf, 10); - lvItem.iImage = i; - - (void)ListView_InsertItem(hLV, &lvItem); - - i++; - } - - return TRUE; -} - - -BOOL CALLBACK -DlgProc(HWND hwnd, - UINT message, - WPARAM wParam, - LPARAM lParam) -{ - switch (message) - { - case WM_INITDIALOG: - DisplayImageList(hwnd, IDC_SYSTEM); - return TRUE; - - case WM_CLOSE: - EndDialog(hwnd, 0); - return TRUE; - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case IDOK: - EndDialog(hwnd, 0); - return TRUE; - - case IDC_SYSTEM: - DisplayImageList(hwnd, IDC_SYSTEM); - return TRUE; - - case IDC_DEVICE: - DisplayImageList(hwnd, IDC_DEVICE); - return TRUE; - } - } - } - - return FALSE; -} - -int WINAPI -WinMain(HINSTANCE hThisInstance, - HINSTANCE hPrevInstance, - LPSTR lpszArgument, - int nCmdShow) -{ - INITCOMMONCONTROLSEX icex; - - icex.dwSize = sizeof(INITCOMMONCONTROLSEX); - icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; - InitCommonControlsEx(&icex); - - return DialogBox(hThisInstance, - MAKEINTRESOURCE(IDD_IMGLST), - NULL, - (DLGPROC)DlgProc); -} +#include <windows.h> +#include <setupapi.h> +#include <tchar.h> +#include <stdlib.h> +#include "resource.h" + +typedef BOOL (WINAPI * SH_GIL_PROC)(HIMAGELIST *phLarge, HIMAGELIST *phSmall); +typedef BOOL (WINAPI * FII_PROC)(BOOL fFullInit); + +/*** Shell32 undoc'd functions ***/ + /* Shell_GetImageLists @71 */ + /* FileIconInit @660 */ + +BOOL +DisplayImageList(HWND hwnd, + UINT uID) +{ + HWND hLV; + SP_CLASSIMAGELIST_DATA ImageListData; + LV_ITEM lvItem; + TCHAR Buf[6]; + INT ImageListCount = -1; + INT i = 0; + + hLV = GetDlgItem(hwnd, IDC_LSTVIEW); + (void)ListView_DeleteAllItems(hLV); + + if (uID == IDC_SYSTEM) + { + HIMAGELIST hLarge, hSmall; + HMODULE hShell32; + SH_GIL_PROC Shell_GetImageLists; + FII_PROC FileIconInit; + + hShell32 = LoadLibrary(_T("shell32.dll")); + if(hShell32 == NULL) + return FALSE; + + Shell_GetImageLists = (SH_GIL_PROC)GetProcAddress(hShell32, (LPCSTR)71); + FileIconInit = (FII_PROC)GetProcAddress(hShell32, (LPCSTR)660); + + if(Shell_GetImageLists == NULL || FileIconInit == NULL) + { + FreeLibrary(hShell32); + return FALSE; + } + + FileIconInit(TRUE); + + Shell_GetImageLists(&hLarge, &hSmall); + + ImageListCount = ImageList_GetImageCount(hSmall); + + (void)ListView_SetImageList(hLV, + hSmall, + LVSIL_SMALL); + + FreeLibrary(hShell32); + } + else if (uID == IDC_DEVICE) + { + ImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA); + SetupDiGetClassImageList(&ImageListData); + + ImageListCount = ImageList_GetImageCount(ImageListData.ImageList); + + (void)ListView_SetImageList(hLV, + ImageListData.ImageList, + LVSIL_SMALL); + } + else + return FALSE; + + lvItem.mask = LVIF_TEXT | LVIF_IMAGE; + + while (i <= ImageListCount) + { + lvItem.iItem = i; + lvItem.iSubItem = 0; + lvItem.pszText = _itot(i, Buf, 10); + lvItem.iImage = i; + + (void)ListView_InsertItem(hLV, &lvItem); + + i++; + } + + return TRUE; +} + + +BOOL CALLBACK +DlgProc(HWND hwnd, + UINT message, + WPARAM wParam, + LPARAM lParam) +{ + switch (message) + { + case WM_INITDIALOG: + DisplayImageList(hwnd, IDC_SYSTEM); + return TRUE; + + case WM_CLOSE: + EndDialog(hwnd, 0); + return TRUE; + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case IDOK: + EndDialog(hwnd, 0); + return TRUE; + + case IDC_SYSTEM: + DisplayImageList(hwnd, IDC_SYSTEM); + return TRUE; + + case IDC_DEVICE: + DisplayImageList(hwnd, IDC_DEVICE); + return TRUE; + } + } + } + + return FALSE; +} + +int WINAPI +WinMain(HINSTANCE hThisInstance, + HINSTANCE hPrevInstance, + LPSTR lpszArgument, + int nCmdShow) +{ + INITCOMMONCONTROLSEX icex; + + icex.dwSize = sizeof(INITCOMMONCONTROLSEX); + icex.dwICC = ICC_BAR_CLASSES | ICC_COOL_CLASSES; + InitCommonControlsEx(&icex); + + return DialogBox(hThisInstance, + MAKEINTRESOURCE(IDD_IMGLST), + NULL, + (DLGPROC)DlgProc); +} Propchange: trunk/rostests/tests/Imagelistviewer/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/tests/Imagelistviewer/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/Imagelistviewer/res… ============================================================================== --- trunk/rostests/tests/Imagelistviewer/resource.h [iso-8859-1] (original) +++ trunk/rostests/tests/Imagelistviewer/resource.h [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,4 +1,4 @@ -#define IDD_IMGLST 1000 -#define IDC_LSTVIEW 1001 -#define IDC_SYSTEM 1002 -#define IDC_DEVICE 1003 +#define IDD_IMGLST 1000 +#define IDC_LSTVIEW 1001 +#define IDC_SYSTEM 1002 +#define IDC_DEVICE 1003 Propchange: trunk/rostests/tests/Imagelistviewer/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/tests/readconsole/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/readconsole/main.c?… ============================================================================== --- trunk/rostests/tests/readconsole/main.c [iso-8859-1] (original) +++ trunk/rostests/tests/readconsole/main.c [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,33 +1,33 @@ -#include <stdio.h> -#include <tchar.h> -#include <windows.h> - -int main() -{ - TCHAR Buffer = 0; - DWORD Count = 0; - - // - // We clear the mode, most importantly turn off ENABLE_ECHO_INPUT and ENABLE_LINE_INPUT - // This is the same mode as that is set up by getch() when trying to get a char - // - SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),0); - - // - // We read one char from the input and then return - // - ReadConsole(GetStdHandle(STD_INPUT_HANDLE),&Buffer,1,&Count,NULL); - - // - // We print out this char as an int to show that infact a backspace does count as input - // - _tprintf(TEXT("You printed %c :: "), Buffer); - _tprintf(TEXT("With a value %d :: "), Buffer); - _tprintf(TEXT("Number of chars recieved %lu :: "), Count); - _tprintf(TEXT("Char equal to backspace %d \n"), (Buffer == TEXT('\b'))); - - // - // :) - // - return 0; -} +#include <stdio.h> +#include <tchar.h> +#include <windows.h> + +int main() +{ + TCHAR Buffer = 0; + DWORD Count = 0; + + // + // We clear the mode, most importantly turn off ENABLE_ECHO_INPUT and ENABLE_LINE_INPUT + // This is the same mode as that is set up by getch() when trying to get a char + // + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE),0); + + // + // We read one char from the input and then return + // + ReadConsole(GetStdHandle(STD_INPUT_HANDLE),&Buffer,1,&Count,NULL); + + // + // We print out this char as an int to show that infact a backspace does count as input + // + _tprintf(TEXT("You printed %c :: "), Buffer); + _tprintf(TEXT("With a value %d :: "), Buffer); + _tprintf(TEXT("Number of chars recieved %lu :: "), Count); + _tprintf(TEXT("Char equal to backspace %d \n"), (Buffer == TEXT('\b'))); + + // + // :) + // + return 0; +} Propchange: trunk/rostests/tests/readconsole/main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/win32/user32/kbdlayout/kbdlayout.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/kbdlayout/kb… ============================================================================== --- trunk/rostests/win32/user32/kbdlayout/kbdlayout.c [iso-8859-1] (original) +++ trunk/rostests/win32/user32/kbdlayout/kbdlayout.c [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,387 +1,387 @@ -/* - * PROJECT: ReactOS - * LICENSE: GPL - See COPYING in the top level directory - * FILE: base/applications/testset/user32/kbdlayout/kbdlayout.c - * PURPOSE: Keyboard layout testapp - * COPYRIGHT: Copyright 2007 Saveliy Tretiakov - */ - -#define UNICODE -#include<wchar.h> -#include <windows.h> -#include "resource.h" - - - -LRESULT MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); - - -HINSTANCE hInst; -HWND hMainDlg; - - -typedef struct { - WNDPROC OrigProc; - WCHAR WndName[25]; -} WND_DATA; - -DWORD WINAPI ThreadProc(LPVOID lpParam) -{ - - DialogBoxParam(hInst, - MAKEINTRESOURCE(IDD_MAINDIALOG), - NULL, - (DLGPROC)MainDialogProc, - (LPARAM)NULL); - - return 0; -} - -INT WINAPI WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nCmdShow) -{ - - - hInst = hInstance; - - ThreadProc(0); - - return 0; -} - - -int GetKlList(HKL **list) -{ - HKL *ret; - int n; - - n = GetKeyboardLayoutList(0, NULL); - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HKL)*n); - GetKeyboardLayoutList(n, ret); - *list = ret; - return n; -} - -void FreeKlList(HKL *list) -{ - HeapFree(GetProcessHeap(), 0, list); -} - - -void UpdateData(HWND hDlg) -{ - WCHAR buf[KL_NAMELENGTH]; - WCHAR buf2[512]; - - HWND hList; - HKL *klList, hKl; - int n, i,j; - - GetKeyboardLayoutName(buf); - swprintf(buf2, L"Active: %s (%x)", buf, GetKeyboardLayout(0)); - SetWindowText(GetDlgItem(hDlg, IDC_ACTIVE), buf2); - - hList = GetDlgItem(hDlg, IDC_LIST); - SendMessage(hList, LB_RESETCONTENT, 0, 0); - - n = GetKlList(&klList); - hKl = GetKeyboardLayout(0); - for(i = 0; i < n; i++) - { - swprintf(buf, L"%x", klList[i] ); - j = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM) buf); - SendMessage(hList, LB_SETITEMDATA, j, (LPARAM) klList[i]); - if(klList[i] == hKl) SendMessage(hList, LB_SETCURSEL, j, 0); - } - - FreeKlList(klList); -} - -void FormatMsg(WCHAR *format, ...) -{ - WCHAR buf[255]; - va_list argptr; - va_start(argptr, format); - _vsnwprintf(buf, sizeof(buf)-1, format, argptr); - MessageBox(0, buf, L"msg", 0); - va_end(argptr); -} - -void FormatBox(HWND hWnd, DWORD Flags, WCHAR *Caption, WCHAR *Format, ...) -{ - WCHAR buf[255]; - va_list argptr; - va_start(argptr, Format); - _vsnwprintf(buf, sizeof(buf)-1, Format, argptr); - MessageBox(hWnd, buf, Caption, Flags); - va_end(argptr); -} - - -LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - WND_DATA *data = (WND_DATA*)GetWindowLong(hwnd, GWL_USERDATA); - - if(uMsg == WM_INPUTLANGCHANGE) - { - FormatMsg(L"%s: WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", data->WndName, lParam, wParam); - UpdateData(hMainDlg); - //Pass message to defwindowproc - } - else if(uMsg == WM_INPUTLANGCHANGEREQUEST) - { - FormatMsg(L"%s: WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", data->WndName, lParam, wParam); - UpdateData(hMainDlg); - //Pass message to defwindowproc - } - - return ( CallWindowProc( data->OrigProc, hwnd, uMsg, wParam, lParam) ); -} - -void SubclassWnd(HWND hWnd, WCHAR* Name) -{ - WND_DATA *data = HeapAlloc(GetProcessHeap(), 0, sizeof(WND_DATA)); - data->OrigProc = (WNDPROC)SetWindowLong( hWnd, GWL_WNDPROC, (LONG)WndSubclassProc); - wcsncpy(data->WndName, Name, 25); - SetWindowLong(hWnd, GWL_USERDATA, (LONG)data); - return; -} - -DWORD GetActivateFlags(HWND hDlg) -{ - DWORD ret = 0; - - if(IsDlgButtonChecked(hDlg, IDC_KLF_REORDER)) - ret |= KLF_REORDER; - - if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) - ret |= KLF_RESET; - - if(IsDlgButtonChecked(hDlg, IDC_KLF_SHIFTLOCK)) - ret |= KLF_SHIFTLOCK; - - if(IsDlgButtonChecked(hDlg, IDC_KLF_SETFORPROCESS)) - ret |= KLF_SETFORPROCESS; - - return ret; - -} - -DWORD GetLoadFlags(HWND hDlg) -{ - DWORD ret = 0; - - if(IsDlgButtonChecked(hDlg, IDL_KLF_ACTIVATE)) - ret |= KLF_ACTIVATE; - - if(IsDlgButtonChecked(hDlg, IDL_KLF_NOTELLSHELL)) - ret |= KLF_NOTELLSHELL; - - if(IsDlgButtonChecked(hDlg, IDL_KLF_REORDER)) - ret |= KLF_REORDER; - - if(IsDlgButtonChecked(hDlg, IDL_KLF_REPLACELANG)) - ret |= KLF_REPLACELANG; - - if(IsDlgButtonChecked(hDlg, IDL_KLF_SUBSTITUTE_OK)) - ret |= KLF_SUBSTITUTE_OK; - - if(IsDlgButtonChecked(hDlg, IDL_KLF_SETFORPROCESS)) - ret |= KLF_SETFORPROCESS; - - return ret; -} - -UINT GetDelayMilliseconds(HWND hDlg) -{ - WCHAR Buf[255]; - UINT ret; - - GetWindowText(GetDlgItem(hDlg, IDC_DELAY), Buf, sizeof(Buf)); - - swscanf(Buf, L"%d", &ret); - - return ret*1000; -} - -HKL GetSelectedLayout(HWND hDlg) -{ - int n; - HWND hList; - hList = GetDlgItem(hDlg, IDC_LIST); - if((n = SendMessage(hList, LB_GETCURSEL, 0, 0)) != LB_ERR) - return (HKL) SendMessage(hList, LB_GETITEMDATA, n, 0); - else return INVALID_HANDLE_VALUE; -} - -HKL GetActivateHandle(HWND hDlg) -{ - - if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) - return GetSelectedLayout(hDlg); - else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) - return (HKL)HKL_NEXT; - - return (HKL)HKL_PREV; - -} - - -/*************************************************** - * MainDialogProc * - ***************************************************/ - -LRESULT MainDialogProc(HWND hDlg, - UINT Msg, - WPARAM wParam, - LPARAM lParam) -{ - HKL hKl; - - switch (Msg) - { - case WM_INITDIALOG: - { - WCHAR Buf[255]; - UpdateData(hDlg); - hMainDlg = hDlg; - - SubclassWnd(GetDlgItem(hDlg, IDC_LIST), L"List"); - SubclassWnd(GetDlgItem(hDlg, IDC_EDIT1), L"Edit1"); - SubclassWnd(GetDlgItem(hDlg, IDC_KLID), L"Klid"); - SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"CancelB"); - SubclassWnd(GetDlgItem(hDlg, IDC_ACTIVATE), L"ActivateB"); - SubclassWnd(GetDlgItem(hDlg, IDC_REFRESH), L"RefreshB"); - SubclassWnd(GetDlgItem(hDlg, IDC_UNLOAD), L"UnloadB"); - SubclassWnd(GetDlgItem(hDlg, IDC_LOAD), L"LoadB"); - - CheckRadioButton(hDlg, IDC_FROMLIST, IDC_FROMEDIT, IDC_FROMLIST); - SetWindowText(GetDlgItem(hDlg, IDC_KLID), L"00000419"); - - swprintf(Buf, L"Current thread id: %d", GetCurrentThreadId()); - SetWindowText(GetDlgItem(hDlg, IDC_CURTHREAD), Buf); - - SetWindowText(GetDlgItem(hDlg, IDC_DELAY), L"0"); - - return 0; - } /* WM_INITDIALOG */ - - case WM_COMMAND: - { - switch(LOWORD(wParam)) - { - case ID_CANCEL: - { - EndDialog(hDlg, ERROR_CANCELLED); - break; - } - - case IDC_ACTIVATE: - { - if((hKl = GetActivateHandle(hDlg)) != INVALID_HANDLE_VALUE) - { - Sleep(GetDelayMilliseconds(hDlg)); - if(!(hKl = ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg)))) - FormatBox(hDlg, MB_ICONERROR, L"Error", - L"ActivateKeyboardLayout() failed. %d", GetLastError()); - else UpdateData(hDlg); - //FormatBox(hDlg, 0, L"Activated", L"Prev - %x, err - %d.", hKl, - // GetLastError()); - } - else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); - break; - } - - case IDC_UNLOAD: - { - if((hKl = GetSelectedLayout(hDlg)) != INVALID_HANDLE_VALUE) - { - Sleep(GetDelayMilliseconds(hDlg)); - if(!UnloadKeyboardLayout(hKl)) - FormatBox(hDlg, MB_ICONERROR, L"Error", - L"UnloadKeyboardLayout() failed. %d", - GetLastError()); - else UpdateData(hDlg); - } - else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); - break; - } - - case IDC_LOAD: - { - WCHAR buf[255]; - GetWindowText(GetDlgItem(hDlg, IDC_KLID), buf, sizeof(buf)); - Sleep(GetDelayMilliseconds(hDlg)); - if(!LoadKeyboardLayout(buf, GetLoadFlags(hDlg))) - FormatBox(hDlg, MB_ICONERROR, L"Error", - L"LoadKeyboardLayout() failed. %d", - GetLastError()); - else UpdateData(hDlg); - break; - } - - case IDC_REFRESH: - { - UpdateData(hDlg); - break; - } - - case IDC_NEWTHREAD: - { - if(!CreateThread(NULL, 0, ThreadProc, NULL, 0, NULL)) - { - FormatBox(hDlg, MB_ICONERROR, L"Error!", - L"Can not create thread (%d).", GetLastError()); - } - } - - case IDC_LIST: - { - if(HIWORD(wParam) == LBN_SELCHANGE) - { - WCHAR buf[25]; - if((hKl = GetSelectedLayout(hDlg)) != NULL) - { - swprintf(buf, L"%x", hKl); - SetWindowText(GetDlgItem(hDlg, IDC_HANDLE), buf); - } - } - break; - } - - } - - return TRUE; - } /* WM_COMMAND */ - - - case WM_INPUTLANGCHANGE: - { - FormatMsg(L"dlg WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", lParam, wParam); - return FALSE; - } - - case WM_INPUTLANGCHANGEREQUEST: - { - FormatMsg(L"dlg WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", lParam, wParam); - UpdateData(hDlg); - return FALSE; - } - - case WM_CLOSE: - { - EndDialog(hDlg, ERROR_CANCELLED); - return TRUE; - } /* WM_CLOSE */ - - default: - return FALSE; - } - -} - - - - +/* + * PROJECT: ReactOS + * LICENSE: GPL - See COPYING in the top level directory + * FILE: base/applications/testset/user32/kbdlayout/kbdlayout.c + * PURPOSE: Keyboard layout testapp + * COPYRIGHT: Copyright 2007 Saveliy Tretiakov + */ + +#define UNICODE +#include<wchar.h> +#include <windows.h> +#include "resource.h" + + + +LRESULT MainDialogProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam); + + +HINSTANCE hInst; +HWND hMainDlg; + + +typedef struct { + WNDPROC OrigProc; + WCHAR WndName[25]; +} WND_DATA; + +DWORD WINAPI ThreadProc(LPVOID lpParam) +{ + + DialogBoxParam(hInst, + MAKEINTRESOURCE(IDD_MAINDIALOG), + NULL, + (DLGPROC)MainDialogProc, + (LPARAM)NULL); + + return 0; +} + +INT WINAPI WinMain(HINSTANCE hInstance, + HINSTANCE hPrevInstance, + LPSTR lpCmdLine, + int nCmdShow) +{ + + + hInst = hInstance; + + ThreadProc(0); + + return 0; +} + + +int GetKlList(HKL **list) +{ + HKL *ret; + int n; + + n = GetKeyboardLayoutList(0, NULL); + ret = HeapAlloc(GetProcessHeap(), 0, sizeof(HKL)*n); + GetKeyboardLayoutList(n, ret); + *list = ret; + return n; +} + +void FreeKlList(HKL *list) +{ + HeapFree(GetProcessHeap(), 0, list); +} + + +void UpdateData(HWND hDlg) +{ + WCHAR buf[KL_NAMELENGTH]; + WCHAR buf2[512]; + + HWND hList; + HKL *klList, hKl; + int n, i,j; + + GetKeyboardLayoutName(buf); + swprintf(buf2, L"Active: %s (%x)", buf, GetKeyboardLayout(0)); + SetWindowText(GetDlgItem(hDlg, IDC_ACTIVE), buf2); + + hList = GetDlgItem(hDlg, IDC_LIST); + SendMessage(hList, LB_RESETCONTENT, 0, 0); + + n = GetKlList(&klList); + hKl = GetKeyboardLayout(0); + for(i = 0; i < n; i++) + { + swprintf(buf, L"%x", klList[i] ); + j = SendMessage(hList, LB_ADDSTRING, 0, (LPARAM) buf); + SendMessage(hList, LB_SETITEMDATA, j, (LPARAM) klList[i]); + if(klList[i] == hKl) SendMessage(hList, LB_SETCURSEL, j, 0); + } + + FreeKlList(klList); +} + +void FormatMsg(WCHAR *format, ...) +{ + WCHAR buf[255]; + va_list argptr; + va_start(argptr, format); + _vsnwprintf(buf, sizeof(buf)-1, format, argptr); + MessageBox(0, buf, L"msg", 0); + va_end(argptr); +} + +void FormatBox(HWND hWnd, DWORD Flags, WCHAR *Caption, WCHAR *Format, ...) +{ + WCHAR buf[255]; + va_list argptr; + va_start(argptr, Format); + _vsnwprintf(buf, sizeof(buf)-1, Format, argptr); + MessageBox(hWnd, buf, Caption, Flags); + va_end(argptr); +} + + +LRESULT CALLBACK WndSubclassProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + WND_DATA *data = (WND_DATA*)GetWindowLong(hwnd, GWL_USERDATA); + + if(uMsg == WM_INPUTLANGCHANGE) + { + FormatMsg(L"%s: WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", data->WndName, lParam, wParam); + UpdateData(hMainDlg); + //Pass message to defwindowproc + } + else if(uMsg == WM_INPUTLANGCHANGEREQUEST) + { + FormatMsg(L"%s: WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", data->WndName, lParam, wParam); + UpdateData(hMainDlg); + //Pass message to defwindowproc + } + + return ( CallWindowProc( data->OrigProc, hwnd, uMsg, wParam, lParam) ); +} + +void SubclassWnd(HWND hWnd, WCHAR* Name) +{ + WND_DATA *data = HeapAlloc(GetProcessHeap(), 0, sizeof(WND_DATA)); + data->OrigProc = (WNDPROC)SetWindowLong( hWnd, GWL_WNDPROC, (LONG)WndSubclassProc); + wcsncpy(data->WndName, Name, 25); + SetWindowLong(hWnd, GWL_USERDATA, (LONG)data); + return; +} + +DWORD GetActivateFlags(HWND hDlg) +{ + DWORD ret = 0; + + if(IsDlgButtonChecked(hDlg, IDC_KLF_REORDER)) + ret |= KLF_REORDER; + + if(IsDlgButtonChecked(hDlg, IDC_KLF_RESET)) + ret |= KLF_RESET; + + if(IsDlgButtonChecked(hDlg, IDC_KLF_SHIFTLOCK)) + ret |= KLF_SHIFTLOCK; + + if(IsDlgButtonChecked(hDlg, IDC_KLF_SETFORPROCESS)) + ret |= KLF_SETFORPROCESS; + + return ret; + +} + +DWORD GetLoadFlags(HWND hDlg) +{ + DWORD ret = 0; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_ACTIVATE)) + ret |= KLF_ACTIVATE; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_NOTELLSHELL)) + ret |= KLF_NOTELLSHELL; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_REORDER)) + ret |= KLF_REORDER; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_REPLACELANG)) + ret |= KLF_REPLACELANG; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_SUBSTITUTE_OK)) + ret |= KLF_SUBSTITUTE_OK; + + if(IsDlgButtonChecked(hDlg, IDL_KLF_SETFORPROCESS)) + ret |= KLF_SETFORPROCESS; + + return ret; +} + +UINT GetDelayMilliseconds(HWND hDlg) +{ + WCHAR Buf[255]; + UINT ret; + + GetWindowText(GetDlgItem(hDlg, IDC_DELAY), Buf, sizeof(Buf)); + + swscanf(Buf, L"%d", &ret); + + return ret*1000; +} + +HKL GetSelectedLayout(HWND hDlg) +{ + int n; + HWND hList; + hList = GetDlgItem(hDlg, IDC_LIST); + if((n = SendMessage(hList, LB_GETCURSEL, 0, 0)) != LB_ERR) + return (HKL) SendMessage(hList, LB_GETITEMDATA, n, 0); + else return INVALID_HANDLE_VALUE; +} + +HKL GetActivateHandle(HWND hDlg) +{ + + if(IsDlgButtonChecked(hDlg, IDC_FROMLIST)) + return GetSelectedLayout(hDlg); + else if(IsDlgButtonChecked(hDlg, IDC_HKL_NEXT)) + return (HKL)HKL_NEXT; + + return (HKL)HKL_PREV; + +} + + +/*************************************************** + * MainDialogProc * + ***************************************************/ + +LRESULT MainDialogProc(HWND hDlg, + UINT Msg, + WPARAM wParam, + LPARAM lParam) +{ + HKL hKl; + + switch (Msg) + { + case WM_INITDIALOG: + { + WCHAR Buf[255]; + UpdateData(hDlg); + hMainDlg = hDlg; + + SubclassWnd(GetDlgItem(hDlg, IDC_LIST), L"List"); + SubclassWnd(GetDlgItem(hDlg, IDC_EDIT1), L"Edit1"); + SubclassWnd(GetDlgItem(hDlg, IDC_KLID), L"Klid"); + SubclassWnd(GetDlgItem(hDlg, ID_CANCEL), L"CancelB"); + SubclassWnd(GetDlgItem(hDlg, IDC_ACTIVATE), L"ActivateB"); + SubclassWnd(GetDlgItem(hDlg, IDC_REFRESH), L"RefreshB"); + SubclassWnd(GetDlgItem(hDlg, IDC_UNLOAD), L"UnloadB"); + SubclassWnd(GetDlgItem(hDlg, IDC_LOAD), L"LoadB"); + + CheckRadioButton(hDlg, IDC_FROMLIST, IDC_FROMEDIT, IDC_FROMLIST); + SetWindowText(GetDlgItem(hDlg, IDC_KLID), L"00000419"); + + swprintf(Buf, L"Current thread id: %d", GetCurrentThreadId()); + SetWindowText(GetDlgItem(hDlg, IDC_CURTHREAD), Buf); + + SetWindowText(GetDlgItem(hDlg, IDC_DELAY), L"0"); + + return 0; + } /* WM_INITDIALOG */ + + case WM_COMMAND: + { + switch(LOWORD(wParam)) + { + case ID_CANCEL: + { + EndDialog(hDlg, ERROR_CANCELLED); + break; + } + + case IDC_ACTIVATE: + { + if((hKl = GetActivateHandle(hDlg)) != INVALID_HANDLE_VALUE) + { + Sleep(GetDelayMilliseconds(hDlg)); + if(!(hKl = ActivateKeyboardLayout(hKl, GetActivateFlags(hDlg)))) + FormatBox(hDlg, MB_ICONERROR, L"Error", + L"ActivateKeyboardLayout() failed. %d", GetLastError()); + else UpdateData(hDlg); + //FormatBox(hDlg, 0, L"Activated", L"Prev - %x, err - %d.", hKl, + // GetLastError()); + } + else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); + break; + } + + case IDC_UNLOAD: + { + if((hKl = GetSelectedLayout(hDlg)) != INVALID_HANDLE_VALUE) + { + Sleep(GetDelayMilliseconds(hDlg)); + if(!UnloadKeyboardLayout(hKl)) + FormatBox(hDlg, MB_ICONERROR, L"Error", + L"UnloadKeyboardLayout() failed. %d", + GetLastError()); + else UpdateData(hDlg); + } + else MessageBox(hDlg, L"No item selected", L"Error", MB_ICONERROR); + break; + } + + case IDC_LOAD: + { + WCHAR buf[255]; + GetWindowText(GetDlgItem(hDlg, IDC_KLID), buf, sizeof(buf)); + Sleep(GetDelayMilliseconds(hDlg)); + if(!LoadKeyboardLayout(buf, GetLoadFlags(hDlg))) + FormatBox(hDlg, MB_ICONERROR, L"Error", + L"LoadKeyboardLayout() failed. %d", + GetLastError()); + else UpdateData(hDlg); + break; + } + + case IDC_REFRESH: + { + UpdateData(hDlg); + break; + } + + case IDC_NEWTHREAD: + { + if(!CreateThread(NULL, 0, ThreadProc, NULL, 0, NULL)) + { + FormatBox(hDlg, MB_ICONERROR, L"Error!", + L"Can not create thread (%d).", GetLastError()); + } + } + + case IDC_LIST: + { + if(HIWORD(wParam) == LBN_SELCHANGE) + { + WCHAR buf[25]; + if((hKl = GetSelectedLayout(hDlg)) != NULL) + { + swprintf(buf, L"%x", hKl); + SetWindowText(GetDlgItem(hDlg, IDC_HANDLE), buf); + } + } + break; + } + + } + + return TRUE; + } /* WM_COMMAND */ + + + case WM_INPUTLANGCHANGE: + { + FormatMsg(L"dlg WM_INPUTLANGCHANGE lParam=%x wParam=%x\n", lParam, wParam); + return FALSE; + } + + case WM_INPUTLANGCHANGEREQUEST: + { + FormatMsg(L"dlg WM_INPUTLANGCHANGEREQUEST lParam=%x wParam=%x\n", lParam, wParam); + UpdateData(hDlg); + return FALSE; + } + + case WM_CLOSE: + { + EndDialog(hDlg, ERROR_CANCELLED); + return TRUE; + } /* WM_CLOSE */ + + default: + return FALSE; + } + +} + + + + Propchange: trunk/rostests/win32/user32/kbdlayout/kbdlayout.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/win32/user32/kbdlayout/kbdlayout.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/kbdlayout/kb… ============================================================================== --- trunk/rostests/win32/user32/kbdlayout/kbdlayout.rbuild [iso-8859-1] (original) +++ trunk/rostests/win32/user32/kbdlayout/kbdlayout.rbuild [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,8 +1,8 @@ -<module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe"> - <include base="kbdlayout">.</include> - <library>kernel32</library> - <library>user32</library> - <library>gdi32</library> - <file>kbdlayout.c</file> - <file>kbdlayout.rc</file> -</module> +<module name="kbdlayout" type="win32gui" installbase="system32" installname="kbdlayout.exe"> + <include base="kbdlayout">.</include> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>kbdlayout.c</file> + <file>kbdlayout.rc</file> +</module> Propchange: trunk/rostests/win32/user32/kbdlayout/kbdlayout.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/win32/user32/kbdlayout/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/kbdlayout/re… ============================================================================== --- trunk/rostests/win32/user32/kbdlayout/resource.h [iso-8859-1] (original) +++ trunk/rostests/win32/user32/kbdlayout/resource.h [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,46 +1,46 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Developer Studio generated include file. -// Used by kbdlayout.rc -// -#define IDD_MAINDIALOG 101 -#define ID_CANCEL 1000 -#define IDC_EDIT1 1021 -#define IDC_LIST 1022 -#define IDC_ACTIVE 1023 -#define IDC_EDIT2 1024 -#define IDC_DELAY 1024 -#define IDC_UNLOAD 1025 -#define IDC_ACTIVATE 1026 -#define IDC_KLF_REORDER 1027 -#define IDC_KLF_RESET 1028 -#define IDC_KLF_SETFORPROCESS 1029 -#define IDC_KLF_SHIFTLOCK 1030 -#define IDC_FROMLIST 1032 -#define IDC_HKL_NEXT 1033 -#define IDC_HKL_PREV 1034 -#define IDL_KLF_ACTIVATE 1035 -#define IDL_KLF_NOTELLSHELL 1036 -#define IDC_KLID 1037 -#define IDL_KLF_REORDER 1038 -#define IDL_KLF_REPLACELANG 1039 -#define IDL_KLF_SUBSTITUTE_OK 1040 -#define IDL_KLF_SETFORPROCESS 1041 -#define IDC_HKL_PREV2 1042 -#define IDC_FROMEDIT 1042 -#define IDC_LOAD 1043 -#define IDC_REFRESH 1044 -#define IDC_HANDLE 1046 -#define IDC_CURTHREAD 1049 -#define IDC_NEWTHREAD 1050 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NO_MFC 1 -#define _APS_NEXT_RESOURCE_VALUE 105 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1051 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif +//{{NO_DEPENDENCIES}} +// Microsoft Developer Studio generated include file. +// Used by kbdlayout.rc +// +#define IDD_MAINDIALOG 101 +#define ID_CANCEL 1000 +#define IDC_EDIT1 1021 +#define IDC_LIST 1022 +#define IDC_ACTIVE 1023 +#define IDC_EDIT2 1024 +#define IDC_DELAY 1024 +#define IDC_UNLOAD 1025 +#define IDC_ACTIVATE 1026 +#define IDC_KLF_REORDER 1027 +#define IDC_KLF_RESET 1028 +#define IDC_KLF_SETFORPROCESS 1029 +#define IDC_KLF_SHIFTLOCK 1030 +#define IDC_FROMLIST 1032 +#define IDC_HKL_NEXT 1033 +#define IDC_HKL_PREV 1034 +#define IDL_KLF_ACTIVATE 1035 +#define IDL_KLF_NOTELLSHELL 1036 +#define IDC_KLID 1037 +#define IDL_KLF_REORDER 1038 +#define IDL_KLF_REPLACELANG 1039 +#define IDL_KLF_SUBSTITUTE_OK 1040 +#define IDL_KLF_SETFORPROCESS 1041 +#define IDC_HKL_PREV2 1042 +#define IDC_FROMEDIT 1042 +#define IDC_LOAD 1043 +#define IDC_REFRESH 1044 +#define IDC_HANDLE 1046 +#define IDC_CURTHREAD 1049 +#define IDC_NEWTHREAD 1050 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NO_MFC 1 +#define _APS_NEXT_RESOURCE_VALUE 105 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1051 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif Propchange: trunk/rostests/win32/user32/kbdlayout/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/winetests/rpcrt4/warningfix.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/warningf… ============================================================================== --- trunk/rostests/winetests/rpcrt4/warningfix.diff [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/warningfix.diff [iso-8859-1] Wed Oct 28 21:13:23 2009 @@ -1,8 +1,8 @@ -Index: server.c -=================================================================== ---- server.c (revision 38883) -+++ server.c (working copy) -@@ -352,12 +352,6 @@ +Index: server.c +=================================================================== +--- server.c (revision 38883) ++++ server.c (working copy) +@@ -352,12 +352,6 @@ } int @@ -15,7 +15,7 @@ s_sum_pcarr(int *a[], int n) { int i, s = 0; -@@ -367,6 +361,12 @@ +@@ -367,6 +361,12 @@ } int Propchange: trunk/rostests/winetests/rpcrt4/warningfix.diff ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/winetests/user32/clipboard.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/dce.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/dde.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/dialog.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/edit.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/input.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/listbox.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/menu.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/monitor.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/msg.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/resource.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/resource.rc ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/sysparams.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/testlist.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/text.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/user32.rbuild ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/win.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/winstation.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c Propchange: trunk/rostests/winetests/user32/wsprintf.c ------------------------------------------------------------------------------ --- native (original) +++ native (removed) @@ -1,1 +1,0 @@ -class.c

15 years, 1 month

[spetreolle] 43816: forgot to include winmm winetest on testcd

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Oct 28 19:51:17 2009 New Revision: 43816 URL: http://svn.reactos.org/svn/reactos?rev=43816&view=rev Log: forgot to include winmm winetest on testcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Oct 28 19:51:17 2009 @@ -790,6 +790,7 @@ modules\rostests\winetests\version\version_winetest.exe 7 optional modules\rostests\winetests\winhttp\winhttp_winetest.exe 7 optional modules\rostests\winetests\wininet\wininet_winetest.exe 7 optional +modules\rostests\winetests\winmm\winmm_winetest.exe 7 optional modules\rostests\winetests\wintrust\wintrust_winetest.exe 7 optional modules\rostests\winetests\wlanapi\wlanapi_winetest.exe 7 optional modules\rostests\winetests\ws2_32\ws2_32_winetest.exe 7 optional

15 years, 1 month

[janderwald] 43815: - Silence wdmaud.drv

by janderwald＠svn.reactos.org

Author: janderwald Date: Wed Oct 28 19:42:24 2009 New Revision: 43815 URL: http://svn.reactos.org/svn/reactos?rev=43815&view=rev Log: - Silence wdmaud.drv Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.c [iso-8859-1] Wed Oct 28 19:42:24 2009 @@ -715,6 +715,7 @@ break; default: SND_ASSERT(0); + return MMSYSERR_NOTSUPPORTED; } Result = SyncOverlappedDeviceIoControl(KernelHandle, Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Wed Oct 28 19:42:24 2009 @@ -4,7 +4,7 @@ <include base="ReactOS">include/reactos/libs/sound</include> <include base="wdmaud_kernel">.</include> <include base="libsamplerate">.</include> - <define name="DEBUG_NT4" /> + <define name="NDEBUG">1</define>  <library>mmebuddy</library> <library>ntdll</library>

15 years, 1 month

[lsuggs] 43814: libdns should now compile but not link, it depends on libisc. libisc is closer to compiling, but not quite there yet.

by lsuggs＠svn.reactos.org

Author: lsuggs Date: Wed Oct 28 18:23:11 2009 New Revision: 43814 URL: http://svn.reactos.org/svn/reactos?rev=43814&view=rev Log: libdns should now compile but not link, it depends on libisc. libisc is closer to compiling, but not quite there yet. Added: branches/nslookup/dll/3rdparty/dns/code.h (with props) branches/nslookup/dll/3rdparty/dns/dns.rbuild (with props) branches/nslookup/dll/3rdparty/dns/include/dns/enumclass.h (with props) branches/nslookup/dll/3rdparty/dns/include/dns/enumtype.h (with props) branches/nslookup/dll/3rdparty/dns/include/dns/rdatastruct.h (with props) branches/nslookup/dll/3rdparty/isc/include/config.h (with props) branches/nslookup/dll/3rdparty/isc/include/versions.h (with props) branches/nslookup/dll/3rdparty/isc/isc.rbuild (with props) Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild branches/nslookup/dll/3rdparty/isc/include/isc/log.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h branches/nslookup/dll/3rdparty/isc/win32/include/isc/stat.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/nslookup/dll/3rdparty/3rdparty.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/3rdparty.… Added: branches/nslookup/dll/3rdparty/dns/code.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/code.… Added: branches/nslookup/dll/3rdparty/dns/dns.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/dns.r… Added: branches/nslookup/dll/3rdparty/dns/include/dns/enumclass.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/inclu… Added: branches/nslookup/dll/3rdparty/dns/include/dns/enumtype.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/inclu… Added: branches/nslookup/dll/3rdparty/dns/include/dns/rdatastruct.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/dns/inclu… Added: branches/nslookup/dll/3rdparty/isc/include/config.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… Modified: branches/nslookup/dll/3rdparty/isc/include/isc/log.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… Added: branches/nslookup/dll/3rdparty/isc/include/versions.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/inclu… Added: branches/nslookup/dll/3rdparty/isc/isc.rbuild URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/isc.r… Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/net.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32… Modified: branches/nslookup/dll/3rdparty/isc/win32/include/isc/stat.h URL: http://svn.reactos.org/svn/reactos/branches/nslookup/dll/3rdparty/isc/win32…

15 years, 1 month

[khornicek] 43813: - preparation for initial palette support

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Oct 28 17:03:10 2009 New Revision: 43813 URL: http://svn.reactos.org/svn/reactos?rev=43813&view=rev Log: - preparation for initial palette support Added: branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c (with props) Modified: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild Modified: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -4,9 +4,111 @@ * PROJECT: ReactOS DirectX * FILE: ddraw/Palette/palette.c * PURPOSE: IDirectDrawPalette Implementation - * PROGRAMMER: + * PROGRAMMER: Kamil Hornicek * */ #include "rosdraw.h" +LPDDRAWI_DDRAWPALETTE_INT +internal_directdrawpalette_int_alloc(LPDDRAWI_DDRAWPALETTE_INT This) +{ + LPDDRAWI_DDRAWPALETTE_INT newThis; + DxHeapMemAlloc(newThis, sizeof(DDRAWI_DDRAWPALETTE_INT)); + if (newThis) + { + newThis->lpLcl = This->lpLcl; + newThis->lpLink = This; + } + + return newThis; +} + +ULONG WINAPI +Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface) +{ + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; + ULONG ref = 0; + + AcquireDDThreadLock(); + + _SEH2_TRY + { + ref = ++This->dwIntRefCnt; + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + ReleaseDDThreadLock(); + + return ref; +} + +HRESULT WINAPI +Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, REFIID refiid, LPVOID *ppObj) +{ + HRESULT retVal = DD_OK; + *ppObj = NULL; + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT) iface; + + DX_WINDBG_trace(); + + _SEH2_TRY + { + if (IsEqualGUID(refiid, &IID_IUnknown) || IsEqualGUID(refiid, &IID_IDirectDrawPalette)) + { + if (This->lpVtbl != &DirectDrawPalette_Vtable) + { + This = internal_directdrawpalette_int_alloc(This); + if (!This) + { + retVal = DDERR_OUTOFVIDEOMEMORY; + _SEH2_LEAVE; + } + } + This->lpVtbl = &DirectDrawPalette_Vtable; + *ppObj = This; + Main_DirectDrawPalette_AddRef((LPDIRECTDRAWPALETTE)This); + } + else + { + DX_STUB_str("E_NOINTERFACE\n"); + retVal = E_NOINTERFACE; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + return retVal; +} + +ULONG WINAPI +Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface) +{ + ULONG ref = 0; + LPDDRAWI_DDRAWPALETTE_INT This = (LPDDRAWI_DDRAWPALETTE_INT)iface; + + AcquireDDThreadLock(); + + _SEH2_TRY + { + This->dwIntRefCnt--; + ref = This->dwIntRefCnt; + if(ref == 0) + { + DxHeapMemFree(This); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + ReleaseDDThreadLock(); + + return ref; +} Modified: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Palette/palette_stubs.c [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -10,24 +10,8 @@ #include "rosdraw.h" -ULONG WINAPI -DirectDrawPalette_Release( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - -ULONG WINAPI -DirectDrawPalette_AddRef( LPDIRECTDRAWPALETTE iface) -{ - DX_WINDBG_trace(); - - DX_STUB; -} - HRESULT WINAPI -DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_Initialize( LPDIRECTDRAWPALETTE iface, LPDIRECTDRAW ddraw, DWORD dwFlags, LPPALETTEENTRY palent) @@ -37,7 +21,7 @@ } HRESULT WINAPI -DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_GetEntries( LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent) @@ -47,7 +31,7 @@ } HRESULT WINAPI -DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_SetEntries( LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, @@ -57,29 +41,9 @@ DX_STUB; } HRESULT WINAPI -DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, +Main_DirectDrawPalette_GetCaps( LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps) { DX_WINDBG_trace(); DX_STUB; } - -HRESULT WINAPI -DirectDrawPalette_QueryInterface( LPDIRECTDRAWPALETTE iface, - REFIID refiid, - LPVOID *obj) -{ - DX_WINDBG_trace(); - DX_STUB; -} - -IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = -{ - DirectDrawPalette_QueryInterface, - DirectDrawPalette_AddRef, - DirectDrawPalette_Release, - DirectDrawPalette_GetCaps, - DirectDrawPalette_GetEntries, - DirectDrawPalette_Initialize, - DirectDrawPalette_SetEntries -}; Added: branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c (added) +++ branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -1,0 +1,36 @@ +#include <windows.h> +#include <stdio.h> +#include <ddraw.h> +#include <ddrawi.h> +#include <d3dhal.h> +#include <ddrawgdi.h> + +#if defined(_WIN32) && !defined(_NO_COM ) +#define COM_NO_WINDOWS_H +#include <objbase.h> +#else +#define IUnknown void +#if !defined(NT_BUILD_ENVIRONMENT) && !defined(WINNT) + #define CO_E_NOTINITIALIZED 0x800401F0 +#endif +#endif + +ULONG WINAPI Main_DirectDrawPalette_Release(LPDIRECTDRAWPALETTE iface); +ULONG WINAPI Main_DirectDrawPalette_AddRef(LPDIRECTDRAWPALETTE iface); +HRESULT WINAPI Main_DirectDrawPalette_Initialize(LPDIRECTDRAWPALETTE iface, LPDIRECTDRAW ddraw, DWORD dwFlags, LPPALETTEENTRY palent); +HRESULT WINAPI Main_DirectDrawPalette_GetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent); +HRESULT WINAPI Main_DirectDrawPalette_SetEntries(LPDIRECTDRAWPALETTE iface, DWORD dwFlags, DWORD dwStart, DWORD dwCount, LPPALETTEENTRY palent); +HRESULT WINAPI Main_DirectDrawPalette_GetCaps(LPDIRECTDRAWPALETTE iface, LPDWORD lpdwCaps); +HRESULT WINAPI Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, REFIID refiid, LPVOID *obj); + +IDirectDrawPaletteVtbl DirectDrawPalette_Vtable = +{ + Main_DirectDrawPalette_QueryInterface, + Main_DirectDrawPalette_AddRef, + Main_DirectDrawPalette_Release, + Main_DirectDrawPalette_GetCaps, + Main_DirectDrawPalette_GetEntries, + Main_DirectDrawPalette_Initialize, + Main_DirectDrawPalette_SetEntries +}; + Propchange: branches/reactx/reactos/dll/directx/ddraw/Vtable/DirectDrawPalette_Vtable.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 17:03:10 2009 @@ -61,6 +61,7 @@ <file>DirectDraw4_Vtable.c</file> <file>DirectDraw2_Vtable.c</file> <file>DirectDraw_Vtable.c</file> + <file>DirectDrawPalette_Vtable.c</file> <file>DirectDrawSurface7_Vtable.c</file> <file>DirectDrawSurface4_Vtable.c</file> <file>DirectDrawSurface3_Vtable.c</file>

15 years, 1 month

[khornicek] 43812: - fix DDrawSurface_Release for now + more minor fixes

by khornicek＠svn.reactos.org

Author: khornicek Date: Wed Oct 28 16:22:45 2009 New Revision: 43812 URL: http://svn.reactos.org/svn/reactos?rev=43812&view=rev Log: - fix DDrawSurface_Release for now + more minor fixes Added: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c (with props) Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild Modified: branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -117,7 +117,7 @@ else { *obj = NULL; - DX_STUB_str("E_NOINTERFACE"); + DX_STUB_str("E_NOINTERFACE\n"); retVal = E_NOINTERFACE; } } @@ -533,6 +533,9 @@ } _SEH2_END; + if(*ppSurf != NULL) + Main_DirectDraw_AddRef(This); + LeaveCriticalSection(&ddcs); return ret; } @@ -540,11 +543,3 @@ /* 5 of 31 DirectDraw7_Vtable api are working simluare to windows */ /* 8 of 31 DirectDraw7_Vtable api are under devloping / testing */ - - - - - - - - Added: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c (added) +++ branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -1,0 +1,12 @@ +/* $Id: palette.c $ + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS DirectX + * FILE: ddraw/Palette/palette.c + * PURPOSE: IDirectDrawPalette Implementation + * PROGRAMMER: + * + */ + +#include "rosdraw.h" + Propchange: branches/reactx/reactos/dll/directx/ddraw/Palette/palette_main.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/Surface/surface_main.c [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -264,12 +264,27 @@ ULONG WINAPI Main_DDrawSurface_Release(LPDDRAWI_DDRAWSURFACE_INT This) { - - /* FIXME - This is not right exiame how it should be done - */ - DX_STUB_str("FIXME This is not right exiame how it should be done\n"); - return This->dwIntRefCnt; + ULONG ref = 0; + + AcquireDDThreadLock(); + + _SEH2_TRY + { + This->dwIntRefCnt--; + ref = This->dwIntRefCnt; + if(!ref) + { + DxHeapMemFree(This); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END + + ReleaseDDThreadLock(); + + return ref; } Modified: branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/directx/ddra… ============================================================================== --- branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] (original) +++ branches/reactx/reactos/dll/directx/ddraw/ddraw.rbuild [iso-8859-1] Wed Oct 28 16:22:45 2009 @@ -9,7 +9,7 @@ <library>d3d8thk</library> <library>dxguid</library> <library>ole32</library> - <library>user32</library> + <library>uuid</library> <library>advapi32</library> <library>pseh</library> @@ -50,6 +50,7 @@ <file>kernel_stubs.c</file> </directory> <directory name="Palette"> + <file>palette_main.c</file> <file>palette_stubs.c</file> </directory> <directory name="Videoport">

15 years, 1 month

[spetreolle] 43811: add winmm winetest

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Wed Oct 28 16:15:59 2009 New Revision: 43811 URL: http://svn.reactos.org/svn/reactos?rev=43811&view=rev Log: add winmm winetest Added: trunk/rostests/winetests/winmm/ trunk/rostests/winetests/winmm/capture.c (with props) trunk/rostests/winetests/winmm/mci.c (with props) trunk/rostests/winetests/winmm/mixer.c (with props) trunk/rostests/winetests/winmm/mmio.c (with props) trunk/rostests/winetests/winmm/testlist.c (with props) trunk/rostests/winetests/winmm/timer.c (with props) trunk/rostests/winetests/winmm/wave.c (with props) trunk/rostests/winetests/winmm/winmm.rbuild (with props) trunk/rostests/winetests/winmm/winmm_test.h (with props) Modified: trunk/rostests/winetests/directory.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/directory.rbuil… Added: trunk/rostests/winetests/winmm/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/capture.c… Added: trunk/rostests/winetests/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mci.c?rev… Added: trunk/rostests/winetests/winmm/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mixer.c?r… Added: trunk/rostests/winetests/winmm/mmio.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/mmio.c?re… Added: trunk/rostests/winetests/winmm/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/testlist.… Added: trunk/rostests/winetests/winmm/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/timer.c?r… Added: trunk/rostests/winetests/winmm/wave.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/wave.c?re… Added: trunk/rostests/winetests/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/winmm.rbu… Added: trunk/rostests/winetests/winmm/winmm_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/winmm/winmm_tes…

15 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
65
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009