Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[fireball] 23330: Add message's spy into user32.dll. In order to enable, just uncomment #define YDEBUG in spy.c file and optionally set the messages you want to include / exclude in the registry (HKCU\ReactOS\Debug). When it's turned off (YDEBUG is not defined), it doesn't provide any slow-down to the system. DefWindowProc() functions are slightly refactored to have one exit point instead of numerous returns in a switch-case statement. FIXME: maybe DPRINTs will be changed to DbgPrint because it'

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jul 28 17:52:23 2006 New Revision: 23330 URL: http://svn.reactos.org/svn/reactos?rev=23330&view=rev Log: Add message's spy into user32.dll. In order to enable, just uncomment #define YDEBUG in spy.c file and optionally set the messages you want to include / exclude in the registry (HKCU\ReactOS\Debug). When it's turned off (YDEBUG is not defined), it doesn't provide any slow-down to the system. DefWindowProc() functions are slightly refactored to have one exit point instead of numerous returns in a switch-case statement. FIXME: maybe DPRINTs will be changed to DbgPrint because it's pointless to display path to the spy.c file everytime. Added: trunk/reactos/dll/win32/user32/windows/spy.c Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/misc/dllmain.c trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/dll/win32/user32/windows/defwnd.c trunk/reactos/dll/win32/user32/windows/mdi.c trunk/reactos/dll/win32/user32/windows/message.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… Modified: trunk/reactos/dll/win32/user32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/dllm… Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… Modified: trunk/reactos/dll/win32/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… Modified: trunk/reactos/dll/win32/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… Added: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s…

18 years, 1 month

[frik85] 23329: ReactOS Status Report (July 2006) html version

by frik85＠svn.reactos.org

