Ros-diffs August 2005

ros-diffs@reactos.org

23 participants
669 discussions

[ea] 17348: OS/2: begin converting the subtree to rbuild.

by ea＠svn.reactos.com

OS/2: begin converting the subtree to rbuild. Added: trunk/os2/copying Added: trunk/os2/directory.xml Added: trunk/os2/makefile _____ Added: trunk/os2/copying --- trunk/os2/copying 2005-08-12 19:15:01 UTC (rev 17347) +++ trunk/os2/copying 2005-08-12 19:22:42 UTC (rev 17348) @@ -0,0 +1,340 @@ + + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 675 Mass Ave, Cambridge, MA 02139, USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + Appendix: How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) 19yy <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. Property changes on: trunk/os2/copying ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/os2/directory.xml --- trunk/os2/directory.xml 2005-08-12 19:15:01 UTC (rev 17347) +++ trunk/os2/directory.xml 2005-08-12 19:22:42 UTC (rev 17348) @@ -0,0 +1,11 @@ +<group> + <directory name="apps"> + <xi:include href="apps/directory.xml" /> + </directory> + <directory name="lib"> + <xi:include href="lib/directory.xml" /> + </directory> + <directory name="server"> + <xi:include href="server/os2srv.xml" /> + </directory> +</group> Property changes on: trunk/os2/directory.xml ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native _____ Added: trunk/os2/makefile --- trunk/os2/makefile 2005-08-12 19:15:01 UTC (rev 17347) +++ trunk/os2/makefile 2005-08-12 19:22:42 UTC (rev 17348) @@ -0,0 +1,14 @@ +all: + @echo To build "os2" there are two paths: + @echo --- + @echo 1. copy the os2 folder into the reactos\modules folder + @echo 2. link reactos/modules/os2 to os2 + @echo UNIX + @echo cd $${ROS_SRC_ROOT}/reactos/modules + @echo ln -s $${ROS_SRC_ROOT}/os2 os2 + @echo WINDOWS + @echo cd %%ROS_SRC_ROOT%%\reactos\modules + @echo junction os2 %%ROS_SRC_ROOT%%\os2 + @echo --- + @echo Eventually you can run "make depends" in the %%ROS_SRC_ROOT%%\reactos + @echo directory to compile it. Property changes on: trunk/os2/makefile ___________________________________________________________________ Name: svn:keywords + author date id revision Name: svn:eol-style + native

19 years, 1 month

[ea] 17347: Correct the version info.

by ea＠svn.reactos.com

Correct the version info. Modified: trunk/reactos/subsys/win/winsrv/winsrv.rc _____ Modified: trunk/reactos/subsys/win/winsrv/winsrv.rc --- trunk/reactos/subsys/win/winsrv/winsrv.rc 2005-08-12 19:05:45 UTC (rev 17346) +++ trunk/reactos/subsys/win/winsrv/winsrv.rc 2005-08-12 19:15:01 UTC (rev 17347) @@ -1,4 +1,4 @@ -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/VMS Environment Subsystem Server\0" -#define REACTOS_STR_INTERNAL_NAME "vmsss\0" -#define REACTOS_STR_ORIGINAL_FILENAME "vmsss.exe\0" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS/Win32 console+user usermode server\0" +#define REACTOS_STR_INTERNAL_NAME "winsrv\0" +#define REACTOS_STR_ORIGINAL_FILENAME "winsrv.exe\0" #include <reactos/version.rc>

19 years, 1 month

[gvg] 17346: - Fix all line endings

by gvg＠svn.reactos.com

- Fix all line endings - Finish Wine-20050725 merge Deleted: vendor/wine/dlls/cabinet/Wine-20050628/ Added: vendor/wine/dlls/cabinet/Wine-20050725/ Modified: vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabextract.c Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet.h Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet.rc Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet.spec Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabinet_main.c Modified: vendor/wine/dlls/cabinet/Wine-20050725/fci.c Modified: vendor/wine/dlls/cabinet/Wine-20050725/fdi.c Modified: vendor/wine/dlls/cabinet/current/Makefile.in Modified: vendor/wine/dlls/cabinet/current/cabextract.c Modified: vendor/wine/dlls/cabinet/current/cabinet.h Modified: vendor/wine/dlls/cabinet/current/cabinet.rc Modified: vendor/wine/dlls/cabinet/current/cabinet.spec Modified: vendor/wine/dlls/cabinet/current/cabinet_main.c Modified: vendor/wine/dlls/cabinet/current/fci.c Modified: vendor/wine/dlls/cabinet/current/fdi.c Deleted: vendor/wine/dlls/comctl32/Wine-20050628/ Added: vendor/wine/dlls/comctl32/Wine-20050725/ Modified: vendor/wine/dlls/comctl32/Wine-20050725/Makefile.in Modified: vendor/wine/dlls/comctl32/Wine-20050725/animate.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/comboex.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl32.h Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl32.spec Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Cn.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Cs.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_De.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_En.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Es.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Fr.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_It.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Ja.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Ko.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Nl.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Pl.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Pt.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Ru.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Si.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Th.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/comctl_Uk.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/commctrl.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/datetime.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/draglist.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/flatsb.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/header.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/hotkey.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/imagelist.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/imagelist.h Modified: vendor/wine/dlls/comctl32/Wine-20050725/ipaddress.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/listview.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/monthcal.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/nativefont.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/pager.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/progress.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/propsheet.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/rebar.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/rsrc.rc Modified: vendor/wine/dlls/comctl32/Wine-20050725/smoothscroll.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/status.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/string.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/syslink.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/tab.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/toolbar.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/tooltips.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/trackbar.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/treeview.c Modified: vendor/wine/dlls/comctl32/Wine-20050725/updown.c Modified: vendor/wine/dlls/comctl32/current/Makefile.in Modified: vendor/wine/dlls/comctl32/current/animate.c Modified: vendor/wine/dlls/comctl32/current/comboex.c Modified: vendor/wine/dlls/comctl32/current/comctl32.h Modified: vendor/wine/dlls/comctl32/current/comctl32.spec Modified: vendor/wine/dlls/comctl32/current/comctl32undoc.c Modified: vendor/wine/dlls/comctl32/current/comctl_Cn.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Cs.rc Modified: vendor/wine/dlls/comctl32/current/comctl_De.rc Modified: vendor/wine/dlls/comctl32/current/comctl_En.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Es.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Fr.rc Modified: vendor/wine/dlls/comctl32/current/comctl_It.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Ja.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Ko.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Nl.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Pl.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Pt.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Ru.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Si.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Th.rc Modified: vendor/wine/dlls/comctl32/current/comctl_Uk.rc Modified: vendor/wine/dlls/comctl32/current/commctrl.c Modified: vendor/wine/dlls/comctl32/current/datetime.c Modified: vendor/wine/dlls/comctl32/current/draglist.c Modified: vendor/wine/dlls/comctl32/current/flatsb.c Modified: vendor/wine/dlls/comctl32/current/header.c Modified: vendor/wine/dlls/comctl32/current/hotkey.c Modified: vendor/wine/dlls/comctl32/current/imagelist.c Modified: vendor/wine/dlls/comctl32/current/imagelist.h Modified: vendor/wine/dlls/comctl32/current/ipaddress.c [truncated at 100 lines; 749 more skipped] _____ Copied: vendor/wine/dlls/cabinet/Wine-20050725 (from rev 17342, vendor/wine/dlls/cabinet/current) _____ Modified: vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in --- vendor/wine/dlls/cabinet/current/Makefile.in 2005-08-12 18:22:47 UTC (rev 17342) +++ vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in 2005-08-12 19:05:45 UTC (rev 17346) @@ -1,19 +1,19 @@ -TOPSRCDIR = @top_srcdir@ -TOPOBJDIR = ../.. -SRCDIR = @srcdir@ -VPATH = @srcdir@ -MODULE = cabinet.dll -IMPORTLIB = libcabinet.$(IMPLIBEXT) -IMPORTS = kernel32 - -C_SRCS = \ - cabextract.c \ - cabinet_main.c \ - fci.c \ - fdi.c - -RC_SRCS = cabinet.rc - -@MAKE_DLL_RULES@ - -### Dependencies: +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = cabinet.dll +IMPORTLIB = libcabinet.$(IMPLIBEXT) +IMPORTS = kernel32 + +C_SRCS = \ + cabextract.c \ + cabinet_main.c \ + fci.c \ + fdi.c + +RC_SRCS = cabinet.rc + +@MAKE_DLL_RULES@ + +### Dependencies: Property changes on: vendor/wine/dlls/cabinet/Wine-20050725/Makefile.in ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: vendor/wine/dlls/cabinet/Wine-20050725/cabextract.c --- vendor/wine/dlls/cabinet/current/cabextract.c 2005-08-12 18:22:47 UTC (rev 17342) +++ vendor/wine/dlls/cabinet/Wine-20050725/cabextract.c 2005-08-12 19:05:45 UTC (rev 17346) @@ -1,2654 +1,2654 @@ -/* - * cabextract.c - * - * Copyright 2000-2002 Stuart Caie - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Principal author: Stuart Caie <kyzer(a)4u.net> - * - * Based on specification documents from Microsoft Corporation - * Quantum decompression researched and implemented by Matthew Russoto - * Huffman code adapted from unlzx by Dave Tritscher. - * InfoZip team's INFLATE implementation adapted to MSZIP by Dirk Stoecker. - * Major LZX fixes by Jae Jung. - */ - -#include "config.h" - -#include <stdarg.h> -#include <stdio.h> -#include <stdlib.h> -#include <ctype.h> - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" - -#include "cabinet.h" - -#include "wine/debug.h" - -WINE_DEFAULT_DEBUG_CHANNEL(cabinet); - -THOSE_ZIP_CONSTS; - -/* all the file IO is abstracted into these routines: - * cabinet_(open|close|read|seek|skip|getoffset) - * file_(open|close|write) - */ - -/* try to open a cabinet file, returns success */ -static BOOL cabinet_open(struct cabinet *cab) -{ - const char *name = cab->filename; - HANDLE fh; - - TRACE("(cab == ^%p)\n", cab); - - if ((fh = CreateFileA( name, GENERIC_READ, FILE_SHARE_READ, - NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL )) == INVALID_HANDLE_VALUE) { - ERR("Couldn't open %s\n", debugstr_a(name)); - return FALSE; - } - - /* seek to end of file and get the length */ - if ((cab->filelen = SetFilePointer(fh, 0, NULL, FILE_END)) == INVALID_SET_FILE_POINTER) { - if (GetLastError() != NO_ERROR) { - ERR("Seek END failed: %s\n", debugstr_a(name)); - CloseHandle(fh); - return FALSE; - } - } - - /* return to the start of the file */ - if (SetFilePointer(fh, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) { - ERR("Seek BEGIN failed: %s\n", debugstr_a(name)); - CloseHandle(fh); - return FALSE; - } - - cab->fh = fh; - return TRUE; -} - -/******************************************************************* - * cabinet_close (internal) - * - * close the file handle in a struct cabinet. - */ -static void cabinet_close(struct cabinet *cab) { - TRACE("(cab == ^%p)\n", cab); - if (cab->fh) CloseHandle(cab->fh); - cab->fh = 0; -} - -/******************************************************* - * ensure_filepath2 (internal) - */ -static BOOL ensure_filepath2(char *path) { - BOOL ret = TRUE; - int len; - char *new_path; - - new_path = HeapAlloc(GetProcessHeap(), 0, (strlen(path) + 1)); - strcpy(new_path, path); - - while((len = strlen(new_path)) && new_path[len - 1] == '\\') - new_path[len - 1] = 0; - - TRACE("About to try to create directory %s\n", debugstr_a(new_path)); - while(!CreateDirectoryA(new_path, NULL)) { - char *slash; - DWORD last_error = GetLastError(); - - if(last_error == ERROR_ALREADY_EXISTS) - break; - - if(last_error != ERROR_PATH_NOT_FOUND) { - ret = FALSE; - break; - } - - if(!(slash = strrchr(new_path, '\\'))) { - ret = FALSE; - break; - } - - len = slash - new_path; - new_path[len] = 0; - if(! ensure_filepath2(new_path)) { - ret = FALSE; - break; - } - new_path[len] = '\\'; - TRACE("New path in next iteration: %s\n", debugstr_a(new_path)); - } - - HeapFree(GetProcessHeap(), 0, new_path); - return ret; -} - - -/********************************************************************** - * ensure_filepath (internal) - * - * ensure_filepath("a\b\c\d.txt") ensures a, a\b and a\b\c exist as dirs - */ -static BOOL ensure_filepath(char *path) { - char new_path[MAX_PATH]; - int len, i, lastslashpos = -1; - - TRACE("(path == %s)\n", debugstr_a(path)); - - strcpy(new_path, path); - /* remove trailing slashes (shouldn't need to but wth...) */ - while ((len = strlen(new_path)) && new_path[len - 1] == '\\') - new_path[len - 1] = 0; - /* find the position of the last '\\' */ - for (i=0; i<MAX_PATH; i++) { - if (new_path[i] == 0) break; - if (new_path[i] == '\\') - lastslashpos = i; - } - if (lastslashpos > 0) { - new_path[lastslashpos] = 0; - /* may be trailing slashes but ensure_filepath2 will chop them */ - return ensure_filepath2(new_path); - } else - return TRUE; /* ? */ -} - -/******************************************************************* - * file_open (internal) - * - * opens a file for output, returns success - */ -static BOOL file_open(struct cab_file *fi, BOOL lower, LPCSTR dir) -{ - char c, *d, *name; - BOOL ok = FALSE; - const char *s; - - TRACE("(fi == ^%p, lower == %s, dir == %s)\n", fi, lower ? "TRUE" : "FALSE", debugstr_a(dir)); - - if (!(name = malloc(strlen(fi->filename) + (dir ? strlen(dir) : 0) + 2))) { - ERR("out of memory!\n"); - return FALSE; - } - - /* start with blank name */ - *name = 0; - - /* add output directory if needed */ - if (dir) { - strcpy(name, dir); - strcat(name, "\\"); - } - - /* remove leading slashes */ - s = (char *) fi->filename; - while (*s == '\\') s++; - - /* copy from fi->filename to new name. - * lowercases characters if needed. - */ - d = &name[strlen(name)]; - do { - c = *s++; - *d++ = (lower ? tolower((unsigned char) c) : c); - } while (c); - - /* create directories if needed, attempt to write file */ - if (ensure_filepath(name)) { - fi->fh = CreateFileA(name, GENERIC_WRITE, 0, NULL, - CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0); - if (fi->fh != INVALID_HANDLE_VALUE) - ok = TRUE; - else { - ERR("CreateFileA returned INVALID_HANDLE_VALUE\n"); - fi->fh = 0; - } - } else - ERR("Couldn't ensure filepath for %s\n", debugstr_a(name)); - - if (!ok) { - ERR("Couldn't open file %s for writing\n", debugstr_a(name)); - } - - /* as full filename is no longer needed, free it */ - free(name); - - return ok; -} - -/******************************************************** - * close_file (internal) - * - * closes a completed file - */ -static void file_close(struct cab_file *fi) -{ - TRACE("(fi == ^%p)\n", fi); - - if (fi->fh) { - CloseHandle(fi->fh); - } - fi->fh = 0; -} - -/****************************************************************** - * file_write (internal) - * - * writes from buf to a file specified as a cab_file struct. - * returns success/failure - */ -static BOOL file_write(struct cab_file *fi, cab_UBYTE *buf, cab_off_t length) -{ - DWORD bytes_written; - - TRACE("(fi == ^%p, buf == ^%p, length == %u)\n", fi, buf, length); - - if ((!WriteFile( fi->fh, (LPCVOID) buf, length, &bytes_written, FALSE) || - (bytes_written != length))) { - ERR("Error writing file: %s\n", debugstr_a(fi->filename)); - return FALSE; - } - return TRUE; -} - - -/******************************************************************* - * cabinet_skip (internal) - * - * advance the file pointer associated with the cab structure - * by distance bytes - */ -static void cabinet_skip(struct cabinet *cab, cab_off_t distance) -{ - TRACE("(cab == ^%p, distance == %u)\n", cab, distance); - if (SetFilePointer(cab->fh, distance, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - if (distance != INVALID_SET_FILE_POINTER) - ERR("%s\n", debugstr_a(cab->filename)); - } -} - -/******************************************************************* - * cabinet_seek (internal) - * - * seek to the specified absolute offset in a cab - */ -static void cabinet_seek(struct cabinet *cab, cab_off_t offset) { - TRACE("(cab == ^%p, offset == %u)\n", cab, offset); - if (SetFilePointer(cab->fh, offset, NULL, FILE_BEGIN) != offset) - ERR("%s seek failure\n", debugstr_a(cab->filename)); -} - -/******************************************************************* - * cabinet_getoffset (internal) - * - * returns the file pointer position of a cab - */ -static cab_off_t cabinet_getoffset(struct cabinet *cab) -{ - return SetFilePointer(cab->fh, 0, NULL, FILE_CURRENT); -} - -/******************************************************************* - * cabinet_read (internal) - * - * read data from a cabinet, returns success - */ -static BOOL cabinet_read(struct cabinet *cab, cab_UBYTE *buf, cab_off_t length) -{ - DWORD bytes_read; - cab_off_t avail = cab->filelen - cabinet_getoffset(cab); - - TRACE("(cab == ^%p, buf == ^%p, length == %u)\n", cab, buf, length); - - if (length > avail) { - WARN("%s: WARNING; cabinet is truncated\n", debugstr_a(cab->filename)); - length = avail; - } - - if (! ReadFile( cab->fh, (LPVOID) buf, length, &bytes_read, NULL )) { - ERR("%s read error\n", debugstr_a(cab->filename)); - return FALSE; - } else if (bytes_read != length) { - ERR("%s read size mismatch\n", debugstr_a(cab->filename)); - return FALSE; - } - - return TRUE; -} - -/********************************************************************** - * cabinet_read_string (internal) - * - * allocate and read an aribitrarily long string from the cabinet - */ -static char *cabinet_read_string(struct cabinet *cab) -{ - cab_off_t len=256, base = cabinet_getoffset(cab), maxlen = cab->filelen - base; - BOOL ok = FALSE; - unsigned int i; - cab_UBYTE *buf = NULL; - - TRACE("(cab == ^%p)\n", cab); - - do { - if (len > maxlen) len = maxlen; - if (!(buf = realloc(buf, (size_t) len))) break; - if (!cabinet_read(cab, buf, (size_t) len)) break; - - /* search for a null terminator in what we've just read */ - for (i=0; i < len; i++) { - if (!buf[i]) {ok=TRUE; break;} - } - - if (!ok) { - if (len == maxlen) { - ERR("%s: WARNING; cabinet is truncated\n", debugstr_a(cab->filename)); - break; - } - len += 256; - cabinet_seek(cab, base); - } - } while (!ok); - - if (!ok) { - if (buf) - free(buf); - else - ERR("out of memory!\n"); - return NULL; - } - - /* otherwise, set the stream to just after the string and return */ - cabinet_seek(cab, base + ((cab_off_t) strlen((char *) buf)) + 1); - - return (char *) buf; -} - -/****************************************************************** - * cabinet_read_entries (internal) - * - * reads the header and all folder and file entries in this cabinet - */ -static BOOL cabinet_read_entries(struct cabinet *cab) -{ - int num_folders, num_files, header_resv, folder_resv = 0, i; - struct cab_folder *fol, *linkfol = NULL; - struct cab_file *file, *linkfile = NULL; - cab_off_t base_offset; - cab_UBYTE buf[64]; - - TRACE("(cab == ^%p)\n", cab); - - /* read in the CFHEADER */ - base_offset = cabinet_getoffset(cab); - if (!cabinet_read(cab, buf, cfhead_SIZEOF)) { - return FALSE; - } - - /* check basic MSCF signature */ - if (EndGetI32(buf+cfhead_Signature) != 0x4643534d) { - ERR("%s: not a Microsoft cabinet file\n", debugstr_a(cab->filename)); - return FALSE; - } - - /* get the number of folders */ - num_folders = EndGetI16(buf+cfhead_NumFolders); - if (num_folders == 0) { - ERR("%s: no folders in cabinet\n", debugstr_a(cab->filename)); - return FALSE; - } - - /* get the number of files */ - num_files = EndGetI16(buf+cfhead_NumFiles); - if (num_files == 0) { - ERR("%s: no files in cabinet\n", debugstr_a(cab->filename)); - return FALSE; - } - - /* just check the header revision */ - if ((buf[cfhead_MajorVersion] > 1) || - (buf[cfhead_MajorVersion] == 1 && buf[cfhead_MinorVersion] > 3)) - { - WARN("%s: WARNING; cabinet format version > 1.3\n", debugstr_a(cab->filename)); - } - - /* read the reserved-sizes part of header, if present */ - cab->flags = EndGetI16(buf+cfhead_Flags); - if (cab->flags & cfheadRESERVE_PRESENT) { - if (!cabinet_read(cab, buf, cfheadext_SIZEOF)) return FALSE; - header_resv = EndGetI16(buf+cfheadext_HeaderReserved); - folder_resv = buf[cfheadext_FolderReserved]; - cab->block_resv = buf[cfheadext_DataReserved]; - - if (header_resv > 60000) { - WARN("%s: WARNING; header reserved space > 60000\n", debugstr_a(cab->filename)); - } - - /* skip the reserved header */ - if (header_resv) - if (SetFilePointer(cab->fh, (cab_off_t) header_resv, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) - ERR("seek failure: %s\n", debugstr_a(cab->filename)); - } - - if (cab->flags & cfheadPREV_CABINET) { - cab->prevname = cabinet_read_string(cab); - if (!cab->prevname) return FALSE; - cab->previnfo = cabinet_read_string(cab); - } - - if (cab->flags & cfheadNEXT_CABINET) { - cab->nextname = cabinet_read_string(cab); - if (!cab->nextname) return FALSE; - cab->nextinfo = cabinet_read_string(cab); - } - - /* read folders */ - for (i = 0; i < num_folders; i++) { - if (!cabinet_read(cab, buf, cffold_SIZEOF)) return FALSE; - if (folder_resv) cabinet_skip(cab, folder_resv); - - fol = (struct cab_folder *) calloc(1, sizeof(struct cab_folder)); - if (!fol) { - ERR("out of memory!\n"); - return FALSE; - } - - fol->cab[0] = cab; - fol->offset[0] = base_offset + (cab_off_t) EndGetI32(buf+cffold_DataOffset); - fol->num_blocks = EndGetI16(buf+cffold_NumBlocks); - fol->comp_type = EndGetI16(buf+cffold_CompType); - - if (!linkfol) - cab->folders = fol; - else - linkfol->next = fol; - - linkfol = fol; - } - - /* read files */ - for (i = 0; i < num_files; i++) { - if (!cabinet_read(cab, buf, cffile_SIZEOF)) - return FALSE; - - file = (struct cab_file *) calloc(1, sizeof(struct cab_file)); - if (!file) { - ERR("out of memory!\n"); - return FALSE; - } - - file->length = EndGetI32(buf+cffile_UncompressedSize); - file->offset = EndGetI32(buf+cffile_FolderOffset); - file->index = EndGetI16(buf+cffile_FolderIndex); - file->time = EndGetI16(buf+cffile_Time); - file->date = EndGetI16(buf+cffile_Date); - file->attribs = EndGetI16(buf+cffile_Attribs); - file->filename = cabinet_read_string(cab); - - if (!file->filename) { - free(file); - return FALSE; - } - - if (!linkfile) - cab->files = file; - else - linkfile->next = file; - - linkfile = file; - } - return TRUE; -} - -/*********************************************************** - * load_cab_offset (internal) - * - * validates and reads file entries from a cabinet at offset [offset] in - * file [name]. Returns a cabinet structure if successful, or NULL - * otherwise. - */ -static struct cabinet *load_cab_offset(LPCSTR name, cab_off_t offset) -{ - struct cabinet *cab = (struct cabinet *) calloc(1, sizeof(struct cabinet)); - int ok; - - TRACE("(name == %s, offset == %u)\n", debugstr_a(name), offset); - - if (!cab) return NULL; - - cab->filename = name; - if ((ok = cabinet_open(cab))) { - cabinet_seek(cab, offset); - ok = cabinet_read_entries(cab); - cabinet_close(cab); - } - - if (ok) return cab; - free(cab); - return NULL; -} - -/* MSZIP decruncher */ - -/* Dirk Stoecker wrote the ZIP decoder, based on the InfoZip deflate code */ - -/******************************************************** - * Ziphuft_free (internal) - */ -static void Ziphuft_free(struct Ziphuft *t) -{ - register struct Ziphuft *p, *q; - - /* Go through linked list, freeing from the allocated (t[-1]) address. */ - p = t; - while (p != (struct Ziphuft *)NULL) - { - q = (--p)->v.t; - free(p); - p = q; - } -} - -/********************************************************* - * Ziphuft_build (internal) - */ -static cab_LONG Ziphuft_build(cab_ULONG *b, cab_ULONG n, cab_ULONG s, cab_UWORD *d, cab_UWORD *e, -struct Ziphuft **t, cab_LONG *m, cab_decomp_state *decomp_state) -{ - cab_ULONG a; /* counter for codes of length k */ - cab_ULONG el; /* length of EOB code (value 256) */ - cab_ULONG f; /* i repeats in table every f entries */ - cab_LONG g; /* maximum code length */ - cab_LONG h; /* table level */ - register cab_ULONG i; /* counter, current code */ - register cab_ULONG j; /* counter */ - register cab_LONG k; /* number of bits in current code */ - cab_LONG *l; /* stack of bits per table */ - register cab_ULONG *p; /* pointer into ZIP(c)[],ZIP(b)[],ZIP(v)[] */ - register struct Ziphuft *q; /* points to current table */ - struct Ziphuft r; /* table entry for structure assignment */ - register cab_LONG w; /* bits before this table == (l * h) */ - cab_ULONG *xp; /* pointer into x */ - cab_LONG y; /* number of dummy codes added */ - cab_ULONG z; /* number of entries in current table */ - - l = ZIP(lx)+1; - - /* Generate counts for each bit length */ - el = n > 256 ? b[256] : ZIPBMAX; /* set length of EOB code, if any */ - - for(i = 0; i < ZIPBMAX+1; ++i) - ZIP(c)[i] = 0; - p = b; i = n; - do - { - ZIP(c)[*p]++; p++; /* assume all entries <= ZIPBMAX */ - } while (--i); - if (ZIP(c)[0] == n) /* null input--all zero length codes */ - { - *t = (struct Ziphuft *)NULL; - *m = 0; - return 0; - } - - /* Find minimum and maximum length, bound *m by those */ - for (j = 1; j <= ZIPBMAX; j++) - if (ZIP(c)[j]) - break; - k = j; /* minimum code length */ - if ((cab_ULONG)*m < j) - *m = j; - for (i = ZIPBMAX; i; i--) - if (ZIP(c)[i]) - break; - g = i; /* maximum code length */ - if ((cab_ULONG)*m > i) - *m = i; - - /* Adjust last length count to fill out codes, if needed */ - for (y = 1 << j; j < i; j++, y <<= 1) - if ((y -= ZIP(c)[j]) < 0) - return 2; /* bad input: more codes than bits */ - if ((y -= ZIP(c)[i]) < 0) - return 2; - ZIP(c)[i] += y; - - /* Generate starting offsets LONGo the value table for each length */ - ZIP(x)[1] = j = 0; - p = ZIP(c) + 1; xp = ZIP(x) + 2; - while (--i) - { /* note that i == g from above */ - *xp++ = (j += *p++); - } - - /* Make a table of values in order of bit lengths */ - p = b; i = 0; - do{ - if ((j = *p++) != 0) - ZIP(v)[ZIP(x)[j]++] = i; - } while (++i < n); - - - /* Generate the Huffman codes and for each, make the table entries */ - ZIP(x)[0] = i = 0; /* first Huffman code is zero */ - p = ZIP(v); /* grab values in bit order */ - h = -1; /* no tables yet--level -1 */ - w = l[-1] = 0; /* no bits decoded yet */ - ZIP(u)[0] = (struct Ziphuft *)NULL; /* just to keep compilers happy */ - q = (struct Ziphuft *)NULL; /* ditto */ - z = 0; /* ditto */ - - /* go through the bit lengths (k already is bits in shortest code) */ - for (; k <= g; k++) - { - a = ZIP(c)[k]; - while (a--) - { - /* here i is the Huffman code of length k bits for value *p */ - /* make tables up to required level */ - while (k > w + l[h]) - { - w += l[h++]; /* add bits already decoded */ - - /* compute minimum size table less than or equal to *m bits */ - z = (z = g - w) > (cab_ULONG)*m ? *m : z; /* upper limit */ - if ((f = 1 << (j = k - w)) > a + 1) /* try a k-w bit table */ - { /* too few codes for k-w bit table */ - f -= a + 1; /* deduct codes from patterns left */ - xp = ZIP(c) + k; - while (++j < z) /* try smaller tables up to z bits */ - { - if ((f <<= 1) <= *++xp) - break; /* enough codes to use up j bits */ - f -= *xp; /* else deduct codes from patterns */ - } - } - if ((cab_ULONG)w + j > el && (cab_ULONG)w < el) - j = el - w; /* make EOB code end at table */ - z = 1 << j; /* table entries for j-bit table */ - l[h] = j; /* set table size in stack */ - - /* allocate and link in new table */ - if (!(q = (struct Ziphuft *) malloc((z + 1)*sizeof(struct Ziphuft)))) - { - if(h) - Ziphuft_free(ZIP(u)[0]); - return 3; /* not enough memory */ - } - *t = q + 1; /* link to list for Ziphuft_free() */ - *(t = &(q->v.t)) = (struct Ziphuft *)NULL; - ZIP(u)[h] = ++q; /* table starts after link */ - - /* connect to last table, if there is one */ - if (h) - { - ZIP(x)[h] = i; /* save pattern for backing up */ - r.b = (cab_UBYTE)l[h-1]; /* bits to dump before this table */ - r.e = (cab_UBYTE)(16 + j); /* bits in this table */ - r.v.t = q; /* pointer to this table */ - j = (i & ((1 << w) - 1)) >> (w - l[h-1]); - ZIP(u)[h-1][j] = r; /* connect to last table */ - } - } - - /* set up table entry in r */ - r.b = (cab_UBYTE)(k - w); - if (p >= ZIP(v) + n) - r.e = 99; /* out of values--invalid code */ - else if (*p < s) - { - r.e = (cab_UBYTE)(*p < 256 ? 16 : 15); /* 256 is end-of-block code */ - r.v.n = *p++; /* simple code is just the value */ - } - else - { - r.e = (cab_UBYTE)e[*p - s]; /* non-simple--look up in lists */ - r.v.n = d[*p++ - s]; - } - - /* fill code-like entries with r */ - f = 1 << (k - w); - for (j = i >> w; j < z; j += f) - q[j] = r; - - /* backwards increment the k-bit code i */ - for (j = 1 << (k - 1); i & j; j >>= 1) - i ^= j; - i ^= j; - - /* backup over finished tables */ - while ((i & ((1 << w) - 1)) != ZIP(x)[h]) - w -= l[--h]; /* don't need to update q */ - } - } - - /* return actual size of base table */ - *m = l[0]; - - /* Return true (1) if we were given an incomplete table */ - return y != 0 && g != 1; -} - -/********************************************************* - * Zipinflate_codes (internal) - */ -static cab_LONG Zipinflate_codes(struct Ziphuft *tl, struct Ziphuft *td, - cab_LONG bl, cab_LONG bd, cab_decomp_state *decomp_state) -{ - register cab_ULONG e; /* table entry flag/number of extra bits */ - cab_ULONG n, d; /* length and index for copy */ - cab_ULONG w; /* current window position */ - struct Ziphuft *t; /* pointer to table entry */ - cab_ULONG ml, md; /* masks for bl and bd bits */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ - - /* make local copies of globals */ - b = ZIP(bb); /* initialize bit buffer */ - k = ZIP(bk); - w = ZIP(window_posn); /* initialize window position */ - - /* inflate the coded data */ - ml = Zipmask[bl]; /* precompute masks for speed */ - md = Zipmask[bd]; - - for(;;) - { - ZIPNEEDBITS((cab_ULONG)bl) - if((e = (t = tl + ((cab_ULONG)b & ml))->e) > 16) - do - { - if (e == 99) - return 1; - ZIPDUMPBITS(t->b) - e -= 16; - ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); - ZIPDUMPBITS(t->b) - if (e == 16) /* then it's a literal */ - CAB(outbuf)[w++] = (cab_UBYTE)t->v.n; - else /* it's an EOB or a length */ - { - /* exit if end of block */ - if(e == 15) - break; - - /* get length of block to copy */ - ZIPNEEDBITS(e) - n = t->v.n + ((cab_ULONG)b & Zipmask[e]); - ZIPDUMPBITS(e); - - /* decode distance of block to copy */ - ZIPNEEDBITS((cab_ULONG)bd) - if ((e = (t = td + ((cab_ULONG)b & md))->e) > 16) - do { - if (e == 99) - return 1; - ZIPDUMPBITS(t->b) - e -= 16; - ZIPNEEDBITS(e) - } while ((e = (t = t->v.t + ((cab_ULONG)b & Zipmask[e]))->e) > 16); - ZIPDUMPBITS(t->b) - ZIPNEEDBITS(e) - d = w - t->v.n - ((cab_ULONG)b & Zipmask[e]); - ZIPDUMPBITS(e) - do - { - n -= (e = (e = ZIPWSIZE - ((d &= ZIPWSIZE-1) > w ? d : w)) > n ?n:e); - do - { - CAB(outbuf)[w++] = CAB(outbuf)[d++]; - } while (--e); - } while (n); - } - } - - /* restore the globals from the locals */ - ZIP(window_posn) = w; /* restore global window pointer */ - ZIP(bb) = b; /* restore global bit buffer */ - ZIP(bk) = k; - - /* done */ - return 0; -} - -/*********************************************************** - * Zipinflate_stored (internal) - */ -static cab_LONG Zipinflate_stored(cab_decomp_state *decomp_state) -/* "decompress" an inflated type 0 (stored) block. */ -{ - cab_ULONG n; /* number of bytes in block */ - cab_ULONG w; /* current window position */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ - - /* make local copies of globals */ - b = ZIP(bb); /* initialize bit buffer */ - k = ZIP(bk); - w = ZIP(window_posn); /* initialize window position */ - - /* go to byte boundary */ - n = k & 7; - ZIPDUMPBITS(n); - - /* get the length and its complement */ - ZIPNEEDBITS(16) - n = ((cab_ULONG)b & 0xffff); - ZIPDUMPBITS(16) - ZIPNEEDBITS(16) - if (n != (cab_ULONG)((~b) & 0xffff)) - return 1; /* error in compressed data */ - ZIPDUMPBITS(16) - - /* read and output the compressed data */ - while(n--) - { - ZIPNEEDBITS(8) - CAB(outbuf)[w++] = (cab_UBYTE)b; - ZIPDUMPBITS(8) - } - - /* restore the globals from the locals */ - ZIP(window_posn) = w; /* restore global window pointer */ - ZIP(bb) = b; /* restore global bit buffer */ - ZIP(bk) = k; - return 0; -} - -/****************************************************** - * Zipinflate_fixed (internal) - */ -static cab_LONG Zipinflate_fixed(cab_decomp_state *decomp_state) -{ - struct Ziphuft *fixed_tl; - struct Ziphuft *fixed_td; - cab_LONG fixed_bl, fixed_bd; - cab_LONG i; /* temporary variable */ - cab_ULONG *l; - - l = ZIP(ll); - - /* literal table */ - for(i = 0; i < 144; i++) - l[i] = 8; - for(; i < 256; i++) - l[i] = 9; - for(; i < 280; i++) - l[i] = 7; - for(; i < 288; i++) /* make a complete, but wrong code set */ - l[i] = 8; - fixed_bl = 7; - if((i = Ziphuft_build(l, 288, 257, (cab_UWORD *) Zipcplens, - (cab_UWORD *) Zipcplext, &fixed_tl, &fixed_bl, decomp_state))) - return i; - - /* distance table */ - for(i = 0; i < 30; i++) /* make an incomplete code set */ - l[i] = 5; - fixed_bd = 5; - if((i = Ziphuft_build(l, 30, 0, (cab_UWORD *) Zipcpdist, (cab_UWORD *) Zipcpdext, - &fixed_td, &fixed_bd, decomp_state)) > 1) - { - Ziphuft_free(fixed_tl); - return i; - } - - /* decompress until an end-of-block code */ - i = Zipinflate_codes(fixed_tl, fixed_td, fixed_bl, fixed_bd, decomp_state); - - Ziphuft_free(fixed_td); - Ziphuft_free(fixed_tl); - return i; -} - -/************************************************************** - * Zipinflate_dynamic (internal) - */ -static cab_LONG Zipinflate_dynamic(cab_decomp_state *decomp_state) - /* decompress an inflated type 2 (dynamic Huffman codes) block. */ -{ - cab_LONG i; /* temporary variables */ - cab_ULONG j; - cab_ULONG *ll; - cab_ULONG l; /* last length */ - cab_ULONG m; /* mask for bit lengths table */ - cab_ULONG n; /* number of lengths to get */ - struct Ziphuft *tl; /* literal/length code table */ - struct Ziphuft *td; /* distance code table */ - cab_LONG bl; /* lookup bits for tl */ - cab_LONG bd; /* lookup bits for td */ - cab_ULONG nb; /* number of bit length codes */ - cab_ULONG nl; /* number of literal/length codes */ - cab_ULONG nd; /* number of distance codes */ - register cab_ULONG b; /* bit buffer */ - register cab_ULONG k; /* number of bits in bit buffer */ - - /* make local bit buffer */ - b = ZIP(bb); - k = ZIP(bk); [truncated at 1000 lines; 1230077 more skipped]