Author: frik85 Date: Fri Jul 28 12:17:06 2006 New Revision: 23329 URL: http://svn.reactos.org/svn/reactos?rev=23329&view=rev Log: ReactOS Status Report (July 2006) html version Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.html Added: trunk/press-media/Status Reports/July 2006/ReactOS status report.html URL: http://svn.reactos.org/svn/reactos/trunk/press-media/Status%20Reports/July%… ============================================================================== --- trunk/press-media/Status Reports/July 2006/ReactOS status report.html (added) +++ trunk/press-media/Status Reports/July 2006/ReactOS status report.html Fri Jul 28 12:17:06 2006 @@ -1,0 +1,227 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" +"http://www.w3.org/TR/html4/loose.dtd"> +<html> +<head> +<title>ReactOS Status Report for July 2006</title> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +</head> + +<body> +<h1>ReactOS Status Report for July 2006 </h1> +<p> </p> +<h2>Content:</h2> +<ol> + <li><strong><a href="#1">Preface</a></strong></li> + <li><strong><a href="#2">Legal situation</a></strong></li> + <li><strong><a href="#3">General Status + </a> </strong> + <ul> + <li><a href="#31">Networking</a></li> + <li><a href="#32"> Plug and Play</a></li> + <li><a href="#33"> USB</a></li> + <li><a href="#34">Build System Changes</a></li> + <li><a href="#35"> DirectX and OpenGL</a></li> + <li><a href="#36"> Website, Translation and Internationalization Support </a></li> + </ul> + </li> +<li><a href="#4"><strong>ReactOS participation in Google Summer Of Code</strong></a></li> +<li><strong><a href="#5">Developer Status +</a></strong> + <ul> + <li><a href="#51"> Johannes Anderwald</a></li> + <li><a href="#52"> Maarten Bosma</a></li> + <li> <a href="#53">Klemens Friedl</a></li> + <li> <a href="#54">Alex Ionescu</a></li> + <li> <a href="#55">Ged Murphy</a></li> + <li> <a href="#56">Andrew Munger</a></li> + <li> <a href="#57">Magnus Olsen</a></li> + <li><a href="#58">HervÃ© Poussineau</a></li> + <li><a href="#59">James Tabor</a></li> + <li><a href="#510">Brandon Turner</a></li> + <li><a href="#511">Aleksey Bragin</a></li> + </ul> +</li> +</ol> +<p>  </p> +<h2><a name="1"></a>Preface: </h2> +<p>This is the 2 nd issue of the ReactOS Status Report, and this is the first one produced by me, Aleksey Bragin being in a Project Coordinator's position. In this Status Report I tried to provide the most detailed coverage of the various and most interesting aspects of ReactOS project progress since January, 2006 till the current time.</p> +<p>ReactOS team is also thinking for the future of the project, how people could benefit from the project. We do not want to disclose many details now, but there are some very interesting ideas, particularly in area of virtualization and embedded systems. We will release more information as soon as the ideas are ready, so stay tuned!</p> +<p>For information about joining or donating to the ReactOS Project please visit main web-site <a href="http://www.reactos.org/">http://www.reactos.org </a> and ReactOS Wiki <a href="http://www.reactos.org/wiki/index.php/Main_Page">http://www.reactos.org/wiki/index.php/Main_Page </a></p> +<p>  </p> +<h2><a name="2"></a>Legal situation: </h2> +<p>Due to previous internal problems involving some ReactOS developers who were unsure in the cleanness of the ReactOS's code base, it was decided to conduct a full audit of the source code for legal matters. So far, 93% of code is audited already and no suspicious code was found, however many bugs were uncovered and fixed thanks to it. </p> +<p>Maybe the whole issue was triggered by a small flamewar between programmers, who wish other projects (like Wine) to succeed instead ReactOS. </p> +<p>The rules for any patch which enters the repository have been also made to be stricter: </p> +<ol> + <li>Anonymous patches are not accepted </li> + <li>Every code patch must contain either a reference to a publicly available and well-known documentation and/or to a test-case, demonstrating correctness of the patch </li> + <li>Patches whose cleanliness are in doubt will be rejected </li> +</ol> +<p>Upon the finish of the audit and, if code with unknown origin will be found, it will be removed from the repository, and rewritten by a developer who has not seen this code (some 3 rd -party developer) based on the created during auditing process information. </p> +<p>Not only it gives a way to be sure in a good future of the project, without any legal fears, but it also presents a whole new concept of a regression-tested development, which certainly results in better compatibility.</p> +<p>  </p> +<h2><a name="3"></a>General Status: </h2> +<p>By mid of July 2006 the ReactOS Project most recent released version is 0.3-rc1 of the ReactOS System. </p> +<p>The current ReactOS 0.3.0 TODO list is located at: <br> +<a href="http://www.reactos.org/wiki/index.php/0.3.x/0.3.0">http://www.reactos.org/wiki/index.php/0.3.x/0.3.0 </a></p> +<p>The list of planned features for the 0.3.x development line is located at: <br> +<a href="http://www.reactos.org/wiki/index.php/0.3.x">http://www.reactos.org/wiki/index.php/0.3.x </a> </p> +<p>However, the most advanced and âbleeding-edgeâ changes are located in trunk. With all the changes done during this period of time, we reached a level of compatibility we never had before. ReactOS website screenshots and Support Database speak for themselves, but what is not yet included there is, for example, a nice Google Picasa running under ReactOS without any major bugs, and a lot of supported drivers which could not work before due to serious mistakes in Native API implementation.</p> +<p> </p> +<p><strong>Besides of this, it's possible to classify progress by some ongoing subprojects for the overall project: </strong></p> +<p>  </p> +<h3><a name="31"></a>Networking: </h3> +<p>Mainly there are bugfixes and small improvements into the networking, making it working better. Despite the state of networking is still not mature, a lot of applications already work â FireFox, mIRC, Miranda (with some glitches), FTP apps. </p> +<p>Other major achievements are network cards support, and easier installation and setting up: thanks to Herve Poussineau's work it is now possible to install network card drivers, even on a LiveCD without necessary rebooting (however TCP/IP stack and NDIS await improvement to not require a reboot too). This gives a chance for more users to try and test ReactOS on their PCs. </p> +<p>Configuration is made easy by a working Control Panel applet, which removes the need to change registry in order to setup your IP and gateway's addresses, now you can do it in a similar to Windows' dialog. </p> +<p>  </p> +<h3><a name="32"></a>Plug and Play: </h3> +<p>There are really a lot of good changes into Plug and Play, mainly improving 3 rd -party drivers support and ease of installing drivers: no more hacking with copying .sys and .dll files â just point the âNew Hardware Foundâ wizard to the directory where you have your driver, and it will install them for you! </p> +<p>  </p> +<h3><a name="33"></a>USB: </h3> +<p>USB development was put on hold during this period; it's going to be restarted in the second half of 2006. </p> +<p>  </p> +<h3><a name="34"></a>Build System Changes: </h3> +<p>RBuild is further improved, especially its MSVC-backend, allowing to generate project files more and more closer to the point when you can just open the solution in Visual C++ Express and click âBuildâ. </p> +<p>ReactOS also utilizes a BuildBot now (instead of an unmaintained and unfinished CIS) â it greatly reduces trunk breakage problems, and automatically provides per-revision ISOs available for download. And thanks to scalability of a BuildBot, we are able to utilize several PCs for parallel building different revisions. Thanks goes to Christoph and Magnus for hosting the buildslaves and the buildmaster, and to Aleksey for configuring it. </p> +<p>You can see it live at <a href="http://reactos.dyndns.org:8010/">http://reactos.dyndns.org:8010</a> . </p> +<p>  </p> +<h3><a name="35"></a>DirectX and OpenGL: </h3> +<p>Magnus Olsen works on DirectX support in ReactOS, and he provided an interesting plan of work on DX-support, which you can read below. </p> +<p>OpenGL support currently regressed due to changes and fixes in the kernel, it's estimated to be back within the coming months. </p> +<p>  </p> +<h3><a name="36"></a>Website, Translation and Internationalization Support: </h3> +<p>Klemens Friedl expanded and improved a lot of the reactos.org website, and especially the RosCMS system and its interface for translators. The work on translating the website is going on, and the list of supported languages grows. You can read more about the website's changes in Klemens' Developer Status section below. </p> +<p>Also, we are still looking for a good candidate for ReactOS Weekly Newsletter, though Ravelo is already preparing a new issue in the meanwhile. </p> +<p><strong><em>  </em></strong></p> +<h2><a name="4"></a>ReactOS participation in Google Summer Of Code:</h2> +<p>First of all, I would like to thank Google a lot for their effort of supporting FOSS community by providing such a beautiful thing as Summer Of Code. </p> +<p>ReactOS was approved for participation in SoC. We were given 4 project slots, however during midterm evaluation, we had to set unsatisfactory mark to 2 students, because they didn't complete even the initial phase of the project, leaving currently two projects: Remote Desktop client application by Michele Cicciotti, which is the best moving project, it already has current progress in ReactOS SVN repository, and Clipboard Server API implementation, which is progressing slower than Remote Desktop client, however there is progress and student's will to finish the project. </p> +<p>These are very valuable projects not only for ReactOS, but for users too. So we wish our best luck to those students to complete projects in time. </p> +<p><strong>  </strong></p> +<h2><a name="5"></a>Developer Status: </h2> +<p>Individual project developers' todo-lists are presented below. Not all active developers are listed here, because some of them were unable to provide the information on time. For further information as to what projects each developer is working on please watch ros-dev mailing list, visit: <a href="http://www.reactos.org/wiki/index.php/People_of_ReactOS">http://www.reactos.org/wiki/index.php/People_of_ReactOS</a> and come to irc channel #reactos. </p> +<p>  </p> +<h3><a name="51"></a>Johannes Anderwald: </h3> +<p>Some small fixes in user32 and win32k, reducing number of failures in wine regression tests. </p> +<p>  </p> +<h3><a name="52"></a>Maarten Bosma: </h3> +<p>I am planning to start again with syncing cache manager branch to the new NDK. And then try to make my trim function work. After that I will try to make the package manager at least usable as downloader. </p> +<p>  </p> +<h3><a name="53"></a>Klemens Friedl: </h3> +<p>I have been working on the Compatibility Database (11/2005 to 06/2006) and some RosCMS improvements. <br> +I spend a lot of time on RSDB; it it is more than twice as large as RosCMS, circa 250 script files where as RosCMS consists of about 100 script files. </p> +<p>The Compatibility Database is almost finished, I have fixed a lot of small glitches in the beta phase and as soon as ReactOS 0.3 release goes on air, I think we can say that the Compatibility Database is in gold status. </p> +<p>Our website has been translated to 15 different languages from German, French to Chinese, Lithuanian, etc. <br> +About active 50 translators have worked with RosCMS and I got a lot of positive respond and some really good technical criticism/suggestions, which I took as a base for further improvements.<br> +I want to thank all translators for take part and keep the translations up-to-date. </p> +<p>Website Status: <a href="http://www.reactos.org/roscms/?page=webstatus">http://www.reactos.org/roscms/?page=webstatus </a></p> +<p>I want to work on my SearchLight app and hope that it will be useful (in future) for ReactOS (similar to Beagle for Gnome). </p> +<p>I have talked with Magnus about a ReactOS PE first step setup (LiveCD with Ram-Drive). It would be possible to revamp our old Ram-Drive driver code and use it for storing the registry settings, to achieve a Vista like setup feeling: </p> +<p>Boot into LiveCD ReactOS, GUI setup (first+second step combined; and optional old-style first step setup for experts / low end PCs). <br> +Then reboot into ReactOS installed version, so only one reboot required which sounds cool, even Vista needs 2+ reboots with Vista PE setup. </p> +<p>  </p> +<h3><a name="54"></a>Alex Ionescu: </h3> +<p>Mainly the work is concentrated in the kernel. A few interesting changes: </p> +<ul> + <li>Object Manager proper implementation. Provides: great speedup, a compatible implementation of exported functions. Based on: Kernel-mode tests of exported APIs and publicly available books and documentation. Right now Object Manager's rewrite is done, practically all bugs are gone, so this part of kernel is more-or-less solid, and can be counted at. </li> + <li> Project and Thread Manager fix. Provides: Proper implementation, fixes to bugs due to broken Ob model. Based on: Books (Windows Internals), test cases ran on Windows 2003 SP1. </li> + <li>I/O manager improvements: PnP and Io manager are now separated, and there are a bunch of improvements and new features added to Io. The amount of fixed errors and incorrect behavior is so big that it worth looking at Svn server logs. </li> +</ul> +<p>Also, in the meanwhile there were other improvements, like creating a compatible heap manager implementation in Kernel32. Not only it reduces failures of Wine regression tests to zero, but also provides a better implementation leading to speed improvement. </p> +<p>  </p> +<h3><a name="55"></a>Ged Murphy: </h3> +<p>Over the past 6 months, I've mainly been working on the audit, mostly reviewing and unlocking code. </p> +<p>Have worked on: </p> +<ul> + <li>Imagesoft </li> + <li>Rewrote the ReactOS Service Manager </li> + <li>Added a screenshot app </li> + <li>Cleaning up of control panel applets </li> + <li>Wine syncs </li> +</ul> +<p>Future work: </p> +<ul> + <li>Restart work on imagesoft </li> + <li>Continue work on control panel applets </li> + <li>Possibly restart work on the explorer interface design </li> + <li>Wine syncs </li> +</ul> +<p>  </p> +<h3><a name="56"></a>Andrew Munger: </h3> +<ol> + <li>Testing for 0.3.0. Testing on my rosbox and qemu, reading bugs. </li> + <li>Wasting my time working on a win32 console irc client. </li> +</ol> +<p>  </p> +<h3><a name="57"></a>Magnus Olsen: </h3> +<p>What I have been working on is DirectX support and still do time to time and will continue on it: what I am planning is getting a DirectX HAL interface working partly this year. That is basically all what I plan for this year with DirectX support. I plan to fix as much bugs as I can there and there. Not so much new stuff will be implemented from my side. I think current ReactOS need bugfixing before adding new API if we can concentrate on fixing as much bugs as possible this year </p> +<p>ReactOS will come to a real usable state this year.</p> +<p>What I have done the last 6 month is hard to say without looking at svn log: </p> +<ol> + <li> Fixing bugs there and there </li> + <li>Adding some new stuff </li> + <li>Developing dx draw and dx draw/d3d hal interface. </li> + <li>Helping other devs when they need a extra hand </li> +</ol> +<p>Planning for DirectX developer for 6 month </p> +<ol> + <li>DirectDraw hal interface </li> + <li>Getting more work on curent DirectDraw </li> + <li>Fixing devenum and dxdiagn so they emulate right in Windows and make them more like windows version of them, for moment it is raw port from Wine. </li> +</ol> +<p>Planing other stuff for 6 month </p> +<ol> + <li> Fixing CRT and RTL bugs some of them </li> + <li>Fixing some graphic bugs in win32k and some other bugs </li> + <li>Fixing some other bugs in ReactOS, jumping between part as I do and try to figure out how to fix other bugs </li> + <li>Trying to care a bit more about bugzilla bug reports and solve them. </li> +</ol> +<p>  </p> +<h3><a name="58"></a>HervÃ© Poussineau: </h3> +<p>Done between 2006/01/01 and 2006/06/30: </p> +<ul> + <li>USB: allow more than one controller and support hubs </li> + <li>Green: move green driver to a working state </li> + <li>Recyclebin: Add static library to manage it. Still not used yet </li> + <li>Setupapi/newdev: Lots of new functions implemented, select best driver when several matches, can provide a cdrom during installation... main goal was to be able to install drivers from a custom directory </li> + <li>Fix BSOD in IntPrepareDriver </li> + <li>MSVC backend: take care of "If" conditions in rbuild files to include files, define dependancies between projects </li> + <li>services.exe Implement StartService, which now starts pnpmgr during 2 nd stage setup. So serial mouse is usable in 2nd stage setup and USB mouse at 3 rd boot </li> + <li>And finally, very important, fix the calculation of loss packets percentage in ping.exe :) </li> +</ul> +<p>To do during next months: </p> +<ul> + <li>mostly fixes in pnp (kernel part and setupapi/newdev/class installers) </li> + <li>fix installation of vmware drivers (mostly mouse) => work on i8042prt </li> + <li>other unplanned things :) </li> +</ul> +<p>  </p> +<h3><a name="59"></a>James Tabor: </h3> +<p>Improvements to User32 and Win32k, making ReactOS's internal elements to work correctly (like menu, scrolls, etc). </p> +<p>  </p> +<h3><a name="510"></a>Brandon Turner: </h3> +<p>I don't have much on my plate. I don't think I have done anything notable in the last 6 months. I plan implementing multiline 'if' in cmd.exe and anything else needed to allow wineimport.cmd to run in ReactOS. </p> +<p>  </p> +<h3><a name="511"></a>Aleksey Bragin: </h3> +<p>Some of things I did since 1 st of Jan, 2006: </p> +<ul> + <li>Code auditing </li> + <li>Development (with the help and agreement of all developers of our team) and enforcing new coding style rules to the codebase (still in progress, the codebase is huge) </li> + <li>Starting to remove âmagicâ status from Wine syncs </li> + <li>Working on fixing bugs detected by Wine regression tests </li> + <li>Introduced kernel-mode regression tests framework, adapted old tests and created new ones for the kernel, which allows us to test and implement the same behavior for kernel internals </li> + <li>Improving some parts of User32.dll (together with James Tabor) </li> + <li>Headers updating </li> + <li>Small cleanups in kernel32 and win32k </li> + <li>Changing user32 to a FIXME/TRACE/ERR debug messaging system compatible with Wine (provides a lot easier way to tracing problems and finding bugs in different parts of the OS) </li> + <li>Winetests updating </li> + <li>Some improvements to RBuild's MSVC backend </li> + <li>Some work on supporting MSVC compiler </li> + <li>Translations of various ReactOS modules to Russian language </li> + <li>Wine autosyncing (together and mostly thanks to Herve Poussineau's work) </li> +</ul> +<p>  </p> +<p><strong>Non-development related improvements are described in the other sections of this issue of Status Report. </strong></p> +</body> +</html>

18 years, 1 month

[ion] 23328: - Mega whammy jammy fix commit: - Fix bootcd by fixing some bugs in CDFS (same as in VFAT). - Fix Broken Installers and other I/O programs that couldn't, for example, create temporary directories. - Fix Firefox installers and other apps crashing due to a bug in NtSetInformationFile. - Fix File Objects being referenced twice resulting in IRP_MJ_CLOSE/CLEANUP never being sent and several memory leaks. - Fix File Object Lock being incorrectly created and then misused by mm/section code

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 28 02:26:40 2006 New Revision: 23328 URL: http://svn.reactos.org/svn/reactos?rev=23328&view=rev Log: - Mega whammy jammy fix commit: - Fix bootcd by fixing some bugs in CDFS (same as in VFAT). - Fix Broken Installers and other I/O programs that couldn't, for example, create temporary directories. - Fix Firefox installers and other apps crashing due to a bug in NtSetInformationFile. - Fix File Objects being referenced twice resulting in IRP_MJ_CLOSE/CLEANUP never being sent and several memory leaks. - Fix File Object Lock being incorrectly created and then misused by mm/section code. - Fix creation of File Object before setting up the IRP, to properly cleanup during failures. - Add failure code if ObCreateObject fails. Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c Fri Jul 28 02:26:40 2006 @@ -152,16 +152,16 @@ ASSERT(Fcb != NULL); NameLength = wcslen(Fcb->PathName) * sizeof(WCHAR); - if (*BufferLength < sizeof(FILE_NAME_INFORMATION) + NameLength) + NameInfo->FileNameLength = NameLength; + if (*BufferLength < (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + NameLength)) return STATUS_BUFFER_OVERFLOW; - NameInfo->FileNameLength = NameLength; RtlCopyMemory(NameInfo->FileName, Fcb->PathName, NameLength + sizeof(WCHAR)); *BufferLength -= - (sizeof(FILE_NAME_INFORMATION) + NameLength + sizeof(WCHAR)); + (FIELD_OFFSET(FILE_NAME_INFORMATION, FileName) + NameLength); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Jul 28 02:26:40 2006 @@ -9,10 +9,7 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Io: -// - Fix double-reference in IopCreateFile. // - See why queueing IRPs and cancelling them causes crashes. -// - Find out why 7zip can't create temporary folders due to deferred I/O -// completion in IopParseDevice when creating a new File Object. // - Add SEH to some places where it's missing (MDLs, etc) (iofunc). // - Add a generic Cleanup/Exception Routine (iofunc). // - Add another parameter to IopCleanupFailedIrp. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 28 02:26:40 2006 @@ -69,7 +69,12 @@ /* Reference the DO */ Status = IopReferenceDeviceObject(OriginalDeviceObject); - if (!NT_SUCCESS(Status)) return Status; + if (!NT_SUCCESS(Status)) + { + /* We failed, return status */ + OpenPacket->FinalStatus = Status; + return Status; + } /* Map the generic mask and set the new mapping in the access state */ RtlMapGenericMask(&AccessState->RemainingDesiredAccess, @@ -134,6 +139,85 @@ DeviceObject = IoGetAttachedDevice(DeviceObject); } } + + /* Allocate the IRP */ + Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); + if (!Irp) + { + /* Dereference the device and VPB, then fail */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + if (Vpb) IopDereferenceVpb(Vpb); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Now set the IRP data */ + Irp->RequestorMode = AccessMode; + Irp->Flags = IRP_CREATE_OPERATION | + IRP_SYNCHRONOUS_API | + IRP_DEFER_IO_COMPLETION; + Irp->Tail.Overlay.Thread = PsGetCurrentThread(); + Irp->UserIosb = &IoStatusBlock; + Irp->MdlAddress = NULL; + Irp->PendingReturned = FALSE; + Irp->UserEvent = NULL; + Irp->Cancel = FALSE; + Irp->CancelRoutine = NULL; + Irp->Tail.Overlay.AuxiliaryBuffer = NULL; + + /* Setup the security context */ + SecurityContext.SecurityQos = SecurityQos; + SecurityContext.AccessState = AccessState; + SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; + SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; + + /* Get the I/O Stack location */ + StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); + StackLoc->Control = 0; + + /* Check what kind of file this is */ + switch (OpenPacket->CreateFileType) + { + /* Normal file */ + case CreateFileTypeNone: + + /* Set the major function and EA Length */ + StackLoc->MajorFunction = IRP_MJ_CREATE; + StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; + + /* Set the flags */ + StackLoc->Flags = OpenPacket->Options; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? + SL_CASE_SENSITIVE: 0; + break; + + /* Named pipe */ + case CreateFileTypeNamedPipe: + + /* Set the named pipe MJ and set the parameters */ + StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; + StackLoc->Parameters.CreatePipe.Parameters = + OpenPacket->MailslotOrPipeParameters; + break; + + /* Mailslot */ + case CreateFileTypeMailslot: + + /* Set the mailslot MJ and set the parameters */ + StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; + StackLoc->Parameters.CreateMailslot.Parameters = + OpenPacket->MailslotOrPipeParameters; + break; + } + + /* Set the common data */ + Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; + Irp->AssociatedIrp.SystemBuffer = OpenPacket->EaBuffer; + StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | + (OpenPacket->CreateOptions & + 0xFFFFFF); + StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; + StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; + StackLoc->Parameters.Create.SecurityContext = &SecurityContext; /* Check if we really need to create an object */ if (!UseDummyFile) @@ -153,6 +237,21 @@ 0, 0, (PVOID*)&FileObject); + if (!NT_SUCCESS(Status)) + { + /* Create failed, free the IRP */ + IoFreeIrp(Irp); + + /* Dereference the device and VPB */ + IopDereferenceDeviceObject(DeviceObject, FALSE); + if (Vpb) IopDereferenceVpb(Vpb); + + /* We failed, return status */ + OpenPacket->FinalStatus = Status; + return Status; + } + + /* Clear the file object */ RtlZeroMemory(FileObject, sizeof(FILE_OBJECT)); /* Check if this is Synch I/O */ @@ -170,6 +269,13 @@ } } + /* Check if this is synch I/O */ + if (FileObject->Flags & FO_SYNCHRONOUS_IO) + { + /* Initialize the event. FIXME: Should be FALSE */ + KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, FALSE); + } + /* Check if the caller requested no intermediate buffering */ if (OpenPacket->CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) { @@ -226,94 +332,9 @@ FileObject->Flags |= FO_OPENED_CASE_SENSITIVE; } - /* Setup the security context */ - SecurityContext.SecurityQos = SecurityQos; - SecurityContext.AccessState = AccessState; - SecurityContext.DesiredAccess = AccessState->RemainingDesiredAccess; - SecurityContext.FullCreateOptions = OpenPacket->CreateOptions; - - /* Check if this is synch I/O */ - if (FileObject->Flags & FO_SYNCHRONOUS_IO) - { - /* Initialize the event */ - KeInitializeEvent(&FileObject->Lock, SynchronizationEvent, TRUE); - } - - /* Allocate the IRP */ - Irp = IoAllocateIrp(DeviceObject->StackSize, TRUE); - if (!Irp) - { - /* Dereference the device and VPB, then fail */ - IopDereferenceDeviceObject(DeviceObject, FALSE); - if (Vpb) IopDereferenceVpb(Vpb); - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Now set the IRP data */ + /* Now set the file object */ Irp->Tail.Overlay.OriginalFileObject = FileObject; - Irp->RequestorMode = AccessMode; - Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API | - IRP_DEFER_IO_COMPLETION; - Irp->Tail.Overlay.Thread = PsGetCurrentThread(); - Irp->UserEvent = &FileObject->Event; - Irp->UserIosb = &IoStatusBlock; - Irp->MdlAddress = NULL; - Irp->PendingReturned = FALSE; - Irp->UserEvent = NULL; - Irp->Cancel = FALSE; - Irp->CancelRoutine = NULL; - Irp->Tail.Overlay.AuxiliaryBuffer = NULL; - - /* Get the I/O Stack location */ - StackLoc = (PEXTENDED_IO_STACK_LOCATION)IoGetNextIrpStackLocation(Irp); - StackLoc->Control = 0; StackLoc->FileObject = FileObject; - - /* Check what kind of file this is */ - switch (OpenPacket->CreateFileType) - { - /* Normal file */ - case CreateFileTypeNone: - - /* Set the major function and EA Length */ - StackLoc->MajorFunction = IRP_MJ_CREATE; - StackLoc->Parameters.Create.EaLength = OpenPacket->EaLength; - - /* Set the flags */ - StackLoc->Flags = OpenPacket->Options; - StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? - SL_CASE_SENSITIVE: 0; - break; - - /* Named pipe */ - case CreateFileTypeNamedPipe: - - /* Set the named pipe MJ and set the parameters */ - StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = - OpenPacket->MailslotOrPipeParameters; - break; - - /* Mailslot */ - case CreateFileTypeMailslot: - - /* Set the mailslot MJ and set the parameters */ - StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = - OpenPacket->MailslotOrPipeParameters; - break; - } - - /* Set the common data */ - Irp->Overlay.AllocationSize = OpenPacket->AllocationSize; - Irp->AssociatedIrp.SystemBuffer =OpenPacket->EaBuffer; - StackLoc->Parameters.Create.Options = (OpenPacket->Disposition << 24) | - (OpenPacket->CreateOptions & - 0xFFFFFF); - StackLoc->Parameters.Create.FileAttributes = OpenPacket->FileAttributes; - StackLoc->Parameters.Create.ShareAccess = OpenPacket->ShareAccess; - StackLoc->Parameters.Create.SecurityContext = &SecurityContext; /* Check if the file object has a name */ if (RemainingName->Length) @@ -347,9 +368,6 @@ /* Copy the name */ RtlCopyUnicodeString(&FileObject->FileName, RemainingName); - /* Reference the file object */ - ObReferenceObject(FileObject); - /* Initialize the File Object event and set the FO */ KeInitializeEvent(&FileObject->Event, NotificationEvent, FALSE); OpenPacket->FileObject = FileObject; @@ -373,6 +391,7 @@ { /* We'll have to complete it ourselves */ ASSERT(!Irp->PendingReturned); + ASSERT(!Irp->MdlAddress ); /* Completion happens at APC_LEVEL */ KeRaiseIrql(APC_LEVEL, &OldIrql); @@ -385,8 +404,8 @@ FileObject->Event.Header.SignalState = 1; /* Now that we've signaled the events, de-associate the IRP */ - RemoveEntryList(&Irp->ThreadListEntry); - InitializeListHead(&Irp->ThreadListEntry); + //RemoveEntryList(&Irp->ThreadListEntry); + //InitializeListHead(&Irp->ThreadListEntry); /* Check if the IRP had an input buffer */ if ((Irp->Flags & IRP_BUFFERED_IO) && Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c Fri Jul 28 02:26:40 2006 @@ -2159,7 +2159,7 @@ if (LocalEvent) { /* Then to a non-alertable wait */ - Status = KeWaitForSingleObject(&Event, + Status = KeWaitForSingleObject(Event, Executive, PreviousMode, FALSE, Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c (original) +++ trunk/reactos/ntoskrnl/mm/section.c Fri Jul 28 02:26:40 2006 @@ -155,7 +155,8 @@ static NTSTATUS MmspWaitForFileLock(PFILE_OBJECT File) { - return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); + return STATUS_SUCCESS; + //return KeWaitForSingleObject(&File->Lock, 0, KernelMode, FALSE, NULL); } @@ -2476,7 +2477,7 @@ TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); ObDereferenceObject(Section); ObDereferenceObject(FileObject); return(STATUS_NO_MEMORY); @@ -2531,7 +2532,7 @@ Section->FileObject = FileObject; Section->MaximumSize = MaximumSize; CcRosReferenceCache(FileObject); - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(STATUS_SUCCESS); } @@ -3362,7 +3363,7 @@ } Section->FileObject = FileObject; CcRosReferenceCache(FileObject); - KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); + //KeSetEvent((PVOID)&FileObject->Lock, IO_NO_INCREMENT, FALSE); *SectionObject = Section; return(Status); }