19 years, 1 month

[gvg] 17345: Update status

by gvg＠svn.reactos.com

Update status Modified: trunk/reactos/media/doc/README.WINE _____ Modified: trunk/reactos/media/doc/README.WINE --- trunk/reactos/media/doc/README.WINE 2005-08-12 19:03:35 UTC (rev 17344) +++ trunk/reactos/media/doc/README.WINE 2005-08-12 19:08:45 UTC (rev 17345) @@ -26,57 +26,58 @@ work to import a new dll. The following build tools are shared with Wine. -reactos/tools/unicode # Synced to Wine-20050628 -reactos/tools/wpp # Synced to Wine-20050628 +reactos/tools/unicode # Synced to Wine-20050725 +reactos/tools/wpp # Synced to Wine-20050725 reactos/tools/bin2res # Resource to binary converter -reactos/tools/winebuild # Synced to Wine-20050628 +reactos/tools/winebuild # Synced to Wine-20050725 reactos/tools/wmc # Wine Message Compiler -reactos/tools/wrc # Synced to Wine-20050628 -reactos/tools/widl # Synced to Wine-20050628 (merge back to winehq in progress) +reactos/tools/wrc # Synced to Wine-20050725 +reactos/tools/widl # Forked at Wine-20050628 The following libraries are shared with Wine. -reactos/lib/cabinet # Synced to Wine-20050628 -reactos/lib/comctl32 # Synced to Wine-20050628 -reactos/lib/comdlg32 # Synced to Wine-20050628 -reactos/lib/dinput # Synced to Wine-20050310 -reactos/lib/dinput8 # Synced to Wine-20050628 -reactos/lib/icmp # Synced to Wine-20050628 +reactos/lib/cabinet # Synced to Wine-20050725 +reactos/lib/comctl32 # Synced to Wine-20050725 +reactos/lib/comdlg32 # Synced to Wine-20050725 +reactos/lib/dbghelp # +reactos/lib/dinput # Forked at Wine-20050310 +reactos/lib/dinput8 # Synced to Wine-20050725 +reactos/lib/icmp # Synced to Wine-20050725 reactos/lib/iphlpapi # Out of sync reactos/lib/imagehlp # Patches for BindImage need review and submission to winehq. reactos/lib/msvcrt20 # Out of sync -reactos/lib/mpr # Synced to Wine-20050628 +reactos/lib/mpr # Synced to Wine-20050725 reactos/lib/msacm # Out of sync -reactos/lib/msimg32 # Synced to Wine-20050628 -reactos/lib/msi # Synced to Wine-20050628 +reactos/lib/msimg32 # Synced to Wine-20050725 +reactos/lib/msi # Synced to Wine-20050725 reactos/lib/msvideo # Out of sync reactos/lib/netapi32 # Out of sync reactos/lib/objsel # Synced to Wine-20050726 reactos/lib/odbc32 # In sync. Depends on port of Linux ODBC. -reactos/lib/ole32 # Synced to Wine-20050628 -reactos/lib/oleaut32 # Synced to Wine-20050628 -reactos/lib/oledlg # Synced to Wine-20050628 -reactos/lib/olepro32 # Synced to Wine-20050628 -reactos/lib/riched20 # Synced to Wine-20050628 -reactos/lib/richedit # Synced to Wine-20050628 -reactos/lib/rpcrt4 # Synced to Wine-20050628 -reactos/lib/setupapi # Synced to Wine-20050524 -reactos/lib/shell32 # Synced to Wine-20050628 -reactos/lib/shdocvw # Synced to Wine-20050628 -reactos/lib/shlwapi # Synced to Wine-20050628 +reactos/lib/ole32 # Synced to Wine-20050725 +reactos/lib/oleaut32 # Synced to Wine-20050725 +reactos/lib/oledlg # Synced to Wine-20050725 +reactos/lib/olepro32 # Synced to Wine-20050725 +reactos/lib/riched20 # Synced to Wine-20050725 +reactos/lib/richedit # Synced to Wine-20050725 +reactos/lib/rpcrt4 # Synced to Wine-20050725 +reactos/lib/setupapi # Forked at Wine-20050524 +reactos/lib/shell32 # Synced to Wine-20050725 +reactos/lib/shdocvw # Synced to Wine-20050725 +reactos/lib/shlwapi # Synced to Wine-20050725 reactos/lib/twain # Out of sync -reactos/lib/urlmon # Synced to Wine-20050628 -reactos/lib/uxtheme # Synced to Wine-20050703 +reactos/lib/urlmon # Synced to Wine-20050725 +reactos/lib/uxtheme # Synced to Wine-20050725 reactos/lib/version # Out of sync reactos/lib/wininet # Out of sync -reactos/lib/winmm # Synced to Wine-20050628 -reactos/lib/winmm/midimap # Synced to Wine-20050628 -reactos/lib/winmm/wavemap # Synced to Wine-20050628 +reactos/lib/winmm # Forked at Wine-20050628 +reactos/lib/winmm/midimap # Forked at Wine-20050628 +reactos/lib/winmm/wavemap # Forked at Wine-20050628 ReactOS shares the following programs with Winehq. reactos/subsys/system/regedit # Out of sync reactos/subsys/system/expand # Out of sync -reactos/subsys/system/msiexec # Synced to Wine-20050628 +reactos/subsys/system/msiexec # Synced to Wine-20050725 In addition the following libs, dlls and source files are mostly based on code ported from Winehq CVS. If you are looking to update something in these files