18 years, 1 month

[fireball] 23327: Improve a few headers by adding missing definitions and structures (taken from Wine). Versioning might not be correct.

by fireball＠svn.reactos.org

Author: fireball Date: Fri Jul 28 00:34:04 2006 New Revision: 23327 URL: http://svn.reactos.org/svn/reactos?rev=23327&view=rev Log: Improve a few headers by adding missing definitions and structures (taken from Wine). Versioning might not be correct. Modified: trunk/reactos/include/psdk/commctrl.h trunk/reactos/include/psdk/prsht.h trunk/reactos/include/psdk/richedit.h Modified: trunk/reactos/include/psdk/commctrl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/commctrl.h?re… ============================================================================== --- trunk/reactos/include/psdk/commctrl.h (original) +++ trunk/reactos/include/psdk/commctrl.h Fri Jul 28 00:34:04 2006 @@ -631,6 +631,15 @@ #define TB_MAPACCELERATORW (WM_USER+90) #define TB_GETSTRINGW (WM_USER+91) #define TB_GETSTRINGA (WM_USER+92) + +/* undocumented messages in Toolbar */ +#define TB_UNKWN45D (WM_USER+93) +#define TB_UNKWN45E (WM_USER+94) +#define TB_UNKWN460 (WM_USER+96) +#define TB_UNKWN462 (WM_USER+98) +#define TB_UNKWN463 (WM_USER+99) +#define TB_UNKWN464 (WM_USER+100) + #define TB_SETCOLORSCHEME CCM_SETCOLORSCHEME #define TB_GETCOLORSCHEME CCM_GETCOLORSCHEME #define TB_SETUNICODEFORMAT CCM_SETUNICODEFORMAT @@ -655,6 +664,7 @@ #define TBN_DROPDOWN (TBN_FIRST-10) #endif #if (_WIN32_IE >= 0x0400) +#define TBN_GETOBJECT (TBN_FIRST-12) #define TBN_HOTITEMCHANGE (TBN_FIRST-13) #define TBN_DRAGOUT (TBN_FIRST-14) #define TBN_DELETINGBUTTON (TBN_FIRST-15) @@ -1212,6 +1222,7 @@ #define LVN_SETDISPINFOA (LVN_FIRST-51) #define LVN_SETDISPINFOW (LVN_FIRST-78) #define LVN_KEYDOWN (LVN_FIRST-55) +#define LVN_MARQUEEBEGIN (LVN_FIRST-56) #if (_WIN32_IE >= 0x0400) #define LVN_GETINFOTIPA (LVN_FIRST-57) #define LVN_GETINFOTIPW (LVN_FIRST-58) @@ -1468,6 +1479,7 @@ #define TCN_KEYDOWN TCN_FIRST #define TCN_SELCHANGE (TCN_FIRST-1) #define TCN_SELCHANGING (TCN_FIRST-2) +#define TCN_GETOBJECT (TCN_FIRST-3) #define NM_OUTOFMEMORY (NM_FIRST-1) #define NM_CLICK (NM_FIRST-2) #define NM_DBLCLK (NM_FIRST-3) @@ -1681,6 +1693,7 @@ #define LVN_ODFINDITEMW (LVN_FIRST-79) #define LVN_ITEMACTIVATE (LVN_FIRST-14) #define LVN_ODSTATECHANGED (LVN_FIRST-15) +#define LVN_HOTTRACK (LVN_FIRST-21) #ifdef UNICODE #define LVN_ODFINDITEM LVN_ODFINDITEMW #else @@ -1995,12 +2008,32 @@ char szText[CBEMAXSTRLEN]; int iWhy; } NMCBEENDEDITA, *LPNMCBEENDEDITA,*PNMCBEENDEDITA; +typedef struct tagNMOBJECTNOTIFY +{ + NMHDR hdr; + int iItem; +#ifdef __IID_DEFINED__ + const IID *piid; +#else + const void *piid; +#endif + void *pObject; + HRESULT hResult; + DWORD dwFlags; +} NMOBJECTNOTIFY, *LPNMOBJECTNOTIFY; typedef struct tagNMKEY { NMHDR hdr; UINT nVKey; UINT uFlags; } NMKEY, *LPNMKEY; +typedef struct tagNMCHAR +{ + NMHDR hdr; + UINT ch; + DWORD dwItemPrev; /* Item previously selected */ + DWORD dwItemNext; /* Item to be selected */ +} NMCHAR, *LPNMCHAR; typedef struct _COLORMAP { COLORREF from; COLORREF to; @@ -2572,6 +2605,19 @@ int iTo; } NMLVCACHEHINT, *PNMLVCACHEHINT; #define NM_CACHEHINT NMLVCACHEHINT +typedef struct tagNMLVFINDITEMA +{ + NMHDR hdr; + int iStart; + LVFINDINFOA lvfi; +} NMLVFINDITEMA, *LPNMLVFINDITEMA; +typedef struct tagNMLVFINDITEMW +{ + NMHDR hdr; + int iStart; + LVFINDINFOW lvfi; +} NMLVFINDITEMW, *LPNMLVFINDITEMW; + typedef struct _TREEITEM *HTREEITEM; typedef struct tagTVITEMA { UINT mask; @@ -2726,11 +2772,16 @@ LPARAM lParam; } NMTVGETINFOTIPW, *LPNMTVGETINFOTIPW; #endif -typedef struct _TV_KEYDOWN { +#include <pshpack1.h> +typedef struct tagTVKEYDOWN +{ NMHDR hdr; WORD wVKey; UINT flags; -} TV_KEYDOWN; +} NMTVKEYDOWN, *LPNMTVKEYDOWN; +#include <poppack.h> +#define TV_KEYDOWN NMTVKEYDOWN + typedef struct _TC_ITEMHEADERA { UINT mask; UINT lpReserved1; Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/prsht.h (original) +++ trunk/reactos/include/psdk/prsht.h Fri Jul 28 00:34:04 2006 @@ -106,6 +106,9 @@ #define PSN_HELP (-205) #define PSN_KILLACTIVE (-201) #define PSN_QUERYCANCEL (-209) +#define PSN_GETOBJECT (PSN_FIRST-10) +#define PSN_TRANSLATEACCELERATOR (PSN_FIRST-12) +#define PSN_QUERYINITIALFOCUS (PSN_FIRST-13) #define PSN_RESET (-203) #define PSN_SETACTIVE (-200) #define PSN_WIZBACK (-206) @@ -306,6 +309,17 @@ #define PropSheet_UnChanged(d,w) SendMessage(d,PSM_UNCHANGED,(WPARAM)w,0) #endif +#define WC_PROPSHEETA "SysPropertySheet" +#if defined(__GNUC__) +# define WC_PROPSHEETW (const WCHAR []){ 'S','y','s', \ + 'P','r','o','p','e','r','t','y','S','h','e','e','t',0 } +#elif defined(_MSC_VER) +# define WC_PROPSHEETW L"SysPropertySheet" +#else +static const WCHAR WC_PROPSHEETW[] = { 'S','y','s', + 'P','r','o','p','e','r','t','y','S','h','e','e','t',0 }; +#endif + #ifdef UNICODE #define LPFNPSPCALLBACK LPFNPSPCALLBACKW #define PROPSHEETPAGE PROPSHEETPAGEW Modified: trunk/reactos/include/psdk/richedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/richedit.h?re… ============================================================================== --- trunk/reactos/include/psdk/richedit.h (original) +++ trunk/reactos/include/psdk/richedit.h Fri Jul 28 00:34:04 2006 @@ -11,8 +11,10 @@ #ifdef UNICODE #define RICHEDIT_CLASS L"RichEdit20W" +#define RICHEDIT_CLASS20W L"RichEdit20W" #else #define RICHEDIT_CLASS "RichEdit20A" +#define RICHEDIT_CLASS20A "RichEdit20A" #endif #define RICHEDIT_CLASS10A "RICHEDIT" #define CF_RTF TEXT("Rich Text Format") @@ -222,6 +224,7 @@ #define EM_GETIMECOLOR (WM_USER + 105) #define EM_SETIMEOPTIONS (WM_USER + 106) #define EM_GETIMEOPTIONS (WM_USER + 107) +#define EM_CONVPOSITION (WM_USER + 108) #define EM_SETLANGOPTIONS (WM_USER+120) #define EM_GETLANGOPTIONS (WM_USER+121) #define EM_GETIMECOMPMODE (WM_USER+122) @@ -236,6 +239,7 @@ #define EM_GETTYPOGRAPHYOPTIONS (WM_USER+203) #define EM_SETEDITSTYLE (WM_USER + 204) #define EM_GETEDITSTYLE (WM_USER + 205) +#define EM_OUTLINE (WM_USER + 220) #define EM_GETSCROLLPOS (WM_USER+221) #define EM_SETSCROLLPOS (WM_USER+222) #define EM_SETFONTSIZE (WM_USER+223)

18 years, 1 month

[ion] 23326: - Add kernel fun entry: - Find out why 7zip can't create temporary folders due to deferred I/O completion in IopParseDevice when creating a new File Object.. Thanks to encoded.

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 28 00:18:22 2006 New Revision: 23326 URL: http://svn.reactos.org/svn/reactos?rev=23326&view=rev Log: - Add kernel fun entry: - Find out why 7zip can't create temporary folders due to deferred I/O completion in IopParseDevice when creating a new File Object.. Thanks to encoded. Modified: trunk/reactos/ntoskrnl/KrnlFun.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Fri Jul 28 00:18:22 2006 @@ -11,6 +11,8 @@ // Io: // - Fix double-reference in IopCreateFile. // - See why queueing IRPs and cancelling them causes crashes. +// - Find out why 7zip can't create temporary folders due to deferred I/O +// completion in IopParseDevice when creating a new File Object. // - Add SEH to some places where it's missing (MDLs, etc) (iofunc). // - Add a generic Cleanup/Exception Routine (iofunc). // - Add another parameter to IopCleanupFailedIrp.

18 years, 1 month

[ion] 23325: - Enable IopReferenceDeviceObject in IopParseDevice (not much use for now except OS "Correctness" and identifying broken drivers). DO referencing isn't fully used in the kernel yet. - Fix broken drivers: i8042 and videoprt. NDIS might be broken too, but downloading worked fine for me, so it's not hitting the check in IopParseDevice.