19 years, 1 month

[hpoussin] 17344: Implement SetupDiCallClassInstaller (still doesn't support custom class installers/co-installers)

by hpoussin＠svn.reactos.com

Implement SetupDiCallClassInstaller (still doesn't support custom class installers/co-installers) Implement SetupDiGetDeviceInstallParamsA by calling SetupDiGetDeviceInstallParamsW. Add stub for SetupDiGetDeviceInstallParamsW Basic implementation of SetupDiSelectBestCompatDrv (selects first driver of the list) Add stubs for SetupDiInstallDriverFiles, SetupDiRegisterCoDeviceInstallers, SetupDiInstallDeviceInterfaces, SetupDiInstallDevice Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/setupapi.spec _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-12 19:00:04 UTC (rev 17343) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-12 19:03:35 UTC (rev 17344) @@ -79,9 +79,33 @@ /* FIXME: header mess */ DEFINE_GUID(GUID_NULL, 0x00000000L, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00); +typedef DWORD +(CALLBACK* CLASS_INSTALL_PROC) ( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL); +typedef BOOL +(WINAPI* DEFAULT_CLASS_INSTALL_PROC) ( + IN HDEVINFO DeviceInfoSet, + IN OUT PSP_DEVINFO_DATA DeviceInfoData); +typedef DWORD +(CALLBACK* COINSTALLER_PROC) ( + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL, + IN OUT PCOINSTALLER_CONTEXT_DATA Context); #define SETUP_DEV_INFO_SET_MAGIC 0xd00ff057 +struct CoInstallerElement +{ + LIST_ENTRY ListEntry; + + COINSTALLER_PROC Function; + BOOL DoPostProcessing; + PVOID PrivateData; +}; + struct DeviceInterface /* Element of DeviceInfoElement.InterfaceListHead */ { LIST_ENTRY ListEntry; @@ -2758,22 +2782,304 @@ * SetupDiCallClassInstaller (SETUPAPI.@) */ BOOL WINAPI SetupDiCallClassInstaller( - DI_FUNCTION InstallFunction, - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData) + IN DI_FUNCTION InstallFunction, + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) { - FIXME("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); - return FALSE; + BOOL ret = FALSE; + + TRACE("%ld %p %p\n", InstallFunction, DeviceInfoSet, DeviceInfoData); + + if (!DeviceInfoSet) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInfoSet == (HDEVINFO)INVALID_HANDLE_VALUE) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->magic != SETUP_DEV_INFO_SET_MAGIC) + SetLastError(ERROR_INVALID_HANDLE); + else if (((struct DeviceInfoSet *)DeviceInfoSet)->HKLM != HKEY_LOCAL_MACHINE) + SetLastError(ERROR_INVALID_HANDLE); + else if (DeviceInfoData && DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { +#define CLASS_COINSTALLER 0x1 +#define DEVICE_COINSTALLER 0x2 +#define CLASS_INSTALLER 0x4 + UCHAR CanHandle = 0; + DEFAULT_CLASS_INSTALL_PROC DefaultHandler = NULL; + + switch (InstallFunction) + { + case DIF_ALLOW_INSTALL: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_DESTROYPRIVATEDATA: + CanHandle = CLASS_INSTALLER; + break; + case DIF_INSTALLDEVICE: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiInstallDevice; + break; + case DIF_INSTALLDEVICEFILES: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiInstallDriverFiles; + break; + case DIF_INSTALLINTERFACES: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiInstallDeviceInterfaces; + break; + case DIF_NEWDEVICEWIZARD_FINISHINSTALL: + CanHandle = CLASS_COINSTALLER | DEVICE_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_NEWDEVICEWIZARD_POSTANALYZE: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_NEWDEVICEWIZARD_PREANALYZE: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + break; + case DIF_REGISTER_COINSTALLERS: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiRegisterCoDeviceInstallers; + break; + case DIF_SELECTBESTCOMPATDRV: + CanHandle = CLASS_COINSTALLER | CLASS_INSTALLER; + DefaultHandler = SetupDiSelectBestCompatDrv; + break; + default: + FIXME("Install function %ld not implemented\n", InstallFunction); + SetLastError(ERROR_INVALID_PARAMETER); + } + + if (CanHandle != 0) + { + LIST_ENTRY ClassCoInstallersListHead; + LIST_ENTRY DeviceCoInstallersListHead; + CLASS_INSTALL_PROC ClassInstaller = NULL; + COINSTALLER_CONTEXT_DATA Context; + PLIST_ENTRY ListEntry; + HKEY hKey; + DWORD dwRegType, dwLength; + DWORD rc = NO_ERROR; + + InitializeListHead(&ClassCoInstallersListHead); + InitializeListHead(&DeviceCoInstallersListHead); + + if (CanHandle & CLASS_COINSTALLER) + { + FIXME("Doesn't use Class co-installers at the moment\n"); + } + if (CanHandle & DEVICE_COINSTALLER) + { + rc = RegOpenKeyEx( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\CoDeviceInstallers", + 0, /* Options */ + KEY_QUERY_VALUE, + &hKey); + if (rc == ERROR_SUCCESS) + { + LPWSTR lpGuidString; + if (UuidToStringW((UUID*)&DeviceInfoData->ClassGuid, &lpGuidString) == RPC_S_OK) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (KeyBuffer != NULL) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc == ERROR_SUCCESS) + { + LPCWSTR ptr; + for (ptr = KeyBuffer; *ptr; ptr += strlenW(ptr) + 1) + { + /* Add coinstaller to DeviceCoInstallersListHead list */ + FIXME("Device coinstaller is '%S'\n", ptr); + } + } + HeapFree(GetProcessHeap(), 0, KeyBuffer); + } + } + RpcStringFreeW(&lpGuidString); + } + RegCloseKey(hKey); + } + } + if (CanHandle & CLASS_INSTALLER) + { + hKey = SetupDiOpenClassRegKey(&DeviceInfoData->ClassGuid, KEY_QUERY_VALUE); + if (hKey != INVALID_HANDLE_VALUE) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, &dwRegType, NULL, &dwLength); + if (rc == ERROR_SUCCESS && dwRegType == REG_SZ) + { + LPWSTR KeyBuffer = HeapAlloc(GetProcessHeap(), 0, dwLength); + if (KeyBuffer != NULL) + { + rc = RegQueryValueExW(hKey, L"Installer32", NULL, NULL, (LPBYTE)KeyBuffer, &dwLength); + if (rc == ERROR_SUCCESS) + { + /* Set ClassInstaller function pointer */ + FIXME("Installer is '%S'\n", KeyBuffer); + } + HeapFree(GetProcessHeap(), 0, KeyBuffer); + } + } + RegCloseKey(hKey); + } + } + + /* Call Class co-installers */ + Context.PostProcessing = FALSE; + rc = NO_ERROR; + ListEntry = ClassCoInstallersListHead.Flink; + while (rc == NO_ERROR && ListEntry != &ClassCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + coinstaller->PrivateData = Context.PrivateData; + if (rc == ERROR_DI_POSTPROCESSING_REQUIRED) + { + coinstaller->DoPostProcessing = TRUE; + rc = NO_ERROR; + } + ListEntry = ListEntry->Flink; + } + + /* Call Device co-installers */ + ListEntry = DeviceCoInstallersListHead.Flink; + while (rc == NO_ERROR && ListEntry != &DeviceCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + coinstaller->PrivateData = Context.PrivateData; + if (rc == ERROR_DI_POSTPROCESSING_REQUIRED) + { + coinstaller->DoPostProcessing = TRUE; + rc = NO_ERROR; + } + ListEntry = ListEntry->Flink; + } + + /* Call Class installer */ + if (ClassInstaller) + rc = (*ClassInstaller)(InstallFunction, DeviceInfoSet, DeviceInfoData); + else + rc = ERROR_DI_DO_DEFAULT; + + /* Call default handler */ + if (rc == ERROR_DI_DO_DEFAULT) + { + if (DefaultHandler /*FIXME && DI_NODI_DEFAULTACTION not set */) + { + if ((*DefaultHandler)(DeviceInfoSet, DeviceInfoData)) + rc = NO_ERROR; + else + rc = GetLastError(); + } + else + rc = NO_ERROR; + } + + /* Call Class co-installers that required postprocessing */ + Context.PostProcessing = TRUE; + ListEntry = ClassCoInstallersListHead.Flink; + while (ListEntry != &ClassCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + if (coinstaller->DoPostProcessing) + { + Context.InstallResult = rc; + Context.PrivateData = coinstaller->PrivateData; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + } + ListEntry = ListEntry->Flink; + } + + /* Call Device co-installers that required postprocessing */ + ListEntry = DeviceCoInstallersListHead.Flink; + while (ListEntry != &DeviceCoInstallersListHead) + { + struct CoInstallerElement *coinstaller = (struct CoInstallerElement *)ListEntry; + if (coinstaller->DoPostProcessing) + { + Context.InstallResult = rc; + Context.PrivateData = coinstaller->PrivateData; + rc = (*coinstaller->Function)(InstallFunction, DeviceInfoSet, DeviceInfoData, &Context); + } + ListEntry = ListEntry->Flink; + } + + /* Free allocated memory */ + while (!IsListEmpty(&ClassCoInstallersListHead)) + { + ListEntry = RemoveHeadList(&ClassCoInstallersListHead); + HeapFree(GetProcessHeap(), 0, ListEntry); + } + while (!IsListEmpty(&DeviceCoInstallersListHead)) + { + ListEntry = RemoveHeadList(&DeviceCoInstallersListHead); + HeapFree(GetProcessHeap(), 0, ListEntry); + } + + ret = (rc == NO_ERROR); + } + } + + TRACE("Returning %d\n", ret); + return ret; } /*********************************************************************** * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) { + SP_DEVINSTALL_PARAMS_W deviceInstallParamsW; + BOOL ret = FALSE; + + TRACE("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + if (DeviceInstallParams == NULL) + SetLastError(ERROR_INVALID_PARAMETER); + else if (DeviceInstallParams->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + SetLastError(ERROR_INVALID_USER_BUFFER); + else + { + deviceInstallParamsW.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); + ret = SetupDiGetDeviceInstallParamsW(DeviceInfoSet, DeviceInfoData, &deviceInstallParamsW); + + if (ret) + { + /* Do W->A conversion */ + memcpy( + DeviceInstallParams, + &deviceInstallParamsW, + FIELD_OFFSET(SP_DEVINSTALL_PARAMS_W, DriverPath)); + if (WideCharToMultiByte(CP_ACP, 0, deviceInstallParamsW.DriverPath, -1, + DeviceInstallParams->DriverPath, MAX_PATH, NULL, NULL) == 0) + { + DeviceInstallParams->DriverPath[0] = '\0'; + ret = FALSE; + } + } + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiGetDeviceInstallParamsW( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData, + OUT PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); return FALSE; } @@ -3864,3 +4170,114 @@ TRACE("Returning %d\n", ret); return ret; } + +/********************************************************************** * + * SetupDiSelectBestCompatDrv (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiSelectBestCompatDrv( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + SP_DRVINFO_DATA_W drvInfoData; + BOOL ret; + + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiSelectBestCompatDrv() is selecting the 1st driver...\n"); + + drvInfoData.cbSize = sizeof(SP_DRVINFO_DATA_W); + ret = SetupDiEnumDriverInfoW( + DeviceInfoSet, + DeviceInfoData, + SPDIT_COMPATDRIVER, + 0, /* Member index */ + &drvInfoData); + + if (ret) + { + ret = SetupDiSetSelectedDriverW( + DeviceInfoSet, + DeviceInfoData, + &drvInfoData); + } + + TRACE("Returning %d\n", ret); + return ret; +} + +/********************************************************************** * + * SetupDiInstallDriverFiles (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiInstallDriverFiles( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData OPTIONAL) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiInstallDriverFiles not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} + +/********************************************************************** * + * SetupDiRegisterCoDeviceInstallers (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiRegisterCoDeviceInstallers( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiRegisterCoDeviceInstallers not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} + +/********************************************************************** * + * SetupDiInstallDeviceInterfaces (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiInstallDeviceInterfaces( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + FIXME("SetupDiInstallDeviceInterfaces not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} + +/********************************************************************** * + * SetupDiInstallDevice (SETUPAPI.@) + */ +BOOL WINAPI +SetupDiInstallDevice( + IN HDEVINFO DeviceInfoSet, + IN PSP_DEVINFO_DATA DeviceInfoData) +{ + TRACE("%p %p\n", DeviceInfoSet, DeviceInfoData); + + /* Steps to follow: + * 0. If DI_FLAGSEX_SETFAILEDINSTALL is set, set FAILEDINSTALL flag in ConfigFlags registry and exit + * 1. Create driver key and write InfPath and ProviderName + * 2a Process inf sections: {DDInstall}, {DDInstall}.HW [SetupDiOpenDevRegKey] + * b Process {DDInstall}.LogConfigOverride if present [SetupDiOpenDevRegKey] + * c Process {DDInstall}.Services [SetupDiOpenDevRegKey] + * 3. Copy inf file to Inf\ directory [SetupCopyOEMInf] + * 4. Install other waiting files + * 5. Load the driver/Call AddDevice + * 6. Send IRP_MN_START_DEVICE if DI_NEEDRESTART, DI_NEEDREBOOT and DI_DONOTCALLCONFIGMG are not set + */ + + FIXME("SetupDiInstallDevice not implemented. Doing nothing\n"); + //SetLastError(ERROR_GEN_FAILURE); + //return FALSE; + return TRUE; +} _____ Modified: trunk/reactos/lib/setupapi/setupapi.spec --- trunk/reactos/lib/setupapi/setupapi.spec 2005-08-12 19:00:04 UTC (rev 17343) +++ trunk/reactos/lib/setupapi/setupapi.spec 2005-08-12 19:03:35 UTC (rev 17344) @@ -321,7 +321,7 @@ @ stdcall SetupDiGetDeviceInfoListDetailA(ptr ptr) @ stdcall SetupDiGetDeviceInfoListDetailW(ptr ptr) @ stdcall SetupDiGetDeviceInstallParamsA(ptr ptr ptr) -@ stub SetupDiGetDeviceInstallParamsW +@ stdcall SetupDiGetDeviceInstallParamsW(ptr ptr ptr) @ stub SetupDiGetDeviceInstanceIdA @ stub SetupDiGetDeviceInstanceIdW @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr) @@ -350,8 +350,9 @@ @ stub SetupDiInstallClassExA @ stub SetupDiInstallClassExW @ stdcall SetupDiInstallClassW(long wstr long ptr) -@ stub SetupDiInstallDevice -@ stub SetupDiInstallDriverFiles +@ stdcall SetupDiInstallDevice(ptr ptr) +@ stdcall SetupDiInstallDeviceInterfaces(ptr ptr) +@ stdcall SetupDiInstallDriverFiles(ptr ptr) @ stub SetupDiLoadClassIcon @ stub SetupDiMoveDuplicateDevice @ stdcall SetupDiOpenClassRegKey(ptr long) @@ -363,9 +364,11 @@ @ stdcall SetupDiOpenDeviceInterfaceA(ptr str long ptr) @ stub SetupDiOpenDeviceInterfaceRegKey @ stdcall SetupDiOpenDeviceInterfaceW(ptr wstr long ptr) +@ stdcall SetupDiRegisterCoDeviceInstallers(ptr ptr) @ stub SetupDiRegisterDeviceInfo @ stub SetupDiRemoveDevice @ stub SetupDiRemoveDeviceInterface +@ stdcall SetupDiSelectBestCompatDrv(ptr ptr) @ stub SetupDiSelectDevice @ stub SetupDiSelectOEMDrv @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long)

19 years, 1 month

[hpoussin] 17343: Always set a valid class Guid in CreateDeviceInfoElement

by hpoussin＠svn.reactos.com

Always set a valid class Guid in CreateDeviceInfoElement Fix interfaces enumeration by not copying cbSize field (it should already be correct) Modified: trunk/reactos/lib/setupapi/devinst.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-12 18:22:47 UTC (rev 17342) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-12 19:00:04 UTC (rev 17343) @@ -1204,7 +1204,6 @@ struct DeviceInterface *deviceInterface; *pDeviceInterface = NULL; - if (IsEqualIID(&pInterfaceGuid, &GUID_NULL)) { FIXME("Bad argument!!!"); return FALSE; }/* FIXME: remove */ deviceInterface = HeapAlloc(GetProcessHeap(), 0, sizeof(struct DeviceInterface) + (wcslen(SymbolicLink) + 1) * sizeof(WCHAR)); if (!deviceInterface) @@ -1261,6 +1260,8 @@ j = 0; while (TRUE) { + GUID KeyGuid; + dwLength = sizeof(KeyBuffer) / sizeof(KeyBuffer[0]); rc = RegEnumKeyExW(hDeviceIdKey, j, KeyBuffer, &dwLength, NULL, NULL, NULL, NULL); if (rc == ERROR_NO_MORE_ITEMS) @@ -1302,22 +1303,21 @@ RegCloseKey(hDeviceIdKey); return ERROR_GEN_FAILURE; } - else if (pClassGuid) + + KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ + if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) { - GUID KeyGuid; - KeyBuffer[37] = '\0'; /* Replace the } by a NULL character */ - if (UuidFromStringW(&KeyBuffer[1], &KeyGuid) != RPC_S_OK) - { - RegCloseKey(hDeviceIdKey); - return GetLastError(); - } - if (!IsEqualIID(&KeyGuid, pClassGuid)) - /* Skip this entry as it is not the right device class */ - continue; + RegCloseKey(hDeviceIdKey); + return GetLastError(); } + if (pClassGuid && !IsEqualIID(&KeyGuid, pClassGuid)) + { + /* Skip this entry as it is not the right device class */ + continue; + } /* Add the entry to the list */ - if (!CreateDeviceInfoElement(InstancePath, pClassGuid, &deviceInfo)) + if (!CreateDeviceInfoElement(InstancePath, &KeyGuid, &deviceInfo)) { RegCloseKey(hDeviceIdKey); return GetLastError(); @@ -2904,6 +2904,7 @@ { struct DeviceInfoElement *deviceInfo; + /* FIXME: ClassGuid can be NULL */ if (CreateDeviceInfoElement(DeviceName, ClassGuid, &deviceInfo)) { InsertTailList(&list->ListHead, &deviceInfo->ListEntry); @@ -3544,7 +3545,7 @@ if (deviceInfo) { - // good one found + /* good one found */ if (DeviceInfoData) { memcpy(&DeviceInfoData->ClassGuid, &deviceInfo->ClassGuid, sizeof(GUID)); @@ -3580,6 +3581,7 @@ return FALSE; } + /* FIXME: GUID_NULL is not allowed */ if (!CreateDeviceInfoElement(DeviceInstanceId, &GUID_NULL /* FIXME */, &deviceInfo)) { RegCloseKey(hKey); @@ -3722,9 +3724,9 @@ struct DriverInfoElement *DrvInfo = (struct DriverInfoElement *)ItemList; memcpy( - DriverInfoData, - &DrvInfo->Info, - DriverInfoData->cbSize); + &DriverInfoData->DriverType, + &DrvInfo->Info.DriverType, + DriverInfoData->cbSize - FIELD_OFFSET(SP_DRVINFO_DATA_W, DriverType)); ret = TRUE; } } @@ -3770,9 +3772,9 @@ else { memcpy( - DriverInfoData, - &driverInfo->Info, - DriverInfoData->cbSize); + &DriverInfoData->DriverType, + &driverInfo->Info.DriverType, + DriverInfoData->cbSize - FIELD_OFFSET(SP_DRVINFO_DATA_W, DriverType)); ret = TRUE; } }

19 years, 1 month

[gvg] 17342: Sync to Wine-20050725:

by gvg＠svn.reactos.com

Sync to Wine-20050725: Thomas Weidenmueller <wine-patches(a)reactsoft.com> - IsThemeDialogTextureEnabled should have one parameter to match the prototype in the official headers. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes (Reg* functions). Stefan Huehner <stefan(a)huehner.org> - Make some function static. - Fix -Wmissing-declarations warnings. Frank Richter <frank.richter(a)gmail.com> - Enable/disable "flat menus" based on the setting from the active theme. - Have the theme INI file parsed upon theme activation and not just when the first theme data is requested; that way, the themed system colors are set correctly from the start, and not just after some theme data was requested. - GetThemeBackgroundContentRect() does not use the content margins alone, it also falls back to the border size or sizing margins, and if it can't find any possible margins at all, it returns the original rectangle. - Make dialog theme texture setting non-global (ie a per-window setting). - Better viewport origin in DrawThemeParentBackground(). - OpenThemeData() now always sets the window theme to the handle returned (even if that is NULL) - previously, it could happen that when no theme was active or the theme data could not be opened that the window theme remained became then-dangling (and hence subsequent calls to GetWindowTheme() would return that bogus theme). - Correct border rectangle drawing. - Don't crash if NULL is passed as the class list to OpenThemeData(). - UXTHEME_LoadImage(): Set default image count to 1 to avoid division by zero in case image count property is not given. Properly support 0 state IDs. - Every window needs to receive WM_THEMECHANGED (esp. controls), so also send it to child windows. - Changed the default transparent color in case none was explicitly specified from the upper left pixel color to magenta. Empirically gives better results. - Write WCHAR strings to registry with correct size. - Opening some theme class data now also increases the reference count of the theme file, so as long as theme class data is still opened somewhere, the theme file won't get freed. Otherwise, it could happen that invalid class data was used, which could lead to problems. Modified: trunk/reactos/lib/uxtheme/draw.c Modified: trunk/reactos/lib/uxtheme/msstyles.c Modified: trunk/reactos/lib/uxtheme/msstyles.h Modified: trunk/reactos/lib/uxtheme/system.c _____ Modified: trunk/reactos/lib/uxtheme/draw.c --- trunk/reactos/lib/uxtheme/draw.c 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/draw.c 2005-08-12 18:22:47 UTC (rev 17342) @@ -41,7 +41,7 @@ * Defines and global variables */ -DWORD dwDialogTextureFlags; +extern ATOM atDialogThemeEnabled; /*********************************************************************** / @@ -50,8 +50,19 @@ */ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) { + static const WCHAR szTab[] = { 'T','a','b',0 }; + HRESULT hr; + TRACE("(%p,0x%08lx\n", hwnd, dwFlags); - dwDialogTextureFlags = dwFlags; + hr = SetPropW (hwnd, MAKEINTATOMW (atDialogThemeEnabled), + (HANDLE)(dwFlags|0x80000000)); + /* 0x80000000 serves as a "flags set" flag */ + if (FAILED(hr)) + return hr; + if (dwFlags & ETDT_USETABTEXTURE) + return SetWindowTheme (hwnd, NULL, szTab); + else + return SetWindowTheme (hwnd, NULL, NULL); return S_OK; } @@ -60,7 +71,15 @@ */ BOOL WINAPI IsThemeDialogTextureEnabled(HWND hwnd) { + DWORD dwDialogTextureFlags; TRACE("(%p)\n", hwnd); + + dwDialogTextureFlags = (DWORD)GetPropW (hwnd, + MAKEINTATOMW (atDialogThemeEnabled)); + if (dwDialogTextureFlags == 0) + /* Means EnableThemeDialogTexture wasn't called for this dialog */ + return TRUE; + return (dwDialogTextureFlags & ETDT_ENABLE) && !(dwDialogTextureFlags & ETDT_DISABLE); } @@ -95,7 +114,7 @@ MapWindowPoints(hParent, NULL, (LPPOINT)&rt, 2); } - SetViewportOrgEx(hdc, rt.left, rt.top, &org); + OffsetViewportOrgEx(hdc, -rt.left, -rt.top, &org); SendMessageW(hParent, WM_ERASEBKGND, (WPARAM)hdc, 0); SendMessageW(hParent, WM_PRINTCLIENT, (WPARAM)hdc, PRF_CLIENT); @@ -190,7 +209,7 @@ HBITMAP *hBmp, RECT *bmpRect) { int imagelayout = IL_VERTICAL; - int imagecount = 0; + int imagecount = 1; BITMAP bmp; WCHAR szPath[MAX_PATH]; PTHEME_PROPERTY tp = UXTHEME_SelectImage(hTheme, hdc, iPartId, iStateId, pRect, glyph); @@ -213,12 +232,12 @@ int height = bmp.bmHeight/imagecount; bmpRect->left = 0; bmpRect->right = bmp.bmWidth; - bmpRect->top = (min(imagecount, iStateId)-1) * height; + bmpRect->top = (max(min(imagecount, iStateId), 1)-1) * height; bmpRect->bottom = bmpRect->top + height; } else { int width = bmp.bmWidth/imagecount; - bmpRect->left = (min(imagecount, iStateId)-1) * width; + bmpRect->left = (max(min(imagecount, iStateId), 1)-1) * width; bmpRect->right = bmpRect->left + width; bmpRect->top = 0; bmpRect->bottom = bmp.bmHeight; @@ -302,8 +321,8 @@ GetThemeBool(hTheme, iPartId, iStateId, TMT_GLYPHTRANSPARENT, &transparent); if(transparent) { if(FAILED(GetThemeColor(hTheme, iPartId, iStateId, TMT_GLYPHTRANSPARENTCOLOR, &transparentcolor))) { - /* If image is transparent, but no color was specified, get the color of the upper left corner */ - transparentcolor = GetPixel(hdcSrc, 0, 0); + /* If image is transparent, but no color was specified, use magenta */ + transparentcolor = RGB(255, 0, 255); } } GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_VALIGN, &valign); @@ -588,15 +607,17 @@ GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); if(bordersize > 0) { - POINT ptCorners[4]; + POINT ptCorners[5]; ptCorners[0].x = pRect->left; ptCorners[0].y = pRect->top; - ptCorners[1].x = pRect->right; + ptCorners[1].x = pRect->right-1; ptCorners[1].y = pRect->top; - ptCorners[2].x = pRect->right; - ptCorners[2].y = pRect->bottom; + ptCorners[2].x = pRect->right-1; + ptCorners[2].y = pRect->bottom-1; ptCorners[3].x = pRect->left; - ptCorners[3].y = pRect->bottom; + ptCorners[3].y = pRect->bottom-1; + ptCorners[4].x = pRect->left; + ptCorners[4].y = pRect->top; InflateRect(pRect, -bordersize, -bordersize); if(pOptions->dwFlags & DTBG_OMITBORDER) @@ -607,7 +628,7 @@ return HRESULT_FROM_WIN32(GetLastError()); oldPen = SelectObject(hdc, hPen); - if(!Polyline(hdc, ptCorners, 4)) + if(!Polyline(hdc, ptCorners, 5)) hr = HRESULT_FROM_WIN32(GetLastError()); SelectObject(hdc, oldPen); @@ -855,15 +876,34 @@ if(!hTheme) return E_HANDLE; + /* try content margins property... */ hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, TMT_CONTENTMARGINS, NULL, &margin); - if(FAILED(hr)) { - TRACE("Margins not found\n"); - return hr; + if(SUCCEEDED(hr)) { + pContentRect->left = pBoundingRect->left + margin.cxLeftWidth; + pContentRect->top = pBoundingRect->top + margin.cyTopHeight; + pContentRect->right = pBoundingRect->right - margin.cxRightWidth; + pContentRect->bottom = pBoundingRect->bottom - margin.cyBottomHeight; + } else { + /* otherwise, try to determine content rect from the background type and props */ + int bgtype = BT_BORDERFILL; + memcpy(pContentRect, pBoundingRect, sizeof(RECT)); + + GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); + if(bgtype == BT_BORDERFILL) { + int bordersize = 1; + + GetThemeInt(hTheme, iPartId, iStateId, TMT_BORDERSIZE, &bordersize); + InflateRect(pContentRect, -bordersize, -bordersize); + } else if ((bgtype == BT_IMAGEFILE) + && (SUCCEEDED(hr = GetThemeMargins(hTheme, hdc, iPartId, iStateId, + TMT_SIZINGMARGINS, NULL, &margin)))) { + pContentRect->left = pBoundingRect->left + margin.cxLeftWidth; + pContentRect->top = pBoundingRect->top + margin.cyTopHeight; + pContentRect->right = pBoundingRect->right - margin.cxRightWidth; + pContentRect->bottom = pBoundingRect->bottom - margin.cyBottomHeight; + } + /* If nothing was found, leave unchanged */ } - pContentRect->left = pBoundingRect->left + margin.cxLeftWidth; - pContentRect->top = pBoundingRect->top + margin.cyTopHeight; - pContentRect->right = pBoundingRect->right - margin.cxRightWidth; - pContentRect->bottom = pBoundingRect->bottom - margin.cyBottomHeight; TRACE("left:%ld,top:%ld,right:%ld,bottom:%ld\n", pContentRect->left, pContentRect->top, pContentRect->right, pContentRect->bottom); _____ Modified: trunk/reactos/lib/uxtheme/msstyles.c --- trunk/reactos/lib/uxtheme/msstyles.c 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/msstyles.c 2005-08-12 18:22:47 UTC (rev 17342) @@ -253,7 +253,7 @@ * * Retrieve the ini file for the selected color/style */ -PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) +static PUXINI_FILE MSSTYLES_GetActiveThemeIni(PTHEME_FILE tf) { static const WCHAR szFileResNamesResource[] = { 'F','I','L','E','R','E','S','N','A','M','E','S','\0' @@ -320,7 +320,7 @@ * iPartId Location to store part id * iStateId Location to store state id */ -BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR szAppName, LPWSTR szClassName, int *iPartId, int *iStateId) +static BOOL MSSTYLES_ParseIniSectionName(LPCWSTR lpSection, DWORD dwLen, LPWSTR szAppName, LPWSTR szClassName, int *iPartId, int *iStateId) { WCHAR sec[255]; WCHAR part[60] = {'\0'}; @@ -423,7 +423,7 @@ * RETURNS * The class added, or a class previously added with the same name */ -PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) +static PTHEME_CLASS MSSTYLES_AddClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassName) { PTHEME_CLASS cur = MSSTYLES_FindClass(tf, pszAppName, pszClassName); if(cur) return cur; @@ -480,7 +480,7 @@ * RETURNS * The part/state added, or a part/state previously added with the same IDs */ -PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateId) +static PTHEME_PARTSTATE MSSTYLES_AddPartState(PTHEME_CLASS tc, int iPartId, int iStateId) { PTHEME_PARTSTATE cur = MSSTYLES_FindPartState(tc, iPartId, iStateId, NULL); if(cur) return cur; @@ -507,7 +507,7 @@ * RETURNS * The property found, or NULL */ -PTHEME_PROPERTY MSSTYLES_LFindProperty(PTHEME_PROPERTY tp, int iPropertyPrimitive, int iPropertyId) +static PTHEME_PROPERTY MSSTYLES_LFindProperty(PTHEME_PROPERTY tp, int iPropertyPrimitive, int iPropertyId) { PTHEME_PROPERTY cur = tp; while(cur) { @@ -596,7 +596,7 @@ * RETURNS * The property added, or a property previously added with the same IDs */ -PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen, BOOL isGlobal) +static PTHEME_PROPERTY MSSTYLES_AddProperty(PTHEME_PARTSTATE ps, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen, BOOL isGlobal) { PTHEME_PROPERTY cur = MSSTYLES_PSFindProperty(ps, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */ @@ -637,7 +637,7 @@ * RETURNS * The property added, or a property previously added with the same IDs */ -PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) +static PTHEME_PROPERTY MSSTYLES_AddMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId, LPCWSTR lpValue, DWORD dwValueLen) { PTHEME_PROPERTY cur = MSSTYLES_FFindMetric(tf, iPropertyPrimitive, iPropertyId); /* Should duplicate properties overwrite the original, or be ignored? */ @@ -709,6 +709,10 @@ FIXME("Invalid color value for %s\n", debugstr_w(szPropertyName)); } } + else if (iPropertyId == TMT_FLATMENUS) { + BOOL flatMenus = (*lpValue == 'T') || (*lpValue == 't'); + SystemParametersInfoW (SPI_SETFLATMENU, 0, (PVOID)flatMenus, 0); + } /* Catch all metrics, including colors */ MSSTYLES_AddMetric(tf, iPropertyPrimitive, iPropertyId, lpValue, dwValueLen); } @@ -806,6 +810,8 @@ } if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); + cls->tf = tfActiveTheme; + cls->tf->dwRefCount++; } return cls; } @@ -819,11 +825,12 @@ * tc Theme class to close * * NOTES - * There is currently no need clean anything up for theme classes, - * so do nothing for now + * The MSSTYLES_CloseThemeFile decreases the refcount of the owning + * theme file and cleans it up, if needed. */ HRESULT MSSTYLES_CloseThemeClass(PTHEME_CLASS tc) { + MSSTYLES_CloseThemeFile (tc->tf); return S_OK; } _____ Modified: trunk/reactos/lib/uxtheme/msstyles.h --- trunk/reactos/lib/uxtheme/msstyles.h 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/msstyles.h 2005-08-12 18:22:47 UTC (rev 17342) @@ -46,8 +46,11 @@ struct _THEME_PARTSTATE *next; } THEME_PARTSTATE, *PTHEME_PARTSTATE; +struct _THEME_FILE; + typedef struct _THEME_CLASS { HMODULE hTheme; + struct _THEME_FILE* tf; WCHAR szAppName[MAX_THEME_APP_NAME]; WCHAR szClassName[MAX_THEME_CLASS_NAME]; PTHEME_PARTSTATE partstate; _____ Modified: trunk/reactos/lib/uxtheme/system.c --- trunk/reactos/lib/uxtheme/system.c 2005-08-12 18:17:37 UTC (rev 17341) +++ trunk/reactos/lib/uxtheme/system.c 2005-08-12 18:22:47 UTC (rev 17342) @@ -62,6 +62,7 @@ ATOM atWindowTheme; ATOM atSubAppName; ATOM atSubIdList; +ATOM atDialogThemeEnabled; BOOL bThemeActive = FALSE; WCHAR szCurrentTheme[MAX_PATH]; @@ -70,6 +71,27 @@ /*********************************************************************** / +static BOOL CALLBACK UXTHEME_broadcast_msg_enumchild (HWND hWnd, LPARAM msg) +{ + PostMessageW(hWnd, msg, 0, 0); + return TRUE; +} + +/* Broadcast a message to *all* windows, including children */ +static BOOL CALLBACK UXTHEME_broadcast_msg (HWND hWnd, LPARAM msg) +{ + if (hWnd == NULL) + { + EnumWindows (UXTHEME_broadcast_msg, msg); + } + else + { + PostMessageW(hWnd, msg, 0, 0); + EnumChildWindows (hWnd, UXTHEME_broadcast_msg_enumchild, msg); + } + return TRUE; +} + /*********************************************************************** * UXTHEME_LoadTheme * @@ -78,7 +100,7 @@ static void UXTHEME_LoadTheme(void) { HKEY hKey; - LONG buffsize; + DWORD buffsize; HRESULT hr; WCHAR tmp[10]; PTHEME_FILE pt; @@ -169,9 +191,12 @@ tmp[1] = '\0'; RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (const BYTE*)tmp, sizeof(WCHAR)*2); if(bThemeActive) { - RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)szCurrentColor, lstrlenW(szCurrentColor)+1); - RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)szCurrentSize, lstrlenW(szCurrentSize)+1); - RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)szCurrentTheme, lstrlenW(szCurrentTheme)+1); + RegSetValueExW(hKey, szColorName, 0, REG_SZ, (const BYTE*)szCurrentColor, + (lstrlenW(szCurrentColor)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szSizeName, 0, REG_SZ, (const BYTE*)szCurrentSize, + (lstrlenW(szCurrentSize)+1)*sizeof(WCHAR)); + RegSetValueExW(hKey, szDllName, 0, REG_SZ, (const BYTE*)szCurrentTheme, + (lstrlenW(szCurrentTheme)+1)*sizeof(WCHAR)); } else { RegDeleteValueW(hKey, szColorName); @@ -200,12 +225,16 @@ static const WCHAR szSubIdList[] = { 'u','x','_','s','u','b','i','d','l','s','t','\0' }; + static const WCHAR szDialogThemeEnabled[] = { + 'u','x','_','d','i','a','l','o','g','t','h','e','m','e','\0' + }; hDllInst = hInst; - atWindowTheme = GlobalAddAtomW(szWindowTheme); - atSubAppName = GlobalAddAtomW(szSubAppName); - atSubIdList = GlobalAddAtomW(szSubIdList); + atWindowTheme = GlobalAddAtomW(szWindowTheme); + atSubAppName = GlobalAddAtomW(szSubAppName); + atSubIdList = GlobalAddAtomW(szSubIdList); + atDialogThemeEnabled = GlobalAddAtomW(szDialogThemeEnabled); UXTHEME_LoadTheme(); } @@ -247,7 +276,7 @@ RegSetValueExW(hKey, szThemeActive, 0, REG_SZ, (LPBYTE)szEnabled, sizeof(WCHAR)); RegCloseKey(hKey); } - PostMessageW(HWND_BROADCAST, WM_THEMECHANGED, 0, 0); + UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); } return S_OK; } @@ -295,20 +324,23 @@ WCHAR szClassBuff[256]; LPCWSTR pszAppName; LPCWSTR pszUseClassList; - HTHEME hTheme; - TRACE("(%p,%s)\n", hwnd, debugstr_w(pszClassList)); - if(!bThemeActive) - return NULL; + HTHEME hTheme = NULL; + TRACE("(%p,%s)", hwnd, debugstr_w(pszClassList)); - pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); - /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ - pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0])); - if(!pszUseClassList) - pszUseClassList = pszClassList; + if(bThemeActive) + { + pszAppName = UXTHEME_GetWindowProperty(hwnd, atSubAppName, szAppBuff, sizeof(szAppBuff)/sizeof(szAppBuff[0])); + /* If SetWindowTheme was used on the window, that overrides the class list passed to this function */ + pszUseClassList = UXTHEME_GetWindowProperty(hwnd, atSubIdList, szClassBuff, sizeof(szClassBuff)/sizeof(szClassBuff[0])); + if(!pszUseClassList) + pszUseClassList = pszClassList; - hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + if (pszUseClassList) + hTheme = MSSTYLES_OpenThemeClass(pszAppName, pszUseClassList); + } if(IsWindow(hwnd)) SetPropW(hwnd, MAKEINTATOMW(atWindowTheme), hTheme); + TRACE(" = %p\n", hTheme); return hTheme; } @@ -338,7 +370,7 @@ if(SUCCEEDED(hr)) hr = UXTHEME_SetWindowProperty(hwnd, atSubIdList, pszSubIdList); if(SUCCEEDED(hr)) - PostMessageW(hwnd, WM_THEMECHANGED, 0, 0); + UXTHEME_broadcast_msg (hwnd, WM_THEMECHANGED); return hr; } @@ -554,7 +586,7 @@ HRESULT hr; TRACE("(%p,%s,%p)\n", hThemeFile, unknown, hWnd); hr = UXTHEME_SetActiveTheme(hThemeFile); - PostMessageW(HWND_BROADCAST, WM_THEMECHANGED, 0, 0); + UXTHEME_broadcast_msg (NULL, WM_THEMECHANGED); return hr; }