by ion＠svn.reactos.org

Author: ion Date: Fri Jul 28 00:16:48 2006 New Revision: 23325 URL: http://svn.reactos.org/svn/reactos?rev=23325&view=rev Log: - Enable IopReferenceDeviceObject in IopParseDevice (not much use for now except OS "Correctness" and identifying broken drivers). DO referencing isn't fully used in the kernel yet. - Fix broken drivers: i8042 and videoprt. NDIS might be broken too, but downloading worked fine for me, so it's not hitting the check in IopParseDevice. Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/video/videoprt/videoprt.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Fri Jul 28 00:16:48 2006 @@ -741,6 +741,7 @@ KeInitializeTimer(&DevExt->TimerMouseTimeout); Status = I8042Initialize(DevExt); + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; if (!NT_SUCCESS(STATUS_SUCCESS)) { DPRINT1("Initialization failure: %x\n", Status); return Status; @@ -790,6 +791,7 @@ } InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; } else DevExt->KeyboardExists = FALSE; @@ -838,6 +840,7 @@ } InsertTailList(&DevExt->BusDevices, &FdoDevExt->BusDevices); + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; } else DevExt->MouseExists = FALSE; Modified: trunk/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vid… ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.c (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.c Fri Jul 28 00:16:48 2006 @@ -362,6 +362,8 @@ DeviceExtension->NextDeviceObject = IoAttachDeviceToDeviceStack( *DeviceObject, PhysicalDeviceObject); + /* Remove the initailizing flag */ + (*DeviceObject)->Flags &= ~DO_DEVICE_INITIALIZING; return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c Fri Jul 28 00:16:48 2006 @@ -342,6 +342,9 @@ (DeviceObject->Flags & DO_DEVICE_INITIALIZING)) { /* It's unloading or initializing, so fail */ + DPRINT1("You are seeing this because the following ROS driver: %wZ\n" + " sucks. Please fix it's AddDevice Routine\n", + &DeviceObject->DriverObject->DriverName); return STATUS_NO_SUCH_DEVICE; } else Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri Jul 28 00:16:48 2006 @@ -622,8 +622,6 @@ return Status; } - IopReinitializeDrivers(); - /* Set the driver as initialized */ Driver->Flags |= DRVO_INITIALIZED; DeviceObject = Driver->DeviceObject; @@ -633,6 +631,8 @@ DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; DeviceObject = DeviceObject->NextDevice; } + + IopReinitializeDrivers(); return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c Fri Jul 28 00:16:48 2006 @@ -67,9 +67,9 @@ OriginalDeviceObject = OpenPacket->RelatedFileObject->DeviceObject; } - /* Reference the DO FIXME: Don't allow failure */ - //Status = IopReferenceDeviceObject(OriginalDeviceObject); - OriginalDeviceObject->ReferenceCount++; + /* Reference the DO */ + Status = IopReferenceDeviceObject(OriginalDeviceObject); + if (!NT_SUCCESS(Status)) return Status; /* Map the generic mask and set the new mapping in the access state */ RtlMapGenericMask(&AccessState->RemainingDesiredAccess,

18 years, 1 month

[ion] 23324: - Set DRVO_INITAILIZED flag for intiailized driver objects. - Loop the list of devices created by the driver's DriverEntry and remove the DO_DEVICE_INITIALIZING flag.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 27 23:56:38 2006 New Revision: 23324 URL: http://svn.reactos.org/svn/reactos?rev=23324&view=rev Log: - Set DRVO_INITAILIZED flag for intiailized driver objects. - Loop the list of devices created by the driver's DriverEntry and remove the DO_DEVICE_INITIALIZING flag. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Thu Jul 27 23:56:38 2006 @@ -571,6 +571,8 @@ const WCHAR ServicesKeyName[] = L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\"; UNICODE_STRING RegistryKey; PDRIVER_INITIALIZE DriverEntry; + PDRIVER_OBJECT Driver; + PDEVICE_OBJECT DeviceObject; NTSTATUS Status; DriverEntry = ModuleObject->EntryPoint; @@ -593,13 +595,13 @@ } Status = IopCreateDriverObject( - DriverObject, + &Driver, ServiceName, 0, FileSystemDriver, ModuleObject->DllBase, ModuleObject->SizeOfImage); - + *DriverObject = Driver; if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDriverObject failed (Status %x)\n", Status); @@ -609,18 +611,28 @@ DPRINT("RegistryKey: %wZ\n", &RegistryKey); DPRINT("Calling driver entrypoint at %08lx\n", DriverEntry); - Status = DriverEntry(*DriverObject, &RegistryKey); + Status = DriverEntry(Driver, &RegistryKey); RtlFreeUnicodeString(&RegistryKey); if (!NT_SUCCESS(Status)) { - ObMakeTemporaryObject(*DriverObject); - ObDereferenceObject(*DriverObject); + ObMakeTemporaryObject(Driver); + ObDereferenceObject(Driver); return Status; } IopReinitializeDrivers(); + + /* Set the driver as initialized */ + Driver->Flags |= DRVO_INITIALIZED; + DeviceObject = Driver->DeviceObject; + while (DeviceObject) + { + /* Set every device as initialized too */ + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DeviceObject = DeviceObject->NextDevice; + } return STATUS_SUCCESS; }

18 years, 1 month

[ion] 23323: - Fix some last STDCALL->NTAPI problems. - Generate KUSER_SHARED_DATA cookie if it doesn't already exist when a user-mode thread runs. - Remove the last Ps entry from kernel fun.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 27 22:28:26 2006 New Revision: 23323 URL: http://svn.reactos.org/svn/reactos?rev=23323&view=rev Log: - Fix some last STDCALL->NTAPI problems. - Generate KUSER_SHARED_DATA cookie if it doesn't already exist when a user-mode thread runs. - Remove the last Ps entry from kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/process.c trunk/reactos/ntoskrnl/ps/query.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/ps/win32.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 27 22:28:26 2006 @@ -23,9 +23,6 @@ // - Verify ShareAccess APIs, XP added some new semantics. // - Add support for Fast Dispatch I/O. // -// Ps: -// - Generate process cookie for user-more thread. -// // Ob: // - Fix bug related to Deferred Loading (don't requeue active work item). // - Add Directory Lock. Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Thu Jul 27 22:28:26 2006 @@ -28,7 +28,7 @@ #ifdef DBG VOID -STDCALL +NTAPI PspDumpThreads(BOOLEAN IncludeSystem) { PLIST_ENTRY CurrentThread, CurrentProcess; Modified: trunk/reactos/ntoskrnl/ps/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/process.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/process.c (original) +++ trunk/reactos/ntoskrnl/ps/process.c Thu Jul 27 22:28:26 2006 @@ -994,10 +994,11 @@ /* * @implemented */ -HANDLE STDCALL +HANDLE +NTAPI PsGetCurrentProcessId(VOID) { - return((HANDLE)PsGetCurrentProcess()->UniqueProcessId); + return (HANDLE)PsGetCurrentProcess()->UniqueProcessId; } /* @@ -1074,7 +1075,7 @@ * @implemented */ BOOLEAN -STDCALL +NTAPI PsIsProcessBeingDebugged(PEPROCESS Process) { return Process->DebugPort != NULL; Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 27 22:28:26 2006 @@ -400,7 +400,7 @@ /* Get the current process and cookie */ Process = PsGetCurrentProcess(); Cookie = Process->Cookie; - if(!Cookie) + if (!Cookie) { LARGE_INTEGER SystemTime; ULONG NewCookie; @@ -416,7 +416,7 @@ Cookie = InterlockedCompareExchange((LONG*)&Process->Cookie, NewCookie, Cookie); - if(!Cookie) Cookie = NewCookie; + if (!Cookie) Cookie = NewCookie; /* Set return length */ Length = sizeof(ULONG); Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Jul 27 22:28:26 2006 @@ -95,13 +95,21 @@ /* Do we have a cookie set yet? */ if (!SharedUserData->Cookie) { - /* - * FIXME: Generate cookie - * Formula (roughly): Per-CPU Page Fault ^ Per-CPU Interrupt Time ^ - * Global System Time ^ Stack Address of where - * the LARGE_INTEGER containing the Global System - * Time is. - */ + LARGE_INTEGER SystemTime; + ULONG NewCookie; + PKPRCB Prcb; + + /* Generate a new cookie */ + KeQuerySystemTime(&SystemTime); + Prcb = KeGetCurrentPrcb(); + NewCookie = Prcb->MmPageFaultCount ^ Prcb->InterruptTime ^ + SystemTime.u.LowPart ^ SystemTime.u.HighPart ^ + (ULONG)&SystemTime; + + /* Set the new cookie*/ + InterlockedCompareExchange((LONG*)&SharedUserData->Cookie, + NewCookie, + 0); } } Modified: trunk/reactos/ntoskrnl/ps/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/win32.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/win32.c (original) +++ trunk/reactos/ntoskrnl/ps/win32.c Thu Jul 27 22:28:26 2006 @@ -114,7 +114,7 @@ } NTSTATUS -STDCALL +NTAPI NtW32Call(IN ULONG RoutineIndex, IN PVOID Argument, IN ULONG ArgumentLength,

18 years, 1 month

[ion] 23322: - Reimplement and activate NtQueryInformationThread. - Remove kernel fun entry.

by ion＠svn.reactos.org

Author: ion Date: Thu Jul 27 21:09:42 2006 New Revision: 23322 URL: http://svn.reactos.org/svn/reactos?rev=23322&view=rev Log: - Reimplement and activate NtQueryInformationThread. - Remove kernel fun entry. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=233… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Thu Jul 27 21:09:42 2006 @@ -24,7 +24,6 @@ // - Add support for Fast Dispatch I/O. // // Ps: -// - Re-enable NtQuery/SetInformation Thread. // - Generate process cookie for user-more thread. // // Ob: Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Jul 27 21:09:42 2006 @@ -63,7 +63,7 @@ { PEPROCESS Process; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - NTSTATUS Status = STATUS_SUCCESS; + NTSTATUS Status; ULONG Length = 0; PPROCESS_BASIC_INFORMATION ProcessBasicInfo = (PPROCESS_BASIC_INFORMATION)ProcessInformation; @@ -881,80 +881,200 @@ PETHREAD Thread; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status = STATUS_SUCCESS; + ULONG Access; + ULONG Length = 0; + PTHREAD_BASIC_INFORMATION ThreadBasicInfo = + (PTHREAD_BASIC_INFORMATION)ThreadInformation; + PKERNEL_USER_TIMES ThreadTime = (PKERNEL_USER_TIMES)ThreadInformation; + KIRQL OldIrql; PAGED_CODE(); - DPRINT1("%s called for: %d\n", __FUNCTION__, ThreadInformationClass); + /* Verify Information Class validity */ + Status = DefaultSetInfoBufferCheck(ThreadInformationClass, + PsThreadInfoClass, + RTL_NUMBER_OF(PsThreadInfoClass), + ThreadInformation, + ThreadInformationLength, + PreviousMode); + if (!NT_SUCCESS(Status)) return Status; + + /* Check what class this is */ + Access = THREAD_QUERY_INFORMATION; + + /* Reference the process */ Status = ObReferenceObjectByHandle(ThreadHandle, - THREAD_QUERY_INFORMATION, + Access, PsThreadType, PreviousMode, (PVOID*)&Thread, NULL); if (!NT_SUCCESS(Status)) return Status; -#if 0 + /* Check what kind of information class this is */ switch (ThreadInformationClass) { + /* Basic thread information */ case ThreadBasicInformation: - /* A test on W2K agains ntdll shows NtQueryInformationThread return STATUS_PENDING - * as ExitStatus for current/running thread, while KETHREAD's ExitStatus is - * 0. So do the conversion here: - * -Gunnar */ - u.TBI.ExitStatus = (Thread->ExitStatus == 0) ? STATUS_PENDING : Thread->ExitStatus; - u.TBI.TebBaseAddress = (PVOID)Thread->Tcb.Teb; - u.TBI.ClientId = Thread->Cid; - u.TBI.AffinityMask = Thread->Tcb.Affinity; - u.TBI.Priority = Thread->Tcb.Priority; - u.TBI.BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); - break; - + + /* Protect writes with SEH */ + _SEH_TRY + { + /* Write all the information from the ETHREAD/KTHREAD */ + ThreadBasicInfo->ExitStatus = (Thread->ExitStatus == 0) ? + STATUS_PENDING : + Thread->ExitStatus; + ThreadBasicInfo->TebBaseAddress = (PVOID)Thread->Tcb.Teb; + ThreadBasicInfo->ClientId = Thread->Cid; + ThreadBasicInfo->AffinityMask = Thread->Tcb.Affinity; + ThreadBasicInfo->Priority = Thread->Tcb.Priority; + ThreadBasicInfo->BasePriority = KeQueryBasePriorityThread(&Thread->Tcb); + + /* Set return length */ + Length = sizeof(THREAD_BASIC_INFORMATION); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + break; + + /* Thread time information */ case ThreadTimes: - u.TTI.KernelTime.QuadPart = Thread->Tcb.KernelTime * 100000LL; - u.TTI.UserTime.QuadPart = Thread->Tcb.UserTime * 100000LL; - u.TTI.CreateTime = Thread->CreateTime; - /*This works*/ - u.TTI.ExitTime = Thread->ExitTime; + + /* Protect writes with SEH */ + _SEH_TRY + { + /* Copy time information from ETHREAD/KTHREAD */ + ThreadTime->KernelTime.QuadPart = Thread->Tcb.KernelTime * + 100000LL; + ThreadTime->UserTime.QuadPart = Thread->Tcb.UserTime * + 100000LL; + ThreadTime->CreateTime = Thread->CreateTime; + ThreadTime->ExitTime = Thread->ExitTime; + + /* Set the return length */ + Length = sizeof(KERNEL_USER_TIMES); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadQuerySetWin32StartAddress: - u.Address = Thread->Win32StartAddress; + + /* Protect write with SEH */ + _SEH_TRY + { + /* Return the Win32 Start Address */ + *(PVOID*)ThreadInformation = Thread->Win32StartAddress; + + /* Set the return length*/ + Length = sizeof(PVOID); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadPerformanceCount: - /* Nebbett says this class is always zero */ - u.Count.QuadPart = 0; + + /* Protect write with SEH */ + _SEH_TRY + { + /* FIXME */ + (*(PLARGE_INTEGER)ThreadInformation).QuadPart = 0; + + /* Set the return length*/ + Length = sizeof(LARGE_INTEGER); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadAmILastThread: - if (Thread->ThreadsProcess->ThreadListHead.Flink->Flink == - &Thread->ThreadsProcess->ThreadListHead) - { - u.Last = TRUE; - } - else - { - u.Last = FALSE; - } + + /* Protect write with SEH */ + _SEH_TRY + { + /* Return whether or not we are the last thread */ + *(PULONG)ThreadInformation = ((Thread->ThreadsProcess-> + ThreadListHead.Flink->Flink == + &Thread->ThreadsProcess-> + ThreadListHead) ? + TRUE : FALSE); + + /* Set the return length*/ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; break; case ThreadIsIoPending: - { - KIRQL OldIrql; - - /* Raise the IRQL to protect the IRP list */ - KeRaiseIrql(APC_LEVEL, &OldIrql); - u.IsIoPending = !IsListEmpty(&Thread->IrpList); - KeLowerIrql(OldIrql); - break; - } - + + /* Raise the IRQL to protect the IRP list */ + KeRaiseIrql(APC_LEVEL, &OldIrql); + + /* Protect write with SEH */ + _SEH_TRY + { + /* Check if the IRP list is empty or not */ + *(PULONG)ThreadInformation = !IsListEmpty(&Thread->IrpList); + + /* Set the return length*/ + Length = sizeof(ULONG); + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Lower IRQL back */ + KeLowerIrql(OldIrql); + break; + + /* Anything else */ default: - /* Shoult never occure if the data table is correct */ - KEBUGCHECK(0); - } -#endif + + /* Not yet implemented */ + DPRINT1("Not implemented: %lx\n", ThreadInformationClass); + Status = STATUS_NOT_IMPLEMENTED; + } + + /* Protect write with SEH */ + _SEH_TRY + { + /* Check if caller wanted return length */ + if (ReturnLength) *ReturnLength = Length; + } + _SEH_HANDLE + { + /* Get exception code */ + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + + /* Dereference the thread, and return */ ObDereferenceObject(Thread); - return(Status); + return Status; } /* EOF */