19 years, 1 month

[gvg] 17341: Sync to Wine-20050725:

by gvg＠svn.reactos.com

Sync to Wine-20050725: Felix Nawothnig <felix.nawothnig(a)t-online.de> - Fix misuse of UrlCombineW. Mike McCormack <mike(a)codeweavers.com> - Fix -Wpointer-sign warnings. Uwe Bonnes <bon(a)elektron.ikp.physik.tu-darmstadt.de> - URLMonikerImpl_BindToStorage: Don't use a HeapAllocated pointer for other purposes. - URLMonikerImpl_BindToStorage: Escape special characters. Jacek Caban <jack(a)itma.pwr.wroc.pl> - Register protocols. - Better module locking. - Fix handling of pmkContext in CreateURLMoniker. Modified: trunk/reactos/lib/urlmon/Makefile.in Modified: trunk/reactos/lib/urlmon/regsvr.c Added: trunk/reactos/lib/urlmon/rsrc.rc Modified: trunk/reactos/lib/urlmon/sec_mgr.c Modified: trunk/reactos/lib/urlmon/umon.c Modified: trunk/reactos/lib/urlmon/umstream.c Added: trunk/reactos/lib/urlmon/urlmon.inf Modified: trunk/reactos/lib/urlmon/urlmon.xml Modified: trunk/reactos/lib/urlmon/urlmon_main.c Modified: trunk/reactos/lib/urlmon/urlmon_main.h Added: trunk/reactos/w32api/include/advpub.h _____ Modified: trunk/reactos/lib/urlmon/Makefile.in --- trunk/reactos/lib/urlmon/Makefile.in 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/Makefile.in 2005-08-12 18:17:37 UTC (rev 17341) @@ -14,6 +14,8 @@ umstream.c \ urlmon_main.c +RC_SRCS = rsrc.rc + SUBDIRS = tests @MAKE_DLL_RULES@ _____ Modified: trunk/reactos/lib/urlmon/regsvr.c --- trunk/reactos/lib/urlmon/regsvr.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/regsvr.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -20,6 +20,7 @@ #define COM_NO_WINDOWS_H #include <stdarg.h> +#include <stdio.h> #include <string.h> #include "windef.h" @@ -28,6 +29,7 @@ #include "wingdi.h" #include "winreg.h" #include "winerror.h" +#include "advpub.h" #include "objbase.h" @@ -35,6 +37,9 @@ #include "wine/debug.h" +#include "initguid.h" +#include "urlmon_main.h" + WINE_DEFAULT_DEBUG_CHANNEL(urlmon); /* @@ -511,6 +516,48 @@ "urlmon.dll", "Apartment" }, + { &CLSID_CdlProtocol, + "CDL: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_FileProtocol, + "file:, local: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_FtpProtocol, + "ftp: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_GopherProtocol, + "gopher: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_HttpProtocol, + "http: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_HttpsProtocol, + "https: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, + { &CLSID_MkProtocol, + "mk: Asynchronous Pluggable Protocol Handler", + NULL, + "urlmon.dll", + "Apartment" + }, { NULL } /* list terminator */ }; @@ -523,6 +570,58 @@ }; /*********************************************************************** + * register_inf + */ + +#define INF_SET_CLSID(clsid) \ + pse[i].pszName = "CLSID_" #clsid; \ + clsids[i++] = &CLSID_ ## clsid; + +static HRESULT register_inf(BOOL doregister) +{ + HRESULT hres; + HMODULE hAdvpack; + typeof(RegInstall) *pRegInstall; + STRTABLE strtable; + STRENTRY pse[7]; + static CLSID const *clsids[34]; + int i = 0; + + static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0}; + + INF_SET_CLSID(CdlProtocol); + INF_SET_CLSID(FileProtocol); + INF_SET_CLSID(FtpProtocol); + INF_SET_CLSID(GopherProtocol); + INF_SET_CLSID(HttpProtocol); + INF_SET_CLSID(HttpsProtocol); + INF_SET_CLSID(MkProtocol); + + for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) { + pse[i].pszValue = HeapAlloc(GetProcessHeap(), 0, 39); + sprintf(pse[i].pszValue, "{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + clsids[i]->Data1, clsids[i]->Data2, clsids[i]->Data3, clsids[i]->Data4[0], + clsids[i]->Data4[1], clsids[i]->Data4[2], clsids[i]->Data4[3], clsids[i]->Data4[4], + clsids[i]->Data4[5], clsids[i]->Data4[6], clsids[i]->Data4[7]); + } + + strtable.cEntries = sizeof(pse)/sizeof(pse[0]); + strtable.pse = pse; + + hAdvpack = LoadLibraryW(wszAdvpack); + pRegInstall = (typeof(RegInstall)*)GetProcAddress(hAdvpack, "RegInstall"); + + hres = pRegInstall(URLMON_hInstance, doregister ? "RegisterDll" : "UnregisterDll", &strtable); + + for(i=0; i < sizeof(pse)/sizeof(pse[0]); i++) + HeapFree(GetProcessHeap(), 0, pse[i].pszValue); + + return hres; +} + +#undef INF_SET_CLSID + +/********************************************************************** * * DllRegisterServer (URLMON.@) */ HRESULT WINAPI URLMON_DllRegisterServer(void) @@ -534,7 +633,9 @@ hr = register_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = register_interfaces(interface_list); - return hr; + if(FAILED(hr)) + return hr; + return register_inf(TRUE); } /*********************************************************************** @@ -549,5 +650,7 @@ hr = unregister_coclasses(coclass_list); if (SUCCEEDED(hr)) hr = unregister_interfaces(interface_list); - return hr; + if(FAILED(hr)) + return hr; + return register_inf(FALSE); } _____ Copied: trunk/reactos/lib/urlmon/rsrc.rc (from rev 17340, vendor/wine/dlls/urlmon/current/rsrc.rc) Property changes on: trunk/reactos/lib/urlmon/rsrc.rc ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/sec_mgr.c --- trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/sec_mgr.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -43,7 +43,7 @@ const IInternetSecurityManagerVtbl* lpvtbl1; /* VTable relative to the IInternetSecurityManager interface.*/ - ULONG ref; /* reference counter for this object */ + LONG ref; /* reference counter for this object */ } SecManagerImpl; @@ -82,8 +82,6 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - URLMON_LockModule(); - return refCount; } @@ -97,10 +95,9 @@ /* destroy the object if there's no more reference on it */ if (!refCount){ HeapFree(GetProcessHeap(),0,This); + URLMON_UnlockModule(); } - URLMON_UnlockModule(); - return refCount; } @@ -201,6 +198,9 @@ This->ref = 1; *ppobj = This; + + URLMON_LockModule(); + return S_OK; } @@ -210,7 +210,7 @@ */ typedef struct { const IInternetZoneManagerVtbl* lpVtbl; - ULONG ref; + LONG ref; } ZoneMgrImpl; /******************************************************************** @@ -247,8 +247,6 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - URLMON_LockModule(); - return refCount; } @@ -262,10 +260,10 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount + 1); - if(!refCount) + if(!refCount) { HeapFree(GetProcessHeap(), 0, This); - - URLMON_UnlockModule(); + URLMON_UnlockModule(); + } return refCount; } @@ -457,6 +455,8 @@ ret->ref = 1; *ppobj = (IInternetZoneManager*)ret; + URLMON_LockModule(); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/umon.c --- trunk/reactos/lib/urlmon/umon.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/umon.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -51,7 +51,7 @@ typedef struct { const IBindingVtbl *lpVtbl; - ULONG ref; + LONG ref; LPWSTR URLName; @@ -291,7 +291,7 @@ const IMonikerVtbl* lpvtbl; /* VTable relative to the IMoniker interface.*/ - ULONG ref; /* reference counter for this object */ + LONG ref; /* reference counter for this object */ LPOLESTR URLName; /* URL string identified by this URLmoniker */ } URLMonikerImpl; @@ -340,8 +340,6 @@ TRACE("(%p)->(ref before=%lu)\n",This, refCount - 1); - URLMON_LockModule(); - return refCount; } @@ -359,10 +357,10 @@ if (!refCount) { HeapFree(GetProcessHeap(),0,This->URLName); HeapFree(GetProcessHeap(),0,This); + + URLMON_UnlockModule(); } - URLMON_UnlockModule(); - return refCount; } @@ -600,7 +598,7 @@ if(SUCCEEDED(hres)) { WCHAR *urlcopy, *tmpwc; URL_COMPONENTSW url; - WCHAR *host, *path, *user, *pass; + WCHAR *host, *path, *partial_path, *user, *pass; DWORD lensz = sizeof(bind->expected_size); DWORD dwService = 0; BOOL bSuccess; @@ -638,7 +636,7 @@ memset(&url, 0, sizeof(url)); url.dwStructSize = sizeof(url); url.dwSchemeLength = url.dwHostNameLength = url.dwUrlPathLength = url.dwUserNameLength = url.dwPasswordLength = 1; - InternetCrackUrlW(urlcopy, 0, 0, &url); + InternetCrackUrlW(urlcopy, 0, ICU_ESCAPE, &url); host = HeapAlloc(GetProcessHeap(), 0, (url.dwHostNameLength + 1) * sizeof(WCHAR)); memcpy(host, url.lpszHostName, url.dwHostNameLength * sizeof(WCHAR)); host[url.dwHostNameLength] = '\0'; @@ -799,9 +797,9 @@ break; case INTERNET_SCHEME_FILE: - path = bind->URLName + 5; /* Skip the "file:" part */ - if ((path[0] != '/' && path[0] != '\\') || - (path[1] != '/' && path[1] != '\\')) + partial_path = bind->URLName + 5; /* Skip the "file:" part */ + if ((partial_path[0] != '/' && partial_path[0] != '\\') || + (partial_path[1] != '/' && partial_path[1] != '\\')) { hres = E_FAIL; } @@ -809,10 +807,10 @@ { HANDLE h; - path += 2; - if (path[0] == '/' || path[0] == '\\') - ++path; - h = CreateFileW(path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); + partial_path += 2; + if (partial_path[0] == '/' || partial_path[0] == '\\') + ++partial_path; + h = CreateFileW(partial_path, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0 ); if (h == (HANDLE) HFILE_ERROR) { hres = HRESULT_FROM_WIN32(GetLastError()); @@ -1136,7 +1134,7 @@ static HRESULT URLMonikerImpl_Construct(URLMonikerImpl* This, LPCOLESTR lpszLeftURLName, LPCOLESTR lpszURLName) { HRESULT hres; - DWORD sizeStr; + DWORD sizeStr = INTERNET_MAX_URL_LENGTH; TRACE("(%p,%s,%s)\n",This,debugstr_w(lpszLeftURLName),debugstr_w(lpszURL Name)); memset(This, 0, sizeof(*This)); @@ -1170,6 +1168,8 @@ else strcpyW(This->URLName,lpszURLName); + URLMON_LockModule(); + return S_OK; } @@ -1255,11 +1255,12 @@ return E_OUTOFMEMORY; if(pmkContext) { - CLSID clsid; IBindCtx* bind; - IMoniker_GetClassID(pmkContext, &clsid); - if(IsEqualCLSID(&clsid, &CLSID_StdURLMoniker) && SUCCEEDED(CreateBindCtx(0, &bind))) { - URLMonikerImpl_GetDisplayName(pmkContext, bind, NULL, &lefturl); + DWORD dwMksys = 0; + IMoniker_IsSystemMoniker(pmkContext, &dwMksys); + if(dwMksys == MKSYS_URLMONIKER && SUCCEEDED(CreateBindCtx(0, &bind))) { + IMoniker_GetDisplayName(pmkContext, bind, NULL, &lefturl); + TRACE("lefturl = %s\n", debugstr_w(lefturl)); IBindCtx_Release(bind); } } _____ Modified: trunk/reactos/lib/urlmon/umstream.c --- trunk/reactos/lib/urlmon/umstream.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/umstream.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -253,7 +253,8 @@ DWORD dwOrigin, ULARGE_INTEGER* plibNewPosition) { - DWORD pos, newposlo, newposhi; + DWORD pos, newposlo; + LONG newposhi; IUMCacheStream *This = (IUMCacheStream *)iface; @@ -262,7 +263,7 @@ pos = dlibMove.QuadPart; /* FIXME: truncates */ newposhi = 0; newposlo = SetFilePointer( This->handle, pos, &newposhi, dwOrigin ); - if( newposlo == INVALID_SET_FILE_POINTER ) + if( newposlo == INVALID_SET_FILE_POINTER && GetLastError()) return E_FAIL; if (plibNewPosition) _____ Copied: trunk/reactos/lib/urlmon/urlmon.inf (from rev 17340, vendor/wine/dlls/urlmon/current/urlmon.inf) Property changes on: trunk/reactos/lib/urlmon/urlmon.inf ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/lib/urlmon/urlmon.xml --- trunk/reactos/lib/urlmon/urlmon.xml 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/urlmon.xml 2005-08-12 18:17:37 UTC (rev 17341) @@ -23,5 +23,6 @@ <file>umon.c</file> <file>umstream.c</file> <file>urlmon_main.c</file> + <file>rsrc.rc</file> <file>urlmon.spec</file> </module> _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.c --- trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/urlmon_main.c 2005-08-12 18:17:37 UTC (rev 17341) @@ -89,7 +89,7 @@ typedef struct { IClassFactory ITF_IClassFactory; - DWORD ref; + LONG ref; HRESULT (*pfnCreateInstance)(IUnknown *pUnkOuter, LPVOID *ppObj); } IClassFactoryImpl; @@ -125,8 +125,6 @@ static ULONG WINAPI CF_AddRef(LPCLASSFACTORY iface) { IClassFactoryImpl *This = (IClassFactoryImpl *)iface; - URLMON_LockModule(); - return InterlockedIncrement(&This->ref); } @@ -136,11 +134,11 @@ ULONG ref = InterlockedDecrement(&This->ref); - if (ref == 0) - HeapFree(GetProcessHeap(), 0, This); + if (ref == 0) { + HeapFree(GetProcessHeap(), 0, This); + URLMON_UnlockModule(); + } - URLMON_UnlockModule(); - return ref; } @@ -229,10 +227,12 @@ factory->ITF_IClassFactory.lpVtbl = &CF_Vtbl; factory->ref = 1; - factory->pfnCreateInstance = object_creation[i].pfnCreateInstance; *ppv = &(factory->ITF_IClassFactory); + + URLMON_LockModule(); + return S_OK; } _____ Modified: trunk/reactos/lib/urlmon/urlmon_main.h --- trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/lib/urlmon/urlmon_main.h 2005-08-12 18:17:37 UTC (rev 17341) @@ -40,7 +40,7 @@ typedef struct { const IStreamVtbl *lpVtbl; - DWORD ref; + LONG ref; HANDLE handle; BOOL closed; WCHAR *pszFileName; @@ -50,4 +50,13 @@ HRESULT UMCreateStreamOnCacheFile(LPCWSTR pszURL, DWORD dwSize, LPWSTR pszFileName, HANDLE *phfile, IUMCacheStream **ppstr); void UMCloseCacheFileStream(IUMCacheStream *pstr); +DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02); +DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_FtpProtocol, 0x79EAC9E3, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_GopherProtocol, 0x79EAC9E4, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_HttpProtocol, 0x79EAC9E2, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_HttpsProtocol, 0x79EAC9E5, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); +DEFINE_GUID(CLSID_MkProtocol, 0x79EAC9E6, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B); + + #endif /* __WINE_URLMON_MAIN_H */ _____ Added: trunk/reactos/w32api/include/advpub.h --- trunk/reactos/w32api/include/advpub.h 2005-08-12 18:09:06 UTC (rev 17340) +++ trunk/reactos/w32api/include/advpub.h 2005-08-12 18:17:37 UTC (rev 17341) @@ -0,0 +1,77 @@ +/* + * Copyright 2004 Huw D M Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __WINE_ADVPUB_H +#define __WINE_ADVPUB_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _CabInfo { + PSTR pszCab; + PSTR pszInf; + PSTR pszSection; + char szSrcPath[MAX_PATH]; + DWORD dwFlags; +} CABINFO, *PCABINFO; + +typedef struct _StrEntry { + LPSTR pszName; + LPSTR pszValue; +} STRENTRY, *LPSTRENTRY; + +typedef const STRENTRY CSTRENTRY; +typedef CSTRENTRY *LPCSTRENTRY; + +typedef struct _StrTable { + DWORD cEntries; + LPSTRENTRY pse; +} STRTABLE, *LPSTRTABLE; + +typedef const STRTABLE CSTRTABLE; +typedef CSTRTABLE *LPCSTRTABLE; + +/* Flags for RunSetupCommand */ +#define RSC_FLAG_INF 0x00000001 +#define RSC_FLAG_SKIPDISKSPACECHECK 0x00000002 +#define RSC_FLAG_QUIET 0x00000004 +#define RSC_FLAG_NGCONV 0x00000008 +#define RSC_FLAG_UPDHLPDLLS 0x00000010 +#define RSC_FLAG_DELAYREGISTEROCX 0x00000200 +#define RSC_FLAG_SETUPAPI 0x00000400 + +/* Flags for DelNode */ +#define ADN_DEL_IF_EMPTY 0x00000001 +#define ADN_DONT_DEL_SUBDIRS 0x00000002 +#define ADN_DONT_DEL_DIR 0x00000004 + +HRESULT WINAPI RunSetupCommand(HWND hWnd, + LPCSTR szCmdName, LPCSTR szInfSection, LPCSTR szDir, LPCSTR lpszTitle, + HANDLE *phEXE, DWORD dwFlags, LPVOID pvReserved); +HRESULT WINAPI DelNode(LPCSTR pszFileOrDirName, DWORD dwFlags); +DWORD WINAPI NeedRebootInit(VOID); +BOOL WINAPI NeedReboot(DWORD dwRebootCheck); +HRESULT WINAPI RegInstall(HMODULE hm, LPCSTR pszSection, LPCSTRTABLE pstTable); +HRESULT WINAPI GetVersionFromFile(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); +HRESULT WINAPI GetVersionFromFileEx(LPSTR lpszFilename, LPDWORD pdwMSVer, LPDWORD pdwLSVer, BOOL bVersion); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_ADVPUB_H */ Property changes on: trunk/reactos/w32api/include/advpub.h ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native

19 years, 1 month

[gvg] 17340: Sync to Wine-20050725:

by gvg＠svn.reactos.com

Sync to Wine-20050725: Francois Gouget <fgouget(a)free.fr> - Assorted spelling fixes. Mike McCormack <mike(a)codeweavers.com> - gcc 4.0 -Wpointer-sign fixes (Reg* functions). Modified: trunk/reactos/lib/shlwapi/ordinal.c Modified: trunk/reactos/lib/shlwapi/reg.c _____ Modified: trunk/reactos/lib/shlwapi/ordinal.c --- trunk/reactos/lib/shlwapi/ordinal.c 2005-08-12 18:06:58 UTC (rev 17339) +++ trunk/reactos/lib/shlwapi/ordinal.c 2005-08-12 18:09:06 UTC (rev 17340) @@ -139,7 +139,7 @@ The reason for these functions to be there is to provide a wrapper for unicode functions to provide these functions on systems without unicode functions eg. win95/win98. Since we have such functions we just - call these. If running Wine with native DLL's, some late bound calls may + call these. If running Wine with native DLLs, some late bound calls may fail. However, it is better to implement the functions in the forward DLL and recommend the builtin rather than reimplementing the calls here! */ _____ Modified: trunk/reactos/lib/shlwapi/reg.c --- trunk/reactos/lib/shlwapi/reg.c 2005-08-12 18:06:58 UTC (rev 17339) +++ trunk/reactos/lib/shlwapi/reg.c 2005-08-12 18:09:06 UTC (rev 17340) @@ -935,7 +935,7 @@ LONG WINAPI SHRegWriteUSValueW(HUSKEY hUSKey, LPCWSTR pszValue, DWORD dwType, LPVOID pvData, DWORD cbData, DWORD dwFlags) { - LONG dummy; + DWORD dummy; LPSHUSKEY hKey = (LPSHUSKEY)hUSKey; LONG ret = ERROR_SUCCESS;

19 years, 1 month

[gvg] 17339: Sync to Wine-20050725:

by gvg＠svn.reactos.com

Sync to Wine-20050725: Mike McCormack <mike(a)codeweavers.com> - Interlocked LONG* gcc warning fixes. Modified: trunk/reactos/lib/shdocvw/shdocvw.h Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: trunk/reactos/lib/shdocvw/shdocvw.h --- trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-12 18:04:51 UTC (rev 17338) +++ trunk/reactos/lib/shdocvw/shdocvw.h 2005-08-12 18:06:58 UTC (rev 17339) @@ -42,7 +42,7 @@ { /* IUnknown fields */ const IClassFactoryVtbl *lpVtbl; - DWORD ref; + LONG ref; } IClassFactoryImpl; extern IClassFactoryImpl SHDOCVW_ClassFactory; @@ -55,7 +55,7 @@ { /* IUnknown fields */ const IOleObjectVtbl *lpVtbl; - DWORD ref; + LONG ref; } IOleObjectImpl; extern IOleObjectImpl SHDOCVW_OleObject; @@ -67,7 +67,7 @@ { /* IUnknown fields */ const IWebBrowserVtbl *lpVtbl; - DWORD ref; + LONG ref; } IWebBrowserImpl; extern IWebBrowserImpl SHDOCVW_WebBrowser; @@ -80,7 +80,7 @@ { /* IUnknown fields */ const IProvideClassInfoVtbl *lpVtbl; - DWORD ref; + LONG ref; } IProvideClassInfoImpl; extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo; @@ -93,7 +93,7 @@ { /* IUnknown fields */ const IProvideClassInfo2Vtbl *lpVtbl; - DWORD ref; + LONG ref; } IProvideClassInfo2Impl; extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2; @@ -106,7 +106,7 @@ { /* IUnknown fields */ const IPersistStorageVtbl *lpVtbl; - DWORD ref; + LONG ref; } IPersistStorageImpl; extern IPersistStorageImpl SHDOCVW_PersistStorage; @@ -119,7 +119,7 @@ { /* IUnknown fields */ const IPersistStreamInitVtbl *lpVtbl; - DWORD ref; + LONG ref; } IPersistStreamInitImpl; extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit; @@ -132,7 +132,7 @@ { /* IUnknown fields */ const IQuickActivateVtbl *lpVtbl; - DWORD ref; + LONG ref; } IQuickActivateImpl; extern IQuickActivateImpl SHDOCVW_QuickActivate; @@ -145,7 +145,7 @@ { /* IUnknown fields */ const IConnectionPointContainerVtbl *lpVtbl; - DWORD ref; + LONG ref; } IConnectionPointContainerImpl; extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer; @@ -158,7 +158,7 @@ { /* IUnknown fields */ const IConnectionPointVtbl *lpVtbl; - DWORD ref; + LONG ref; } IConnectionPointImpl; /********************************************************************** _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-12 18:04:51 UTC (rev 17338) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-08-12 18:06:58 UTC (rev 17339) @@ -152,7 +152,7 @@ */ typedef struct _IBindStatusCallbackImpl { const IBindStatusCallbackVtbl *vtbl; - DWORD ref; + LONG ref; HWND hDialog; BOOL *pbCancelled; } IBindStatusCallbackImpl;

19 years, 1 month

← Newer
1
...
23
24
25
26
27
28
29
...
67
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 August 2005