18 years, 1 month

[amunger] 23321: Merge 23320 from trunk.

by amunger＠svn.reactos.org

Author: amunger Date: Thu Jul 27 20:55:45 2006 New Revision: 23321 URL: http://svn.reactos.org/svn/reactos?rev=23321&view=rev Log: Merge 23320 from trunk. Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/include/ne2000.h Thu Jul 27 20:55:45 2006 @@ -78,7 +78,8 @@ /* I/O base address and interrupt number of adapter */ ULONG IoBaseAddress; - ULONG InterruptNumber; + ULONG InterruptLevel; + ULONG InterruptVector; /* Mapped address of the I/O base port */ PUCHAR IOBase; Modified: branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/driver… ============================================================================== --- branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c (original) +++ branches/ros-branch-0_3_0/reactos/drivers/network/dd/ne2000/ne2000/main.c Thu Jul 27 20:55:45 2006 @@ -151,6 +151,54 @@ } +static VOID STDCALL MiQueryResources( + OUT PNDIS_STATUS Status, + IN PNIC_ADAPTER Adapter, + IN NDIS_HANDLE WrapperConfigurationContext) +{ + PNDIS_RESOURCE_LIST AssignedResources; + UINT BufferSize = 0; + PCM_PARTIAL_RESOURCE_DESCRIPTOR Descriptor; + int i; + + NdisMQueryAdapterResources(Status, + WrapperConfigurationContext, + NULL, + &BufferSize); + if (*Status != NDIS_STATUS_RESOURCES) + return; + + *Status = NdisAllocateMemory((PVOID)&AssignedResources, + BufferSize, + 0, + HighestAcceptableMax); + if (*Status != NDIS_STATUS_SUCCESS) + return; + + NdisMQueryAdapterResources(Status, + WrapperConfigurationContext, + AssignedResources, + &BufferSize); + if (*Status != NDIS_STATUS_SUCCESS) + return; + + for (i = 0; i < AssignedResources->Count; i++) + { + Descriptor = AssignedResources->PartialDescriptors + i; + switch (Descriptor->Type) + { + case CmResourceTypeInterrupt: + Adapter->InterruptLevel = Descriptor->u.Interrupt.Level; + Adapter->InterruptVector = Descriptor->u.Interrupt.Vector; + break; + case CmResourceTypePort: + Adapter->IoBaseAddress = Descriptor->u.Port.Start.LowPart; + break; + } + } +} + + static NDIS_STATUS STDCALL MiniportInitialize( OUT PNDIS_STATUS OpenErrorStatus, OUT PUINT SelectedMediumIndex, @@ -202,13 +250,18 @@ NdisZeroMemory(Adapter, sizeof(NIC_ADAPTER)); Adapter->MiniportAdapterHandle = MiniportAdapterHandle; Adapter->IoBaseAddress = DRIVER_DEFAULT_IO_BASE_ADDRESS; - Adapter->InterruptNumber = DRIVER_DEFAULT_INTERRUPT_NUMBER; + Adapter->InterruptLevel = DRIVER_DEFAULT_INTERRUPT_NUMBER; + Adapter->InterruptVector = DRIVER_DEFAULT_INTERRUPT_NUMBER; Adapter->MaxMulticastListSize = DRIVER_MAX_MULTICAST_LIST_SIZE; Adapter->InterruptMask = DRIVER_INTERRUPT_MASK; Adapter->LookaheadSize = DRIVER_MAXIMUM_LOOKAHEAD; - /* get the port, irq, and MAC address from registry */ - do + /* Query the resources from PnP. */ + MiQueryResources(&Status, Adapter, WrapperConfigurationContext); + + /* Get the port, irq, and MAC address from registry if the PnP + failed. */ + if (Status != NDIS_STATUS_SUCCESS) { PNDIS_CONFIGURATION_PARAMETER ConfigurationParameter; NDIS_HANDLE ConfigurationHandle; @@ -217,52 +270,54 @@ UINT RegNetworkAddressLength = 0; NdisOpenConfiguration(&Status, &ConfigurationHandle, WrapperConfigurationContext); - if(Status != NDIS_STATUS_SUCCESS) + if (Status == NDIS_STATUS_SUCCESS) + { + NdisInitUnicodeString(&Keyword, L"Irq"); + NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); + if(Status == NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Irq returned successfully, irq 0x%x\n", + ConfigurationParameter->ParameterData.IntegerData)); + Adapter->InterruptLevel = + Adapter->InterruptVector = ConfigurationParameter->ParameterData.IntegerData; + } + + NdisInitUnicodeString(&Keyword, L"Port"); + NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); + if(Status == NDIS_STATUS_SUCCESS) + { + NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Port returned successfully, port 0x%x\n", + ConfigurationParameter->ParameterData.IntegerData)); + Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; + } + + /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ + NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); + if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) + { + int i; + NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", + RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], + RegNetworkAddress[4], RegNetworkAddress[5])); + for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) + Adapter->StationAddress[i] = RegNetworkAddress[i]; + } + + NdisCloseConfiguration(ConfigurationHandle); + } + else { NDIS_DbgPrint(MIN_TRACE,("NdisOpenConfiguration returned error 0x%x\n", Status)); - break; } - - NdisInitUnicodeString(&Keyword, L"Irq"); - NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); - if(Status == NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Irq returned successfully, irq 0x%x\n", - ConfigurationParameter->ParameterData.IntegerData)); - Adapter->InterruptNumber = ConfigurationParameter->ParameterData.IntegerData; - } - - NdisInitUnicodeString(&Keyword, L"Port"); - NdisReadConfiguration(&Status, &ConfigurationParameter, ConfigurationHandle, &Keyword, NdisParameterHexInteger); - if(Status == NDIS_STATUS_SUCCESS) - { - NDIS_DbgPrint(MID_TRACE,("NdisReadConfiguration for Port returned successfully, port 0x%x\n", - ConfigurationParameter->ParameterData.IntegerData)); - Adapter->IoBaseAddress = ConfigurationParameter->ParameterData.IntegerData; - } - - /* the returned copy of the data is owned by NDIS and will be released on NdisCloseConfiguration */ - NdisReadNetworkAddress(&Status, (PVOID *)&RegNetworkAddress, &RegNetworkAddressLength, ConfigurationHandle); - if(Status == NDIS_STATUS_SUCCESS && RegNetworkAddressLength == DRIVER_LENGTH_OF_ADDRESS) - { - int i; - NDIS_DbgPrint(MID_TRACE,("NdisReadNetworkAddress returned successfully, address %x:%x:%x:%x:%x:%x\n", - RegNetworkAddress[0], RegNetworkAddress[1], RegNetworkAddress[2], RegNetworkAddress[3], - RegNetworkAddress[4], RegNetworkAddress[5])); - for(i = 0; i < DRIVER_LENGTH_OF_ADDRESS; i++) - Adapter->StationAddress[i] = RegNetworkAddress[i]; - } - - NdisCloseConfiguration(ConfigurationHandle); - } while(0); + } /* find the nic */ if (!NICCheck(Adapter)) { NDIS_DbgPrint(MID_TRACE, ("No adapter found at (0x%X).\n", Adapter->IoBaseAddress)); + NdisFreeMemory(Adapter, sizeof(NIC_ADAPTER), 0); return NDIS_STATUS_ADAPTER_NOT_FOUND; } else NDIS_DbgPrint(MID_TRACE, ("Adapter found at (0x%X).\n", Adapter->IoBaseAddress)); - NdisMSetAttributes( MiniportAdapterHandle, @@ -334,8 +389,8 @@ Status = NdisMRegisterInterrupt( &Adapter->Interrupt, MiniportAdapterHandle, - Adapter->InterruptNumber, - Adapter->InterruptNumber, + Adapter->InterruptVector, + Adapter->InterruptLevel, FALSE, FALSE, NdisInterruptLatched);

18 years, 1 month

← Newer
1
...
5
6
7
8
9
10
11
...
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 July 2006